Commit 79a7a944 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

update BASOP code

parent b1224d1d

lib_isar/isar_splitRendererPre.c

+5 −4
Original line number Diff line number Diff line
@@ -2998,13 +2998,14 @@ ivas_error isar_renderMultiTDBinToSplitBinaural( 
        ELSE

        {

#ifdef LC3PLUS_LEA_COMPAT_BITRATES_48_6

            if ( pBits->pose_correction == ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE )

            IF( EQ_32( pBits->pose_correction, ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE ) )

            {

                available_bits = isar_get_lc3plus_bitrate( SplitRendBitRate, hSplitBin->multiBinPoseData.poseCorrectionMode, hSplitBin->hLc3plusEnc->config.channels, hSplitBin->hLc3plusEnc->config.lc3plus_frame_duration_us ) / FRAMES_PER_SEC;

                available_bits = isar_get_lc3plus_bitrate( SplitRendBitRate, hSplitBin->multiBinPoseData.poseCorrectionMode, hSplitBin->hLc3plusEnc->config.channels, hSplitBin->hLc3plusEnc->config.lc3plus_frame_duration_us );

                available_bits = Mpy_32_32( available_bits, ONE_BY_FRAMES_PER_SEC_Q31 );

            }

            else

            ELSE

            {

                available_bits = ( SplitRendBitRate / FRAMES_PER_SEC ) - pBits->bits_written;

                available_bits = L_sub( Mpy_32_32( SplitRendBitRate, ONE_BY_FRAMES_PER_SEC_Q31 ), pBits->bits_written );

            }

#else

            available_bits = ( SplitRendBitRate / FRAMES_PER_SEC ) - pBits->bits_written;

lib_isar/isar_splitRenderer_utils.c

+6 −3
Original line number Diff line number Diff line
@@ -753,12 +753,15 @@ Word32 isar_get_lc3plus_bitrate( 
    Word32 bitrate;

    bitrate = isar_get_lcld_bitrate( SplitRendBitRate, poseCorrectionMode );

    /* Check for LC3plus LEA 48_6 LC3 compatibility mode signalling */

    if ( ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE == poseCorrectionMode && bitrate == 256000 && nChannels == 2 && codecFrameDurationUs == 10000 )

    test();

    test();

    test();

    if ( EQ_32( ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE, poseCorrectionMode ) && EQ_32( bitrate, 256000 ) && EQ_32( nChannels, 2 ) && EQ_32( codecFrameDurationUs, 10000 ) )

    {





        bitrate = 2 * 126000;

        move32();

    }



    return bitrate;

}

lib_isar/lib_isar_pre_rend.c

+5 −4
Original line number Diff line number Diff line
@@ -484,13 +484,14 @@ ivas_error ISAR_PRE_REND_MultiBinToSplitBinaural( 




#ifdef LC3PLUS_LEA_COMPAT_BITRATES_48_6

            if ( pBits->pose_correction == ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE )

            IF( EQ_32( pBits->pose_correction, ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE ) )

            {

                available_bits = isar_get_lc3plus_bitrate( SplitRendBitRate, hSplitBin->multiBinPoseData.poseCorrectionMode, hSplitBin->hLc3plusEnc->config.channels, hSplitBin->hLc3plusEnc->config.lc3plus_frame_duration_us ) / FRAMES_PER_SEC;

                available_bits = isar_get_lc3plus_bitrate( SplitRendBitRate, hSplitBin->multiBinPoseData.poseCorrectionMode, hSplitBin->hLc3plusEnc->config.channels, hSplitBin->hLc3plusEnc->config.lc3plus_frame_duration_us );

                available_bits = Mpy_32_32( available_bits, ONE_BY_FRAMES_PER_SEC_Q31 );

            }

            else

            ELSE

            {

                available_bits = ( SplitRendBitRate / FRAMES_PER_SEC ) - pBits->bits_written;

                available_bits = L_sub( Mpy_32_32( SplitRendBitRate, ONE_BY_FRAMES_PER_SEC_Q31 ), pBits->bits_written );

            }

#else

            available_bits = ( SplitRendBitRate / FRAMES_PER_SEC ) - pBits->bits_written;