Commit 9299b7c3 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

fix in MCT enc

parent a1ce9d3f

lib_enc/ivas_mct_core_enc.c

+10 −8
Original line number Diff line number Diff line
@@ -497,15 +497,17 @@ void ivas_mct_core_enc( 
    {

        nAvailBits -= IVAS_FORMAT_SIGNALING_NBITS_EXTENDED;

        nAvailBits -= SBA_ORDER_BITS + SBA_PLANAR_BITS;

        if ( ivas_format == SBA_ISM_FORMAT && nChannels > 4 )



#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B

        /*MCT is used at bitrates > 80 kbps and additional 1 bit is present at these bitrates*/

        if ( ivas_format == SBA_ISM_FORMAT )

        {

            nAvailBits -= IVAS_COMBINED_FORMAT_SIGNALLING_BITS;

        }



#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B

        if ( ivas_format == SBA_ISM_FORMAT && nChannels == 3 )

#else

        if ( ivas_format == SBA_ISM_FORMAT && nChannels > 4 )

        {

            nAvailBits -= SBA_PLANAR_BITS;

            nAvailBits -= IVAS_COMBINED_FORMAT_SIGNALLING_BITS;

        }

#endif

    }
@@ -582,10 +584,10 @@ void ivas_mct_core_enc( 
#ifdef DEBUGGING

    format_bits = ( ivas_format == MC_FORMAT ? IVAS_FORMAT_SIGNALING_NBITS + MC_LS_SETUP_BITS : IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + SBA_ORDER_BITS + SBA_PLANAR_BITS );



    format_bits += ( ivas_format == SBA_ISM_FORMAT && nChannels > FOA_CHANNELS );



#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B

    format_bits += ( ivas_format == SBA_ISM_FORMAT && nChannels == 3 ) ? SBA_PLANAR_BITS : 0;

    format_bits += ( ivas_format == SBA_ISM_FORMAT );

#else

    format_bits += ( ivas_format == SBA_ISM_FORMAT && nChannels > FOA_CHANNELS );

#endif



    mct_bits += hMCT->nBitsMCT + hMCT->nchan_out_woLFE;