har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/cmdutils: add error handling to filter_codec_opts()

Browse Source
This commit is contained in:
Anton Khirnov 2023-07-14 17:19:28 +02:00
parent 6b8cf2505a
commit 87f0333af1
6 changed files with 56 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
fftools/cmdutils.c
View File

@ -943,8 +943,9 @@ int check_stream_specifier(AVFormatContext *s, AVStream *st, const char *spec)
return ret; return ret;
} }
AVDictionary *filter_codec_opts(const AVDictionary *opts, enum AVCodecID codec_id, int filter_codec_opts(const AVDictionary *opts, enum AVCodecID codec_id,
AVFormatContext *s, AVStream *st, const AVCodec *codec) AVFormatContext *s, AVStream *st, const AVCodec *codec,
AVDictionary **dst)
{ {
AVDictionary *ret = NULL; AVDictionary *ret = NULL;
const AVDictionaryEntry *t = NULL; const AVDictionaryEntry *t = NULL;
@ -977,11 +978,15 @@ AVDictionary *filter_codec_opts(const AVDictionary *opts, enum AVCodecID codec_i
char *p = strchr(t->key, ':'); char *p = strchr(t->key, ':');
/* check stream specification in opt name */ /* check stream specification in opt name */
if (p) if (p) {
switch (check_stream_specifier(s, st, p + 1)) { int err = check_stream_specifier(s, st, p + 1);
case 1: *p = 0; break; if (err < 0) {
case 0: continue; av_dict_free(&ret);
default: exit_program(1); return err;
} else if (!err)
continue;
*p = 0;
} }
if (av_opt_find(&cc, t->key, NULL, flags, AV_OPT_SEARCH_FAKE_OBJ) || if (av_opt_find(&cc, t->key, NULL, flags, AV_OPT_SEARCH_FAKE_OBJ) ||
@ -998,14 +1003,16 @@ AVDictionary *filter_codec_opts(const AVDictionary *opts, enum AVCodecID codec_i
if (p) if (p)
*p = ':'; *p = ':';
} }
return ret;
*dst = ret;
return 0;
} }
int setup_find_stream_info_opts(AVFormatContext *s, int setup_find_stream_info_opts(AVFormatContext *s,
AVDictionary *codec_opts, AVDictionary *codec_opts,
AVDictionary ***dst) AVDictionary ***dst)
{ {
int i; int ret;
AVDictionary **opts; AVDictionary **opts;
*dst = NULL; *dst = NULL;
@ -1017,11 +1024,19 @@ int setup_find_stream_info_opts(AVFormatContext *s,
if (!opts) if (!opts)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
for (i = 0; i < s->nb_streams; i++) for (int i = 0; i < s->nb_streams; i++) {
opts[i] = filter_codec_opts(codec_opts, s->streams[i]->codecpar->codec_id, ret = filter_codec_opts(codec_opts, s->streams[i]->codecpar->codec_id,
s, s->streams[i], NULL); s, s->streams[i], NULL, &opts[i]);
if (ret < 0)
goto fail;
}
*dst = opts; *dst = opts;
return 0; return 0;
fail:
for (int i = 0; i < s->nb_streams; i++)
av_dict_free(&opts[i]);
av_freep(&opts);
return ret;
} }
int grow_array(void **array, int elem_size, int *size, int new_size) int grow_array(void **array, int elem_size, int *size, int new_size)

8
fftools/cmdutils.h
View File

@ -333,10 +333,12 @@ int check_stream_specifier(AVFormatContext *s, AVStream *st, const char *spec);
* @param st A stream from s for which the options should be filtered. * @param st A stream from s for which the options should be filtered.
* @param codec The particular codec for which the options should be filtered. * @param codec The particular codec for which the options should be filtered.
* If null, the default one is looked up according to the codec id. * If null, the default one is looked up according to the codec id.
* @return a pointer to the created dictionary * @param dst a pointer to the created dictionary
* @return a non-negative number on success, a negative error code on failure
*/ */
AVDictionary *filter_codec_opts(const AVDictionary *opts, enum AVCodecID codec_id, int filter_codec_opts(const AVDictionary *opts, enum AVCodecID codec_id,
AVFormatContext *s, AVStream *st, const AVCodec *codec); AVFormatContext *s, AVStream *st, const AVCodec *codec,
AVDictionary **dst);
/** /**
* Setup AVCodecContext options for avformat_find_stream_info(). * Setup AVCodecContext options for avformat_find_stream_info().

5
fftools/ffmpeg_demux.c
View File

@ -1176,7 +1176,10 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st)
if (ret < 0) if (ret < 0)
return ret; return ret;
ist->decoder_opts = filter_codec_opts(o->g->codec_opts, ist->st->codecpar->codec_id, ic, st, ist->dec); ret = filter_codec_opts(o->g->codec_opts, ist->st->codecpar->codec_id,
ic, st, ist->dec, &ist->decoder_opts);
if (ret < 0)
return ret;
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);

11
fftools/ffmpeg_mux_init.c
View File

@ -1206,8 +1206,10 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type,
const char *enc_stats_pre = NULL, *enc_stats_post = NULL, *mux_stats = NULL; const char *enc_stats_pre = NULL, *enc_stats_post = NULL, *mux_stats = NULL;
const char *enc_time_base = NULL; const char *enc_time_base = NULL;
ost->encoder_opts = filter_codec_opts(o->g->codec_opts, enc->codec_id, ret = filter_codec_opts(o->g->codec_opts, enc->codec_id,
oc, st, enc->codec); oc, st, enc->codec, &ost->encoder_opts);
if (ret < 0)
return ret;
MATCH_PER_STREAM_OPT(presets, str, preset, oc, st); MATCH_PER_STREAM_OPT(presets, str, preset, oc, st);
ost->autoscale = 1; ost->autoscale = 1;
@ -1305,7 +1307,10 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type,
ost->enc_timebase = q; ost->enc_timebase = q;
} }
} else { } else {
ost->encoder_opts = filter_codec_opts(o->g->codec_opts, AV_CODEC_ID_NONE, oc, st, NULL); ret = filter_codec_opts(o->g->codec_opts, AV_CODEC_ID_NONE, oc, st,
NULL, &ost->encoder_opts);
if (ret < 0)
return ret;
} }

6
fftools/ffplay.c
View File

@ -2584,7 +2584,11 @@ static int stream_component_open(VideoState *is, int stream_index)
if (fast) if (fast)
avctx->flags2 |= AV_CODEC_FLAG2_FAST; avctx->flags2 |= AV_CODEC_FLAG2_FAST;
opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index], codec); ret = filter_codec_opts(codec_opts, avctx->codec_id, ic,
ic->streams[stream_index], codec, &opts);
if (ret < 0)
goto fail;
if (!av_dict_get(opts, "threads", NULL, 0)) if (!av_dict_get(opts, "threads", NULL, 0))
av_dict_set(&opts, "threads", "auto", 0); av_dict_set(&opts, "threads", "auto", 0);
if (stream_lowres) if (stream_lowres)

8
fftools/ffprobe.c
View File

@ -3421,8 +3421,12 @@ static int open_input_file(InputFile *ifile, const char *filename,
continue; continue;
} }
{ {
AVDictionary *opts = filter_codec_opts(codec_opts, stream->codecpar->codec_id, AVDictionary *opts;
fmt_ctx, stream, codec);
err = filter_codec_opts(codec_opts, stream->codecpar->codec_id,
fmt_ctx, stream, codec, &opts);
if (err < 0)
exit(1);
ist->dec_ctx = avcodec_alloc_context3(codec); ist->dec_ctx = avcodec_alloc_context3(codec);
if (!ist->dec_ctx) if (!ist->dec_ctx)