Commit e650f528 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_1302_FIX_OMASA_JBM_FLUSH

parent 222c0d00

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,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_1328_FIX_NON_LINEARITY                    /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0  */

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

#define NONBE_FIX_1376_MDCT_CONCEALMENT                 /* FhG: fix concealment artifact in MDCT Stereo with DTX, in case transition frame gets lost */

#define NONBE_1377_REND_DIRATT_CONF                     /* Eri: Issue 1377: Error in directivity attenuation configuration for both IVAS_dec and IVAS_rend */

#define FIX_1377_HANDLE_ERROR_CODE                      /* Eri: Add missing error code handling from IVAS_REND_SetObjectIDs */

lib_dec/ivas_jbm_dec.c

+0 −9
Original line number Diff line number Diff line
@@ -1567,13 +1567,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++ )
@@ -1582,7 +1580,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;
@@ -1609,12 +1606,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 )