Commit 9981ea82 authored by vaclav's avatar vaclav
Browse files

port FIX_1372_OSBA_OBJECT_EDITING

parent 2474c980

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ 
#define FIX_1217_OBJECT_EDIT_FILE_INTERFACE             /* Nokia: issue #1217: add decoder functionality to read object edit instructions from a file */

#define NONBE_1217_OBJ_EDIT_FOA                         /* VA/Nokia: isse 1217: fix crash in object editing to FOA output in ParamISM */

#define NONBE_FIX_1255_OBJ_EDIT_JBM                     /* VA: issue 1255: restore object editing in JBM */



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



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_sba_dec.c

+6 −0
Original line number Diff line number Diff line
@@ -760,6 +760,12 @@ 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

+4 −0
Original line number Diff line number Diff line
@@ -1435,7 +1435,11 @@ 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++ )

            {