Commit 41b1b8ab authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] strip SPLIT_REND_LC3PLUS_HBR_DBG

parent cbdd88f4

apps/renderer.c

+0 −3
Original line number Diff line number Diff line
@@ -1350,9 +1350,6 @@ int main( 
#else

        bitsBufferSize = (int32_t) SPLIT_REND_MAX_BRATE / FRAMES_PER_SEC;

        bitsBufferSize = ( bitsBufferSize + 7 ) >> 3;

#endif

#ifdef SPLIT_REND_LC3PLUS_HBR_DBG

        bitsBufferSize = ( SPLIT_REND_LC3PLUS_HBR * MAX_HEAD_ROT_POSES /* Max head poses */ * BINAURAL_CHANNELS /* Ech pose is 2 channels */ + 256000 /* Max metadata bitrate */ ) / FRAMES_PER_SEC / 8;

#endif

    }

    else

lib_com/ivas_cnst.h

+0 −3
Original line number Diff line number Diff line
@@ -1821,9 +1821,6 @@ typedef enum 
#define SPLIT_REND_512k                               512000

#define SPLIT_REND_768k                               768000

#define SPLIT_REND_MAX_BRATE                          SPLIT_REND_768k

#ifdef SPLIT_REND_LC3PLUS_HBR_DBG

#define SPLIT_REND_LC3PLUS_HBR                        128000    /* bitrate per LC3plus core */

#endif



#ifdef SPLIT_REND_CLDFB_HUFF_SAN_FIX

#define SPLIT_REND_ADDITIONAL_BYTES_TO_READ ( 1 )

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -221,7 +221,6 @@ 
#define SPLIT_REND_STACK_OPT



#define SPLIT_REND_LC3PLUS                              /* FhG: split rendering using LC3plus codec */

// #define SPLIT_REND_LC3PLUS_HBR_DBG                      /* Override bitrate per LC3 core */

#endif /* SPLIT_REND_WITH_HEAD_ROT */



/* ################## End DEVELOPMENT switches ######################### */

lib_rend/ivas_lc3plus_enc.c

+0 −6
Original line number Diff line number Diff line
@@ -54,12 +54,6 @@ ivas_error IVAS_LC3PLUS_ENC_Open( 
        return IVAS_ERROR( IVAS_ERR_INTERNAL, "Invalid number of channels\n" );

    }

    bitsPerSecondPerChannel = bitsPerSecond / config.channels;

#ifdef SPLIT_REND_LC3PLUS_HBR_DBG

    if ( bitsPerSecond == (uint32_t) -1 )

    {

        bitsPerSecondPerChannel = SPLIT_REND_LC3PLUS_HBR;

    }

#endif



    encoder_size = lc3plus_enc_get_size( config.samplerate, 1 );

    if ( 0 == encoder_size )

lib_rend/ivas_splitRenderer_utils.c

+0 −27
Original line number Diff line number Diff line
@@ -396,13 +396,6 @@ int32_t ivas_get_split_rend_md_target_brate( const int32_t SplitRendBitRate, con 
                md_bitrate = 128000;

                break;

            }

#ifdef SPLIT_REND_LC3PLUS_HBR_DBG

            case -1:

            {

                md_bitrate = 256000;

                break;

            }

#endif

            default:

            {

                return -1;
@@ -446,13 +439,6 @@ int32_t ivas_get_lcld_bitrate( const int32_t SplitRendBitRate, const IVAS_SPLIT_ 
#ifdef SPLIT_REND_LC3PLUS

int32_t ivas_get_lc3plus_bitrate( const int32_t SplitRendBitRate, IVAS_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode )

{

#ifdef SPLIT_REND_LC3PLUS_HBR_DBG

    if ( SplitRendBitRate == -1 )

    {

        return -1;

    }

#endif



    if ( poseCorrectionMode == IVAS_SPLIT_REND_POSE_CORRECTION_MODE_CLDFB )

    {

        int32_t inBandMdBps = (int32_t) ( 8 * FRAMES_PER_SECOND );
@@ -470,12 +456,6 @@ int32_t ivas_get_lc3plus_bitrate( const int32_t SplitRendBitRate, IVAS_SPLIT_REN 


int8_t ivas_get_lc3plus_bitrate_id( const int32_t SplitRendBitRate )

{

#ifdef SPLIT_REND_LC3PLUS_HBR_DBG

    if ( SplitRendBitRate == -1 )

    {

        return 3;

    }

#endif

    switch ( SplitRendBitRate )

    {

        case SPLIT_REND_768k:
@@ -509,13 +489,6 @@ int32_t ivas_get_lc3plus_size_from_id( const int8_t SplitRendBitRateId, IVAS_SPL 
{

    int32_t bitrate;



#ifdef SPLIT_REND_LC3PLUS_HBR_DBG

    if ( SplitRendBitRateId == 3 )

    {

        return -1;

    }

#endif



    switch ( SplitRendBitRateId )

    {

        case 4: