Commit 9868b4ac authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 1444-conformance-scripts-ism-metadata-file-comparison-seems-to-be-line-ending-sensitive
parents 5b347f96 2b62b141

apps/decoder.c

+13 −0
Original line number Diff line number Diff line
@@ -80,9 +80,13 @@ static 
#define NUM_BITS_SID_IVAS_5K2     104



#endif

#ifdef NONBE_FIX_BASOP_2233_RTPDUMP_DIFFERING_BITSTREAMS

#define RANDOM_INITSEED_DEC ( 0xFADE )

#else

#ifdef FIXED_RTP_SEQUENCE_NUM

#define RANDOM_INITSEED_DEC ( 0xFEEDFADE )

#endif

#endif



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

 * Local structure for storing cmdln arguments
@@ -2050,6 +2054,14 @@ 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

#ifdef FIXED_RTP_SEQUENCE_NUM

        /* 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
@@ -2057,6 +2069,7 @@ static ivas_error initOnFirstGoodFrame( 
        srand( RANDOM_INITSEED_DEC );

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

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

#endif

#endif



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

apps/encoder.c

+13 −0
Original line number Diff line number Diff line
@@ -61,9 +61,13 @@ static 
#endif

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



#ifdef NONBE_FIX_BASOP_2233_RTPDUMP_DIFFERING_BITSTREAMS

#define RANDOM_INITSEED_ENC ( 0xDEAF )

#else

#ifdef FIXED_RTP_SEQUENCE_NUM

#define RANDOM_INITSEED_ENC ( 0xFEEDDEAF )

#endif

#endif



#define DEFAULT_FIXED_SID_RATE 8 /* DTX SID rate */
@@ -234,6 +238,14 @@ int main( 
    IVAS_RTP ivasRtp = { 0 };

#endif



#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

#ifdef FIXED_RTP_SEQUENCE_NUM

    /* 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
@@ -241,6 +253,7 @@ int main( 
    srand( RANDOM_INITSEED_ENC );

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

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

#endif

#endif



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

apps/encoder_fmtsw.c

+13 −0
Original line number Diff line number Diff line
@@ -64,9 +64,13 @@ static 
#endif

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



#ifdef NONBE_FIX_BASOP_2233_RTPDUMP_DIFFERING_BITSTREAMS

#define RANDOM_INITSEED_ENC ( 0xDEAF )

#else

#ifdef FIXED_RTP_SEQUENCE_NUM

#define RANDOM_INITSEED_ENC ( 0xFEEDDEAF )

#endif

#endif



#define DEFAULT_FIXED_SID_RATE 8 /* DTX SID rate */
@@ -359,6 +363,14 @@ int encoder_main( 
    /* IVAS_RTP ivasRtp = { 0 }; */

#endif



#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

#ifdef FIXED_RTP_SEQUENCE_NUM

    /* 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
@@ -366,6 +378,7 @@ int encoder_main( 
    srand( RANDOM_INITSEED_ENC );

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

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

#endif

#endif



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

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -211,6 +211,8 @@ 
#define FIX_1430_EVS_STEREO_DMX_CHANNEL_DISAPPEARING    /* Orange: Fix for basop issue 2184 - to prevent one channel from becoming inaudible in the mono downmix output */

#define FIX_1440_AMR_WB_RESET                           /* VA: issue 1440: Fix missing AMR-WB IO memory reset (applicable to float only) */



#define NONBE_FIX_BASOP_2233_RTPDUMP_DIFFERING_BITSTREAMS /* Nokia: fix basop issue 2233: Fix differing rtpdump streams */



/* ##################### End NON-BE switches ########################### */



/* ################## End DEVELOPMENT switches ######################### */

lib_util/ivas_rtp_file.c

+7 −0
Original line number Diff line number Diff line
@@ -1103,3 +1103,10 @@ ivas_error IVAS_RTP_ReadNextFrame( 


    return IVAS_ERR_OK;

}



uint16_t IVAS_RTP_OwnRandom( uint16_t *seed )

{

    *seed = (uint16_t) ( *seed * 31821L + 13849L );



    return ( *seed );

}