generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/mpeg12enc: Move high resolution thread check to before initializing threads

Browse Source 
Cleaner solution is welcome!

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a53fbda9dc)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-01-21 00:36:51 +01:00
parent 30463a0c99
commit 3fc75e79cf
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mpeg12enc.c
View File

@@ -144,9 +144,6 @@ static av_cold int encode_init(AVCodecContext *avctx)
{ {
MpegEncContext *s = avctx->priv_data; MpegEncContext *s = avctx->priv_data;
if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO && avctx->height > 2800)
avctx->thread_count = 1;
if (ff_mpv_encode_init(avctx) < 0) if (ff_mpv_encode_init(avctx) < 0)
return -1; return -1;

6
libavcodec/pthread_slice.c
View File

@@ -181,6 +181,12 @@ int ff_slice_thread_init(AVCodecContext *avctx)
w32thread_init(); w32thread_init();
#endif #endif
// We cannot do this in the encoder init as the threads are created before
if (av_codec_is_encoder(avctx->codec) &&
avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO &&
avctx->height > 2800)
thread_count = avctx->thread_count = 1;
if (!thread_count) { if (!thread_count) {
int nb_cpus = av_cpu_count(); int nb_cpus = av_cpu_count();
if (avctx->height) if (avctx->height)