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

fftools/ffmpeg_dec: pass decoder options as an argument to dec_open()

Browse Source 
Rather than access the dictionary in 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 7ecd45587f
commit 5b0e4f945e
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fftools/ffmpeg.h
View File

@@ -731,7 +731,12 @@ AVBufferRef *hw_device_for_filter(void);
int hwaccel_retrieve_data(AVCodecContext *avctx, AVFrame *input); int hwaccel_retrieve_data(AVCodecContext *avctx, AVFrame *input);
int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx); /**
* @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,
AVDictionary **dec_opts);
void dec_free(Decoder **pdec); void dec_free(Decoder **pdec);
int dec_add_filter(Decoder *dec, InputFilter *ifilter); int dec_add_filter(Decoder *dec, InputFilter *ifilter);

17
fftools/ffmpeg_dec.c
View File

@@ -918,7 +918,8 @@ static const AVClass dec_class = {
.item_name = dec_item_name, .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,
AVDictionary **dec_opts)
{ {
DecoderPriv *dp; DecoderPriv *dp;
const AVCodec *codec = ist->dec; const AVCodec *codec = ist->dec;
@@ -970,7 +971,7 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx)
if (dp->dec_ctx->codec_id == AV_CODEC_ID_DVB_SUBTITLE && if (dp->dec_ctx->codec_id == AV_CODEC_ID_DVB_SUBTITLE &&
(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(dec_opts, "compute_edt", "1", AV_DICT_DONT_OVERWRITE);
if (ist->decoding_needed & DECODING_FOR_FILTER) if (ist->decoding_needed & DECODING_FOR_FILTER)
av_log(dp, AV_LOG_WARNING, av_log(dp, AV_LOG_WARNING,
"Warning using DVB subtitles for filtering and output at the " "Warning using DVB subtitles for filtering and output at the "
@@ -981,13 +982,13 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx)
* audio, and video decoders such as cuvid or mediacodec */ * audio, and video decoders such as cuvid or mediacodec */
dp->dec_ctx->pkt_timebase = ist->st->time_base; dp->dec_ctx->pkt_timebase = ist->st->time_base;
if (!av_dict_get(ist->decoder_opts, "threads", NULL, 0)) if (!av_dict_get(*dec_opts, "threads", NULL, 0))
av_dict_set(&ist->decoder_opts, "threads", "auto", 0); av_dict_set(dec_opts, "threads", "auto", 0);
/* Attached pics are sparse, therefore we would not want to delay their decoding till EOF. */ /* Attached pics are sparse, therefore we would not want to delay their decoding till EOF. */
if (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC) if (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC)
av_dict_set(&ist->decoder_opts, "threads", "1", 0); av_dict_set(dec_opts, "threads", "1", 0);
av_dict_set(&ist->decoder_opts, "flags", "+copy_opaque", AV_DICT_MULTIKEY); av_dict_set(dec_opts, "flags", "+copy_opaque", AV_DICT_MULTIKEY);
ret = hw_device_setup_for_decode(ist, dp); ret = hw_device_setup_for_decode(ist, dp);
if (ret < 0) { if (ret < 0) {
@@ -997,13 +998,13 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx)
return ret; return ret;
} }
if ((ret = avcodec_open2(dp->dec_ctx, codec, &ist->decoder_opts)) < 0) { if ((ret = avcodec_open2(dp->dec_ctx, codec, dec_opts)) < 0) {
av_log(dp, 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;
} }
ret = check_avoptions(ist->decoder_opts); ret = check_avoptions(*dec_opts);
if (ret < 0) if (ret < 0)
return ret; return ret;

3
fftools/ffmpeg_demux.c
View File

@@ -895,7 +895,8 @@ static int ist_use(InputStream *ist, int decoding_needed)
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = dec_open(ist, d->sch, ds->sch_idx_dec); ret = dec_open(ist, d->sch, ds->sch_idx_dec,
&ist->decoder_opts);
if (ret < 0) if (ret < 0)
return ret; return ret;