Commit f0a2d5f4 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[fix] LC3plus decoder crashes due to updated bitrates + disable a 

debugging switch left activated.
parent 565f9146

apps/decoder.c

+5 −1
Original line number Diff line number Diff line
@@ -75,7 +75,11 @@ static 
#define MAX_NUM_OUTPUT_CHANNELS    16

#define MAX_OUTPUT_PCM_BUFFER_SIZE ( MAX_NUM_OUTPUT_CHANNELS * MAX_FRAME_SIZE )

#ifdef SPLIT_REND_WITH_HEAD_ROT

#ifdef SPLIT_REND_LC3PLUS

#define MAX_SPLIT_REND_BITRATE ( 1792000 ) /* TODO tmu: unify with SPLIT_REND_MAX_BRATE ?*/

#else

#define MAX_SPLIT_REND_BITRATE ( 768000 )

#endif

#define MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES ( ( ( (int32_t) MAX_SPLIT_REND_BITRATE / NUM_FRAMES_PER_SEC ) + 7 ) >> 3 )

#endif

#define IVAS_PUBLIC_ORIENT_TRK_NONE        ( 0 )

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -1226,7 +1226,7 @@ int main( 
        bitsBufferSize = ( bitsBufferSize + 7 ) >> 3;

#endif

#ifdef SPLIT_REND_LC3PLUS_HBR_DBG

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

        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

+10 −1
Original line number Diff line number Diff line
@@ -1737,10 +1737,19 @@ typedef enum 


#define SIZE_SPLIT_REND_BRATE_TBL                     (4)

#define SPLIT_REND_256k                               256000

#ifdef SPLIT_REND_LC3PLUS

#define SPLIT_REND_320k                               320000 /* TODO tmu: LC3plus 0DOF only at the moment - not included in SIZE_SPLIT_REND_BRATE_TBL! */

#endif

#define SPLIT_REND_384k                               384000

#define SPLIT_REND_512k                               512000

#define SPLIT_REND_768k                               768000

#ifdef SPLIT_REND_LC3PLUS

#define SPLIT_REND_1536k                              1536000

#define SPLIT_REND_1792k                              1792000

#define SPLIT_REND_MAX_BRATE                          SPLIT_REND_1792k

#else

#define SPLIT_REND_MAX_BRATE                          SPLIT_REND_768k

#endif

#ifdef SPLIT_REND_LC3PLUS

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

#endif

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ 
#define SPLIT_REND_LC3PLUS                              /* FhG: split rendering using LC3plus codec */

#define SPLIT_REND_TD_POSE_CORRECTION                   /* FhG: split rendering using LC3plus codec and time-domain pose correction */

#define FIX_SPLIT_REND_OPEN_ERROR_HANDLING              /* adds missing error handling around ivas_split_renderer_open calls  */

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

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

#endif



#define RENAME_GWLPR                                    /* FhG: Rename clashing symbol */

lib_rend/ivas_splitRendererPre.c

+1 −1
Original line number Diff line number Diff line
@@ -1466,7 +1466,7 @@ void ivas_rend_CldfbSplitPreRendProcess( 
}



#ifdef SPLIT_REND_TD_POSE_CORRECTION

void ivas_rend_TdSplitPreRendProcess(

static void ivas_rend_TdSplitPreRendProcess(

    const IVAS_QUATERNION headPositions[MAX_PARAM_SPATIAL_SUBFRAMES],

    MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData,

    ivas_split_rend_bits_t *pBits )