Commit 213c333c authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept FIX_1372_OSBA_OBJECT_EDITING

parent e9541211

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ 
#define FIX_HRTF_LOAD_API                               // solves API conflicts between HRTF and object-editing features

#define TMP_FIX_SPLIT_REND                              // temporary fix to split-rendering (it follows the later state of the framework but it is needed now because of current test-conditions)

#define TMP_FIX_OMASA_SR_BE                             // temporary fix to keep OMASA split-rendering BE

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

#define NONBE_1399_1400_FIX_OBJ_EDIT_ISSUES             /* Nokia: Fix for issues 1399: obj edit broken with MC/SBA output in VOIP, and 1400: negative energy estimate used for gaining. */

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

#define FIX_1318_ROOM_SIZE_CMD_LINE                     /* Philips/Nokia: Default room sizes support */

lib_dec/ivas_sba_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -713,12 +713,10 @@ ivas_error ivas_sba_dec_render( 
        {

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

        }

#ifdef FIX_1372_OSBA_OBJECT_EDITING

        else if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

        {

            nchan_out = BINAURAL_CHANNELS;

        }

#endif

    }



    nchan_out = min( nchan_out, ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate ) );

lib_dec/ivas_spar_decoder.c

+0 −4
Original line number Diff line number Diff line
@@ -1415,11 +1415,7 @@ void ivas_spar_dec_upmixer_sf( 
            p_tc[i] = st_ivas->hTcBuffer->tc[i + nchan_ism] + slot_idx_start * slot_size;

        }



#ifdef FIX_1372_OSBA_OBJECT_EDITING

        if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

#else

        if ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_SBA_MODE_DISC && st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

#endif

        {

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

            {