Commit 80e6f63e authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1121_MASA_DESCRIPTOR

parent 26e6c821

lib_com/ivas_rom_com.c

+0 −2
Original line number Diff line number Diff line
@@ -2464,13 +2464,11 @@ const uint16_t ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_ 
 * MASA ROM tables

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













#ifdef FIX_1121_MASA_DESCRIPTOR















const uint8_t ivasmasaFormatDescriptor[8] = 















{ 















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















};



























#endif















const float diffuseness_reconstructions_hr[HR_MASA_ER_LEVELS] =















{















     0.00f,

































lib_com/ivas_rom_com.h



+0
−2




























Original line number
Diff line number
Diff line








@@ -264,10 +264,8 @@ extern const uint16_t ivas_param_mc_sym_freq_icc_delta_combined_48_16bits[2 * PA













 * MASA ROM tables















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





























#ifdef FIX_1121_MASA_DESCRIPTOR















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





























#endif















extern const int16_t bits_direction_masa[DIRAC_DIFFUSE_LEVELS];















extern const int16_t no_theta_masa[NO_SPHERICAL_GRIDS - 2];















extern const int16_t no_phi_masa[NO_SPHERICAL_GRIDS][MAX_NO_THETA];

































lib_com/options.h



+0
−1




























Original line number
Diff line number
Diff line








@@ -159,7 +159,6 @@













#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 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_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */













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















#define NONBE_1894_OSBA_SCALING                         /* FhG: port OSBA scaling MRs (298,355,360) jointly */















#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.c



+0
−3




























Original line number
Diff line number
Diff line








@@ -1835,9 +1835,6 @@ static void create_masa_ext_out_meta(













    IVAS_QMETADATA_HANDLE hQMetaData,















    const int16_t nchan_transport )















{













#ifndef FIX_1121_MASA_DESCRIPTOR













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













#endif















    int16_t i, sf, b_old, b_new, dir;















    MASA_DECRIPTIVE_META *descMeta;















    int16_t *bandMap;

































lib_rend/ivas_mcmasa_ana.c



+0
−3




























Original line number
Diff line number
Diff line








@@ -1069,9 +1069,6 @@ void ivas_create_masa_out_meta(













    float surroundingCoherence[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] /* i  : Estimated surround coherence    */















)















{













#ifndef FIX_1121_MASA_DESCRIPTOR













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













#endif















    int16_t i, sf, band;















    uint8_t numFrequencyBands;















    uint8_t numDirections;