RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-18 21:45:10 +00:00
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg_dec: stop passing InputStream to dec_open()

Browse Source
This commit is contained in:
Anton Khirnov 2024-01-23 19:45:14 +01:00
parent a0ca99ccb7
commit fe3be6f78f
3 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fftools/ffmpeg.h
View File

@ -296,6 +296,7 @@ typedef struct DecoderOpts {
int flags;
char *name;
void *log_parent;
const AVCodec *codec;
const AVCodecParameters *par;
@ -756,7 +757,7 @@ AVBufferRef *hw_device_for_filter(void);
* @param dec_opts Dictionary filled with decoder options. Its ownership
* is transferred to the decoder.
*/
int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx,
int dec_open(Decoder **pdec, Scheduler *sch, unsigned sch_idx,
AVDictionary **dec_opts, const DecoderOpts *o);
void dec_free(Decoder **pdec);

50
fftools/ffmpeg_dec.c
View File

@ -110,7 +110,7 @@ void dec_free(Decoder **pdec)
av_freep(pdec);
}
static int dec_alloc(Decoder **pdec)
static int dec_alloc(DecoderPriv **pdec)
{
DecoderPriv *dp;
@ -133,7 +133,7 @@ static int dec_alloc(Decoder **pdec)
dp->last_frame_tb = (AVRational){ 1, 1 };
dp->hwaccel_pix_fmt = AV_PIX_FMT_NONE;
*pdec = &dp->dec;
*pdec = dp;
return 0;
fail:
@ -940,24 +940,25 @@ static const AVClass dec_class = {
.item_name = dec_item_name,
};
int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx,
int dec_open(Decoder **pdec, Scheduler *sch, unsigned sch_idx,
AVDictionary **dec_opts, const DecoderOpts *o)
{
DecoderPriv *dp;
const AVCodec *codec = o->codec;
int ret;
ret = dec_alloc(&ist->decoder);
*pdec = NULL;
ret = dec_alloc(&dp);
if (ret < 0)
return ret;
dp = dp_from_dec(ist->decoder);
dp->sch = sch;
dp->sch_idx = sch_idx;
dp->flags = o->flags;
dp->dec.class = &dec_class;
dp->log_parent = ist;
dp->log_parent = o->log_parent;
dp->framerate_in = o->framerate;
@ -968,31 +969,39 @@ 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 (!dp->parent_name) {
ret = AVERROR(ENOMEM);
goto fail;
}
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++) {
dp->sub_prev[i] = av_frame_alloc();
if (!dp->sub_prev[i])
return AVERROR(ENOMEM);
if (!dp->sub_prev[i]) {
ret = AVERROR(ENOMEM);
goto fail;
}
}
dp->sub_heartbeat = av_frame_alloc();
if (!dp->sub_heartbeat)
return AVERROR(ENOMEM);
if (!dp->sub_heartbeat) {
ret = AVERROR(ENOMEM);
goto fail;
}
}
dp->sar_override = o->par->sample_aspect_ratio;
dp->dec_ctx = avcodec_alloc_context3(codec);
if (!dp->dec_ctx)
return AVERROR(ENOMEM);
if (!dp->dec_ctx) {
ret = AVERROR(ENOMEM);
goto fail;
}
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;
goto fail;
}
dp->dec_ctx->opaque = dp;
@ -1009,23 +1018,28 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx,
av_log(dp, AV_LOG_ERROR,
"Hardware device setup failed for decoder: %s\n",
av_err2str(ret));
return ret;
goto fail;
}
if ((ret = avcodec_open2(dp->dec_ctx, codec, dec_opts)) < 0) {
av_log(dp, AV_LOG_ERROR, "Error while opening decoder: %s\n",
av_err2str(ret));
return ret;
goto fail;
}
ret = check_avoptions(*dec_opts);
if (ret < 0)
return ret;
goto fail;
dp->dec.subtitle_header = dp->dec_ctx->subtitle_header;
dp->dec.subtitle_header_size = dp->dec_ctx->subtitle_header_size;
*pdec = &dp->dec;
return 0;
fail:
dec_free((Decoder**)&dp);
return ret;
}
int dec_add_filter(Decoder *dec, InputFilter *ifilter)

4
fftools/ffmpeg_demux.c
View File

@ -933,7 +933,9 @@ static int ist_use(InputStream *ist, int decoding_needed)
ds->dec_opts.codec = ist->dec;
ds->dec_opts.par = ist->par;
ret = dec_open(ist, d->sch, ds->sch_idx_dec,
ds->dec_opts.log_parent = ist;
ret = dec_open(&ist->decoder, d->sch, ds->sch_idx_dec,
&ist->decoder_opts, &ds->dec_opts);
if (ret < 0)
return ret;