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

Disable gain editing related code due to the caused differences

parent a37be589

lib_dec/ivas_dirac_dec_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -3838,7 +3838,8 @@ void ivas_dirac_dec_render_sf_fx( 
                        const Word32 ele_fx = L_shl( el1_32, Q22 - Q16 ); // Q16 -> Q22

                        efap_determine_gains_fx( st_ivas->hEFAPdata, st_ivas->hIsmRendererData->gains_fx[i], azi_fx, ele_fx, EFAP_MODE_EFAP );

#ifdef OBJ_EDITING_API

                        v_multc_fixed( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], nchan_out_woLFE ); // Q30, Q30 --> Q30

                        // TODO: Enable gain editing feature

                        // v_multc_fixed( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], nchan_out_woLFE ); // Q30, Q30 --> Q30

#endif

                    }

                }

lib_dec/ivas_ism_param_dec_fx.c

+6 −3
Original line number Diff line number Diff line
@@ -986,7 +986,8 @@ void ivas_ism_dec_digest_tc_fx( 
                move32();

                st_ivas->hIsmRendererData->gains_fx[i][1] = L_shr( L_deposit_h( gains_fx[1] ), 1 ); // Q31 -> Q30

                move32();

                v_multc_fixed( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], CPE_CHANNELS ); // Q30, Q30 --> Q30

                // TODO: Enable gain editing feature

                 // v_multc_fixed( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], CPE_CHANNELS ); // Q30, Q30 --> Q30

#else

                Word16 gains_fx[2];

                ivas_ism_get_stereo_gains_fx( (Word16) L_shr( st_ivas->hIsmMetaData[i]->azimuth_fx, 22 ), (Word16) L_shr( st_ivas->hIsmMetaData[i]->elevation_fx, 22 ), &gains_fx[0], &gains_fx[1] );
@@ -1034,7 +1035,8 @@ void ivas_ism_dec_digest_tc_fx( 
                        elevation_fx = L_shl( elevation_fx, Q22 ); // Q22

                        efap_determine_gains_fx( st_ivas->hEFAPdata, st_ivas->hIsmRendererData->gains_fx[i], azimuth_fx, elevation_fx, EFAP_MODE_EFAP );

#ifdef OBJ_EDITING_API

                        v_multc_fixed( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hEFAPdata->numSpk );

                        // TODO: Enable gain editing feature

                        // v_multc_fixed( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hEFAPdata->numSpk );

#endif

                    }

                }
@@ -1047,7 +1049,8 @@ void ivas_ism_dec_digest_tc_fx( 
                    Word16 ele = shr( extract_h( st_ivas->hIsmMetaData[i]->elevation_fx ), 22 - 16 ); // Q0

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

#ifdef OBJ_EDITING_API

                    v_multc_fixed( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], ivas_sba_get_nchan_fx( st_ivas->hIntSetup.ambisonics_order, 0 ) ); // Q30, Q30 --> Q30

                    // TODO: Enable gain editing feature

                    // v_multc_fixed( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], ivas_sba_get_nchan_fx( st_ivas->hIntSetup.ambisonics_order, 0 ) ); // Q30, Q30 --> Q30

#endif

                }

            }

lib_dec/ivas_ism_renderer_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -278,7 +278,8 @@ void ivas_ism_render_sf_fx( 
                {

                    efap_determine_gains_fx( st_ivas->hEFAPdata, st_ivas->hIsmRendererData->gains_fx[i], L_shl( azimuth, 22 ), L_shl( elevation, 22 ), EFAP_MODE_EFAP );

#ifdef OBJ_EDITING_API

                    v_multc_fixed( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], nchan_out_woLFE ); // Q30, Q30 --> Q30

                    // TODO: Enable gain editing feature

                    // v_multc_fixed( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], nchan_out_woLFE ); // Q30, Q30 --> Q30

#endif

                }

            }

lib_dec/ivas_jbm_dec_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -2262,7 +2262,8 @@ ivas_error ivas_jbm_dec_render_fx( 
                {

                    Word32 gain = st_ivas->hSbaIsmData->gain_bed_fx;

                    test();

                    IF( NE_32( gain, ONE_IN_Q30 ) && GT_32( gain, 0 ) )

                    // TODO: Enable gain editing feature (NE_32 ( gain, ONE_IN_Q_gain ) )

                    IF( NE_32( gain, ONE_IN_Q31 ) && GT_32( gain, 0 ) )

                    {

                        FOR( n = 0; n < nchan_out; n++ )

                        {