Commit 6f6bafda authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_1302_FIX_OMASA_JBM_FLUSH

parent b5e8702f

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ 


#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define NONBE_1302_FIX_OMASA_JBM_FLUSH                  /* VA: issue 1302: fix OMASA JBM bitrate switching flush in binaural output */

#define NONBE_1324_TC_BUFFER_MEMOERY_KEEP               /* VA: issue 1324: do not reset TSM memory in JBM bitrate switching */

#define NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND /* Eri: issue 1337: Missing directivity setting and distance attenuation in external renderer IVAS_rend */

lib_dec/ivas_jbm_dec.c

+0 −9
Original line number Diff line number Diff line
@@ -1504,13 +1504,11 @@ ivas_error ivas_jbm_dec_flush_renderer( 
            if ( ism_mode_old == ISM_MASA_MODE_DISC )

            {

                float *tc_local[MAX_NUM_OBJECTS];

#ifdef NONBE_1302_FIX_OMASA_JBM_FLUSH

                int16_t last_dirac_md_idx;

                uint16_t nSamplesAvailableNext;

                ISM_MODE ism_mode_orig;

                RENDERER_TYPE renderer_type_orig;

                int32_t ivas_total_brate;

#endif



                /* copy from ISM delay buffer to the correct place in TCs */

                for ( ch_idx = 0; ch_idx < st_ivas->nchan_ism; ch_idx++ )
@@ -1519,7 +1517,6 @@ ivas_error ivas_jbm_dec_flush_renderer( 
                    mvr2r( st_ivas->hMasaIsmData->delayBuffer[ch_idx], tc_local[ch_idx], st_ivas->hMasaIsmData->delayBuffer_size );

                }



#ifdef NONBE_1302_FIX_OMASA_JBM_FLUSH

                /* to render flushed samples, use configuration from the last received frame */

                ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;

                renderer_type_orig = st_ivas->renderer_type;
@@ -1546,12 +1543,6 @@ ivas_error ivas_jbm_dec_flush_renderer( 
                st_ivas->ism_mode = ism_mode_orig;

                st_ivas->renderer_type = renderer_type_orig;

                st_ivas->hDecoderConfig->ivas_total_brate = ivas_total_brate;

#else

                if ( ( error = ivas_td_binaural_renderer_sf( st_ivas, p_output, hTcBuffer->n_samples_granularity ) ) != IVAS_ERR_OK )

                {

                    return error;

                }

#endif

            }

        }

        else if ( st_ivas->ivas_format == SBA_ISM_FORMAT )