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

fftools/ffmpeg_demux: set discard on the AVStream directly

Browse Source 
Avoid taking an ugly detour through the decoder AVCodecContext.
This commit is contained in:
Anton Khirnov
2023-12-18 20:14:21 +01:00
parent b26407ccb8
commit 6916105b11
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fftools/ffmpeg_demux.c
View File

@@ -1141,7 +1141,6 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st)
ist->reinit_filters = -1; ist->reinit_filters = -1;
MATCH_PER_STREAM_OPT(reinit_filters, i, ist->reinit_filters, ic, st); MATCH_PER_STREAM_OPT(reinit_filters, i, ist->reinit_filters, ic, st);
MATCH_PER_STREAM_OPT(discard, str, discard_str, ic, st);
ist->user_set_discard = AVDISCARD_NONE; ist->user_set_discard = AVDISCARD_NONE;
if ((o->video_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) || if ((o->video_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) ||
@@ -1150,20 +1149,20 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st)
(o->data_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_DATA)) (o->data_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_DATA))
ist->user_set_discard = AVDISCARD_ALL; ist->user_set_discard = AVDISCARD_ALL;
ist->dec_ctx = avcodec_alloc_context3(ist->dec); MATCH_PER_STREAM_OPT(discard, str, discard_str, ic, st);
if (!ist->dec_ctx)
return AVERROR(ENOMEM);
if (discard_str) { if (discard_str) {
const AVOption *discard_opt = av_opt_find(ist->dec_ctx, "skip_frame", ret = av_opt_set(ist->st, "discard", discard_str, 0);
NULL, 0, 0);
ret = av_opt_eval_int(ist->dec_ctx, discard_opt, discard_str, &ist->user_set_discard);
if (ret < 0) { if (ret < 0) {
av_log(ist, AV_LOG_ERROR, "Error parsing discard %s.\n", discard_str); av_log(ist, AV_LOG_ERROR, "Error parsing discard %s.\n", discard_str);
return ret; return ret;
} }
ist->user_set_discard = ist->st->discard;
} }
ist->dec_ctx = avcodec_alloc_context3(ist->dec);
if (!ist->dec_ctx)
return AVERROR(ENOMEM);
ret = avcodec_parameters_to_context(ist->dec_ctx, par); ret = avcodec_parameters_to_context(ist->dec_ctx, par);
if (ret < 0) { if (ret < 0) {
av_log(ist, AV_LOG_ERROR, "Error initializing the decoder context.\n"); av_log(ist, AV_LOG_ERROR, "Error initializing the decoder context.\n");