Loading lib_dec/ari_dec_fx.c +0 −2 Original line number Diff line number Diff line Loading @@ -9,8 +9,6 @@ #include "rom_com.h" #include "prot_fx.h" // #define FIX_2402_DEBUGGING /*--------------------------------------------------------------- * Ari decode 14 bits routines -------------------------------------------------------------*/ Loading lib_dec/arith_coder_dec_fx.c +1 −25 Original line number Diff line number Diff line Loading @@ -36,10 +36,6 @@ static Word16 tcx_arith_decode_fx( #else bp = ari_start_decoding_14bits_prm_fx( prm, 0, &as ); #endif /* FIX_2402_REPL_EVS_ARI_CODEC_DEC */ #ifdef FIX_2402_DEBUGGING printf( "start_dec_14bits_prm() as.h,l,v= %d,%d,%d\n", HIGH( as ), as.low, as.value ); #endif tmp = sub( envelope_e, 1 + 15 ); W_tmp = 0; Loading @@ -61,10 +57,6 @@ static Word16 tcx_arith_decode_fx( #else bp = ari_decode_14bits_pow_fx( prm, bp, target_bits, &q, &as, exp_k ); #endif /* FIX_2402_REPL_EVS_ARI_CODEC_DEC */ #ifdef FIX_2402_DEBUGGING printf( "14bits_pow_ivas() as.h,l,v= %d,%d,%d, bp=%d\n", HIGH( as ), as.low, as.value, bp ); #endif IF( q == 0 ) { Loading @@ -75,14 +67,10 @@ static Word16 tcx_arith_decode_fx( { #ifdef FIX_2402_REPL_EVS_ARI_CODEC_DEC bp = ari_decode_14bits_sign_ivas( prm, bp, target_bits, &s, &as ); s -= 1; /* ivas returns 1 or 2, evs expects 0 or 1 */ s = sub( s, 1 ); /* ivas returns 1 or 2, evs expects 0 or 1 */ #else bp = ari_decode_14bits_sign_fx( prm, bp, target_bits, &s, &as ); #endif /* FIX_2402_REPL_EVS_ARI_CODEC_DEC */ #ifdef FIX_2402_DEBUGGING printf( "14bits_sign_ivas() as.h,l,v= %d,%d,%d, bp=%d\n", HIGH( as ), as.low, as.value, bp ); #endif W_tmp = W_mac_16_16( W_tmp, q, k ); Loading @@ -93,20 +81,12 @@ static Word16 tcx_arith_decode_fx( move32(); } #ifdef FIX_2402_DEBUGGING printf( "before overflow_() as.h,l,v= %d,%d,%d, bp=%d\n", HIGH( as ), as.low, as.value, bp ); #endif #ifdef FIX_2402_REPL_EVS_ARI_CODEC_DEC IF( ari_decode_overflow_ivas_fx( &as ) ) #else IF( ari_decode_overflow_fx( &as ) ) #endif /* FIX_2402_REPL_EVS_ARI_CODEC_DEC */ { #ifdef FIX_2402_DEBUGGING printf( "after overflow_() as.h,l,v= %d,%d,%d, bp=%d\n", HIGH( as ), as.low, as.value, bp ); #endif if ( LT_16( bp, target_bits ) ) /* safety check in case of bit errors */ { bp = -1; Loading @@ -116,10 +96,6 @@ static Word16 tcx_arith_decode_fx( } else { #ifdef FIX_2402_DEBUGGING printf( "after/else overflow_() as.h,l,v= %d,%d,%d, bp=%d\n", HIGH( as ), as.low, as.value, bp ); #endif } } *q_spectrum_e = SPEC_EXP_DEC; Loading Loading
lib_dec/ari_dec_fx.c +0 −2 Original line number Diff line number Diff line Loading @@ -9,8 +9,6 @@ #include "rom_com.h" #include "prot_fx.h" // #define FIX_2402_DEBUGGING /*--------------------------------------------------------------- * Ari decode 14 bits routines -------------------------------------------------------------*/ Loading
lib_dec/arith_coder_dec_fx.c +1 −25 Original line number Diff line number Diff line Loading @@ -36,10 +36,6 @@ static Word16 tcx_arith_decode_fx( #else bp = ari_start_decoding_14bits_prm_fx( prm, 0, &as ); #endif /* FIX_2402_REPL_EVS_ARI_CODEC_DEC */ #ifdef FIX_2402_DEBUGGING printf( "start_dec_14bits_prm() as.h,l,v= %d,%d,%d\n", HIGH( as ), as.low, as.value ); #endif tmp = sub( envelope_e, 1 + 15 ); W_tmp = 0; Loading @@ -61,10 +57,6 @@ static Word16 tcx_arith_decode_fx( #else bp = ari_decode_14bits_pow_fx( prm, bp, target_bits, &q, &as, exp_k ); #endif /* FIX_2402_REPL_EVS_ARI_CODEC_DEC */ #ifdef FIX_2402_DEBUGGING printf( "14bits_pow_ivas() as.h,l,v= %d,%d,%d, bp=%d\n", HIGH( as ), as.low, as.value, bp ); #endif IF( q == 0 ) { Loading @@ -75,14 +67,10 @@ static Word16 tcx_arith_decode_fx( { #ifdef FIX_2402_REPL_EVS_ARI_CODEC_DEC bp = ari_decode_14bits_sign_ivas( prm, bp, target_bits, &s, &as ); s -= 1; /* ivas returns 1 or 2, evs expects 0 or 1 */ s = sub( s, 1 ); /* ivas returns 1 or 2, evs expects 0 or 1 */ #else bp = ari_decode_14bits_sign_fx( prm, bp, target_bits, &s, &as ); #endif /* FIX_2402_REPL_EVS_ARI_CODEC_DEC */ #ifdef FIX_2402_DEBUGGING printf( "14bits_sign_ivas() as.h,l,v= %d,%d,%d, bp=%d\n", HIGH( as ), as.low, as.value, bp ); #endif W_tmp = W_mac_16_16( W_tmp, q, k ); Loading @@ -93,20 +81,12 @@ static Word16 tcx_arith_decode_fx( move32(); } #ifdef FIX_2402_DEBUGGING printf( "before overflow_() as.h,l,v= %d,%d,%d, bp=%d\n", HIGH( as ), as.low, as.value, bp ); #endif #ifdef FIX_2402_REPL_EVS_ARI_CODEC_DEC IF( ari_decode_overflow_ivas_fx( &as ) ) #else IF( ari_decode_overflow_fx( &as ) ) #endif /* FIX_2402_REPL_EVS_ARI_CODEC_DEC */ { #ifdef FIX_2402_DEBUGGING printf( "after overflow_() as.h,l,v= %d,%d,%d, bp=%d\n", HIGH( as ), as.low, as.value, bp ); #endif if ( LT_16( bp, target_bits ) ) /* safety check in case of bit errors */ { bp = -1; Loading @@ -116,10 +96,6 @@ static Word16 tcx_arith_decode_fx( } else { #ifdef FIX_2402_DEBUGGING printf( "after/else overflow_() as.h,l,v= %d,%d,%d, bp=%d\n", HIGH( as ), as.low, as.value, bp ); #endif } } *q_spectrum_e = SPEC_EXP_DEC; Loading