Commit 7e18f15d authored by Ripinder Singh's avatar Ripinder Singh
Browse files

Issue 1540: Expose payload type in IVAS_RTP_PACK_UpdateHeader API 



Signed-off-by: default avatarRipinder Singh <ripinder.singh@dolby.com>
parent 7bf796ef

apps/decoder.c

+7 −0
Original line number Diff line number Diff line
@@ -1728,6 +1728,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 )

        {
@@ -1764,7 +1767,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
@@ -227,6 +227,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
@@ -618,7 +621,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
@@ -338,6 +338,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
@@ -727,7 +730,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
@@ -68,6 +68,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

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ 
#define FIX_BASOP_2486_HQ_FINE_GAIN_ALIGNMENT           /* Eri: Basop issue 2486: IVAS BASOP used calculations with truncation, EVS BASOP used rounding. This aligns the use of a table lookup. */

#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_2488_PREVENT_NEG_PITCH                      /* VA: Fix for 2488, use saturation to prevent possible wrap-around, thus negative pitch values */

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



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