Commit f2d83656 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'basop_instrumentation_changes_2' into 'main' 

BASOP and instrumentation changes in lib_dec and lib_rend

See merge request !400
parents 5c25362c ba677385

lib_com/ivas_prot.h

+9 −3
Original line number Diff line number Diff line
@@ -491,9 +491,15 @@ void destroy_core_dec( 
    DEC_CORE_HANDLE hCoreCoder                                  /* i/o: core decoder structure                  */

);



#ifndef IVAS_FLOAT_FIXED

void ivas_destroy_dec(

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

);

#else

void ivas_destroy_dec_fx(

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

);

#endif



void ivas_initialize_handles_dec(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */
@@ -4614,9 +4620,9 @@ void ivas_mc_paramupmix_dec_digest_tc( 
#ifdef IVAS_FLOAT_FIXED

void ivas_mc_paramupmix_dec_render(

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

    const uint16_t nSamplesAsked,                               /* i  : number of CLDFB slots requested                 */

    uint16_t *nSamplesRendered,                                 /* o  : number of CLDFB slots rendered                  */

    uint16_t *nSamplesAvailable,                                /* o  : number of CLDFB slots still to render           */

    const UWord16 nSamplesAsked,                               /* i  : number of CLDFB slots requested                 */

    UWord16 *nSamplesRendered,                                 /* o  : number of CLDFB slots rendered                  */

    UWord16 *nSamplesAvailable,                                /* o  : number of CLDFB slots still to render           */

    Word32 *input_fx[],                                           /* i  : core-coder transport channels                   */

    Word32 *output_fx[]                                           /* i/o: synthesized core-coder transport channels       */

);

lib_dec/ivas_init_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -4479,7 +4479,7 @@ void ivas_initialize_handles_dec( 
 *-------------------------------------------------------------------------*/



#ifdef IVAS_FLOAT_FIXED

void ivas_destroy_dec(

void ivas_destroy_dec_fx(

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

)

{
@@ -4624,13 +4624,13 @@ void ivas_destroy_dec( 
    /* OMASA structure */

    ivas_omasa_data_close_fx( &st_ivas->hMasaIsmData );

    /* Head track data handle */

    ivas_headTrack_close( &st_ivas->hHeadTrackData );

    ivas_headTrack_close_fx( &st_ivas->hHeadTrackData );



    /* External orientation data handle */

    ivas_external_orientation_close( &st_ivas->hExtOrientationData );

    ivas_external_orientation_close_fx( &st_ivas->hExtOrientationData );



    /* Combined orientation data handle */

    ivas_combined_orientation_close( &st_ivas->hCombinedOrientationData );

    ivas_combined_orientation_close_fx( &st_ivas->hCombinedOrientationData );



    /* Time Domain binaural renderer handle */

    IF( st_ivas->hBinRendererTd != NULL )

lib_dec/ivas_mc_param_dec.c

+669 −329

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_mc_paramupmix_dec.c

+213 −131

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_mct_dec.c

+406 −218

File changed.

Preview size limit exceeded, changes collapsed.