Commit 96ef46b9 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into 1854-basop-PortFlpMr1587

parents 6ca1bdd1 654b594c

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];

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ 
#define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */

#define NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING       /* VA: issue 1110: fix encoder crash in the stereo DTX bitrate switching condition */

#define FIX_1099_JBM_MD_HANDLE_ALLOC                    /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */

#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

+4 −0
Original line number Diff line number Diff line
@@ -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();

lib_rend/ivas_mcmasa_ana_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -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;