diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-02-23 20:56:56 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-02-23 20:56:56 +0000 |
| commit | c62c07d3d7d204527bfa991bac1204cbb593747b (patch) | |
| tree | 207c61727f1c992fe1a05eef9c96a7cc34f6d143 /ffplay.c | |
| parent | c0a2c42f59329811fc08a2c982d394ab49204b01 (diff) | |
| download | ffmpeg-c62c07d3d7d204527bfa991bac1204cbb593747b.tar.gz | |
multithreaded mpeg2 decoding
Originally committed as revision 2810 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffplay.c')
| -rw-r--r-- | ffplay.c | 19 |
1 files changed, 17 insertions, 2 deletions
@@ -168,6 +168,7 @@ static int64_t start_time = AV_NOPTS_VALUE; static int debug = 0; static int debug_mv = 0; static int step = 0; +static int thread_count = 1; /* current context */ static int is_full_screen; @@ -1169,6 +1170,12 @@ static int stream_component_open(VideoState *is, int stream_index) if (!codec || avcodec_open(enc, codec) < 0) return -1; + enc->debug = debug; +#if defined(HAVE_PTHREADS) || defined(HAVE_W32THREADS) + if(thread_count>1) + avcodec_thread_init(enc, thread_count); +#endif + enc->thread_count= thread_count; switch(enc->codec_type) { case CODEC_TYPE_AUDIO: is->audio_stream = stream_index; @@ -1197,7 +1204,6 @@ static int stream_component_open(VideoState *is, int stream_index) packet_queue_init(&is->videoq); is->video_tid = SDL_CreateThread(video_thread, is); - enc->debug = debug; enc->debug_mv = debug_mv; break; default: @@ -1793,6 +1799,14 @@ static void opt_vismv(const char *arg) { debug_mv = atoi(arg); } + +static void opt_thread_count(const char *arg) +{ + thread_count= atoi(arg); +#if !defined(HAVE_PTHREADS) && !defined(HAVE_W32THREADS) + fprintf(stderr, "Warning: not compiled with thread support, using thread emulation\n"); +#endif +} const OptionDef options[] = { { "h", 0, {(void*)show_help}, "show help" }, @@ -1814,7 +1828,8 @@ const OptionDef options[] = { #ifdef CONFIG_NETWORK { "rtp_tcp", OPT_EXPERT, {(void*)&opt_rtp_tcp}, "force RTP/TCP protocol usage", "" }, #endif - { "sync", HAS_ARG | OPT_EXPERT, {(void*)&opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" }, + { "sync", HAS_ARG | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" }, + { "threads", HAS_ARG | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" }, { NULL, }, }; |