[FFmpeg-cvslog] fftools/ffmpeg_dec: pass decoder name through DecoderOpts
Anton Khirnov
git at videolan.org
Tue Jan 30 11:07:59 EET 2024
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Jan 23 18:42:20 2024 +0100| [097f9ddbe94039b3c6f888560e24cc1753fec3f3] | committer: Anton Khirnov
fftools/ffmpeg_dec: pass decoder name through DecoderOpts
Do not build it from InputStream values.
This is a step towards decoupling Decoder and InputStream.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=097f9ddbe94039b3c6f888560e24cc1753fec3f3
---
fftools/ffmpeg.h | 2 ++
fftools/ffmpeg_dec.c | 17 +++++++++++------
fftools/ffmpeg_demux.c | 4 ++++
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index 9add5cac85..bdfacf16b7 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -295,6 +295,8 @@ enum DecoderFlags {
typedef struct DecoderOpts {
int flags;
+ char *name;
+
/* hwaccel options */
enum HWAccelID hwaccel_id;
enum AVHWDeviceType hwaccel_device_type;
diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c
index 184d2130c7..cbb782bf9d 100644
--- a/fftools/ffmpeg_dec.c
+++ b/fftools/ffmpeg_dec.c
@@ -73,6 +73,7 @@ typedef struct DecoderPriv {
void *log_parent;
char log_name[32];
+ char *parent_name;
} DecoderPriv;
static DecoderPriv *dp_from_dec(Decoder *d)
@@ -104,6 +105,8 @@ void dec_free(Decoder **pdec)
av_frame_free(&dp->sub_prev[i]);
av_frame_free(&dp->sub_heartbeat);
+ av_freep(&dp->parent_name);
+
av_freep(pdec);
}
@@ -499,7 +502,6 @@ static int transcode_subtitles(InputStream *ist, const AVPacket *pkt,
static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame)
{
- const InputFile *ifile = ist->file;
DecoderPriv *dp = dp_from_dec(ist->decoder);
AVCodecContext *dec = dp->dec_ctx;
const char *type_desc = av_get_media_type_string(dec->codec_type);
@@ -554,8 +556,7 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame)
update_benchmark(NULL);
ret = avcodec_receive_frame(dec, frame);
- update_benchmark("decode_%s %d.%d", type_desc,
- ifile->index, ist->index);
+ update_benchmark("decode_%s %s", type_desc, dp->parent_name);
if (ret == AVERROR(EAGAIN)) {
av_assert0(pkt); // should never happen during flushing
@@ -616,10 +617,10 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame)
}
}
-static void dec_thread_set_name(const InputStream *ist, const DecoderPriv *dp)
+static void dec_thread_set_name(const DecoderPriv *dp)
{
char name[16];
- snprintf(name, sizeof(name), "dec%d:%d:%s", ist->file->index, ist->index,
+ snprintf(name, sizeof(name), "dec%s:%s", dp->parent_name,
dp->dec_ctx->codec->name);
ff_thread_setname(name);
}
@@ -662,7 +663,7 @@ void *decoder_thread(void *arg)
if (ret < 0)
goto finish;
- dec_thread_set_name(ist, dp);
+ dec_thread_set_name(dp);
while (!input_status) {
int flush_buffers, have_data;
@@ -972,6 +973,10 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx,
snprintf(dp->log_name, sizeof(dp->log_name), "dec:%s", codec->name);
+ dp->parent_name = av_strdup(o->name ? o->name : "");
+ if (!dp->parent_name)
+ return AVERROR(ENOMEM);
+
if (codec->type == AVMEDIA_TYPE_SUBTITLE &&
(dp->flags & DECODER_FLAG_FIX_SUB_DURATION)) {
for (int i = 0; i < FF_ARRAY_ELEMS(dp->sub_prev); i++) {
diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c
index 3c3be214c5..8bc73e2bf3 100644
--- a/fftools/ffmpeg_demux.c
+++ b/fftools/ffmpeg_demux.c
@@ -73,6 +73,7 @@ typedef struct DemuxStream {
const AVCodecDescriptor *codec_desc;
DecoderOpts dec_opts;
+ char dec_name[16];
AVBSFContext *bsf;
@@ -926,6 +927,9 @@ static int ist_use(InputStream *ist, int decoding_needed)
"same time is not fully supported, also see -compute_edt [0|1]\n");
}
+ snprintf(ds->dec_name, sizeof(ds->dec_name), "%d:%d", ist->file->index, ist->index);
+ ds->dec_opts.name = ds->dec_name;
+
ret = dec_open(ist, d->sch, ds->sch_idx_dec,
&ist->decoder_opts, &ds->dec_opts);
if (ret < 0)
More information about the ffmpeg-cvslog
mailing list