highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes "make THREADS=2 THREAD_TYPE=1 fate-mpeg2-field-enc".
This commit is contained in:
Ronald S. Bultje 2011-05-17 10:26:29 -04:00
parent 8d44cd2cd8
commit 508a24f8dc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mpeg12.c
View File

@ -2262,7 +2262,7 @@ static int decode_chunks(AVCodecContext *avctx,
buf_ptr = ff_find_start_code(buf_ptr,buf_end, &start_code); buf_ptr = ff_find_start_code(buf_ptr,buf_end, &start_code);
if (start_code > 0x1ff){ if (start_code > 0x1ff){
if(s2->pict_type != AV_PICTURE_TYPE_B || avctx->skip_frame <= AVDISCARD_DEFAULT){ 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; int i;
avctx->execute(avctx, slice_decode_thread, &s2->thread_context[0], NULL, s->slice_count, sizeof(void*)); 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; 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; int threshold= (s2->mb_height*s->slice_count + avctx->thread_count/2) / avctx->thread_count;
if(threshold <= mb_y){ if(threshold <= mb_y){
MpegEncContext *thread_context= s2->thread_context[s->slice_count]; MpegEncContext *thread_context= s2->thread_context[s->slice_count];
@ -2541,7 +2541,7 @@ AVCodec ff_mpegvideo_decoder = {
#if CONFIG_MPEG_XVMC_DECODER #if CONFIG_MPEG_XVMC_DECODER
static av_cold int mpeg_mc_decode_init(AVCodecContext *avctx){ 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; return -1;
if( !(avctx->slice_flags & SLICE_FLAG_CODED_ORDER) ) if( !(avctx->slice_flags & SLICE_FLAG_CODED_ORDER) )
return -1; return -1;