Commit f3f3e574 authored by vaclav's avatar vaclav
Browse files

fixes

parent d7e46943

lib_dec/ivas_init_dec.c

+0 −3
Original line number Diff line number Diff line
@@ -2255,9 +2255,6 @@ ivas_error ivas_init_decoder( 
            {

                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for floating-point output audio buffer!\n" ) );

            }

#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX

            set_zero( st_ivas->p_output_f[n], 48000 / FRAMES_PER_SEC );

#endif

        }

#ifndef NONBE_UNIFIED_DECODING_PATHS

    }

lib_dec/ivas_ism_renderer.c

+4 −4
Original line number Diff line number Diff line
@@ -254,8 +254,8 @@ void ivas_ism_render_sf( 
    int16_t tc_offset;

    int16_t interp_offset;

    float gain, prev_gain;

#ifdef NONBE_UNIFIED_DECODING_PATHS

    float tc_local[MAX_NUM_OBJECTS][L_FRAME48k];

#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX

    float tc_local[MAX_NUM_OBJECTS][L_FRAME48k]; // VE2SB: TBV

#endif



    num_objects = st_ivas->nchan_transport;
@@ -269,7 +269,7 @@ void ivas_ism_render_sf( 
    tc_offset = st_ivas->hTcBuffer->n_samples_rendered;

    interp_offset = st_ivas->hTcBuffer->n_samples_rendered;



#ifdef NONBE_UNIFIED_DECODING_PATHS

#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX

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

    {

        mvr2r( output_f[i], tc_local[i], n_samples_to_render );
@@ -321,7 +321,7 @@ void ivas_ism_render_sf( 
            if ( fabsf( gain ) > 0.0f || fabsf( prev_gain ) > 0.0f )

            {

                g1 = &st_ivas->hIsmRendererData->interpolator[interp_offset];

#ifdef NONBE_UNIFIED_DECODING_PATHS

#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX

                tc = &tc_local[i][tc_offset];

#else

                tc = &st_ivas->hTcBuffer->tc[i][tc_offset];

lib_dec/ivas_osba_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ ivas_error ivas_osba_dirac_td_binaural_jbm( 
#endif



#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX

        if ( ( error = ivas_td_binaural_renderer_sf( st_ivas, output_f, *nSamplesRendered ) ) != IVAS_ERR_OK )

        if ( ( error = ivas_td_binaural_renderer_sf( st_ivas, p_sepobj, *nSamplesRendered ) ) != IVAS_ERR_OK )

#else

    if ( ( error = ivas_td_binaural_renderer_sf( st_ivas, output_f, *nSamplesRendered ) ) != IVAS_ERR_OK )

#endif
@@ -219,7 +219,7 @@ ivas_error ivas_osba_dirac_td_binaural_jbm( 
            for ( i = 0; i < nSamplesAsked; i++ )

            {

#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX

                output_f[n][i] = 0.5f * output_f[channel_offset + n][i] + 0.5f * output_f[n][i];

                output_f[n][i] = 0.5f * output_f[channel_offset + n][i] + 0.5f * p_sepobj[n][i];

#else

            output_f[n][i] = 0.5f * output_f[2 + n][i] + 0.5f * output_f[n][i];

#endif

lib_dec/ivas_stat_dec.h

+13 −9
Original line number Diff line number Diff line
@@ -911,7 +911,11 @@ typedef struct ivas_masa_ism_data_structure 
typedef struct decoder_tc_buffer_structure

{

    float *tc_buffer; /* the buffer itself                                                        */

#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX

    float *tc[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS]; /* pointers into the buffer to the beginning of each tc                     */ // VE2SB: TBV

#else

    float *tc[MAX_TRANSPORT_CHANNELS + MAX_NUM_OBJECTS]; /* pointers into the buffer to the beginning of each tc                     */

#endif

    TC_BUFFER_MODE tc_buffer_mode;    /* mode of the buffer (no buffering, render buffering, out buffering)       */

    int16_t nchan_transport_jbm;      /* number of TCs after TC decoding                                          */

    int16_t nchan_transport_internal; /* total number of TC buffer channels, can include e.g. TD decorr data      */

lib_dec/ivas_dirac_dec.c

+17 −17

File changed.

Contains only whitespace changes.