Commit 2497b762 authored by vaclav's avatar vaclav
Browse files

Merge branch '997-obsolete-function-ivas_spar_dec_upmixer' into 'main' 

Resolve "Obsolete function ivas_spar_dec_upmixer()"

See merge request !1394
parents 7a6af185 c8e55073

lib_com/ivas_prot.h

+2 −1
Original line number Diff line number Diff line
@@ -4360,13 +4360,14 @@ void ivas_spar_dec_upmixer_sf( 
    const int16_t nchan_internal                                /* i  : number of internal channels             */

);



#ifndef FIX_997_REMOVE_SPAR_DEC_UPMIXER

void ivas_spar_dec_upmixer(

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

    float *output[],                                            /* i/o: input/output audio channels             */

    const int16_t nchan_internal,                               /* i  : number of internal channels             */

    const int16_t output_frame                                  /* i  : output frame length                     */

);



#endif

/* MD module */

ivas_error ivas_spar_md_enc_open(

    ivas_spar_md_enc_state_t **hMdEnc,                          /* i/o: SPAR MD encoder handle                  */

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ 


#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */

#define FIX_699_FILE_READER_JBM_TSM                     /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */

#define FIX_997_REMOVE_SPAR_DEC_UPMIXER                 /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */

lib_dec/ivas_spar_decoder.c

+10 −3
Original line number Diff line number Diff line
@@ -1250,12 +1250,19 @@ void ivas_spar_dec_set_render_map( 
    return;

}





#ifdef FIX_997_REMOVE_SPAR_DEC_UPMIXER

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

 * ivas_spar_dec_set_render_params()

 *

 * IVAS SPAR set rendering parameters

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

#else

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

 * ivas_spar_dec_upmixer()

 *

 * IVAS SPAR upmixer

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

#endif



void ivas_spar_dec_set_render_params(

    Decoder_Struct *st_ivas,    /* i/o: IVAS decoder handle                     */
@@ -1362,7 +1369,7 @@ void ivas_spar_dec_digest_tc( 
    return;

}





#ifndef FIX_997_REMOVE_SPAR_DEC_UPMIXER

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

 * ivas_spar_dec_upmixer()

 *
@@ -1487,7 +1494,7 @@ void ivas_spar_dec_upmixer( 


    return;

}



#endif



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

 * ivas_spar_dec_upmixer_sf()