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

acceptance of switches, step 1

parent b49817d8

apps/decoder.c

+12 −0
Original line number Diff line number Diff line
@@ -66,11 +66,14 @@ static 


#define RANDOM_INITSEED_DEC ( 0xFADE )

<<<<<<< HEAD

<<<<<<< HEAD

=======

#else

#define RANDOM_INITSEED_DEC ( 0xFEEDFADE )

#endif

>>>>>>> 526949b21 (accept RTPDUMP switches)

=======

>>>>>>> 60093d3e5 (acceptance of switches, step 1)



#ifdef DEBUGGING

#define MIN_NUM_BITS_ACTIVE_FRAME 56
@@ -1738,6 +1741,7 @@ static ivas_error initOnFirstGoodFrame( 
        uint32_t ssrc = ( (uint32_t) IVAS_RTP_OwnRandom( &rtpDecSeed ) & 0x0000FFFF ) | ( (uint32_t) IVAS_RTP_OwnRandom( &rtpDecSeed ) << 16 );

        uint16_t seqNumInitVal = IVAS_RTP_OwnRandom( &rtpDecSeed );

<<<<<<< HEAD

<<<<<<< HEAD

=======

#else

        /* Ideally ssrc is negotiated via SDP and sequence number is radomized but we
@@ -1748,6 +1752,8 @@ static ivas_error initOnFirstGoodFrame( 
        uint16_t seqNumInitVal = (uint16_t) ( rand() & 0xFFFF );

#endif

>>>>>>> 526949b21 (accept RTPDUMP switches)

=======

>>>>>>> 60093d3e5 (acceptance of switches, step 1)



        if ( ( error = IVAS_DEC_GetDelay( hIvasDec, delayNumSamples_temp, &delayTimeScale_temp ) ) != IVAS_ERR_OK )

        {
@@ -3725,6 +3731,7 @@ static void do_object_editing_fx( 
                    if ( readInfo->obj_radius_relative[obj_idx] )

                    {

                        /* radius: apply relative edit + saturation */

<<<<<<< HEAD

<<<<<<< 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)*/
@@ -3734,6 +3741,11 @@ static void do_object_editing_fx( 
                        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)

=======

                        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 */

>>>>>>> 60093d3e5 (acceptance of switches, step 1)

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



                        /*  L_tmp2  is in S31Q25  stored in a signed Word32

lib_enc/ivas_cpe_enc_fx.c

+1 −0
Original line number Diff line number Diff line
@@ -1107,6 +1107,7 @@ ivas_error ivas_cpe_enc_fx( 
                }

                igf = getIgfPresent_fx( sts[n]->element_mode, L_mult0( sts[n]->bits_frame_nominal, FRAMES_PER_SEC ), bw, sts[n]->rf_mode ); /* Q0 */

                move16();



                IF( ( error = IGF_Reconfig_fx( &sts[n]->hIGFEnc, igf, 0, L_mult0( sts[n]->bits_frame_nominal, FRAMES_PER_SEC ), bw, sts[n]->element_mode, sts[n]->rf_mode ) ) != IVAS_ERR_OK )



                {