---
cmdutils.c | 19 +++++++++++++++++++
cmdutils.h | 5 +++++
ffplay.c | 42 ++++++++++++++++++++++--------------------
3 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/cmdutils.c b/cmdutils.c
index 943a77c..b3c8e63 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -899,6 +899,25 @@ FILE *get_preset_file(char *filename, size_t filename_size,
return f;
}
+AVDictionary **setup_find_stream_info_opts(AVFormatContext *s)
+{
+ int i;
+ AVDictionary **opts;
+
+ if (!s->nb_streams)
+ return NULL;
+ opts = av_mallocz(s->nb_streams * sizeof(*opts));
+ for (i = 0; i < s->nb_streams; i++) {
+ AVCodecContext *dec = s->streams[i]->codec;
+ switch (dec->codec_type) {
+ case AVMEDIA_TYPE_AUDIO: av_dict_copy(&opts[i], audio_opts, 0);
break;
+ case AVMEDIA_TYPE_VIDEO: av_dict_copy(&opts[i], video_opts, 0);
break;
+ case AVMEDIA_TYPE_SUBTITLE: av_dict_copy(&opts[i], sub_opts, 0);
break;
+ }
+ }
+ return opts;
+}
+
#if CONFIG_AVFILTER
static int ffsink_init(AVFilterContext *ctx, const char *args, void *opaque)
diff --git a/cmdutils.h b/cmdutils.h
index 02fcea4..749d822 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -152,6 +152,11 @@ void parse_options(int argc, char **argv, const OptionDef
*options,
void set_context_opts(void *ctx, void *opts_ctx, int flags, AVCodec *codec);
/**
+ * Setup AVCodecContext options for avformat_find_stream_info.
+ */
+AVDictionary **setup_find_stream_info_opts(AVFormatContext *s);
+
+/**
* Print an error message to stderr, indicating filename and a human
* readable description of the error code err.
*
diff --git a/ffplay.c b/ffplay.c
index c9891d3..746e9a8 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2134,11 +2134,19 @@ static int stream_component_open(VideoState *is, int
stream_index)
AVCodecContext *avctx;
AVCodec *codec;
SDL_AudioSpec wanted_spec, spec;
+ AVDictionary *opts = NULL;
+ AVDictionaryEntry *t;
if (stream_index < 0 || stream_index >= ic->nb_streams)
return -1;
avctx = ic->streams[stream_index]->codec;
+ switch (avctx->codec_type) {
+ case AVMEDIA_TYPE_VIDEO: opts = video_opts; break;
+ case AVMEDIA_TYPE_AUDIO: opts = audio_opts; break;
+ case AVMEDIA_TYPE_SUBTITLE: opts = sub_opts; break;
+ }
+
/* prepare audio output */
if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) {
if (avctx->channels > 0) {
@@ -2163,11 +2171,13 @@ static int stream_component_open(VideoState *is, int
stream_index)
avctx->error_concealment= error_concealment;
avctx->thread_count= thread_count;
- set_context_opts(avctx, avcodec_opts[avctx->codec_type], 0, codec);
-
if (!codec ||
- avcodec_open(avctx, codec) < 0)
+ avcodec_open2(avctx, codec, &opts) < 0)
return -1;
+ if ((t = av_dict_get(opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
+ av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
+ return AVERROR_OPTION_NOT_FOUND;
+ }
/* prepare audio output */
if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) {
@@ -2317,6 +2327,8 @@ static int decode_thread(void *arg)
int eof=0;
int pkt_in_play_range = 0;
AVDictionaryEntry *t;
+ AVDictionary **opts;
+ int orig_nb_streams;
memset(st_index, -1, sizeof(st_index));
is->video_stream = -1;
@@ -2342,29 +2354,19 @@ static int decode_thread(void *arg)
if(genpts)
ic->flags |= AVFMT_FLAG_GENPTS;
- /* Set AVCodecContext options so they will be seen by
av_find_stream_info() */
- for (i = 0; i < ic->nb_streams; i++) {
- AVCodecContext *dec = ic->streams[i]->codec;
- switch (dec->codec_type) {
- case AVMEDIA_TYPE_AUDIO:
- set_context_opts(dec, avcodec_opts[AVMEDIA_TYPE_AUDIO],
- AV_OPT_FLAG_AUDIO_PARAM |
AV_OPT_FLAG_DECODING_PARAM,
- NULL);
- break;
- case AVMEDIA_TYPE_VIDEO:
- set_context_opts(dec, avcodec_opts[AVMEDIA_TYPE_VIDEO],
- AV_OPT_FLAG_VIDEO_PARAM |
AV_OPT_FLAG_DECODING_PARAM,
- NULL);
- break;
- }
- }
+ opts = setup_find_stream_info_opts(ic);
+ orig_nb_streams = ic->nb_streams;
- err = av_find_stream_info(ic);
+ err = avformat_find_stream_info(ic, opts);
if (err < 0) {
fprintf(stderr, "%s: could not find codec parameters\n", is->filename);
ret = -1;
goto fail;
}
+ for (i = 0; i < orig_nb_streams; i++)
+ av_dict_free(&opts[i]);
+ av_freep(&opts);
+
if(ic->pb)
ic->pb->eof_reached= 0; //FIXME hack, ffplay maybe should not use
url_feof() to test for the end
--
1.7.5.3
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
