Commit a4390336 authored by vaclav's avatar vaclav
Browse files

accept FIX_812_DOUBLE_PREC_MCT

parent fbc8acdc

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ 
#define FIX_712_713_SPLIT_REND_MASA_MC                 /*Dlb : Fix for issue 712 and 713*/

#endif



#define FIX_812_DOUBLE_PREC_MCT                         /* FhG: Issue 812: Avoid double precision in MCT */

#define FIX_807_VARIABLE_SPEED_DECODING                 /* FhG: Issue 807: Resolve "Variable Speed Decoding broken" */

#define FIX_818_DOUBLE_PREC_KERNEN_SW                   /* FhG: Issue 818: Avoid double precision in kernel switching */

lib_dec/ivas_mct_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -428,11 +428,7 @@ ivas_error create_mct_dec( 
    hMCT->currBlockDataCnt = 0;



    /*Initialize bits required to signal channel-pair index*/

#ifdef FIX_812_DOUBLE_PREC_MCT

    hMCT->bitsChannelPairIndex = max( 1, (int16_t) ( floorf( ( logf( (float) hMCT->nchan_out_woLFE * ( hMCT->nchan_out_woLFE - 1 ) / 2 - 1 ) * INV_LOG_2 ) ) + 1 ) );

#else

    hMCT->bitsChannelPairIndex = max( 1, (int16_t) ( floor( ( log( hMCT->nchan_out_woLFE * ( hMCT->nchan_out_woLFE - 1 ) / 2 - 1 ) / log( 2. ) ) ) + 1 ) );

#endif



    set_s( hMCT->chBitRatios, 0, MCT_MAX_CHANNELS );

    set_s( hMCT->lowE_ch, 0, MCT_MAX_CHANNELS );
@@ -589,11 +585,7 @@ ivas_error mct_dec_reconfigure( 
        hMCT->currBlockDataCnt = 0;



        /*Initialize bits required to signal channel-pair index*/

#ifdef FIX_812_DOUBLE_PREC_MCT

        hMCT->bitsChannelPairIndex = max( 1, (int16_t) ( floorf( ( logf( (float) hMCT->nchan_out_woLFE * ( hMCT->nchan_out_woLFE - 1 ) / 2 - 1 ) * INV_LOG_2 ) ) + 1 ) );

#else

        hMCT->bitsChannelPairIndex = max( 1, (int16_t) ( floor( ( log( hMCT->nchan_out_woLFE * ( hMCT->nchan_out_woLFE - 1 ) / 2 - 1 ) / log( 2. ) ) ) + 1 ) );

#endif



        set_s( hMCT->chBitRatios, 0, MCT_MAX_CHANNELS );

        set_s( hMCT->lowE_ch, 0, MCT_MAX_CHANNELS );

lib_enc/ivas_mct_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -71,11 +71,7 @@ static void set_mct_enc_params( 
        hMCT->currBlockDataCnt = 0;



        /*Initialize bits required to signal channel-pair index*/

#ifdef FIX_812_DOUBLE_PREC_MCT

        hMCT->bitsChannelPairIndex = max( 1, (int16_t) ( floorf( ( logf( (float) hMCT->nchan_out_woLFE * ( hMCT->nchan_out_woLFE - 1 ) / 2 - 1 ) * INV_LOG_2 ) ) + 1 ) );

#else

        hMCT->bitsChannelPairIndex = max( 1, (int16_t) ( floor( ( log( hMCT->nchan_out_woLFE * ( hMCT->nchan_out_woLFE - 1 ) / 2 - 1 ) / log( 2. ) ) ) + 1 ) );

#endif



        set_s( hMCT->lowE_ch, 0, MCT_MAX_CHANNELS );