Commit 36aa1518 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept FIX_1023_REMOVE_PARAMMC_DEC

parent 4254c638

lib_com/ivas_prot.h

+0 −7
Original line number Diff line number Diff line
@@ -3879,13 +3879,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
@@ -189,7 +189,6 @@ 


#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */

#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF              /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to actiate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on  )*/

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

#define NONBE_FIX_1034_DRY_MASA_RATIOS                  /* Nokia: Fix issue 1034, use of wrong numDir state. */

#define NONBE_FIX_1021_ISM_BRIR_RS_FLUSH                /* FhG: issue #1021: fix ISM with JBM and RS renderer flushing*/

#define FIX_1035_HT_OSBA                                /* Dlb: issue 1035: Issue with headtracking in OSBA*/

lib_dec/ivas_mc_param_dec.c

+0 −43
Original line number Diff line number Diff line
@@ -1835,49 +1835,6 @@ void ivas_param_mc_dec_render( 
    return;

}



#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()