Commit 40667261 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1023_REMOVE_PARAMMC_DEC

parent a1b756c4

lib_com/ivas_prot.h

+0 −7
Original line number Diff line number Diff line
@@ -3869,13 +3869,6 @@ void ivas_param_mc_dec_render( 
    float *output_f[]                                           /* o  : rendered time signal                                */

);



#ifndef FIX_1023_REMOVE_PARAMMC_DEC

void ivas_param_mc_dec(

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

    float *output_f[]                                           /* i/o: synthesized core-coder transport channels/DirAC output  */

);



#endif

/*! r: number of cldfb synthesis instances */

int16_t param_mc_get_num_cldfb_syntheses( 

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

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_1023_REMOVE_PARAMMC_DEC                     /* VA: issue 1023: remove unused function ivas_param_mc_dec() */

#define FIX_1022_REMOVE_PARAMISM_DEC                    /* VA: issue 1022: remove unused function ivas_param_ism_dec() */

#define FIX_1033_MEMORY_LEAK_OMASA                      /* Nokia / Orange: issue #1033: Memory leak in OMASA to BINAURAL with HRTF with bitrate switching */

lib_dec/ivas_mc_param_dec.c

+0 −41
Original line number Diff line number Diff line
@@ -1801,47 +1801,6 @@ void ivas_param_mc_dec_render( 
}





#ifndef FIX_1023_REMOVE_PARAMMC_DEC

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

 * ivas_param_mc_dec()

 *

 * Parametric MC decoding process

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



void ivas_param_mc_dec(

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

    float *output_f[]        /* i/o: synthesized core-coder transport channels/DirAC output  */

)

{

    PARAM_MC_DEC_HANDLE hParamMC;

    float Cldfb_RealBuffer_in[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_NSLOTS * CLDFB_NO_CHANNELS_MAX];

    float Cldfb_ImagBuffer_in[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_NSLOTS * CLDFB_NO_CHANNELS_MAX];

    uint16_t nSamplesAsked, nSamplesAvailableNext, nSamplesRendered;



    hParamMC = st_ivas->hParamMC;

    assert( hParamMC );

    push_wmops( "param_mc_dec" );



    /* set some handle pointers to the stack buffers */

    hParamMC->Cldfb_RealBuffer_tc = Cldfb_RealBuffer_in;

    hParamMC->Cldfb_ImagBuffer_tc = Cldfb_ImagBuffer_in;



    nSamplesAsked = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC );

    ivas_param_mc_dec_digest_tc( st_ivas, DEFAULT_JBM_CLDFB_TIMESLOTS, output_f );

    ivas_param_mc_dec_render( st_ivas, nSamplesAsked, &nSamplesRendered, &nSamplesAvailableNext, output_f );

#ifdef DEBUGGING

    assert( nSamplesRendered == nSamplesAsked );

    assert( nSamplesAvailableNext == 0 );

#endif



    /* set handle pointers back to NULL */

    hParamMC->Cldfb_RealBuffer_tc = NULL;

    hParamMC->Cldfb_ImagBuffer_tc = NULL;



    pop_wmops();

    return;

}

#endif



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

 * param_mc_dec_init()