Commit cefea067 authored by vaclav's avatar vaclav
Browse files

accept FIX_1372_OSBA_OBJECT_EDITING and FIX_1372_OSBA_OBJECT_EDITING

parent 0e330920

lib_com/options.h

+1 −2
Original line number Diff line number Diff line
@@ -163,8 +163,7 @@ 


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define FIX_1995_REVERB_INIT                            /* issue 1995: Fix use-of-uninitialized-value in ivas_binaural_reverb_init() */

#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

+0 −2
Original line number Diff line number Diff line
@@ -729,12 +729,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 −5
Original line number Diff line number Diff line
@@ -1406,11 +1406,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++ )

            {
@@ -1462,7 +1458,6 @@ void ivas_spar_dec_upmixer_sf( 
        }

    }

#endif



    /*---------------------------------------------------------------------*

     * TD Decorr and pcm ingest

     *---------------------------------------------------------------------*/

lib_rend/ivas_reverb.c

+0 −8
Original line number Diff line number Diff line
@@ -1892,11 +1892,7 @@ ivas_error ivas_binaural_reverb_init( 
    }

    else

    {

#ifdef FIX_1995_REVERB_INIT

        for ( bin = 0; bin < numBins; bin++ )

#else

        for ( bin = 0; bin < CLDFB_NO_CHANNELS_MAX; bin++ )

#endif

        {

            revTimes[bin] = defaultTimes[bin];

            revEne[bin] = defaultEne[bin];
@@ -1904,11 +1900,7 @@ ivas_error ivas_binaural_reverb_init( 
        preDelay = 10;

    }



#ifdef FIX_1995_REVERB_INIT

    for ( bin = 0; bin < numBins; bin++ )

#else

    for ( bin = 0; bin < CLDFB_NO_CHANNELS_MAX; bin++ )

#endif

    {

        /* Adjust the room effect parameters when the reverberation time is less than a threshold value, to avoid

           spectral artefacts with the synthetic reverberator. */