Commit fb2b478a authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_ISMRENDERER_HANDLE_DEALLOC

parent 5ec05e62

lib_com/ivas_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -5306,11 +5306,9 @@ ivas_error ivas_ism_renderer_open( 
    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                          */

);



#ifdef FIX_ISMRENDERER_HANDLE_DEALLOC

void ivas_ism_renderer_close(

    ISM_RENDERER_HANDLE *hIsmRendererData                       /* i/o: ISM renderer handle                             */

);

#endif



void ivas_ism_render(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                          */

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ 
#define FIX_708_DPID_COMMAND_LINE                       /* issue 708: sanity checks for '-dpid' command-line */

#define FIX_730_DPID_NOT_SET_CORRECTLY                  /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */

#define FIX_513_REND_MC_ALLOC                           /* FhG: issue 513, optimise external renderer allocation for multichannel */

#define FIX_ISMRENDERER_HANDLE_DEALLOC                  /* VA: issue 781: harmonize Deallocation of handle 'hIsmRendererData' */

#define FIX_782_OSBA_FUNCTION_NAMES                     /* VA: fix 782: correct OSBA function names */

#define PARAM_ISM_REFACTOR                              /* FhG: Issue 768: Refactoring to decouple hDirAC and hParamISM */

#define FIX_678_ISM_SBA_ASAN                            /* FhG: Issue 678: ASAN in ISM to SBA conversion in JBM */

lib_dec/ivas_init_dec.c

+0 −9
Original line number Diff line number Diff line
@@ -2623,16 +2623,7 @@ void ivas_destroy_dec( 
    ivas_ism_metadata_close( st_ivas->hIsmMetaData, 0 );



    /* ISM renderer handle */

#ifdef FIX_ISMRENDERER_HANDLE_DEALLOC

    ivas_ism_renderer_close( &( st_ivas->hIsmRendererData ) );

#else

    if ( st_ivas->hIsmRendererData != NULL )

    {

        free( st_ivas->hIsmRendererData->interpolator );

        free( st_ivas->hIsmRendererData );

        st_ivas->hIsmRendererData = NULL;

    }

#endif



    /* DirAC handle */

    if ( st_ivas->ivas_format == ISM_FORMAT )

lib_dec/ivas_ism_dec.c

+0 −19
Original line number Diff line number Diff line
@@ -220,17 +220,7 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
        else

        {

            /* close the ISM renderer and reinitialize */

#ifdef FIX_ISMRENDERER_HANDLE_DEALLOC

            ivas_ism_renderer_close( &st_ivas->hIsmRendererData );

#else



            if ( st_ivas->hIsmRendererData != NULL )

            {

                free( st_ivas->hIsmRendererData->interpolator );

                free( st_ivas->hIsmRendererData );

                st_ivas->hIsmRendererData = NULL;

            }

#endif



            if ( ( error = ivas_ism_renderer_open( st_ivas ) ) != IVAS_ERR_OK )

            {
@@ -309,16 +299,7 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
        else

        {

            /* Close the ISM renderer */

#ifdef FIX_ISMRENDERER_HANDLE_DEALLOC

            ivas_ism_renderer_close( &st_ivas->hIsmRendererData );

#else

            if ( st_ivas->hIsmRendererData != NULL )

            {

                free( st_ivas->hIsmRendererData->interpolator );

                free( st_ivas->hIsmRendererData );

                st_ivas->hIsmRendererData = NULL;

            }

#endif

        }



        if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR )

lib_dec/ivas_ism_renderer.c

+0 −16
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ ivas_error ivas_ism_renderer_open( 
}





#ifdef FIX_ISMRENDERER_HANDLE_DEALLOC

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

 * ivas_ism_renderer_close()

 *
@@ -135,7 +134,6 @@ void ivas_ism_renderer_close( 


    return;

}

#endif





/*-------------------------------------------------------------------------*
@@ -471,21 +469,7 @@ void ivas_omasa_separate_object_renderer_close( 
        }

    }



#ifdef FIX_ISMRENDERER_HANDLE_DEALLOC

    ivas_ism_renderer_close( &st_ivas->hIsmRendererData );

#else

    if ( st_ivas->hIsmRendererData != NULL )

    {

        if ( st_ivas->hIsmRendererData->interpolator != NULL )

        {

            free( st_ivas->hIsmRendererData->interpolator );

            st_ivas->hIsmRendererData->interpolator = NULL;

        }



        free( st_ivas->hIsmRendererData );

        st_ivas->hIsmRendererData = NULL;

    }

#endif



    return;

}