From 0524e674a46f28f3938a77cdd500aabcbb57ed6a Mon Sep 17 00:00:00 2001 From: vaclav Date: Tue, 12 Aug 2025 14:41:37 +0200 Subject: [PATCH] port MR; under FIX_1121_MASA_DESCRIPTOR --- lib_com/ivas_rom_com.c | 8 ++++++++ lib_com/ivas_rom_com.h | 4 ++++ lib_com/options.h | 1 + lib_dec/ivas_masa_dec_fx.c | 4 ++++ lib_rend/ivas_mcmasa_ana_fx.c | 6 +++--- lib_util/masa_file_reader.c | 5 +++++ 6 files changed, 25 insertions(+), 3 deletions(-) diff --git a/lib_com/ivas_rom_com.c b/lib_com/ivas_rom_com.c index 183e61ca1..2373d647b 100644 --- a/lib_com/ivas_rom_com.c +++ b/lib_com/ivas_rom_com.c @@ -2327,6 +2327,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, diff --git a/lib_com/ivas_rom_com.h b/lib_com/ivas_rom_com.h index 4a227befb..515293693 100644 --- a/lib_com/ivas_rom_com.h +++ b/lib_com/ivas_rom_com.h @@ -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]; diff --git a/lib_com/options.h b/lib_com/options.h index 62bccdca6..3451b3728 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -130,6 +130,7 @@ #define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */ #define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */ #define NONBE_FIX_1052_SBA_EXT_FIX /* VA: SBA external output support fix - do not overwrite "output_config" parameter */ +#define FIX_1121_MASA_DESCRIPTOR /* VA: issue 1121: Define 'ivasmasaFormatDescriptor' at one common place */ /* #################### End BASOP porting switches ############################ */ diff --git a/lib_dec/ivas_masa_dec_fx.c b/lib_dec/ivas_masa_dec_fx.c index 669a5da2f..3be3f4601 100644 --- a/lib_dec/ivas_masa_dec_fx.c +++ b/lib_dec/ivas_masa_dec_fx.c @@ -2698,13 +2698,16 @@ 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(); @@ -2713,6 +2716,7 @@ static void create_masa_ext_out_meta_fx( move16(); move16(); move16(); +#endif numDirections = hMasa->config.numberOfDirections; move16(); diff --git a/lib_rend/ivas_mcmasa_ana_fx.c b/lib_rend/ivas_mcmasa_ana_fx.c index cf86608b2..4d41d73a5 100644 --- a/lib_rend/ivas_mcmasa_ana_fx.c +++ b/lib_rend/ivas_mcmasa_ana_fx.c @@ -1620,11 +1620,11 @@ void ivas_create_masa_out_meta_fx( Word32 surroundingCoherence[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS], /* i : Estimated surround coherence */ Word16 energyRatio_q, Word16 spreadCoherence_q, - Word16 surroundingCoherence_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; diff --git a/lib_util/masa_file_reader.c b/lib_util/masa_file_reader.c index efab80b79..2bbc1bec6 100644 --- a/lib_util/masa_file_reader.c +++ b/lib_util/masa_file_reader.c @@ -35,6 +35,9 @@ #include #include #include "ivas_prot_fx.h" +#ifdef FIX_1121_MASA_DESCRIPTOR +#include "ivas_rom_com.h" /* load 'ivasmasaFormatDescriptor[8]' */ +#endif struct MasaFileReader @@ -111,7 +114,9 @@ ivas_error MasaFileReader_readNextFrame( return IVAS_ERR_UNEXPECTED_NULL_POINTER; } +#ifndef FIX_1121_MASA_DESCRIPTOR const uint8_t ivasmasaFormatDescriptor[8] = { 0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 }; /* "IVASMASA" */ +#endif uint16_t twoByteBuffer = 0; int16_t i, j, b; IVAS_MASA_METADATA_HANDLE hMeta; -- GitLab