Commit 958b0ce4 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

use edited angles in ISM gain calculation

parent 7ce3889a

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ 
#define FIX_1217_OBJECT_EDIT_FILE_INTERFACE             /* Nokia: issue #1217: add decoder functionality to read object edit instructions from a file */

#define NONBE_1217_OBJ_EDIT_FOA                         /* VA/Nokia: isse 1217: fix crash in object editing to FOA output in ParamISM */

#define NONBE_FIX_1255_OBJ_EDIT_JBM                     /* VA: issue 1255: restore object editing in JBM */



#define FIX_2193_ISM_GAINS_WITH_OE                      /* FhG: fix issue 2193: use edited angles in ISM gain calculation */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_ism_param_dec_fx.c

+5 −0
Original line number Diff line number Diff line
@@ -1054,8 +1054,13 @@ void ivas_ism_dec_digest_tc_fx( 
                         EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) )

                {

                    /*get HOA gets for direction (ACN/SN3D)*/

#ifdef FIX_2193_ISM_GAINS_WITH_OE

                    Word16 azi = shr( extract_h( st_ivas->hIsmMetaData[i]->azimuth_fx ), 22 - 16 );   // Q0

                    Word16 ele = shr( extract_h( st_ivas->hIsmMetaData[i]->elevation_fx ), 22 - 16 ); // Q0

#else

                    Word16 azi = shr( extract_h( azimuth_fx ), 22 - 16 );   // Q0

                    Word16 ele = shr( extract_h( elevation_fx ), 22 - 16 ); // Q0

#endif



                    ivas_dirac_dec_get_response_fx( azi, ele, st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIntSetup.ambisonics_order, Q30 );