Commit d65bb0e0 authored by multrus's avatar multrus
Browse files

[cleanup] accept LC3PLUS_LEA_COMPAT_BITRATES_48_6

parent 7ab6a65f

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ 


/* #################### Start BASOP porting switches ############################ */



#define LC3PLUS_LEA_COMPAT_BITRATES_48_6                /* FhG: treat split-rendering 256kbps lc3plus 10ms 0dof bitrate as sentinel value for LEA compatible 48_6 bitrate (124 kbps per channel)  */

#define NONBE_FIX_1091_PMC_LOW_SIGNAL_BURSTS            /* FhG: fix for #1091, fix limit calculation for the regularized inverse of Kx to avoid bursts in very low signals  */

#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

#define NONBE_FIX_ISM_XOVER_BR                          /* FhG: issue 1072: select OSBA coding method depending on number of object and bitrate */

lib_isar/isar_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -290,13 +290,11 @@ void isar_set_split_rend_ht_setup( 
    float Rmat[MAX_PARAM_SPATIAL_SUBFRAMES][3][3] );





#ifdef LC3PLUS_LEA_COMPAT_BITRATES_48_6

int32_t isar_get_lc3plus_bitrate(

    const int32_t SplitRendBitRate,

    const ISAR_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode,

    const int32_t nChannels,

    const int32_t codecFrameDurationUs );

#endif



ivas_error isar_split_rend_validate_config(

    const ISAR_SPLIT_REND_CONFIG_DATA *pSplitRendConfig,

lib_isar/isar_splitRendererPre.c

+0 −8
Original line number Diff line number Diff line
@@ -1744,11 +1744,7 @@ ivas_error split_renderer_open_lc3plus( 
    config.channels = BINAURAL_CHANNELS;



    if ( ( error = ISAR_LC3PLUS_ENC_Open( config,

#ifdef LC3PLUS_LEA_COMPAT_BITRATES_48_6

                                          isar_get_lc3plus_bitrate( pSplitRendConfig->splitRendBitRate, pSplitRendConfig->poseCorrectionMode, config.channels, config.lc3plus_frame_duration_us ),

#else

                                          isar_get_lcld_bitrate( pSplitRendConfig->splitRendBitRate, pSplitRendConfig->poseCorrectionMode ),

#endif

                                          &hSplitRendWrapper->hLc3plusEnc ) ) != IVAS_ERR_OK )

    {

        return error;
@@ -1967,7 +1963,6 @@ ivas_error isar_renderMultiTDBinToSplitBinaural( 
        }

        else

        {

#ifdef LC3PLUS_LEA_COMPAT_BITRATES_48_6

            if ( 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;
@@ -1976,9 +1971,6 @@ ivas_error isar_renderMultiTDBinToSplitBinaural( 
            {

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

            }

#else

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

#endif

            if ( ( error = splitRendLc3plusEncodeAndWrite( hSplitBin, pBits, available_bits, in ) ) != IVAS_ERR_OK )

            {

                return error;

lib_isar/isar_splitRenderer_utils.c

+0 −2
Original line number Diff line number Diff line
@@ -562,7 +562,6 @@ int32_t isar_get_lcld_bitrate( 
    return -1;

}



#ifdef LC3PLUS_LEA_COMPAT_BITRATES_48_6

/*-------------------------------------------------------------------------

 * Function isar_get_lc3plus_bitrate()

 *
@@ -586,7 +585,6 @@ int32_t isar_get_lc3plus_bitrate( 
    }

    return bitrate;

}

#endif





/*-------------------------------------------------------------------------

lib_isar/lib_isar_pre_rend.c

+0 −4
Original line number Diff line number Diff line
@@ -390,7 +390,6 @@ ivas_error ISAR_PRE_REND_MultiBinToSplitBinaural( 
            }





#ifdef LC3PLUS_LEA_COMPAT_BITRATES_48_6

            if ( 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;
@@ -399,9 +398,6 @@ ivas_error ISAR_PRE_REND_MultiBinToSplitBinaural( 
            {

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

            }

#else

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

#endif

            if ( ( error = splitRendLc3plusEncodeAndWrite( hSplitBin, pBits, available_bits, output ) ) != IVAS_ERR_OK )

            {

                return error;