Commit ab818046 authored by vaclav's avatar vaclav
Browse files

remove duplicated SR constants definition

parent c42030eb

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
#define RENDERER_MAX_METADATA_LINE_LENGTH 1024



#ifdef SPLIT_REND_WITH_HEAD_ROT

#define SPLIT_REND_BITS_BUFF_SIZE ( ( ( ( (int32_t) SPLIT_REND_MAX_BRATE / IVAS_NUM_FRAMES_PER_SEC ) + 7 ) >> 3 ) + SPLIT_REND_ADDITIONAL_BYTES_TO_READ )

#define SPLIT_REND_BITS_BUFF_SIZE ( ( ( ( (int32_t) IVAS_MAX_SPLIT_REND_BITRATE / IVAS_NUM_FRAMES_PER_SEC ) + 7 ) >> 3 ) + IVAS_SPLIT_REND_ADDITIONAL_BYTES_TO_READ )

#endif



#define IVAS_MAX16B_FLT 32767.0f

lib_com/common_api_types.h

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ typedef struct _IVAS_JBM_TRACE_DATA 


#define IVAS_MAX_SPLIT_REND_BITRATE                   768000

#define IVAS_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES ( ( ( (int32_t) IVAS_MAX_SPLIT_REND_BITRATE / IVAS_NUM_FRAMES_PER_SEC ) + 7 ) >> 3 )

#define IVAS_SPLIT_REND_ADDITIONAL_BYTES_TO_READ      1



typedef enum

{

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -1847,7 +1847,7 @@ typedef enum 
#define SPLIT_REND_512k                         512000

#define SPLIT_REND_768k                         768000

#define SPLIT_REND_MAX_BRATE                    SPLIT_REND_768k

#define SPLIT_REND_ADDITIONAL_BYTES_TO_READ     1



#endif



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

lib_dec/lib_dec.c

+0 −1
Original line number Diff line number Diff line
@@ -3494,7 +3494,6 @@ ivas_error IVAS_DEC_GetCldfbSamples( 
)

{

    Decoder_Struct *st_ivas;

    ivas_error error;

    int16_t ch, b, slot_idx, num_chs, maxBand, num_samples;



    if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL )

lib_rend/lib_rend.h

+0 −13
Original line number Diff line number Diff line
@@ -48,19 +48,6 @@ 
#define RENDERER_MAX_BIN_INPUTS 1

#endif



#ifdef SPLIT_REND_WITH_HEAD_ROT

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

 * Split rendering bitrate constants

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



#define SPLIT_REND_256k                     256000

#define SPLIT_REND_320k                     320000

#define SPLIT_REND_384k                     384000

#define SPLIT_REND_512k                     512000

#define SPLIT_REND_768k                     768000

#define SPLIT_REND_MAX_BRATE                SPLIT_REND_768k

#define SPLIT_REND_ADDITIONAL_BYTES_TO_READ 1

#endif



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

 * Renderer structures