Commit 76d31bd9 authored by Stefan Doehla's avatar Stefan Doehla
Browse files

addressing comments

parent e927001b

lib_util/ivas_rtp_file.c

+4 −26
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 


*******************************************************************************************************/





#include <stdlib.h>

#include <string.h>

#include <stdio.h>
@@ -799,11 +798,7 @@ void IVAS_RTP_Term( 
                        len = sizeof( pkt.data );

                    memcpy( pkt.data, rtp->rtpPacket.buffer, len );

                    RTPDUMP_ParseRTPHeader( &pkt );

                    pkt.ssrc = rtp->ssrc;

                    pkt.payloadTypeId = rtp->pt;

                    pkt.payloadSize = (unsigned short) ( len - pkt.headerSize );

                    /* override sequence number to enforce 1-step increments */

                    pkt.sequenceNumber = rtp->nextSeq++;

                    /* compute time offset in ms from RTP timestamp (16kHz clock) */

                    uint32_t offset_ms = pkt.timeStamp / 16;

                    RTPDUMP_ERROR werr = RTPDUMP_WritePacket( rtp->dump, &pkt, offset_ms );
@@ -901,21 +896,11 @@ ivas_error IVAS_RTP_WRITER_Init( 
    {

        /* Open the output file for RTPDump writing */

#ifdef USE_RTPDUMP

        {

        RTPDUMP_ERROR rderr = RTPDUMP_OpenForWriting( &rtp->dump, outputBitstreamFilename );

        if ( rderr != RTPDUMP_NO_ERROR )

        {

            return IVAS_ERROR( IVAS_ERR_FAILED_FILE_OPEN, "rtpdump open error %d", rderr );

        }

            /* initialize sequence number and RTP header fields */

            rtp->nextSeq = seqNumInitVal;

            rtp->ssrc = SSRC;

#ifdef FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API

            rtp->pt = payloadType;

#else

            rtp->pt = 96; /* hard-coded for now */

#endif

        }

#else

        error = IvasRtpFile_Open( outputBitstreamFilename, true, &rtp->hRtpFile );

        if ( error != IVAS_ERR_OK )
@@ -924,7 +909,7 @@ ivas_error IVAS_RTP_WRITER_Init( 
        }



        /* initialize RTP packer header sequence only in file-based mode */

#ifdef FIXED_RTP_SEQUENCE_NUM

#endif

#ifdef FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API

        error = IVAS_RTP_PACK_UpdateHeader( rtp->hPack, payloadType, seqNumInitVal, SSRC, 0, NULL, 0, 0, NULL );

#else
@@ -934,8 +919,6 @@ ivas_error IVAS_RTP_WRITER_Init( 
        {

            fprintf( stderr, "error in IVAS_RTP_PACK_UpdateHeader(): %d\n", error );

        }

#endif

#endif

    }



    return error;
@@ -1075,11 +1058,6 @@ ivas_error IVAS_RTP_WriteNextFrame( 
            /* set proper header and payload sizes */

            pkt.headerSize = 12;

            pkt.payloadSize = (unsigned short) ( len - pkt.headerSize );

            /* override header fields to match configured values */

            pkt.ssrc = rtp->ssrc;

            pkt.payloadTypeId = rtp->pt;

            /* override sequence number to enforce 1-step increments */

            pkt.sequenceNumber = rtp->nextSeq++;

            /* compute time offset in ms from RTP timestamp (16kHz clock) */

            uint32_t offset_ms = pkt.timeStamp / 16;

            RTPDUMP_ERROR werr = RTPDUMP_WritePacket( rtp->dump, &pkt, offset_ms );

lib_util/ivas_rtp_file.h

+2 −4
Original line number Diff line number Diff line
@@ -46,8 +46,9 @@ typedef struct 
{

    uint8_t packet[NOMINAL_BUFFER_SIZE( IVAS_MAX_FRAMES_PER_RTP_PACKET )];

    IVAS_PIDATA_TS piData[IVAS_PI_MAX_ID * IVAS_MAX_FRAMES_PER_RTP_PACKET];



#ifndef USE_RTPDUMP

    IVAS_RTP_FILE_HANDLE hRtpFile;

#endif

    FILE *f_piDataOut;

    FILE *f_piExtOut;

    char piExtFilename[FILENAME_MAX];
@@ -70,9 +71,6 @@ typedef struct 
    IVAS_RTP_UNPACK_CONFIG unpackCfg;

#ifdef USE_RTPDUMP

    RTPDUMP_HANDLE dump;

    uint16_t nextSeq;

    uint32_t ssrc;

    uint8_t pt;

#endif

    IVAS_RTP_SR_INFO srInfo;

} IVAS_RTP;