Commit 2ff875e4 authored by lintervo's avatar lintervo
Browse files

Fix build issues, address comments

parent 597239bf

lib_dec/ivas_ism_renderer_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ void ivas_omasa_separate_object_render_jbm_fx( 
            {

#ifdef OMASA_OBJECT_EDITING

                test();

                IF( st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ && st_ivas->hMasaIsmData->ism_dir_is_edited_fx[st_ivas->hMasaIsmData->idx_separated_ism] )

                IF( EQ_16( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) && st_ivas->hMasaIsmData->ism_dir_is_edited_fx[st_ivas->hMasaIsmData->idx_separated_ism] )

                {

                    azimuth = st_ivas->hMasaIsmData->azimuth_ism_edited_fx[st_ivas->hMasaIsmData->idx_separated_ism];

                    move16();

lib_dec/ivas_jbm_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -4698,7 +4698,7 @@ void ivas_jbm_dec_prepare_renderer( 
            }

#ifdef OMASA_OBJECT_EDITING

            test();

            IF( st_ivas->ism_mode == ISM_MASA_MODE_DISC && st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC )

            IF( EQ_16( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) && EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) )

            {

                IF( st_ivas->hMasaIsmData->masa_gain_is_edited_fx )

                {

lib_dec/ivas_objectRenderer_internal_fx.c

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ ivas_error ivas_td_binaural_renderer_sf_fx( 
                    ismMetaData[nS].non_diegetic_flag = st_ivas->hIsmMetaData[nS]->non_diegetic_flag;

                    move16();

                    ismMetaData[nS].gain_fx = st_ivas->hIsmMetaData[nS]->edited_gain_fx;

                    move32();

                    hIsmMetaData[nS] = &ismMetaData[nS];

                }

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -5674,8 +5674,8 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects_fx( 
                    {



                        Word32 instEne_fx;

                        temp64 = W_mult0_32_32( outSlotRe[outCh][slot][bin], outSlotRe[outCh][slot][bin] );                  // 2q-3

                        temp64 = W_add( temp64, W_mult0_32_32( outSlotIm[outCh][slot][bin], outSlotIm[outCh][slot][bin] ) ); // 2q-3

                        temp64 = W_mult0_32_32( inRe_fx[ch][slot][bin], inRe_fx[ch][slot][bin] );                  // 2q-3

                        temp64 = W_add( temp64, W_mult0_32_32( inIm_fx[ch][slot][bin], inIm_fx[ch][slot][bin] ) ); // 2q-3

                        exp1 = W_norm( temp64 );

                        instEne_fx = W_extract_h( W_shl( temp64, exp1 ) ); // 2*cldfb_buf_q - 32 + exp1

                        exp1 = 31 - ( 2 * ( *cldfb_buf_q ) - 32 + exp1 );