virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases 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:39 +02:00
parent 7a4e30f3b6
commit 506ffa793f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/h264_cavlc.c
View File

@ -35,9 +35,8 @@
#include "h264data.h" // FIXME FIXME FIXME #include "h264data.h" // FIXME FIXME FIXME
#include "h264_mvpred.h" #include "h264_mvpred.h"
#include "golomb.h" #include "golomb.h"
#include "libavutil/avassert.h"
//#undef NDEBUG
#include <assert.h>
static const uint8_t golomb_to_inter_cbp_gray[16]={ static const uint8_t golomb_to_inter_cbp_gray[16]={
0, 1, 2, 4, 8, 3, 5,10,12,15, 7,11,13,14, 6, 9, 0, 1, 2, 4, 8, 3, 5,10,12,15, 7,11,13,14, 6, 9,
@ -481,7 +480,7 @@ static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, in
trailing_ones= coeff_token&3; trailing_ones= coeff_token&3;
tprintf(h->s.avctx, "trailing:%d, total:%d\n", trailing_ones, total_coeff); tprintf(h->s.avctx, "trailing:%d, total:%d\n", trailing_ones, total_coeff);
assert(total_coeff<=16); av_assert2(total_coeff<=16);
i = show_bits(gb, 3); i = show_bits(gb, 3);
skip_bits(gb, trailing_ones); skip_bits(gb, trailing_ones);
@ -639,7 +638,7 @@ static av_always_inline int decode_luma_residual(H264Context *h, GetBitContext *
return -1; //FIXME continue if partitioned and other return -1 too return -1; //FIXME continue if partitioned and other return -1 too
} }
assert((cbp&15) == 0 || (cbp&15) == 15); av_assert2((cbp&15) == 0 || (cbp&15) == 15);
if(cbp&15){ if(cbp&15){
for(i8x8=0; i8x8<4; i8x8++){ for(i8x8=0; i8x8<4; i8x8++){
@ -745,7 +744,7 @@ int ff_h264_decode_mb_cavlc(H264Context *h){
goto decode_intra_mb; goto decode_intra_mb;
} }
}else{ }else{
assert(h->slice_type_nos == AV_PICTURE_TYPE_I); av_assert2(h->slice_type_nos == AV_PICTURE_TYPE_I);
if(h->slice_type == AV_PICTURE_TYPE_SI && mb_type) if(h->slice_type == AV_PICTURE_TYPE_SI && mb_type)
mb_type--; mb_type--;
decode_intra_mb: decode_intra_mb:
@ -857,7 +856,7 @@ decode_intra_mb:
h->ref_cache[1][scan8[12]] = PART_NOT_AVAILABLE; h->ref_cache[1][scan8[12]] = PART_NOT_AVAILABLE;
} }
}else{ }else{
assert(h->slice_type_nos == AV_PICTURE_TYPE_P); //FIXME SP correct ? av_assert2(h->slice_type_nos == AV_PICTURE_TYPE_P); //FIXME SP correct ?
for(i=0; i<4; i++){ for(i=0; i<4; i++){
h->sub_mb_type[i]= get_ue_golomb_31(&s->gb); h->sub_mb_type[i]= get_ue_golomb_31(&s->gb);
if(h->sub_mb_type[i] >=4){ if(h->sub_mb_type[i] >=4){
@ -1012,7 +1011,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++){
unsigned int val; unsigned int val;