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

avcodec/frame_thread_encoder: restructure huffyuv checks

Browse Source 
This makes them similar to the other checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-15 15:14:46 +01:00
parent 59279bf21f
commit f7459bcfc5
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/frame_thread_encoder.c
View File

@ -139,6 +139,15 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){
av_log(avctx, AV_LOG_WARNING, av_log(avctx, AV_LOG_WARNING,
"MJPEG CBR encoding works badly with frame multi-threading, consider " "MJPEG CBR encoding works badly with frame multi-threading, consider "
"using -threads 1, -thread_type slice or a constant quantizer.\n"); "using -threads 1, -thread_type slice or a constant quantizer.\n");
if (avctx->codec_id == AV_CODEC_ID_HUFFYUV ||
avctx->codec_id == AV_CODEC_ID_FFVHUFF) {
// huffyuv doesnt support these with multiple frame threads currently
if (avctx->context_model > 0 || (avctx->flags & CODEC_FLAG_PASS1)) {
avctx->thread_count = 1;
}
}
if(!avctx->thread_count) { if(!avctx->thread_count) {
avctx->thread_count = av_cpu_count(); avctx->thread_count = av_cpu_count();
avctx->thread_count = FFMIN(avctx->thread_count, MAX_THREADS); avctx->thread_count = FFMIN(avctx->thread_count, MAX_THREADS);
@ -147,13 +156,6 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){
if(avctx->thread_count <= 1) if(avctx->thread_count <= 1)
return 0; return 0;
if (avctx->codec_id == AV_CODEC_ID_HUFFYUV ||
avctx->codec_id == AV_CODEC_ID_FFVHUFF) {
// huffyuv doesnt support these with multiple frame threads currently
if (avctx->context_model > 0 || (avctx->flags & CODEC_FLAG_PASS1))
return 0;
}
if(avctx->thread_count > MAX_THREADS) if(avctx->thread_count > MAX_THREADS)
return AVERROR(EINVAL); return AVERROR(EINVAL);