Commit 5033c9e2 authored by vaclav's avatar vaclav
Browse files

rename parameter

parent 359125cf

lib_dec/ivas_masa_dec.c

+5 −5
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ ivas_error ivas_masa_decode( 
    int16_t obj;

    int16_t i, ch, ism_imp;

    int16_t dirac_bs_md_write_idx;

    int32_t masa_total_brate;



    dirac_bs_md_write_idx = 0;

    ism_imp = 0;
@@ -350,16 +351,15 @@ ivas_error ivas_masa_decode( 
#endif



#ifdef MASA_AND_OBJECTS

        int32_t total_brate;

        total_brate = ivas_total_brate;

        masa_total_brate = ivas_total_brate;

        if ( ivas_format == MASA_ISM_FORMAT && st_ivas->ism_mode == ISM_MASA_MODE_DISC )

        {

            total_brate = calculate_cpe_brate_MASA_ISM( st_ivas->ism_mode, ivas_total_brate, st_ivas->nchan_ism );

            masa_total_brate = calculate_cpe_brate_MASA_ISM( st_ivas->ism_mode, ivas_total_brate, st_ivas->nchan_ism );

        }



        if ( total_brate >= IVAS_384k )

        if ( masa_total_brate >= IVAS_384k )

        {

            if ( total_brate >= IVAS_512k )

            if ( masa_total_brate >= IVAS_512k )

#else

        if ( ivas_total_brate >= IVAS_384k )

        {

lib_enc/ivas_masa_enc.c

+5 −5
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ ivas_error ivas_masa_encode( 
    int16_t masa_sid_descriptor;

#ifdef MASA_AND_OBJECTS

    int16_t low_bitrate_mode;

    int32_t masa_total_brate;

#endif



    masa_sid_descriptor = -1;
@@ -538,16 +539,15 @@ ivas_error ivas_masa_encode( 


    /* Encode metadata */

#ifdef MASA_AND_OBJECTS

    int32_t total_brate;

    total_brate = ivas_total_brate;

    masa_total_brate = ivas_total_brate;

    if ( ivas_format == MASA_ISM_FORMAT && ism_mode == ISM_MASA_MODE_DISC )

    {

        total_brate = calculate_cpe_brate_MASA_ISM( ism_mode, ivas_total_brate, nchan_ism );

        masa_total_brate = calculate_cpe_brate_MASA_ISM( ism_mode, ivas_total_brate, nchan_ism );

    }



    if ( total_brate >= IVAS_384k )

    if ( masa_total_brate >= IVAS_384k )

    {

        if ( total_brate >= IVAS_512k )

        if ( masa_total_brate >= IVAS_512k )

        {

            ivas_qmetadata_enc_encode_hr_384_512( hMetaData, hQMetaData, 16, 4 );

        }