Commit ef0b63de authored by multrus's avatar multrus
Browse files

[cleanup] accept REMOVE_SID_HARM_LEFTOVERS

parent 583a9b65

apps/decoder.c

+0 −11
Original line number Diff line number Diff line
@@ -71,14 +71,7 @@ static 
    int32_t frame = 0; /* Counter of frames */



#define MIN_NUM_BITS_ACTIVE_FRAME 56

#ifdef REMOVE_SID_HARM_LEFTOVERS

#define NUM_BITS_SID_IVAS_5K2 104

#else

#define NUM_BITS_SID_IVAS_4K4  88

#define NUM_BITS_SID_IVAS_7K8  156

#define NUM_BITS_SID_IVAS_9K3  186

#define NUM_BITS_SID_IVAS_10K2 204

#endif

#define MAX_FRAME_SIZE             ( 48000 / 50 )

#define MAX_NUM_OUTPUT_CHANNELS    16

#define MAX_OUTPUT_PCM_BUFFER_SIZE ( MAX_NUM_OUTPUT_CHANNELS * MAX_FRAME_SIZE )
@@ -353,11 +346,7 @@ int main( 
                fprintf( stderr, "\nError: input bitstream file %s couldn't be read\n\n", arg.inputBitstreamFilename );

                goto cleanup;

            }

#ifdef REMOVE_SID_HARM_LEFTOVERS

        } while ( bfi || num_bits < MIN_NUM_BITS_ACTIVE_FRAME || num_bits == NUM_BITS_SID_IVAS_5K2 );

#else

        } while ( bfi || num_bits < MIN_NUM_BITS_ACTIVE_FRAME || num_bits == NUM_BITS_SID_IVAS_4K4 || num_bits == NUM_BITS_SID_IVAS_7K8 || num_bits == NUM_BITS_SID_IVAS_9K3 || num_bits == NUM_BITS_SID_IVAS_10K2 );

#endif



        BS_Reader_Rewind( hBsReader );

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ 
#define FIX_124_DONT_ALLOC_PLCINFO_IN_IVAS              /* Issue 124: do not allocate unused plc struct in IVAS modes which is only used in EVS mono */

#define SBA_BR_SWITCHING                                /* Issue 114: Changes for sba bit rate switching*/

#define FIX_ITD                                         /* Contribution 16: TD renderer ITD improvement and code cleanup */

#define REMOVE_SID_HARM_LEFTOVERS                       /* Issue 192: remove leftovers from the SID bitrate harmonization */

#define FIX_MCT_UNINIT_MEM                              /* Issue 166: Reading of uninitialized memory in TCX range coder */

#define FIX_IGF_NOISE_REPETITION                        /* Issue 182: fix repetition of same noise in IGF */

#define FIX_126_MDFT_FB_STATIC_MEM                      /* Issue 126: reduce static mem consumption of the MDFT FB for non-SBA formats */