Commit 4ea88c8e authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept/consolidate SPLIT_REND_CLDFB_HUFF_SAN_FIX

parent f3c1c2f7

apps/renderer.c

+1 −6
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
#define RENDERER_MAX_METADATA_LENGTH      8192

#define RENDERER_MAX_METADATA_LINE_LENGTH 1024



#ifdef SPLIT_REND_CLDFB_HUFF_SAN_FIX

#ifdef SPLIT_REND_WITH_HEAD_ROT

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

#endif
@@ -1345,12 +1345,7 @@ int main( 
#ifdef SPLIT_REND_WITH_HEAD_ROT

    if ( is_split_pre_rend_mode( &args ) || is_split_post_rend_mode( &args ) )

    {

#ifdef SPLIT_REND_CLDFB_HUFF_SAN_FIX

        bitsBufferSize = SPLIT_REND_BITS_BUFF_SIZE;

#else

        bitsBufferSize = (int32_t) SPLIT_REND_MAX_BRATE / FRAMES_PER_SEC;

        bitsBufferSize = ( bitsBufferSize + 7 ) >> 3;

#endif

    }

    else

    {

lib_com/ivas_cnst.h

+0 −3
Original line number Diff line number Diff line
@@ -1806,10 +1806,7 @@ typedef enum 
#define SPLIT_REND_512k                               512000

#define SPLIT_REND_768k                               768000

#define SPLIT_REND_MAX_BRATE                          SPLIT_REND_768k



#ifdef SPLIT_REND_CLDFB_HUFF_SAN_FIX

#define SPLIT_REND_ADDITIONAL_BYTES_TO_READ ( 1 )

#endif



#endif

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

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ 
#define SPLIT_REND_PLC

/*CLDFB CODEC SWITCHES -- END*/



#define SPLIT_REND_CLDFB_HUFF_SAN_FIX

#define SPLIT_REND_STACK_OPT

#endif /* SPLIT_REND_WITH_HEAD_ROT */

lib_util/split_render_file_read_write.c

+0 −2
Original line number Diff line number Diff line
@@ -269,12 +269,10 @@ ivas_error split_rend_read_bits_from_file( 
    {

        return IVAS_ERR_FAILED_FILE_READ;

    }

#ifdef SPLIT_REND_CLDFB_HUFF_SAN_FIX

    for ( i = 0; i < SPLIT_REND_ADDITIONAL_BYTES_TO_READ; i++ )

    {

        bits[num_bytes + i] = 0;

    }

#endif



    *bits_read = 0;

    *bits_written = bit_len;