Commit 439a5096 authored by vaclav's avatar vaclav
Browse files

maintenance

parent 58cd6607

lib_com/options.h

+4 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ 




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

#define BE_FIX_832_ASAN_ERROR_EFAP_OSBA                       /* FhG: issue #832: fix ASAN error caused by re-allocating EFAP memories in OSBA*/





/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt selection floating point code */
@@ -187,6 +187,9 @@ 
#define NONBE_FIX_835_JBM_PARAMUPMIX_HEADROT                  /* FhG: issue #835: Resolve "JBM: ParamUpmix head rotation broken" */

#define NONBE_FIX_838_CRASH_24_4_WB                           /* FhG: Issue 838: fix encoder crashes for Unified Stereo and MASA 2 TC at 24.4 kbps WB due to missing IGF (re-) allocation */

#define NONBE_FIX_839_MC_RS_CHANNEL_ALLOC                     /* FhG: Issues #839: problems with reallocation of the channels on the heap in case of MC RS */

#define BE_FIX_832_ASAN_ERROR_EFAP_OSBA                       /* FhG: issue #832: fix ASAN error caused by re-allocating EFAP memories in OSBA*/





/* ##################### End NON-BE switches ########################### */



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_ism_renderer.c

+2 −6
Original line number Diff line number Diff line
@@ -61,12 +61,11 @@ ivas_error ivas_ism_renderer_open( 
    uint16_t init_interpolator_length;

    ivas_error error;



    error = IVAS_ERR_OK;



    if ( ( st_ivas->hIsmRendererData = (ISM_RENDERER_HANDLE) malloc( sizeof( ISM_RENDERER_DATA ) ) ) == NULL )

    {

        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISM renderer\n" ) );

    }



#ifdef BE_FIX_832_ASAN_ERROR_EFAP_OSBA

    if ( st_ivas->hIntSetup.is_loudspeaker_setup && st_ivas->hIntSetup.ls_azimuth != NULL && st_ivas->hIntSetup.ls_elevation != NULL && st_ivas->hEFAPdata == NULL )

#else
@@ -101,13 +100,12 @@ ivas_error ivas_ism_renderer_open( 
        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISM renderer interpolator\n" ) );

    }





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

    {

        st_ivas->hIsmRendererData->interpolator[i] = (float) i / ( (float) interpolator_length - 1 );

    }



    return error;

    return IVAS_ERR_OK;

}
@@ -179,7 +177,6 @@ void ivas_ism_render( 
        set_f( output_f[i], 0.0f, output_frame );

    }





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

    {

        if ( st_ivas->intern_config == IVAS_AUDIO_CONFIG_STEREO )
@@ -287,7 +284,6 @@ void ivas_ism_render_sf( 


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

    {



        /* Combined rotation: rotate the object positions depending the head and external orientations */

        if ( st_ivas->hCombinedOrientationData != NULL && st_ivas->hCombinedOrientationData->enableCombinedOrientation[0] == 1 )

        {

lib_dec/ivas_mc_paramupmix_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -1166,7 +1166,6 @@ static void ivas_mc_paramupmix_dec_sf( 
            }

#endif



#ifdef SPLIT_REND_WITH_HEAD_ROT

            if ( st_ivas->hSplitBinRend.hCldfbDataOut != NULL )

            {

                for ( slot_idx = 0; slot_idx < st_ivas->hTcBuffer->subframe_nbslots[st_ivas->hTcBuffer->subframes_rendered]; slot_idx++ )
@@ -1180,7 +1179,6 @@ static void ivas_mc_paramupmix_dec_sf( 


                st_ivas->hSplitBinRend.hCldfbDataOut->config = st_ivas->hIntSetup.output_config;

            }

#endif

        }

#endif

lib_enc/ivas_cpe_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ ivas_error ivas_cpe_enc( 
    int32_t cpe_brate;

    int32_t element_brate_ref;

#ifdef NONBE_FIX_838_CRASH_24_4_WB

    int16_t last_bits_frame_nominal;

    int16_t last_bits_frame_nominal; /* last_bits_frame_nominal for M or PCh channel */

#endif



    error = IVAS_ERR_OK;