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

h264_cabac: switch to av_assert

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-07-26 16:33:17 +02:00
parent d5d5e3dabe
commit 7a4e30f3b6
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/h264_cabac.c
View File

@ -38,14 +38,12 @@
#include "h264data.h" #include "h264data.h"
#include "h264_mvpred.h" #include "h264_mvpred.h"
#include "golomb.h" #include "golomb.h"
#include "libavutil/avassert.h"
#if ARCH_X86 #if ARCH_X86
#include "x86/h264_i386.h" #include "x86/h264_i386.h"
#endif #endif
//#undef NDEBUG
#include <assert.h>
/* Cabac pre state table */ /* Cabac pre state table */
static const int8_t cabac_context_init_I[1024][2] = static const int8_t cabac_context_init_I[1024][2] =
@ -1672,7 +1670,7 @@ decode_cabac_residual_internal(H264Context *h, DCTELEM *block,
} }
#endif #endif
} }
assert(coeff_count > 0); av_assert2(coeff_count > 0);
if( is_dc ) { if( is_dc ) {
if( cat == 3 ) if( cat == 3 )
@ -1684,7 +1682,7 @@ decode_cabac_residual_internal(H264Context *h, DCTELEM *block,
if( max_coeff == 64 ) if( max_coeff == 64 )
fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, coeff_count, 1); fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, coeff_count, 1);
else { else {
assert( cat == 1 || cat == 2 || cat == 4 || cat == 7 || cat == 8 || cat == 11 || cat == 12 ); av_assert2( cat == 1 || cat == 2 || cat == 4 || cat == 7 || cat == 8 || cat == 11 || cat == 12 );
h->non_zero_count_cache[scan8[n]] = coeff_count; h->non_zero_count_cache[scan8[n]] = coeff_count;
} }
} }
@ -1911,7 +1909,7 @@ int ff_h264_decode_mb_cabac(H264Context *h) {
if( h->slice_type_nos == AV_PICTURE_TYPE_B ) { if( h->slice_type_nos == AV_PICTURE_TYPE_B ) {
int ctx = 0; int ctx = 0;
assert(h->slice_type_nos == AV_PICTURE_TYPE_B); av_assert2(h->slice_type_nos == AV_PICTURE_TYPE_B);
if( !IS_DIRECT( h->left_type[LTOP]-1 ) ) if( !IS_DIRECT( h->left_type[LTOP]-1 ) )
ctx++; ctx++;
@ -1964,7 +1962,7 @@ int ff_h264_decode_mb_cabac(H264Context *h) {
mb_type= decode_cabac_intra_mb_type(h, 3, 1); mb_type= decode_cabac_intra_mb_type(h, 3, 1);
if(h->slice_type == AV_PICTURE_TYPE_SI && mb_type) if(h->slice_type == AV_PICTURE_TYPE_SI && mb_type)
mb_type--; mb_type--;
assert(h->slice_type_nos == AV_PICTURE_TYPE_I); av_assert2(h->slice_type_nos == AV_PICTURE_TYPE_I);
decode_intra_mb: decode_intra_mb:
partition_count = 0; partition_count = 0;
cbp= i_mb_type_info[mb_type].cbp; cbp= i_mb_type_info[mb_type].cbp;
@ -2225,7 +2223,7 @@ decode_intra_mb:
} }
} }
}else{ }else{
assert(IS_8X16(mb_type)); av_assert2(IS_8X16(mb_type));
for(list=0; list<h->list_count; list++){ for(list=0; list<h->list_count; list++){
for(i=0; i<2; i++){ for(i=0; i<2; i++){
if(IS_DIR(mb_type, i, list)){ //FIXME optimize if(IS_DIR(mb_type, i, list)){ //FIXME optimize