Commit 508a24f8 authored by Ronald S. Bultje's avatar Ronald S. Bultje
Browse files

mpeg12: add slice-threading checks to slice-threading initializers.

Fixes "make THREADS=2 THREAD_TYPE=1 fate-mpeg2-field-enc".
parent 8d44cd2c
......@@ -2262,7 +2262,7 @@ static int decode_chunks(AVCodecContext *avctx,
buf_ptr = ff_find_start_code(buf_ptr,buf_end, &start_code);
if (start_code > 0x1ff){
if(s2->pict_type != AV_PICTURE_TYPE_B || avctx->skip_frame <= AVDISCARD_DEFAULT){
if(avctx->thread_count > 1){
if((avctx->active_thread_type & FF_THREAD_SLICE) && avctx->thread_count > 1){
int i;
avctx->execute(avctx, slice_decode_thread, &s2->thread_context[0], NULL, s->slice_count, sizeof(void*));
......@@ -2430,7 +2430,7 @@ static int decode_chunks(AVCodecContext *avctx,
break;
}
if(avctx->thread_count > 1){
if((avctx->active_thread_type & FF_THREAD_SLICE) && avctx->thread_count > 1){
int threshold= (s2->mb_height*s->slice_count + avctx->thread_count/2) / avctx->thread_count;
if(threshold <= mb_y){
MpegEncContext *thread_context= s2->thread_context[s->slice_count];
......@@ -2541,7 +2541,7 @@ AVCodec ff_mpegvideo_decoder = {
#if CONFIG_MPEG_XVMC_DECODER
static av_cold int mpeg_mc_decode_init(AVCodecContext *avctx){
if( avctx->thread_count > 1)
if((avctx->active_thread_type & FF_THREAD_SLICE) && avctx->thread_count > 1)
return -1;
if( !(avctx->slice_flags & SLICE_FLAG_CODED_ORDER) )
return -1;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment