Commit b7374560 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1121_MASA_DESCRIPTOR

parent 89ada716

lib_com/ivas_rom_com.c

+0 −2
Original line number Diff line number Diff line
@@ -2320,13 +2320,11 @@ const UWord16 ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_S 
 *----------------------------------------------------------------------------------*/





#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

+0 −2
Original line number Diff line number Diff line
@@ -225,10 +225,8 @@ 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];

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ 
#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */



#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

#define FIX_1121_MASA_DESCRIPTOR                        /* VA: issue 1121: Define 'ivasmasaFormatDescriptor' at one common place */

#define NONBE_1894_OSBA_SCALING                         /* FhG: do not scale OSBA inputs by 0.5 any more */

#define NONBE_FIX_1141_OSBA_ROOM_RENDERING              /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect  */

#define NONBE_1360_LFE_DELAY                            /* Dlb: LFE delay alignment when rendering in CLDFB domain*/

lib_dec/ivas_masa_dec_fx.c

+0 −13
Original line number Diff line number Diff line
@@ -2622,25 +2622,12 @@ static void create_masa_ext_out_meta_fx( 
    IVAS_QMETADATA_HANDLE hQMetaData,

    const Word16 nchan_transport )

{

#ifndef FIX_1121_MASA_DESCRIPTOR

    const UWord8 ivasmasaFormatDescriptor[8] = { 0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 }; /* "IVASMASA" */

#endif

    Word16 i, sf, b_old, b_new, dir;

    MASA_DECRIPTIVE_META *descMeta;

    Word16 *bandMap;

    UWord8 numCodingBands;

    UWord8 numDirections;

    MASA_DECODER_EXT_OUT_META *extOutMeta;

#ifndef FIX_1121_MASA_DESCRIPTOR

    move16(); /*ivasmasaFormatDescriptor*/

    move16();

    move16();

    move16();

    move16();

    move16();

    move16();

    move16();

#endif



    numDirections = hMasa->config.numberOfDirections;

    move16();

lib_rend/ivas_mcmasa_ana_fx.c

+0 −3
Original line number Diff line number Diff line
@@ -1622,9 +1622,6 @@ void ivas_create_masa_out_meta_fx( 
    Word16 spreadCoherence_q,

    Word16 surroundingCoherence_q )

{

#ifndef FIX_1121_MASA_DESCRIPTOR

    const UWord8 ivasmasaFormatDescriptor[8] = { 0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 }; /* "IVASMASA" */

#endif

    Word16 i, sf, band;

    UWord8 numFrequencyBands;

    UWord8 numDirections;