Commit df8b20d1 authored by multrus's avatar multrus
Browse files

fix compiler warnings for VS

parent ee981fa7

lib_dec/ivas_mct_dec.c

100644 → 100755
+2 −2
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ ivas_error create_mct_dec( 
    hMCT->currBlockDataCnt = 0;



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

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

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



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

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



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

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

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



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

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

lib_enc/ivas_mct_enc.c

100644 → 100755
+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static void set_mct_enc_params( 
        hMCT->currBlockDataCnt = 0;



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

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

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



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