Commit 07adea2a authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix MCT bit budget in OSBA

parent b1271bee

lib_enc/ivas_mct_core_enc.c

+13 −0
Original line number Original line Diff line number Diff line
@@ -505,6 +505,14 @@ void ivas_mct_core_enc( 
        {

        {

            nAvailBits -= IVAS_COMBINED_FORMAT_SIGNALLING_BITS;

            nAvailBits -= IVAS_COMBINED_FORMAT_SIGNALLING_BITS;

        }

        }



#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B

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

        {

            nAvailBits -= SBA_PLANAR_BITS;

        }

#endif   



    }

    }





    for ( cpe_id = 0, i = 0; cpe_id < nCPE; cpe_id++ )

    for ( cpe_id = 0, i = 0; cpe_id < nCPE; cpe_id++ )
@@ -584,6 +592,11 @@ void ivas_mct_core_enc( 
#else

#else

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

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

#endif

#endif



#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B

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

#endif



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

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

    assert( ( total_brate + ( NBITS_BWIDTH + format_bits + mct_bits + sba_meta + lfe_bits ) * FRAMES_PER_SEC ) == ivas_total_brate );

    assert( ( total_brate + ( NBITS_BWIDTH + format_bits + mct_bits + sba_meta + lfe_bits ) * FRAMES_PER_SEC ) == ivas_total_brate );

#endif

#endif