Commit b49817d8 authored by vaclav's avatar vaclav Committed by Manuel Jander
Browse files

accept object-editing switches

parent 543d2909

apps/decoder.c

+6 −0
Original line number Diff line number Diff line
@@ -3725,9 +3725,15 @@ static void do_object_editing_fx( 
                    if ( readInfo->obj_radius_relative[obj_idx] )

                    {

                        /* radius: apply relative edit + saturation */

<<<<<<< HEAD

                        Word32 L_tmp1 = L_mult( editableParameters->ism_metadata[obj_idx].radius_fx, (Word16) ( readInfo->obj_radius[obj_idx] * ( 1L << ( 9 ) ) ) ); /*SQ*SQ where SQ=9*/

                        Word32 L_tmp2 = L_shl_sat( L_tmp1, ( 9 - ( 9 + 9 + 1 - 16 ) ) /*  ^shift by 6  == mult by 2^6 = 64.0 */ );                                   /*shift back to Q(9+16)*/

                        Word16 temp_radius = round_fx( L_tmp2 );                                                                                                     /* Q25 -> Q9 */

=======

                        Word32 L_tmp1 = L_mult( editableParameters->ism_metadata[obj_idx].radius_fx, (Word16) ( readInfo->obj_radius[obj_idx] * ( 1L << ( SQ ) ) ) ); /*SQ*SQ*/

                        Word32 L_tmp2 = L_shl_sat( L_tmp1, ( 9 - ( 9 + 9 + 1 - 16 ) ) /*  ^shift by 6  == mult by 2^6 = 64.0 */ );                                    /*shift back to Q(9+16)*/

                        Word16 temp_radius = round_fx( L_tmp2 );                                                                                                      /* Q25 -> Q9 */

>>>>>>> 619c049f8 (accept object-editing switches)

                        temp_radius = s_max( s_min( temp_radius, OBJ_EDIT_RADIUS_MAX_FX ), 0 );



                        /*  L_tmp2  is in S31Q25  stored in a signed Word32