Commit 61ada6a6 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Remove CI change and improve comment.

parent 26d17c87

.gitlab-ci/variables.yml

+0 −1
Original line number Diff line number Diff line 
variables:

  BASOP_CI_BRANCH_PC_REPO: "ci/port_288_enable_object_editing_tests"

  TESTV_DIR: "/usr/local/testv"

  LTV_DIR: "/usr/local/ltv"

  EVS_BE_TEST_DIR_BASOP: "/usr/local/be_2_evs_basop"

apps/decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -3488,7 +3488,7 @@ static void do_object_editing_fx( 
                {

                    /* gain: apply relative edit + saturation */

#ifdef FIX_2140_OBJECT_EDITING_SANITIZER_ISSUES

                    editableParameters->ism_metadata[obj_idx].gain_fx = L_max( L_min( L_shl_sat( Mpy_32_32( editableParameters->ism_metadata[obj_idx].gain_fx, (Word32) readInfo->obj_gain[obj_idx] * 536870912 ), 2 ), OBJ_EDIT_GAIN_MAX_FX ), OBJ_EDIT_GAIN_MIN_FX ); /* Q29 */

                    editableParameters->ism_metadata[obj_idx].gain_fx = L_max( L_min( L_shl_sat( Mpy_32_32( editableParameters->ism_metadata[obj_idx].gain_fx, (Word32) readInfo->obj_gain[obj_idx] * 536870912 ), 2 ), OBJ_EDIT_GAIN_MAX_FX ), OBJ_EDIT_GAIN_MIN_FX ); /* Q29*Q29 -> Q27 shift back to Q29 */

#else

                    editableParameters->ism_metadata[obj_idx].gain_fx = L_max( L_min( editableParameters->ism_metadata[obj_idx].gain_fx * (Word32) readInfo->obj_gain[obj_idx] * 536870912, OBJ_EDIT_GAIN_MAX_FX ), OBJ_EDIT_GAIN_MIN_FX ); /* Q29 */

#endif