Commit 5055c3dc authored by Archit Tamarapu's avatar Archit Tamarapu Committed by Manuel Jander
Browse files

[cleanup] accept FIX_1372_OSBA_OBJECT_EDITING

parent 1d80a066

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ 
#define TMP_FIX_OMASA_SR_BE                             // temporary fix to keep OMASA split-rendering BE

#define NONBE_1399_1400_FIX_OBJ_EDIT_ISSUES             // Nokia:  Fix 1399_1400 issue in float, this is essential for the BASOP porting

#define OBJ_EDIT_BASOP

#define FIX_1372_OSBA_OBJECT_EDITING                    /* VA: issue 1372: Fix OSBA object-editing in BINAURAL_ROOM_IR */

#define FIX_2140_OBJECT_EDITING_SANITIZER_ISSUES        /* Nokia: Issue 2140, fixes three different sanitizer issues persisting in object editing code. */

#define FIX_2193_ISM_GAINS_WITH_OE                      /* FhG: fix issue 2193: use edited angles in ISM gain calculation */

#define FIX_2192_OBJ_EDITING_EXT_METADATA               /* Eri: Add support for extended metadata in object editing */

lib_dec/ivas_sba_dec_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -841,13 +841,11 @@ ivas_error ivas_sba_dec_render_fx( 
        {

            nchan_out = s_max( nchan_internal, sub( st_ivas->hDecoderConfig->nchan_out, st_ivas->nchan_ism ) );

        }

#ifdef FIX_1372_OSBA_OBJECT_EDITING

        ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )

        {

            nchan_out = BINAURAL_CHANNELS;

            move16();

        }

#endif

    }

    nchan_out = s_min( nchan_out, ivas_get_nchan_buffers_dec_fx( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate ) );

lib_dec/ivas_spar_decoder_fx.c

+0 −6
Original line number Diff line number Diff line
@@ -1735,13 +1735,7 @@ void ivas_spar_dec_upmixer_sf_fx( 
            p_tc_fx[i] = st_ivas->hTcBuffer->tc_fx[( i + nchan_ism )] + prod; /*Q11*/

        }



#ifdef FIX_1372_OSBA_OBJECT_EDITING

        IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )

#else

        test();

        test();

        IF( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) && EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )

#endif

        {

            FOR( i = 0; i < nchan_ism; i++ )

            {