Commit 3facce7f authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '999-wrong-ism-extended-metadata-decoding' into 'main' 

Resolve "Wrong ISM extended metadata decoding"

See merge request !741
parents 0b0f1c4f 4b93ac65

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ 
#define FIX_853_DECODE_MASA_ISM_AZIMUTH_PREC    /* Nokia: Fixes ivas_decode_masaism_metadata decision logic change due to precision difference; needs corresponding fix in floating point */

#define FIX_953_WRONG_ENERGY_RATIO_MASA_EXT     /* Nok: Fix 953 wrong energy ratio value after shift and cast to Word8 */

#define FIX_982_WRONG_DECODED_ENERGY_RATIO      /* Nokia: Fix 982 wrong energy in EXT mode and in second direction when present */

#define FIX_999_WRONG_ISM_EXTENDED_METADATA     /* VA: fix 999: fix ISM extended metadata decoding */

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



/* clang-format on */

lib_dec/ivas_ism_metadata_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1081,7 +1081,11 @@ ivas_error ivas_ism_metadata_dec_fx( 
                                idx_angle2 = hIsmMetaData->orientation_angle.last_angle2_idx;

                                move16();

                                yaw_fx = ism_dequant_meta_fx( idx_angle1, ism_azimuth_borders_fx, ISM_Q_STEP_FX, ISM_Q_STEP_BORDER_FX, ( 1 << ISM_AZIMUTH_NBITS ) );

#ifdef FIX_999_WRONG_ISM_EXTENDED_METADATA

                                pitch_fx = ism_dequant_meta_fx( idx_angle2, ism_elevation_borders_fx, ISM_Q_STEP_FX, ISM_Q_STEP_BORDER_FX, ( 1 << ISM_ELEVATION_NBITS ) );

#else

                                pitch_fx = ism_dequant_meta_fx( idx_angle2, ism_elevation_borders_fx, ISM_Q_STEP_FX, ISM_Q_STEP_BORDER_FX, ( 1 << ISM_AZIMUTH_NBITS ) );

#endif



                                idx_radius = decode_radius_fx( st0, &hIsmMetaData->last_radius_idx, &flag_abs_radius );

                                radius_fx = usdequant_fx( idx_radius, ISM_RADIUS_MIN_Q9, ISM_RADIUS_DELTA_Q8 );