highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg_dec: pass AVCodecParameters through DecoderOpts

Browse Source 
Do not retrieve it from InputStream directly.

This is a step towards decoupling Decoder and InputStream.
This commit is contained in:
Anton Khirnov
2024-01-23 18:42:20 +01:00
parent b3d1916ba0
commit 1b2c539a0f
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fftools/ffmpeg.h
View File

@@ -298,6 +298,7 @@ typedef struct DecoderOpts {
char *name; char *name;
const AVCodec *codec; const AVCodec *codec;
const AVCodecParameters *par;
/* hwaccel options */ /* hwaccel options */
enum HWAccelID hwaccel_id; enum HWAccelID hwaccel_id;

4
fftools/ffmpeg_dec.c
View File

@@ -990,13 +990,13 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx,
return AVERROR(ENOMEM); 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); dp->dec_ctx = avcodec_alloc_context3(codec);
if (!dp->dec_ctx) if (!dp->dec_ctx)
return AVERROR(ENOMEM); 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) { if (ret < 0) {
av_log(dp, 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;

1
fftools/ffmpeg_demux.c
View File

@@ -931,6 +931,7 @@ static int ist_use(InputStream *ist, int decoding_needed)
ds->dec_opts.name = ds->dec_name; ds->dec_opts.name = ds->dec_name;
ds->dec_opts.codec = ist->dec; ds->dec_opts.codec = ist->dec;
ds->dec_opts.par = ist->par;
ret = dec_open(ist, d->sch, ds->sch_idx_dec, ret = dec_open(ist, d->sch, ds->sch_idx_dec,
&ist->decoder_opts, &ds->dec_opts); &ist->decoder_opts, &ds->dec_opts);