summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2011-12-25 11:45:05 +0100
committerJanne Grunau <janne-libav@jannau.net>2011-12-31 17:40:12 +0100
commite4e30256f87f177decf59b59e923d05ef64147df (patch)
tree2de636013d8948f622a34de63d296ff642b88714 /libavformat
parentc11b92b304334b1241ee79406dca6a03131fc921 (diff)
threads: default to automatic thread count detection
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/utils.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index aa2c276b90..163d602a53 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2268,9 +2268,14 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
int i, count, ret, read_size, j;
AVStream *st;
AVPacket pkt1, *pkt;
+ AVDictionary *one_thread_opt = NULL;
int64_t old_offset = avio_tell(ic->pb);
int orig_nb_streams = ic->nb_streams; // new streams might appear, no options for those
+ /* this function doesn't flush the decoders, so force thread count
+ * to 1 to fix behavior when thread count > number of frames in the file */
+ av_dict_set(&one_thread_opt, "threads", "1", 0);
+
for(i=0;i<ic->nb_streams;i++) {
AVCodec *codec;
st = ic->streams[i];
@@ -2300,12 +2305,13 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
/* Ensure that subtitle_header is properly set. */
if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE
&& codec && !st->codec->codec)
- avcodec_open2(st->codec, codec, options ? &options[i] : NULL);
+ avcodec_open2(st->codec, codec, options ? &options[i] : &one_thread_opt);
//try to just open decoders, in case this is enough to get parameters
if(!has_codec_parameters(st->codec)){
if (codec && !st->codec->codec)
- avcodec_open2(st->codec, codec, options ? &options[i] : NULL);
+ avcodec_open2(st->codec, codec, options ? &options[i]
+ : &one_thread_opt);
}
}
@@ -2444,7 +2450,8 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
least one frame of codec data, this makes sure the codec initializes
the channel configuration and does not only trust the values from the container.
*/
- try_decode_frame(st, pkt, (options && i < orig_nb_streams )? &options[i] : NULL);
+ try_decode_frame(st, pkt, (options && i < orig_nb_streams )? &options[i]
+ : &one_thread_opt);
st->codec_info_nb_frames++;
count++;
@@ -2549,8 +2556,12 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
#endif
find_stream_info_err:
- for (i=0; i < ic->nb_streams; i++)
+ for (i=0; i < ic->nb_streams; i++) {
+ if (ic->streams[i]->codec)
+ ic->streams[i]->codec->thread_count = 0;
av_freep(&ic->streams[i]->info);
+ }
+ av_dict_free(&one_thread_opt);
return ret;
}