Commit 62b2af45 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Fix previous merge.

parent 43276f3d

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -166,8 +166,6 @@ 
#define FIX_417_TD_DECORR_BRATE_SW                      /* VA: Issue 417: fix incorrect use of TD decorrelator in bitrate switching */







#define HR_METADATA                                     /* Nok: encode directional MASA metadata with more bits at 384k and 512k */

#define LBR_SBA                                         /* Contribution 47: Master macro for low bitrate SBA (SPAR+DirAC) */

#ifdef LBR_SBA

#define LBR_SBA_BR_SWITCHING                            /* Clean up changes for SBA bitrate switching */
@@ -179,6 +177,8 @@ 
#define LBR_ADAP_SMOOTHING

#endif



#define HR_METADATA                                     /* Nok: encode directional MASA metadata with more bits at 384k and 512k */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

#endif

lib_enc/ivas_masa_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ static int16_t encode_lfe_to_total_energy_ratio( MASA_ENCODER_HANDLE hMasa, BSTR 


static void reduce_metadata_further( MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_HANDLE hqmetadata, const IVAS_FORMAT ivas_format );





#ifdef FIX_382_MASA_META_FRAMING_ASYNC

static void average_masa_metadata( MASA_METADATA_FRAME *masaMetadata, float energy[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]

#ifdef HR_METADATA

                                   ,