diff options
| author | Anton Khirnov <anton@khirnov.net> | 2024-01-23 18:42:20 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2024-01-30 09:52:00 +0100 |
| commit | 1b2c539a0f4b48ed124ff6dc375bd67111efdddc (patch) | |
| tree | 9bc33cde252151a5247911834e03229cd36fc586 | |
| parent | b3d1916ba03086d9d1e80a2ff5fdee2c915152ae (diff) | |
fftools/ffmpeg_dec: pass AVCodecParameters through DecoderOpts
Do not retrieve it from InputStream directly.
This is a step towards decoupling Decoder and InputStream.
| -rw-r--r-- | fftools/ffmpeg.h | 1 | ||||
| -rw-r--r-- | fftools/ffmpeg_dec.c | 4 | ||||
| -rw-r--r-- | fftools/ffmpeg_demux.c | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index b169b1a323..02c614d0ff 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -298,6 +298,7 @@ typedef struct DecoderOpts { char *name; const AVCodec *codec; + const AVCodecParameters *par; /* hwaccel options */ enum HWAccelID hwaccel_id; diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index e41440b21d..c35fceeaf4 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -990,13 +990,13 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, return AVERROR(ENOMEM); } - dp->sar_override = ist->par->sample_aspect_ratio; + dp->sar_override = o->par->sample_aspect_ratio; dp->dec_ctx = avcodec_alloc_context3(codec); if (!dp->dec_ctx) return AVERROR(ENOMEM); - ret = avcodec_parameters_to_context(dp->dec_ctx, ist->par); + ret = avcodec_parameters_to_context(dp->dec_ctx, o->par); if (ret < 0) { av_log(dp, AV_LOG_ERROR, "Error initializing the decoder context.\n"); return ret; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index f66319aafe..6216b7c684 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -931,6 +931,7 @@ static int ist_use(InputStream *ist, int decoding_needed) ds->dec_opts.name = ds->dec_name; ds->dec_opts.codec = ist->dec; + ds->dec_opts.par = ist->par; ret = dec_open(ist, d->sch, ds->sch_idx_dec, &ist->decoder_opts, &ds->dec_opts); |