Commit e9763a08 authored by multrus's avatar multrus
Browse files

merge from main

parents 9fbfa161 c987ca9e

apps/decoder.c

+7 −0
Original line number Diff line number Diff line
@@ -1957,6 +1957,9 @@ static ivas_error initOnFirstGoodFrame( 
        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 );

#ifdef FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API

        uint8_t payloadType = DEFAULT_IVAS_PAYLOAD_TYPE; /* Dynamic PT are in range [96, 127] */

#endif



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

        {
@@ -1993,7 +1996,11 @@ static ivas_error initOnFirstGoodFrame( 




            /* Split Rendering RTPDump Output file */

#ifdef FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API

            if ( ( error = IVAS_RTP_WRITER_Init( srRtp, arg.outputWavFilename, 1000 / ( IVAS_NUM_FRAMES_PER_SEC * splitRendCodecFrameSizeMs ), payloadType, ssrc, seqNumInitVal ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_RTP_WRITER_Init( srRtp, arg.outputWavFilename, 1000 / ( IVAS_NUM_FRAMES_PER_SEC * splitRendCodecFrameSizeMs ), ssrc, seqNumInitVal ) ) != IVAS_ERR_OK )

#endif

            {

                fprintf( stderr, "\nError: Can't open SR output bitstream file for RTP output %s \n\n", arg.outputWavFilename );

                return error;

apps/encoder.c

+7 −0
Original line number Diff line number Diff line
@@ -230,6 +230,9 @@ int main( 
    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 );

#ifdef FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API

    uint8_t payloadType = DEFAULT_IVAS_PAYLOAD_TYPE; /* Dynamic PT are in range [96, 127] */

#endif



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

     * Parse command-line arguments
@@ -623,7 +626,11 @@ int main( 


    if ( arg.rtpdumpOutput )

    {

#ifdef FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API

        if ( ( error = IVAS_RTP_WRITER_Init( &ivasRtp, arg.outputBitstreamFilename, arg.numFramesPerPacket, payloadType, ssrc, seqNumInitVal ) ) != IVAS_ERR_OK )

#else

        if ( ( error = IVAS_RTP_WRITER_Init( &ivasRtp, arg.outputBitstreamFilename, arg.numFramesPerPacket, ssrc, seqNumInitVal ) ) != IVAS_ERR_OK )

#endif

        {

            fprintf( stderr, "\nError: Can't open output bitstream file for RTP output %s \n\n", arg.outputBitstreamFilename );

            goto cleanup;

apps/encoder_fmtsw.c

+7 −0
Original line number Diff line number Diff line
@@ -340,6 +340,9 @@ int encoder_main( 
    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 );

#ifdef FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API

    uint8_t payloadType = DEFAULT_IVAS_PAYLOAD_TYPE; /* Dynamic PT are in range [96, 127] */

#endif



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

     * Parse command-line arguments
@@ -731,7 +734,11 @@ int encoder_main( 


    if ( arg.rtpdumpOutput && init_RtpWriter )

    {

#ifdef FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API

        if ( ( error = IVAS_RTP_WRITER_Init( ivasRtp, arg.outputBitstreamFilename, arg.numFramesPerPacket, payloadType, ssrc, seqNumInitVal ) ) != IVAS_ERR_OK )

#else

        if ( ( error = IVAS_RTP_WRITER_Init( ivasRtp, arg.outputBitstreamFilename, arg.numFramesPerPacket, ssrc, seqNumInitVal ) ) != IVAS_ERR_OK )

#endif

        {

            fprintf( stderr, "\nError: Can't open output bitstream file for RTP output %s \n\n", arg.outputBitstreamFilename );

            goto cleanup;

lib_com/common_api_types.h

+4 −0
Original line number Diff line number Diff line
@@ -66,6 +66,10 @@ 
#define IVAS_TIME_SCALE_MIN 50  /* min. time-scaling [%] */

#define IVAS_TIME_SCALE_MAX 150 /* max. time-scaling [%] */



#ifdef FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API

/* RTP constants */

#define DEFAULT_IVAS_PAYLOAD_TYPE ( 96 )

#endif



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

 * Common API enum for output audio configurations

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ 
#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN            /* Eri: Basop issue 2469: TD renderer gain has wrong Q. In float this is just a synch of the cleanup done in BASOP */

#define FIX_ISSUE_1546_DEAD_CODE                        /* FhG: remove dead code reported in the issue*/

#define FIX_FLOAT_1544_SBA_META_IMPRECISION_UNSAFE_MATH /* FhG: float issue 1544: imprecision in ivas_get_dirac_sba_max_md_bits() with -funsafe-math-optimizations */



/* #################### End BE switches ################################## */
@@ -171,6 +172,8 @@ 


#define FIX_1543_MID_LSF_BITS                           /* VA: float issue 1543: Resolve "MSAN: use-of-uninitialized-value in lib_enc/lsf_enc.c:262:5 for EVS encoder" */

#define FIX_1547_ISMDTX_HANDLE                          /* VA: float issue 1547: fix use of 'hISMDTX' handle */

#define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API            /* Expose Payload Type setting in RTP Header */





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