diff options
| author | Anton Khirnov <anton@khirnov.net> | 2024-10-14 12:16:31 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2024-10-17 10:52:02 +0200 |
| commit | ad50254ee1bccfdb67e4d8443c6c11712f0da755 (patch) | |
| tree | 89190ddb6ad6f5e90a2989e375c2827aaddd239d | |
| parent | e206e72b83a0e512e21694a43af4df2b53f6d045 (diff) | |
| download | ffmpeg-ad50254ee1bccfdb67e4d8443c6c11712f0da755.tar.gz | |
fftools/ffmpeg_demux: use proper logging contexts everywhere
| -rw-r--r-- | fftools/ffmpeg_demux.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 364f148f60..0fd095d8ae 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -240,7 +240,7 @@ static void ts_discontinuity_detect(Demuxer *d, InputStream *ist, } } else { if (FFABS(delta) > 1LL * dts_error_threshold * AV_TIME_BASE) { - av_log(NULL, AV_LOG_WARNING, + av_log(ist, AV_LOG_WARNING, "DTS %"PRId64", next:%"PRId64" st:%d invalid dropping\n", pkt->dts, ds->next_dts, pkt->stream_index); pkt->dts = AV_NOPTS_VALUE; @@ -249,7 +249,7 @@ static void ts_discontinuity_detect(Demuxer *d, InputStream *ist, int64_t pkt_pts = av_rescale_q(pkt->pts, pkt->time_base, AV_TIME_BASE_Q); delta = pkt_pts - ds->next_dts; if (FFABS(delta) > 1LL * dts_error_threshold * AV_TIME_BASE) { - av_log(NULL, AV_LOG_WARNING, + av_log(ist, AV_LOG_WARNING, "PTS %"PRId64", next:%"PRId64" invalid dropping st:%d\n", pkt->pts, ds->next_dts, pkt->stream_index); pkt->pts = AV_NOPTS_VALUE; @@ -261,7 +261,7 @@ static void ts_discontinuity_detect(Demuxer *d, InputStream *ist, int64_t delta = pkt_dts - d->last_ts; if (FFABS(delta) > 1LL * dts_delta_threshold * AV_TIME_BASE) { d->ts_offset_discont -= delta; - av_log(NULL, AV_LOG_DEBUG, + av_log(ist, AV_LOG_DEBUG, "Inter stream timestamp discontinuity %"PRId64", new offset= %"PRId64"\n", delta, d->ts_offset_discont); pkt->dts -= av_rescale_q(delta, AV_TIME_BASE_Q, pkt->time_base); @@ -476,7 +476,7 @@ static int input_packet_process(Demuxer *d, AVPacket *pkt, unsigned *send_flags) fd->wallclock[LATENCY_PROBE_DEMUX] = av_gettime_relative(); if (debug_ts) { - av_log(NULL, AV_LOG_INFO, "demuxer+ffmpeg -> ist_index:%d:%d type:%s pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s duration:%s duration_time:%s off:%s off_time:%s\n", + av_log(ist, AV_LOG_INFO, "demuxer+ffmpeg -> ist_index:%d:%d type:%s pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s duration:%s duration_time:%s off:%s off_time:%s\n", f->index, pkt->stream_index, av_get_media_type_string(ist->par->codec_type), av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &pkt->time_base), @@ -1104,7 +1104,7 @@ static int choose_decoder(const OptionsContext *o, void *logctx, for (int j = 0; config = avcodec_get_hw_config(c, j); j++) { if (config->device_type == hwaccel_device_type) { - av_log(NULL, AV_LOG_VERBOSE, "Selecting decoder '%s' because of requested hwaccel method %s\n", + av_log(logctx, AV_LOG_VERBOSE, "Selecting decoder '%s' because of requested hwaccel method %s\n", c->name, av_hwdevice_get_type_name(hwaccel_device_type)); *pcodec = c; return 0; |