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

h264: improve MAX_SLICES too small check so it gives less false positives.

Browse Source 
Fixes Ticket273

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-09-12 06:06:43 +02:00
parent ad2fba8619
commit 716c1f7b2a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/h264.c
View File

@ -3016,7 +3016,13 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
h0->last_slice_type = slice_type;
h->slice_num = ++h0->current_slice;
if(h->slice_num >= MAX_SLICES){
if(h->slice_num)
h0->slice_row[(h->slice_num-1)&(MAX_SLICES-1)]= s->resync_mb_y;
if ( h0->slice_row[h->slice_num&(MAX_SLICES-1)] + 3 >= s->resync_mb_y
&& h0->slice_row[h->slice_num&(MAX_SLICES-1)] <= s->resync_mb_y
&& h->slice_num >= MAX_SLICES) {
//in case of ASO this check needs to be updated depending on how we decide to assign slice numbers in this case
av_log(s->avctx, AV_LOG_WARNING, "Possibly too many slices (%d >= %d), increase MAX_SLICES and recompile if there are artifacts\n", h->slice_num, MAX_SLICES);
}

2
libavcodec/h264.h
View File

@ -580,6 +580,8 @@ typedef struct H264Context{
int initial_cpb_removal_delay[32]; ///< Initial timestamps for CPBs
int cur_chroma_format_idc;
int16_t slice_row[MAX_SLICES]; ///< to detect when MAX_SLICES is too low
}H264Context;