Commit cc46f760 authored by multrus's avatar multrus
Browse files

[cleanup] accept LC3PLUS_LEA_COMPAT_BITRATES_48_6

parent d150ad19

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,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_ISM_XOVER_BR                          /* FhG: issue 1072: select OSBA coding method depending on number of object and bitrate */

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

#define CONF_DISTATT                                    /* Eri: Make distance attenuation configurable */

lib_isar/isar_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -322,14 +322,12 @@ void isar_set_split_rend_ht_setup_fx( 
    Word32 Rmat_fx[MAX_PARAM_SPATIAL_SUBFRAMES][3][3] 

);



#ifdef LC3PLUS_LEA_COMPAT_BITRATES_48_6

Word32 isar_get_lc3plus_bitrate(

    const Word32 SplitRendBitRate,

    const ISAR_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode,

    const Word32 nChannels,

    const Word32 codecFrameDurationUs );



#endif

ivas_error isar_split_rend_validate_config(

    const ISAR_SPLIT_REND_CONFIG_DATA *pSplitRendConfig,

    const Word16 is_pcm_out

lib_isar/isar_splitRendererPre.c

+0 −8
Original line number Diff line number Diff line
@@ -2718,11 +2718,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;
@@ -3017,7 +3013,6 @@ ivas_error isar_renderMultiTDBinToSplitBinaural( 
        }

        ELSE

        {

#ifdef LC3PLUS_LEA_COMPAT_BITRATES_48_6

            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 );
@@ -3027,9 +3022,6 @@ ivas_error isar_renderMultiTDBinToSplitBinaural( 
            {

                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;

#endif

            IF( ( error = splitRendLc3plusEncodeAndWrite( hSplitBin, pBits, available_bits, in_fx, Q_in ) ) != IVAS_ERR_OK )

            {

                return error;

lib_isar/isar_splitRenderer_utils.c

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

}



#ifdef LC3PLUS_LEA_COMPAT_BITRATES_48_6

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

 * Function isar_get_lc3plus_bitrate()

 *
@@ -770,7 +769,6 @@ Word32 isar_get_lc3plus_bitrate( 
    return bitrate;

}



#endif



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

 * Function isar_split_rend_validate_config()

lib_isar/lib_isar_pre_rend.c

+0 −4
Original line number Diff line number Diff line
@@ -463,7 +463,6 @@ ivas_error ISAR_PRE_REND_MultiBinToSplitBinaural( 
            assert( Q_out[0] == Q_out[1] );





#ifdef LC3PLUS_LEA_COMPAT_BITRATES_48_6

            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 );
@@ -473,9 +472,6 @@ ivas_error ISAR_PRE_REND_MultiBinToSplitBinaural( 
            {

                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;

#endif

            IF( ( error = splitRendLc3plusEncodeAndWrite( hSplitBin, pBits, available_bits, pOutput_fx, Q_out[0] ) ) != IVAS_ERR_OK )

            {

                return error;