Commit 1a6231cc authored by sagnowski's avatar sagnowski
Browse files

Resolve TODO about audio coding bitrate function

parent 7723c19a

lib_isar/isar_prot.h

+3 −5
Original line number Diff line number Diff line
@@ -291,14 +291,12 @@ void isar_set_split_rend_ht_setup( 
    IVAS_QUATERNION Quaternions[MAX_PARAM_SPATIAL_SUBFRAMES],

    float Rmat[MAX_PARAM_SPATIAL_SUBFRAMES][3][3] );



#ifndef LC3PLUS_RTP_PAYLOAD_FORMAT

int32_t isar_get_lc3plus_bitrate(

    const int32_t SplitRendBitRate,

    const ISAR_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode

#ifndef LC3PLUS_RTP_PAYLOAD_FORMAT

    ,

    const int16_t split_prerender_frame_size_ms

    const ISAR_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode,

    const int16_t split_prerender_frame_size_ms );

#endif

);



ivas_error isar_split_rend_validate_config(

    const ISAR_SPLIT_REND_CONFIG_DATA *pSplitRendConfig,

lib_isar/isar_splitRendererPre.c

+5 −6
Original line number Diff line number Diff line
@@ -1719,13 +1719,12 @@ ivas_error split_renderer_open_lc3plus( 
#endif

    config.channels = BINAURAL_CHANNELS;



    if ( ( error = ISAR_LC3PLUS_ENC_Open( config, isar_get_lc3plus_bitrate( pSplitRendConfig->splitRendBitRate, pSplitRendConfig->poseCorrectionMode

#ifndef LC3PLUS_RTP_PAYLOAD_FORMAT



                                                                            ,

                                                                            (int16_t) ( config.isar_frame_duration_us / 1000 )

    if ( ( error = ISAR_LC3PLUS_ENC_Open( config,

#ifdef LC3PLUS_RTP_PAYLOAD_FORMAT

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

#else

                                          isar_get_lc3plus_bitrate( pSplitRendConfig->splitRendBitRate, pSplitRendConfig->poseCorrectionMode, (int16_t) ( config.ivas_frame_duration_us / 1000 ) ),

#endif

                                                                                ),

                                          &hSplitRendWrapper->hLc3plusEnc ) ) != IVAS_ERR_OK )

    {

        return error;

lib_isar/isar_splitRenderer_utils.c

+3 −14
Original line number Diff line number Diff line
@@ -564,32 +564,22 @@ int32_t isar_get_lcld_bitrate( 
}





#ifndef LC3PLUS_RTP_PAYLOAD_FORMAT

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

 * Function isar_get_lc3plus_bitrate()

 *

 *

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



#ifdef LC3PLUS_RTP_PAYLOAD_FORMAT

/* TODO: This is now the same as isar_get_lcld_bitrate - merge these functions into one */

#endif

int32_t isar_get_lc3plus_bitrate(

    const int32_t SplitRendBitRate,

    ISAR_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode

#ifndef LC3PLUS_RTP_PAYLOAD_FORMAT

    ,

    const int16_t split_prerender_frame_size_ms

#endif

)

    ISAR_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode,

    const int16_t split_prerender_frame_size_ms )

{

    if ( poseCorrectionMode == ISAR_SPLIT_REND_POSE_CORRECTION_MODE_CLDFB )

    {

#ifdef LC3PLUS_RTP_PAYLOAD_FORMAT

        return isar_get_lcld_bitrate( SplitRendBitRate, poseCorrectionMode );

#else

        int32_t inBandMdBps = (int32_t) ( 8 * 1000 / split_prerender_frame_size_ms );

        return isar_get_lcld_bitrate( SplitRendBitRate, poseCorrectionMode ) - inBandMdBps;

#endif

    }



    if ( poseCorrectionMode == ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE )
@@ -603,7 +593,6 @@ int32_t isar_get_lc3plus_bitrate( 
}





#ifndef LC3PLUS_RTP_PAYLOAD_FORMAT

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

 * Function isar_get_lc3plus_bitrate_id()

 *