Commit 60093d3e authored by vaclav's avatar vaclav
Browse files

acceptance of switches, step 1

parent 619c049f

apps/decoder.c

+3 −16
Original line number Diff line number Diff line
@@ -66,11 +66,7 @@ static 
#endif

    int32_t frame = 0; /* Counter of frames */



#ifdef NONBE_FIX_BASOP_2233_RTPDUMP_DIFFERING_BITSTREAMS

#define RANDOM_INITSEED_DEC ( 0xFADE )

#else

#define RANDOM_INITSEED_DEC ( 0xFEEDFADE )

#endif



#ifdef DEBUGGING

#define MIN_NUM_BITS_ACTIVE_FRAME 56
@@ -1798,21 +1794,12 @@ static ivas_error initOnFirstGoodFrame( 
        int16_t splitRendIsarFrameSizeMs;

        int16_t lc3plusHighRes;



#ifdef NONBE_FIX_BASOP_2233_RTPDUMP_DIFFERING_BITSTREAMS

        /* Ideally ssrc is negotiated via SDP and sequence number is radomized but we

           use fixed seed for random num generator for regression based tests. Any realtime

           application should implement this initialization seperately */

        uint16_t rtpDecSeed = RANDOM_INITSEED_DEC;

        uint32_t ssrc = ( (uint32_t) IVAS_RTP_OwnRandom( &rtpDecSeed ) & 0x0000FFFF ) | ( (uint32_t) IVAS_RTP_OwnRandom( &rtpDecSeed ) << 16 );

        uint16_t seqNumInitVal = IVAS_RTP_OwnRandom( &rtpDecSeed );

#else

        /* Ideally ssrc is negotiated via SDP and sequence number is radomized but we

        use fixed seed for random num generator for regression based tests. Any realtime

        application should implement this initialization seperately */

        srand( RANDOM_INITSEED_DEC );

        uint32_t ssrc = ( (uint32_t) rand() & 0x0000FFFF ) | ( (uint32_t) rand() << 16 );

        uint16_t seqNumInitVal = (uint16_t) ( rand() & 0xFFFF );

#endif



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

        {
@@ -3753,7 +3740,7 @@ static void do_object_editing_fx( 
                    if ( readInfo->obj_radius_relative[obj_idx] )

                    {

                        /* radius: apply relative edit + saturation */

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

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

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

apps/encoder.c

+0 −13
Original line number Diff line number Diff line
@@ -73,11 +73,7 @@ static 
#endif

    int32_t frame = 0; /* Counter of frames */



#ifdef NONBE_FIX_BASOP_2233_RTPDUMP_DIFFERING_BITSTREAMS

#define RANDOM_INITSEED_ENC ( 0xDEAF )

#else

#define RANDOM_INITSEED_ENC ( 0xFEEDDEAF )

#endif



#define DEFAULT_FIXED_SID_RATE 8 /* DTX SID rate */
@@ -225,21 +221,12 @@ int main( 
    uint8_t au[IVAS_MAX_BITS_PER_FRAME / 8];

    IVAS_RTP ivasRtp = { 0 };



#ifdef NONBE_FIX_BASOP_2233_RTPDUMP_DIFFERING_BITSTREAMS

    /* Ideally ssrc is negotiated via SDP and sequence number is radomized but we

       use fixed seed for random num generator for regression based tests. Any realtime

       application should implement this initialization seperately */

    uint16_t rtpEncSeed = RANDOM_INITSEED_ENC;

    uint32_t ssrc = ( (uint32_t) IVAS_RTP_OwnRandom( &rtpEncSeed ) & 0x0000FFFF ) | ( (uint32_t) IVAS_RTP_OwnRandom( &rtpEncSeed ) << 16 );

    uint16_t seqNumInitVal = IVAS_RTP_OwnRandom( &rtpEncSeed );

#else

    /* Ideally ssrc is negotiated via SDP and sequence number is radomized but we

       use fixed seed for random num generator for regression based tests. Any realtime

       application should implement this initialization seperately */

    srand( RANDOM_INITSEED_ENC );

    uint32_t ssrc = ( (uint32_t) rand() & 0x0000FFFF ) | ( (uint32_t) rand() << 16 );

    uint16_t seqNumInitVal = (uint16_t) ( rand() & 0xFFFF );

#endif



    /*------------------------------------------------------------------------------------------*

     * Parse command-line arguments

apps/encoder_fmtsw.c

+0 −13
Original line number Diff line number Diff line
@@ -76,11 +76,7 @@ static 
#endif

    int32_t frame = 0; /* Counter of frames */



#ifdef NONBE_FIX_BASOP_2233_RTPDUMP_DIFFERING_BITSTREAMS

#define RANDOM_INITSEED_ENC ( 0xDEAF )

#else

#define RANDOM_INITSEED_ENC ( 0xFEEDDEAF )

#endif



#define DEFAULT_FIXED_SID_RATE 8 /* DTX SID rate */
@@ -336,21 +332,12 @@ int encoder_main( 
    uint8_t au[IVAS_MAX_BITS_PER_FRAME / 8];

    /* IVAS_RTP ivasRtp = { 0 }; */



#ifdef NONBE_FIX_BASOP_2233_RTPDUMP_DIFFERING_BITSTREAMS

    /* Ideally ssrc is negotiated via SDP and sequence number is radomized but we

       use fixed seed for random num generator for regression based tests. Any realtime

       application should implement this initialization seperately */

    uint16_t rtpEncSeed = RANDOM_INITSEED_ENC;

    uint32_t ssrc = ( (uint32_t) IVAS_RTP_OwnRandom( &rtpEncSeed ) & 0x0000FFFF ) | ( (uint32_t) IVAS_RTP_OwnRandom( &rtpEncSeed ) << 16 );

    uint16_t seqNumInitVal = IVAS_RTP_OwnRandom( &rtpEncSeed );

#else

    /* Ideally ssrc is negotiated via SDP and sequence number is radomized but we

       use fixed seed for random num generator for regression based tests. Any realtime

       application should implement this initialization seperately */

    srand( RANDOM_INITSEED_ENC );

    uint32_t ssrc = ( (uint32_t) rand() & 0x0000FFFF ) | ( (uint32_t) rand() << 16 );

    uint16_t seqNumInitVal = (uint16_t) ( rand() & 0xFFFF );

#endif



    /*------------------------------------------------------------------------------------------*

     * Parse command-line arguments

lib_com/bitstream_fx.c

+0 −20
Original line number Diff line number Diff line
@@ -5294,23 +5294,3 @@ void evs_dec_previewFrame( 


    return;

}
 


#ifndef NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG

void dtx_read_padding_bits_fx(

    DEC_CORE_HANDLE st,

    const Word16 num_bits )

{

    /* TODO: temporary hack, need to decide what to do with core-coder bitrate */

    Word32 tmp;



    tmp = st->total_brate;

    move32();

    st->total_brate = L_add( st->total_brate, L_mult0( num_bits, FRAMES_PER_SEC ) );

    move32();

    get_next_indice_fx( st, num_bits );

    st->total_brate = tmp;

    move32();



    return;

}

#endif

lib_com/fd_cng_com_fx.c

+2 −5
Original line number Diff line number Diff line
@@ -162,12 +162,7 @@ void ivas_initFdCngCom_fx( HANDLE_FD_CNG_COM hFdCngCom, Word16 scale ) 
    hFdCngCom->exp_cldfb_periodog = 0;

    move16();



#ifdef NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG

    set16_fx( hFdCngCom->coherence_fx, 16384 /* 0.5 in Q15 */, MDCT_ST_DTX_NUM_COHERENCE_BANDS );

#else

    hFdCngCom->coherence_fx = 16384; /* 0.5 in Q15 */

    move16();

#endif



    set32_fx( hFdCngCom->olapBufferSynth_fx, 0, FFTLEN );

    set32_fx( hFdCngCom->olapBufferSynth2_fx, 0, FFTLEN );
@@ -176,6 +171,8 @@ void ivas_initFdCngCom_fx( HANDLE_FD_CNG_COM hFdCngCom, Word16 scale ) 


    return;

}





void initFdCngCom( HANDLE_FD_CNG_COM hFdCngCom, Word16 scale )

{

    /* Calculate CLDFB scaling factor */