Commit 3d4311d7 authored by multrus's avatar multrus
Browse files

[cleanup] accept LC3PLUS_LEA_COMPAT_BITRATES_48_6

parent 2323d31c

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ 
#ifdef SPLIT_REND_WITH_HEAD_ROT

#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

#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)  */

#endif

#endif

lib_isar/isar_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -348,14 +348,12 @@ int32_t isar_get_lc3plus_bitrate( 
);



#endif

#ifdef LC3PLUS_LEA_COMPAT_BITRATES_48_6

int32_t isar_get_lc3plus_bitrate(

    const int32_t SplitRendBitRate,                             /* i  : ISAR bitrate                            */

    const ISAR_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode, /* i  : ISAR pose correction mode            */

    const int32_t nChannels,                                    /* i  : number of channels                      */

    const int32_t lc3plus_frame_duration_us                     /* i  : ISAR frame length in us                 */

);

#endif



ivas_error isar_split_rend_validate_config(

    const ISAR_SPLIT_REND_CONFIG_DATA *pSplitRendConfig,        /* i  : Split renderer pre-renderer config      */

lib_isar/isar_splitRendererPre.c

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



#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

#ifdef LC3PLUS_LEA_COMPAT_BITRATES_48_6

    if ( ( error = ISAR_LC3PLUS_ENC_Open( config, isar_get_lc3plus_bitrate( pSplitRendConfig->splitRendBitRate, pSplitRendConfig->poseCorrectionMode, config.channels, config.lc3plus_frame_duration_us ), &hSplitRendWrapper->hLc3plusEnc ) ) != IVAS_ERR_OK )

#else

    if ( ( error = ISAR_LC3PLUS_ENC_Open( config, isar_get_lcld_bitrate( pSplitRendConfig->splitRendBitRate, pSplitRendConfig->poseCorrectionMode ), &hSplitRendWrapper->hLc3plusEnc ) ) != IVAS_ERR_OK )

#endif

#else

    if ( ( error = ISAR_LC3PLUS_ENC_Open( config, isar_get_lc3plus_bitrate( pSplitRendConfig->splitRendBitRate, pSplitRendConfig->poseCorrectionMode, (int16_t) ( config.isar_frame_duration_us / 1000 ) ), &hSplitRendWrapper->hLc3plusEnc ) ) != IVAS_ERR_OK )

#endif
@@ -2043,7 +2039,6 @@ ivas_error isar_renderMultiTDBinToSplitBinaural( 
        else

        {

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

#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;
@@ -2052,9 +2047,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 )

#else

lib_isar/isar_splitRenderer_utils.c

+0 −2
Original line number Diff line number Diff line
@@ -553,7 +553,6 @@ int32_t isar_get_lcld_bitrate( 
}





#ifdef LC3PLUS_LEA_COMPAT_BITRATES_48_6

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

 * Function isar_get_lc3plus_bitrate()

 *
@@ -579,7 +578,6 @@ int32_t isar_get_lc3plus_bitrate( 


    return bitrate;

}

#endif





#ifndef ISAR_BITSTREAM_UPDATE_LC3PLUS

lib_isar/lib_isar_pre_rend.c

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



#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

#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;
@@ -411,9 +410,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 )

#else