har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg_dec: add an AVClass to Decoder

Browse Source 
Log decoder messages to the decoder rather than InputStream.

This is a step towards decoupling Decoder and InputStream.
This commit is contained in:
Anton Khirnov 2024-01-11 10:45:18 +01:00
parent f2a2094c47
commit 7ecd45587f
2 changed files with 60 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fftools/ffmpeg.h
View File

@ -281,6 +281,8 @@ typedef struct FilterGraph {
} FilterGraph; } FilterGraph;
typedef struct Decoder { typedef struct Decoder {
const AVClass *class;
const uint8_t *subtitle_header; const uint8_t *subtitle_header;
int subtitle_header_size; int subtitle_header_size;
} Decoder; } Decoder;

88
fftools/ffmpeg_dec.c
View File

@ -59,6 +59,9 @@ typedef struct DecoderPriv {
Scheduler *sch; Scheduler *sch;
unsigned sch_idx; unsigned sch_idx;
void *log_parent;
char log_name[32];
} DecoderPriv; } DecoderPriv;
static DecoderPriv *dp_from_dec(Decoder *d) static DecoderPriv *dp_from_dec(Decoder *d)
@ -124,7 +127,7 @@ fail:
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
static AVRational audio_samplerate_update(void *logctx, DecoderPriv *dp, static AVRational audio_samplerate_update(DecoderPriv *dp,
const AVFrame *frame) const AVFrame *frame)
{ {
const int prev = dp->last_frame_tb.den; const int prev = dp->last_frame_tb.den;
@ -139,7 +142,7 @@ static AVRational audio_samplerate_update(void *logctx, DecoderPriv *dp,
gcd = av_gcd(prev, sr); gcd = av_gcd(prev, sr);
if (prev / gcd >= INT_MAX / sr) { if (prev / gcd >= INT_MAX / sr) {
av_log(logctx, AV_LOG_WARNING, av_log(dp, AV_LOG_WARNING,
"Audio timestamps cannot be represented exactly after " "Audio timestamps cannot be represented exactly after "
"sample rate change: %d -> %d\n", prev, sr); "sample rate change: %d -> %d\n", prev, sr);
@ -167,7 +170,7 @@ finish:
return dp->last_frame_tb; return dp->last_frame_tb;
} }
static void audio_ts_process(void *logctx, DecoderPriv *dp, AVFrame *frame) static void audio_ts_process(DecoderPriv *dp, AVFrame *frame)
{ {
AVRational tb_filter = (AVRational){1, frame->sample_rate}; AVRational tb_filter = (AVRational){1, frame->sample_rate};
AVRational tb; AVRational tb;
@ -176,7 +179,7 @@ static void audio_ts_process(void *logctx, DecoderPriv *dp, AVFrame *frame)
// on samplerate change, choose a new internal timebase for timestamp // on samplerate change, choose a new internal timebase for timestamp
// generation that can represent timestamps from all the samplerates // generation that can represent timestamps from all the samplerates
// seen so far // seen so far
tb = audio_samplerate_update(logctx, dp, frame); tb = audio_samplerate_update(dp, frame);
pts_pred = dp->last_frame_pts == AV_NOPTS_VALUE ? 0 : pts_pred = dp->last_frame_pts == AV_NOPTS_VALUE ? 0 :
dp->last_frame_pts + dp->last_frame_duration_est; dp->last_frame_pts + dp->last_frame_duration_est;
@ -278,7 +281,7 @@ static int video_frame_process(InputStream *ist, AVFrame *frame)
if (dp->dec_ctx->width != frame->width || if (dp->dec_ctx->width != frame->width ||
dp->dec_ctx->height != frame->height || dp->dec_ctx->height != frame->height ||
dp->dec_ctx->pix_fmt != frame->format) { dp->dec_ctx->pix_fmt != frame->format) {
av_log(NULL, AV_LOG_DEBUG, "Frame parameters mismatch context %d,%d,%d != %d,%d,%d\n", av_log(dp, AV_LOG_DEBUG, "Frame parameters mismatch context %d,%d,%d != %d,%d,%d\n",
frame->width, frame->width,
frame->height, frame->height,
frame->format, frame->format,
@ -289,7 +292,7 @@ static int video_frame_process(InputStream *ist, AVFrame *frame)
#if FFMPEG_OPT_TOP #if FFMPEG_OPT_TOP
if(ist->top_field_first>=0) { if(ist->top_field_first>=0) {
av_log(ist, AV_LOG_WARNING, "-top is deprecated, use the setfield filter instead\n"); av_log(dp, AV_LOG_WARNING, "-top is deprecated, use the setfield filter instead\n");
frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST;
} }
#endif #endif
@ -320,7 +323,7 @@ static int video_frame_process(InputStream *ist, AVFrame *frame)
dp->last_frame_tb = frame->time_base; dp->last_frame_tb = frame->time_base;
if (debug_ts) { if (debug_ts) {
av_log(ist, AV_LOG_INFO, av_log(dp, AV_LOG_INFO,
"decoder -> pts:%s pts_time:%s " "decoder -> pts:%s pts_time:%s "
"pkt_dts:%s pkt_dts_time:%s " "pkt_dts:%s pkt_dts_time:%s "
"duration:%s duration_time:%s " "duration:%s duration_time:%s "
@ -355,7 +358,7 @@ static int process_subtitle(InputStream *ist, AVFrame *frame)
end = av_rescale(subtitle->pts - sub_prev->pts, end = av_rescale(subtitle->pts - sub_prev->pts,
1000, AV_TIME_BASE); 1000, AV_TIME_BASE);
if (end < sub_prev->end_display_time) { if (end < sub_prev->end_display_time) {
av_log(NULL, AV_LOG_DEBUG, av_log(dp, AV_LOG_DEBUG,
"Subtitle duration reduced from %"PRId32" to %d%s\n", "Subtitle duration reduced from %"PRId32" to %d%s\n",
sub_prev->end_display_time, end, sub_prev->end_display_time, end,
end <= 0 ? ", dropping it" : ""); end <= 0 ? ", dropping it" : "");
@ -440,7 +443,7 @@ static int transcode_subtitles(InputStream *ist, const AVPacket *pkt,
av_packet_free(&flush_pkt); av_packet_free(&flush_pkt);
if (ret < 0) { if (ret < 0) {
av_log(ist, AV_LOG_ERROR, "Error decoding subtitles: %s\n", av_log(dp, AV_LOG_ERROR, "Error decoding subtitles: %s\n",
av_err2str(ret)); av_err2str(ret));
ist->decode_errors++; ist->decode_errors++;
return exit_on_error ? ret : 0; return exit_on_error ? ret : 0;
@ -501,11 +504,11 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame)
// In particular, we don't expect AVERROR(EAGAIN), because we read all // In particular, we don't expect AVERROR(EAGAIN), because we read all
// decoded frames with avcodec_receive_frame() until done. // decoded frames with avcodec_receive_frame() until done.
if (ret == AVERROR(EAGAIN)) { if (ret == AVERROR(EAGAIN)) {
av_log(ist, AV_LOG_FATAL, "A decoder returned an unexpected error code. " av_log(dp, AV_LOG_FATAL, "A decoder returned an unexpected error code. "
"This is a bug, please report it.\n"); "This is a bug, please report it.\n");
return AVERROR_BUG; return AVERROR_BUG;
} }
av_log(ist, AV_LOG_ERROR, "Error submitting %s to decoder: %s\n", av_log(dp, AV_LOG_ERROR, "Error submitting %s to decoder: %s\n",
pkt ? "packet" : "EOF", av_err2str(ret)); pkt ? "packet" : "EOF", av_err2str(ret));
if (ret != AVERROR_EOF) { if (ret != AVERROR_EOF) {
@ -533,7 +536,7 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame)
} else if (ret == AVERROR_EOF) { } else if (ret == AVERROR_EOF) {
return ret; return ret;
} else if (ret < 0) { } else if (ret < 0) {
av_log(ist, AV_LOG_ERROR, "Decoding error: %s\n", av_err2str(ret)); av_log(dp, AV_LOG_ERROR, "Decoding error: %s\n", av_err2str(ret));
ist->decode_errors++; ist->decode_errors++;
if (exit_on_error) if (exit_on_error)
@ -543,7 +546,7 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame)
} }
if (frame->decode_error_flags || (frame->flags & AV_FRAME_FLAG_CORRUPT)) { if (frame->decode_error_flags || (frame->flags & AV_FRAME_FLAG_CORRUPT)) {
av_log(ist, exit_on_error ? AV_LOG_FATAL : AV_LOG_WARNING, av_log(dp, exit_on_error ? AV_LOG_FATAL : AV_LOG_WARNING,
"corrupt decoded frame\n"); "corrupt decoded frame\n");
if (exit_on_error) if (exit_on_error)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -566,12 +569,12 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame)
if (dec->codec_type == AVMEDIA_TYPE_AUDIO) { if (dec->codec_type == AVMEDIA_TYPE_AUDIO) {
ist->samples_decoded += frame->nb_samples; ist->samples_decoded += frame->nb_samples;
audio_ts_process(ist, dp, frame); audio_ts_process(dp, frame);
} else { } else {
ret = video_frame_process(ist, frame); ret = video_frame_process(ist, frame);
if (ret < 0) { if (ret < 0) {
av_log(NULL, AV_LOG_FATAL, "Error while processing the decoded " av_log(dp, AV_LOG_FATAL,
"data for stream #%d:%d\n", ifile->index, ist->index); "Error while processing the decoded data\n");
return ret; return ret;
} }
} }
@ -644,7 +647,7 @@ void *decoder_thread(void *arg)
(intptr_t)dt.pkt->opaque == PKT_OPAQUE_FIX_SUB_DURATION); (intptr_t)dt.pkt->opaque == PKT_OPAQUE_FIX_SUB_DURATION);
flush_buffers = input_status >= 0 && !have_data; flush_buffers = input_status >= 0 && !have_data;
if (!have_data) if (!have_data)
av_log(ist, AV_LOG_VERBOSE, "Decoder thread received %s packet\n", av_log(dp, AV_LOG_VERBOSE, "Decoder thread received %s packet\n",
flush_buffers ? "flush" : "EOF"); flush_buffers ? "flush" : "EOF");
ret = packet_decode(ist, have_data ? dt.pkt : NULL, dt.frame); ret = packet_decode(ist, have_data ? dt.pkt : NULL, dt.frame);
@ -661,7 +664,7 @@ void *decoder_thread(void *arg)
} }
if (ret == AVERROR_EOF) { if (ret == AVERROR_EOF) {
av_log(ist, AV_LOG_VERBOSE, "Decoder returned EOF, %s\n", av_log(dp, AV_LOG_VERBOSE, "Decoder returned EOF, %s\n",
flush_buffers ? "resetting" : "finishing"); flush_buffers ? "resetting" : "finishing");
if (!flush_buffers) if (!flush_buffers)
@ -675,7 +678,7 @@ void *decoder_thread(void *arg)
avcodec_flush_buffers(dp->dec_ctx); avcodec_flush_buffers(dp->dec_ctx);
} else if (ret < 0) { } else if (ret < 0) {
av_log(ist, AV_LOG_ERROR, "Error processing packet in decoder: %s\n", av_log(dp, AV_LOG_ERROR, "Error processing packet in decoder: %s\n",
av_err2str(ret)); av_err2str(ret));
break; break;
} }
@ -698,7 +701,7 @@ void *decoder_thread(void *arg)
ret = sch_dec_send(dp->sch, dp->sch_idx, dt.frame); ret = sch_dec_send(dp->sch, dp->sch_idx, dt.frame);
if (ret < 0 && ret != AVERROR_EOF) { if (ret < 0 && ret != AVERROR_EOF) {
av_log(NULL, AV_LOG_FATAL, av_log(dp, AV_LOG_FATAL,
"Error signalling EOF timestamp: %s\n", av_err2str(ret)); "Error signalling EOF timestamp: %s\n", av_err2str(ret));
goto finish; goto finish;
} }
@ -707,11 +710,11 @@ void *decoder_thread(void *arg)
err_rate = (ist->frames_decoded || ist->decode_errors) ? err_rate = (ist->frames_decoded || ist->decode_errors) ?
ist->decode_errors / (ist->frames_decoded + ist->decode_errors) : 0.f; ist->decode_errors / (ist->frames_decoded + ist->decode_errors) : 0.f;
if (err_rate > max_error_rate) { if (err_rate > max_error_rate) {
av_log(ist, AV_LOG_FATAL, "Decode error rate %g exceeds maximum %g\n", av_log(dp, AV_LOG_FATAL, "Decode error rate %g exceeds maximum %g\n",
err_rate, max_error_rate); err_rate, max_error_rate);
ret = FFMPEG_ERROR_RATE_EXCEEDED; ret = FFMPEG_ERROR_RATE_EXCEEDED;
} else if (err_rate) } else if (err_rate)
av_log(ist, AV_LOG_VERBOSE, "Decode error rate %g\n", err_rate); av_log(dp, AV_LOG_VERBOSE, "Decode error rate %g\n", err_rate);
} }
finish: finish:
@ -798,7 +801,7 @@ static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp)
if (ist->hwaccel_id == HWACCEL_AUTO) { if (ist->hwaccel_id == HWACCEL_AUTO) {
ist->hwaccel_device_type = dev->type; ist->hwaccel_device_type = dev->type;
} else if (ist->hwaccel_device_type != dev->type) { } else if (ist->hwaccel_device_type != dev->type) {
av_log(NULL, AV_LOG_ERROR, "Invalid hwaccel device " av_log(dp, AV_LOG_ERROR, "Invalid hwaccel device "
"specified for decoder: device %s of type %s is not " "specified for decoder: device %s of type %s is not "
"usable with hwaccel %s.\n", dev->name, "usable with hwaccel %s.\n", dev->name,
av_hwdevice_get_type_name(dev->type), av_hwdevice_get_type_name(dev->type),
@ -849,7 +852,7 @@ static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp)
type = config->device_type; type = config->device_type;
dev = hw_device_get_by_type(type); dev = hw_device_get_by_type(type);
if (dev) { if (dev) {
av_log(NULL, AV_LOG_INFO, "Using auto " av_log(dp, AV_LOG_INFO, "Using auto "
"hwaccel type %s with existing device %s.\n", "hwaccel type %s with existing device %s.\n",
av_hwdevice_get_type_name(type), dev->name); av_hwdevice_get_type_name(type), dev->name);
} }
@ -867,12 +870,12 @@ static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp)
continue; continue;
} }
if (ist->hwaccel_device) { if (ist->hwaccel_device) {
av_log(NULL, AV_LOG_INFO, "Using auto " av_log(dp, AV_LOG_INFO, "Using auto "
"hwaccel type %s with new device created " "hwaccel type %s with new device created "
"from %s.\n", av_hwdevice_get_type_name(type), "from %s.\n", av_hwdevice_get_type_name(type),
ist->hwaccel_device); ist->hwaccel_device);
} else { } else {
av_log(NULL, AV_LOG_INFO, "Using auto " av_log(dp, AV_LOG_INFO, "Using auto "
"hwaccel type %s with new default device.\n", "hwaccel type %s with new default device.\n",
av_hwdevice_get_type_name(type)); av_hwdevice_get_type_name(type));
} }
@ -880,7 +883,7 @@ static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp)
if (dev) { if (dev) {
ist->hwaccel_device_type = type; ist->hwaccel_device_type = type;
} else { } else {
av_log(NULL, AV_LOG_INFO, "Auto hwaccel " av_log(dp, AV_LOG_INFO, "Auto hwaccel "
"disabled: no device found.\n"); "disabled: no device found.\n");
ist->hwaccel_id = HWACCEL_NONE; ist->hwaccel_id = HWACCEL_NONE;
return 0; return 0;
@ -888,7 +891,7 @@ static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp)
} }
if (!dev) { if (!dev) {
av_log(NULL, AV_LOG_ERROR, "No device available " av_log(dp, AV_LOG_ERROR, "No device available "
"for decoder: device type %s needed for codec %s.\n", "for decoder: device type %s needed for codec %s.\n",
av_hwdevice_get_type_name(type), ist->dec->name); av_hwdevice_get_type_name(type), ist->dec->name);
return err; return err;
@ -901,6 +904,20 @@ static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp)
return 0; return 0;
} }
static const char *dec_item_name(void *obj)
{
const DecoderPriv *dp = obj;
return dp->log_name;
}
static const AVClass dec_class = {
.class_name = "Decoder",
.version = LIBAVUTIL_VERSION_INT,
.parent_log_context_offset = offsetof(DecoderPriv, log_parent),
.item_name = dec_item_name,
};
int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx) int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx)
{ {
DecoderPriv *dp; DecoderPriv *dp;
@ -922,6 +939,11 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx)
dp->sch = sch; dp->sch = sch;
dp->sch_idx = sch_idx; dp->sch_idx = sch_idx;
dp->dec.class = &dec_class;
dp->log_parent = ist;
snprintf(dp->log_name, sizeof(dp->log_name), "dec:%s", codec->name);
if (codec->type == AVMEDIA_TYPE_SUBTITLE && ist->fix_sub_duration) { if (codec->type == AVMEDIA_TYPE_SUBTITLE && ist->fix_sub_duration) {
for (int i = 0; i < FF_ARRAY_ELEMS(dp->sub_prev); i++) { for (int i = 0; i < FF_ARRAY_ELEMS(dp->sub_prev); i++) {
dp->sub_prev[i] = av_frame_alloc(); dp->sub_prev[i] = av_frame_alloc();
@ -939,7 +961,7 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx)
ret = avcodec_parameters_to_context(dp->dec_ctx, ist->par); ret = avcodec_parameters_to_context(dp->dec_ctx, ist->par);
if (ret < 0) { if (ret < 0) {
av_log(ist, AV_LOG_ERROR, "Error initializing the decoder context.\n"); av_log(dp, AV_LOG_ERROR, "Error initializing the decoder context.\n");
return ret; return ret;
} }
@ -950,7 +972,9 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx)
(ist->decoding_needed & DECODING_FOR_OST)) { (ist->decoding_needed & DECODING_FOR_OST)) {
av_dict_set(&ist->decoder_opts, "compute_edt", "1", AV_DICT_DONT_OVERWRITE); av_dict_set(&ist->decoder_opts, "compute_edt", "1", AV_DICT_DONT_OVERWRITE);
if (ist->decoding_needed & DECODING_FOR_FILTER) if (ist->decoding_needed & DECODING_FOR_FILTER)
av_log(NULL, AV_LOG_WARNING, "Warning using DVB subtitles for filtering and output at the same time is not fully supported, also see -compute_edt [0|1]\n"); av_log(dp, AV_LOG_WARNING,
"Warning using DVB subtitles for filtering and output at the "
"same time is not fully supported, also see -compute_edt [0|1]\n");
} }
/* Useful for subtitles retiming by lavf (FIXME), skipping samples in /* Useful for subtitles retiming by lavf (FIXME), skipping samples in
@ -967,14 +991,14 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx)
ret = hw_device_setup_for_decode(ist, dp); ret = hw_device_setup_for_decode(ist, dp);
if (ret < 0) { if (ret < 0) {
av_log(ist, AV_LOG_ERROR, av_log(dp, AV_LOG_ERROR,
"Hardware device setup failed for decoder: %s\n", "Hardware device setup failed for decoder: %s\n",
av_err2str(ret)); av_err2str(ret));
return ret; return ret;
} }
if ((ret = avcodec_open2(dp->dec_ctx, codec, &ist->decoder_opts)) < 0) { if ((ret = avcodec_open2(dp->dec_ctx, codec, &ist->decoder_opts)) < 0) {
av_log(ist, AV_LOG_ERROR, "Error while opening decoder: %s\n", av_log(dp, AV_LOG_ERROR, "Error while opening decoder: %s\n",
av_err2str(ret)); av_err2str(ret));
return ret; return ret;
} }