Commit 47311aa0 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into... 

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into 1867-replace-overflow-basop-operators-by-overflow-free-variants-in-lib_enc
parents 1d241d6b ae609fd0

apps/encoder.c

+10 −1
Original line number Diff line number Diff line
@@ -1486,6 +1486,7 @@ static bool parseCmdlIVAS_enc( 
                {

                    fprintf( stderr, "Error: Too low number of ISM channels specified!\n\n" );

                    usage_enc();

                    return false;

                }

                else

                {
@@ -1497,6 +1498,7 @@ static bool parseCmdlIVAS_enc( 
                    {

                        fprintf( stderr, "Error: Too high number of ISM channels!\n\n" );

                        usage_enc();

                        return false;

                    }

                }

            }
@@ -1504,6 +1506,7 @@ static bool parseCmdlIVAS_enc( 
            {

                fprintf( stderr, "Error: Number of ISM channels not specified!\n\n" );

                usage_enc();

                return false;

            }

            if ( i < argc - 4 )

            {
@@ -1523,7 +1526,7 @@ static bool parseCmdlIVAS_enc( 
                    default:

                        fprintf( stderr, "Error: MASA channels must be 1 or 2.\n\n" );

                        usage_enc();

                        break;

                        return false;

                }

            }
@@ -1548,6 +1551,7 @@ static bool parseCmdlIVAS_enc( 
                {

                    fprintf( stderr, "Error: not enough arguments\n\n" );

                    usage_enc();

                    return false;

                }

            }
@@ -1560,6 +1564,7 @@ static bool parseCmdlIVAS_enc( 
            {

                fprintf( stderr, "Error: not enough MASA arguments\n\n" );

                usage_enc();

                return false;

            }

        }

        else if ( strcmp( to_upper( argv[i] ), "-ISM_SBA" ) == 0 )
@@ -1578,6 +1583,7 @@ static bool parseCmdlIVAS_enc( 
                {

                    fprintf( stderr, "Error: Too low number of ISM channels specified!\n\n" );

                    usage_enc();

                    return false;

                }

                else

                {
@@ -1589,6 +1595,7 @@ static bool parseCmdlIVAS_enc( 
                    {

                        fprintf( stderr, "Error: Too high number of ISM channels!\n\n" );

                        usage_enc();

                        return false;

                    }

                }

            }
@@ -1596,6 +1603,7 @@ static bool parseCmdlIVAS_enc( 
            {

                fprintf( stderr, "Error: Number of ISM channels not specified!\n\n" );

                usage_enc();

                return false;

            }



            if ( i < argc - 4 )
@@ -1647,6 +1655,7 @@ static bool parseCmdlIVAS_enc( 
                {

                    fprintf( stderr, "Error: not enough arguments\n\n" );

                    usage_enc();

                    return false;

                }

            }

        }

lib_com/ivas_cnst.h

+2 −0
Original line number Diff line number Diff line
@@ -215,7 +215,9 @@ typedef enum 


typedef enum

{

#ifndef FIX_1101_CLEANING_JBM_CALL

    TC_BUFFER_MODE_NONE = 0,

#endif

    TC_BUFFER_MODE_RENDERER,

    TC_BUFFER_MODE_BUFFER

} TC_BUFFER_MODE;

lib_com/ivas_prot_fx.h

+4 −0
Original line number Diff line number Diff line
@@ -3422,7 +3422,11 @@ void mctStereoIGF_enc_fx( 
    Encoder_State **sts,                                 /* i/o: encoder state structure                    */

    Word32 *orig_spectrum_fx[MCT_MAX_CHANNELS][2],       /* i  : MDCT spectrum for ITF                      */

    Word16 q_origSpec,                                   /* i  : Q for MDCT spectrum                        */

#ifdef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC

    Word32 *powerSpec[MCT_MAX_CHANNELS],                 /* i/o: MDCT^2 + MDST^2 spectrum,or estimate       */

#else

    Word32 powerSpec_fx[MCT_MAX_CHANNELS][L_FRAME48k],   /* i/o: MDCT^2 + MDST^2 spectrum,or estimate       */

#endif

    Word16 q_powerSpec[MCT_MAX_CHANNELS],                /* i  : Q for powSpec_fx                           */

    Word32 *powerSpecMsInv_fx[MCT_MAX_CHANNELS][NB_DIV], /* i  : same as powerSpec_fx but for inverse spect.*/

    Word16 *q_powerSpecMsInv[MCT_MAX_CHANNELS][NB_DIV],  /* i  : Q for powSpecMsInv_fx                      */

lib_com/ivas_rom_com.c

+8 −0
Original line number Diff line number Diff line
@@ -2328,6 +2328,14 @@ const UWord16 ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_S 
 * MASA ROM tables

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





#ifdef FIX_1121_MASA_DESCRIPTOR

const UWord8 ivasmasaFormatDescriptor[8] = 

{ 

    0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 /* "IVASMASA" */

};



#endif

const Word64 diffuseness_reconstructions_hr_fx[HR_MASA_ER_LEVELS] = { /* Q62 */

    0,

    65865144550293504,

lib_com/ivas_rom_com.h

+4 −0
Original line number Diff line number Diff line
@@ -225,6 +225,10 @@ extern const UWord16 ivas_param_mc_sym_freq_icc_delta_combined_48_16bits[2 * PAR 
 * MASA ROM tables

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



#ifdef FIX_1121_MASA_DESCRIPTOR

extern const UWord8 ivasmasaFormatDescriptor[8]; /* "IVASMASA" */



#endif

extern const Word16 bits_direction_masa[DIRAC_DIFFUSE_LEVELS];

extern const Word16 no_theta_masa[NO_SPHERICAL_GRIDS - 2];

extern const Word16 no_phi_masa[NO_SPHERICAL_GRIDS][MAX_NO_THETA];