Commit fe4355d9 authored by vaclav's avatar vaclav
Browse files

issue 1372: Fix OSBA object-editing in BINAURAL_ROOM_IR; under FIX_1372_OSBA_OBJECT_EDITING

parent f4c2831a

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ 
#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define FIX_1348_OVERFLOW                               /* FhG: fix BASOP overflow in hq_lr_dec(), brings floating-point code inline with FX */

#define FIX_1369_HQ_LR_OVERFLOW                         /* FhG: fix BASOP overflow in hq_lr_enc(), brings floating-point code inline with FX */

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



/* #################### End BE switches ################################## */

lib_dec/ivas_sba_dec.c

+6 −0
Original line number Diff line number Diff line
@@ -712,6 +712,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
@@ -1406,7 +1406,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++ )

            {