Commit 1829d248 authored by PLAINSI's avatar PLAINSI
Browse files

Fix naming

parent 55a9b504

lib_dec/ivas_mc_paramupmix_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static void get_ec_data( Decoder_State *st, PAR_TYPE parType, QUANT_TYPE quant_t 
/*-------------------------------------------------------------------------

 * ivas_mc_paramupmix_dec_read_BS()

 *

 * Read the Coupling MC metadata

 * Read the ParamUpmix MC metadata

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



void ivas_mc_paramupmix_dec_read_BS(
@@ -149,7 +149,7 @@ void ivas_mc_paramupmix_dec_read_BS( 
/*-------------------------------------------------------------------------

 * ivas_mc_paramupmix_dec()

 *

 * MC Coupling decoding process

 * MC ParamUpmix decoding process

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

void ivas_mc_paramupmix_dec(

    Decoder_Struct *st_ivas,     /* i/o: IVAS decoder handle                                     */
@@ -342,7 +342,7 @@ ivas_error ivas_mc_paramupmix_dec_open( 
            break;

#ifdef DEBUGGING

        default:

            assert( 0 && "Number of TC not supported for MC Coupling!" );

            assert( 0 && "Number of TC not supported for MC ParamUpmix!" );

#endif

    }

    /*-----------------------------------------------------------------*
@@ -373,7 +373,7 @@ ivas_error ivas_mc_paramupmix_dec_open( 
/*-------------------------------------------------------------------------

 * ivas_mc_paramupmix_dec_close()

 *

 * Close Coupling MC memories

 * Close ParamUpmix MC memories

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



void ivas_mc_paramupmix_dec_close(

lib_enc/ivas_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ ivas_error ivas_enc( 
        else if ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX )

        {



            /* encode MC coupling parameters and write bitstream */

            /* encode MC ParamUpmix parameters and write bitstream */

            ivas_mc_paramupmix_enc( st_ivas, hMetaData, data_f, input_frame );



            st_ivas->hLFE->hBstr = ( st_ivas->nSCE > 0 ) ? st_ivas->hSCE[0]->hCoreCoder[0]->hBstr : st_ivas->hCPE[0]->hCoreCoder[0]->hBstr;

lib_enc/ivas_mc_paramupmix_enc.c

+3 −3
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static void quantize_pars( int16_t nv, const float *v, int16_t nq, const float * 
/*-------------------------------------------------------------------------

 * ivas_mc_paramupmix_enc()

 *

 * MC Coupling Encoder main encoding function

 * MC ParamUpmix Encoder main encoding function

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



void ivas_mc_paramupmix_enc(
@@ -120,7 +120,7 @@ void ivas_mc_paramupmix_enc( 
/*-------------------------------------------------------------------------

 * ivas_mc_paramupmix_enc_open()

 *

 * Initialize MC Coupling encoder handle

 * Initialize MC ParamUpmix encoder handle

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



ivas_error ivas_mc_paramupmix_enc_open(
@@ -666,7 +666,7 @@ static void put_ec_data( 
 *------------------------------------------------------------------------*/



static void ivas_mc_paramupmix_dmx(

    MC_PARAMUPMIX_ENC_HANDLE hMCParamUpmix, /* i/o: MC Coupling encoder handle     */

    MC_PARAMUPMIX_ENC_HANDLE hMCParamUpmix, /* i/o: MC ParamUpmix encoder handle     */

    float data_f[][L_FRAME48k],             /* i/o  : Input, downmix out            */

    const int16_t input_frame               /* i  : Input frame length               */

)