This was forgotten due to the non-gpl build used in 549045254.
Clément Bœsch authored on 2017/03/29 23:09:28... | ... |
@@ -551,20 +551,27 @@ static MatchingInfo lookup_signatures(AVFilterContext *ctx, SignatureContext *sc |
551 | 551 |
if (find_next_coarsecandidate(sc, second->coarsesiglist, &cs, &cs2, 1) == 0) |
552 | 552 |
return bestmatch; /* no candidate found */ |
553 | 553 |
do { |
554 |
- av_log(ctx, AV_LOG_DEBUG, "Stage 1: got coarsesignature pair. indices of first frame: %d and %d\n", cs->first->index, cs2->first->index); |
|
554 |
+ av_log(ctx, AV_LOG_DEBUG, "Stage 1: got coarsesignature pair. " |
|
555 |
+ "indices of first frame: %"PRIu32" and %"PRIu32"\n", |
|
556 |
+ cs->first->index, cs2->first->index); |
|
555 | 557 |
/* stage 2: l1-distance and hough-transform */ |
556 | 558 |
av_log(ctx, AV_LOG_DEBUG, "Stage 2: calculate matching parameters\n"); |
557 | 559 |
infos = get_matching_parameters(ctx, sc, cs->first, cs2->first); |
558 | 560 |
if (av_log_get_level() == AV_LOG_DEBUG) { |
559 | 561 |
for (i = infos; i != NULL; i = i->next) { |
560 |
- av_log(ctx, AV_LOG_DEBUG, "Stage 2: matching pair at %d and %d, ratio %f, offset %d\n", i->first->index, i->second->index, i->framerateratio, i->offset); |
|
562 |
+ av_log(ctx, AV_LOG_DEBUG, "Stage 2: matching pair at %"PRIu32" and %"PRIu32", " |
|
563 |
+ "ratio %f, offset %d\n", i->first->index, i->second->index, |
|
564 |
+ i->framerateratio, i->offset); |
|
561 | 565 |
} |
562 | 566 |
} |
563 | 567 |
/* stage 3: evaluation */ |
564 | 568 |
av_log(ctx, AV_LOG_DEBUG, "Stage 3: evaluate\n"); |
565 | 569 |
if (infos) { |
566 | 570 |
bestmatch = evaluate_parameters(ctx, sc, infos, bestmatch, mode); |
567 |
- av_log(ctx, AV_LOG_DEBUG, "Stage 3: best matching pair at %d and %d, ratio %f, offset %d, score %d, %d frames matching\n", bestmatch.first->index, bestmatch.second->index, bestmatch.framerateratio, bestmatch.offset, bestmatch.score, bestmatch.matchframes); |
|
571 |
+ av_log(ctx, AV_LOG_DEBUG, "Stage 3: best matching pair at %"PRIu32" and %"PRIu32", " |
|
572 |
+ "ratio %f, offset %d, score %d, %d frames matching\n", |
|
573 |
+ bestmatch.first->index, bestmatch.second->index, |
|
574 |
+ bestmatch.framerateratio, bestmatch.offset, bestmatch.score, bestmatch.matchframes); |
|
568 | 575 |
sll_free(infos); |
569 | 576 |
} |
570 | 577 |
} while (find_next_coarsecandidate(sc, second->coarsesiglist, &cs, &cs2, 0) && !bestmatch.whole); |