diff options
Diffstat (limited to 'libavcodec/h264_cabac.c')
| -rw-r--r-- | libavcodec/h264_cabac.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 2bf08b5..1c4288a 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -2,20 +2,20 @@ * H.26L/H.264/AVC/JVT/14496-10/... cabac decoding * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -26,6 +26,7 @@ */ #define CABAC 1 +#define UNCHECKED_BITSTREAM_READER 1 #include "config.h" #include "cabac.h" @@ -37,14 +38,12 @@ #include "h264data.h" #include "h264_mvpred.h" #include "golomb.h" +#include "libavutil/avassert.h" #if ARCH_X86 #include "x86/h264_i386.h" #endif -//#undef NDEBUG -#include <assert.h> - /* Cabac pre state table */ static const int8_t cabac_context_init_I[1024][2] = @@ -1623,7 +1622,6 @@ decode_cabac_residual_internal(H264Context *h, DCTELEM *block, cc.range = h->cabac.range; cc.low = h->cabac.low; cc.bytestream= h->cabac.bytestream; - cc.bytestream_end = h->cabac.bytestream_end; #else #define CC &h->cabac #endif @@ -1672,7 +1670,7 @@ decode_cabac_residual_internal(H264Context *h, DCTELEM *block, } #endif } - assert(coeff_count > 0); + av_assert2(coeff_count > 0); if( is_dc ) { if( cat == 3 ) @@ -1684,11 +1682,12 @@ decode_cabac_residual_internal(H264Context *h, DCTELEM *block, if( max_coeff == 64 ) fill_rectangle(&h->non_zero_count_cache[scan8[n]], 2, 2, 8, coeff_count, 1); 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; } } + #define STORE_BLOCK(type) \ do { \ uint8_t *ctx = coeff_abs_level1_ctx[node_ctx] + abs_level_m1_ctx_base; \ @@ -1732,11 +1731,11 @@ decode_cabac_residual_internal(H264Context *h, DCTELEM *block, } \ } while ( coeff_count ); - if (h->pixel_shift) { - STORE_BLOCK(int32_t) - } else { - STORE_BLOCK(int16_t) - } + if (h->pixel_shift) { + STORE_BLOCK(int32_t) + } else { + STORE_BLOCK(int16_t) + } #ifdef CABAC_ON_STACK h->cabac.range = cc.range ; h->cabac.low = cc.low ; @@ -1910,7 +1909,7 @@ int ff_h264_decode_mb_cabac(H264Context *h) { if( h->slice_type_nos == AV_PICTURE_TYPE_B ) { 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 ) ) ctx++; @@ -1963,7 +1962,7 @@ int ff_h264_decode_mb_cabac(H264Context *h) { mb_type= decode_cabac_intra_mb_type(h, 3, 1); if(h->slice_type == AV_PICTURE_TYPE_SI && 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: partition_count = 0; cbp= i_mb_type_info[mb_type].cbp; @@ -2224,7 +2223,7 @@ decode_intra_mb: } } }else{ - assert(IS_8X16(mb_type)); + av_assert2(IS_8X16(mb_type)); for(list=0; list<h->list_count; list++){ for(i=0; i<2; i++){ if(IS_DIR(mb_type, i, list)){ //FIXME optimize |
