Commit efa0cbde authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_913_OMASA_BITBUDGET_VIOLATION

parent 30ad81d6

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ 
/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

#define NONBE_FIX_913_OMASA_BITBUDGET_VIOLATION               /* VA/Nok: issue 913: Resolve "Crash in OMASA encoder - DFT-Stereo bit-budget violated" */

#define NONBE_FIX_855_JBM_FLUSH_OFFSET                        /* FhG: issue #855: add missing switch here for the code in JBM flushing                 */

#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA           /* FhG: issue 926: crash in OSBA decoding with planar FOA */

#define NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH                 /* FhG: issue 908: fix crash in OSBA BR switching with long test vectors */

lib_dec/ivas_cpe_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -258,7 +258,6 @@ ivas_error ivas_cpe_dec( 
            }

            else

            {

#ifdef NONBE_FIX_913_OMASA_BITBUDGET_VIOLATION

                if ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT )

                {

                    nb_bits -= nb_bits_metadata;
@@ -268,7 +267,6 @@ ivas_error ivas_cpe_dec( 
                    }

                }



#endif

                stereo_dft_dec_read_BS( ivas_total_brate, hCPE->element_brate, &sts[0]->total_brate, sts[1], hCPE->hStereoDft, sts[0]->bwidth, output_frame, res_buf, &nb_bits, hCPE->hStereoCng->coh, st_ivas->ivas_format );

            }

lib_enc/ivas_cpe_enc.c

+0 −9
Original line number Diff line number Diff line
@@ -656,14 +656,10 @@ ivas_error ivas_cpe_enc( 
            if ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT )

            {

                max_bits -= nb_bits_metadata;

#ifdef NONBE_FIX_913_OMASA_BITBUDGET_VIOLATION

                if ( hCPE->brate_surplus < 0 )

                {

#endif

                    max_bits += (int16_t) ( hCPE->brate_surplus / FRAMES_PER_SEC );

#ifdef NONBE_FIX_913_OMASA_BITBUDGET_VIOLATION

                }

#endif

            }



            stereo_dft_enc_res( hCPE->hStereoDft, old_inp_12k8[1] + L_INP_MEM - STEREO_DFT_OVL_8k, hCPE->hMetaData, &nb_bits, max_bits );
@@ -675,7 +671,6 @@ ivas_error ivas_cpe_enc( 
        }

        else

        {

#ifdef NONBE_FIX_913_OMASA_BITBUDGET_VIOLATION

#ifdef DEBUGGING

            if ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT )

            {
@@ -686,10 +681,6 @@ ivas_error ivas_cpe_enc( 
                assert( ( ( hCPE->element_brate / FRAMES_PER_SEC - nb_bits ) >= ( 0.8f * sts[0]->bits_frame_nominal ) ) && "Stereo DFT: bit budget is violated" );

            }



#endif

#else

            assert( ( ( hCPE->element_brate / FRAMES_PER_SEC - nb_bits ) >= ( 0.8f * sts[0]->bits_frame_nominal ) ) && "Stereo DFT: bit budget is violated" );



#endif

            /* Flexible total bitrate in M channel */

            sts[0]->total_brate = hCPE->element_brate - ( nb_bits * FRAMES_PER_SEC );