diff options
Diffstat (limited to 'libavformat/avidec.c')
| -rw-r--r-- | libavformat/avidec.c | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 6bd8b11f75..6945aeedd6 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -118,7 +118,7 @@ static int avi_load_index(AVFormatContext *s); static int guess_ni_flag(AVFormatContext *s); #define print_tag(str, tag, size) \ - av_dlog(NULL, "pos:%"PRIX64" %s: tag=%c%c%c%c size=0x%x\n", \ + av_log(NULL, AV_LOG_TRACE, "pos:%"PRIX64" %s: tag=%c%c%c%c size=0x%x\n", \ avio_tell(pb), str, tag & 0xff, \ (tag >> 8) & 0xff, \ (tag >> 16) & 0xff, \ @@ -178,7 +178,7 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num) int64_t last_pos = -1; int64_t filesize = avi->fsize; - av_dlog(s, + av_log(s, AV_LOG_TRACE, "longs_pre_entry:%d index_type:%d entries_in_use:%d " "chunk_id:%X base:%16"PRIX64" frame_num:%d\n", longs_pre_entry, @@ -220,9 +220,8 @@ static int read_braindead_odml_indx(AVFormatContext *s, int frame_num) int key = len >= 0; len &= 0x7FFFFFFF; -#ifdef DEBUG_SEEK - av_log(s, AV_LOG_ERROR, "pos:%"PRId64", len:%X\n", pos, len); -#endif + av_log(s, AV_LOG_TRACE, "pos:%"PRId64", len:%X\n", pos, len); + if (avio_feof(pb)) return AVERROR_INVALIDDATA; @@ -518,7 +517,7 @@ static int avi_read_header(AVFormatContext *s) avi->movi_end = avi->movi_list + size + (size & 1); else avi->movi_end = avi->fsize; - av_dlog(NULL, "movi end=%"PRIx64"\n", avi->movi_end); + av_log(NULL, AV_LOG_TRACE, "movi end=%"PRIx64"\n", avi->movi_end); goto end_of_header; } else if (tag1 == MKTAG('I', 'N', 'F', 'O')) ff_read_riff_info(s, size - 4); @@ -668,7 +667,7 @@ static int avi_read_header(AVFormatContext *s) } ast->sample_size = avio_rl32(pb); /* sample ssize */ ast->cum_len *= FFMAX(1, ast->sample_size); - av_dlog(s, "%"PRIu32" %"PRIu32" %d\n", + av_log(s, AV_LOG_TRACE, "%"PRIu32" %"PRIu32" %d\n", ast->rate, ast->scale, ast->sample_size); switch (tag1) { @@ -931,7 +930,7 @@ static int avi_read_header(AVFormatContext *s) if (active_aspect.num && active_aspect.den && active.num && active.den) { st->sample_aspect_ratio = av_div_q(active_aspect, active); - av_dlog(s, "vprp %d/%d %d/%d\n", + av_log(s, AV_LOG_TRACE, "vprp %d/%d %d/%d\n", active_aspect.num, active_aspect.den, active.num, active.den); } @@ -1151,7 +1150,7 @@ start_sync: size = d[4] + (d[5] << 8) + (d[6] << 16) + (d[7] << 24); n = get_stream_idx(d + 2); - av_dlog(s, "%X %X %X %X %X %X %X %X %"PRId64" %u %d\n", + av_log(s, AV_LOG_TRACE, "%X %X %X %X %X %X %X %X %"PRId64" %u %d\n", d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], i, size, n); if (i*(avi->io_fsize>0) + (uint64_t)size > avi->fsize || d[0] > 127) continue; @@ -1319,7 +1318,7 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt) (AVRational) { FFMAX(1, ast->sample_size), AV_TIME_BASE }); - av_dlog(s, "%"PRId64" %d/%d %"PRId64"\n", ts, + av_log(s, AV_LOG_TRACE, "%"PRId64" %d/%d %"PRId64"\n", ts, st->time_base.num, st->time_base.den, ast->frame_offset); if (ts < best_ts) { best_ts = ts; @@ -1430,7 +1429,7 @@ FF_ENABLE_DEPRECATION_WARNINGS // pkt->dts += ast->start; if (ast->sample_size) pkt->dts /= ast->sample_size; - av_dlog(s, + av_log(s, AV_LOG_TRACE, "dts:%"PRId64" offset:%"PRId64" %d/%d smpl_siz:%d " "base:%d st:%d size:%d\n", pkt->dts, @@ -1545,7 +1544,7 @@ static int avi_read_idx1(AVFormatContext *s, int size) flags = avio_rl32(pb); pos = avio_rl32(pb); len = avio_rl32(pb); - av_dlog(s, "%d: tag=0x%x flags=0x%x pos=0x%x len=%d/", + av_log(s, AV_LOG_TRACE, "%d: tag=0x%x flags=0x%x pos=0x%x len=%d/", i, tag, flags, pos, len); index = ((tag & 0xff) - '0') * 10; @@ -1561,7 +1560,7 @@ static int avi_read_idx1(AVFormatContext *s, int size) } pos += data_offset; - av_dlog(s, "%d cum_len=%"PRId64"\n", len, ast->cum_len); + av_log(s, AV_LOG_TRACE, "%d cum_len=%"PRId64"\n", len, ast->cum_len); // even if we have only a single stream, we should // switch to non-interleaved to get correct timestamps @@ -1690,7 +1689,7 @@ static int avi_load_index(AVFormatContext *s) if (avio_seek(pb, avi->movi_end, SEEK_SET) < 0) goto the_end; // maybe truncated file - av_dlog(s, "movi_end=0x%"PRIx64"\n", avi->movi_end); + av_log(s, AV_LOG_TRACE, "movi_end=0x%"PRIx64"\n", avi->movi_end); for (;;) { tag = avio_rl32(pb); size = avio_rl32(pb); @@ -1698,7 +1697,7 @@ static int avi_load_index(AVFormatContext *s) break; next = avio_tell(pb) + size + (size & 1); - av_dlog(s, "tag=%c%c%c%c size=0x%x\n", + av_log(s, AV_LOG_TRACE, "tag=%c%c%c%c size=0x%x\n", tag & 0xff, (tag >> 8) & 0xff, (tag >> 16) & 0xff, @@ -1776,7 +1775,7 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, pos = st->index_entries[index].pos; timestamp = st->index_entries[index].timestamp / FFMAX(ast->sample_size, 1); - av_dlog(s, "XX %"PRId64" %d %"PRId64"\n", + av_log(s, AV_LOG_TRACE, "XX %"PRId64" %d %"PRId64"\n", timestamp, index, st->index_entries[index].timestamp); if (CONFIG_DV_DEMUXER && avi->dv_demux) { |