Commit 596ebef8 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'basop_rtp_sr_framesize_support_in_toc_byte' into 'main' 

Split Rendering codec frame size support in RTP ToC SR byte

See merge request !2576
parents 16900ab4 69a2c05c

apps/decoder.c

+13 −0
Original line number Diff line number Diff line
@@ -1923,12 +1923,16 @@ static ivas_error initOnFirstGoodFrame( 
            fParamsSR = fopen( srParamsFile, "w" );

            if ( NULL != fParamsSR )

            {

#ifdef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE

                fprintf( fParamsSR, "DOF = %d;\nLC3PLUS_HIGHRES = %d;\n", poseCorrection, lc3plusHighRes );

#else

                fprintf( fParamsSR, "CODEC = %s;\nDOF = %d;\nFRAMESIZE = %d;\nRENDERSIZE = %d;\nLC3PLUS_HIGHRES = %d;\n",

                         splitRendCodec == ISAR_SPLIT_REND_CODEC_LC3PLUS ? "LC3PLUS" : "LCLD",

                         poseCorrection,

                         splitRendCodecFrameSizeMs,

                         splitRendIsarFrameSizeMs,

                         lc3plusHighRes );

#endif

                fclose( fParamsSR );

                fParamsSR = NULL;

            }
@@ -3066,7 +3070,11 @@ static ivas_error decodeVoIP( 
#ifdef IVAS_RTPDUMP

    IVAS_RTP ivasRtp = { 0 };

    IVAS_RTP srRtp = { 0 };

#ifdef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE

    IVAS_RTP_SR_INFO srInfo = { true, false, 0, 20, IVAS_SR_TRANSPORT_LCLD };

#else

    IVAS_RTP_SR_INFO srInfo = { true, false, 0, IVAS_SR_TRANSPORT_LCLD };

#endif

    int32_t initialTsOffsetSystemAndRTP = 0;

#else

    FILE *f_rtpstream = NULL;
@@ -3144,8 +3152,10 @@ static ivas_error decodeVoIP( 
        case IVAS_DEC_INPUT_FORMAT_RTPDUMP:

        case IVAS_DEC_INPUT_FORMAT_RTPDUMP_HF:

#ifdef IVAS_RTPDUMP

#ifndef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE

#ifdef RTP_S4_251135_CR26253_0016_REV1

            if ( ( error = IVAS_RTP_READER_Init( &ivasRtp, 0, arg.inputBitstreamFilename, arg.piOutputFilename, arg.outputConfig == IVAS_AUDIO_CONFIG_EXTERNAL, arg.outputWavFilename ) ) != IVAS_ERR_OK )

#endif

#else

            if ( ( error = IVAS_RTP_READER_Init( &ivasRtp, arg.inputBitstreamFilename, arg.piOutputFilename, arg.outputConfig == IVAS_AUDIO_CONFIG_EXTERNAL, arg.outputWavFilename ) ) != IVAS_ERR_OK )

#endif
@@ -3765,6 +3775,9 @@ static ivas_error decodeVoIP( 
        {

            srInfo.bitrateKbps = splitRendBits->bits_written * 1000 / splitRendBits->codec_frame_size_ms;

            srInfo.codec = ( splitRendBits->codec == ISAR_SPLIT_REND_CODEC_LC3PLUS ) ? IVAS_SR_TRANSPORT_LC3PLUS : IVAS_SR_TRANSPORT_LCLD;

#ifdef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE

            srInfo.codecFrameSizeMs = (uint32_t) splitRendBits->codec_frame_size_ms;

#endif

            if ( ( error = IVAS_RTP_WriteNextFrame( &srRtp, splitRendBits->bits_buf, &srInfo, (int16_t) splitRendBits->bits_written, false, false ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nError %s while pushing SR audio bitstream to RTP pack\n", ivas_error_to_string( error ) );

apps/isar_post_rend.c

+78 −0
Original line number Diff line number Diff line
@@ -749,6 +749,9 @@ static void trim( char *str ) 


static ivas_error parseSRParamsFile(

    const char *srParamsFilePath,

#ifdef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE

    const char *rtpFilePath,

#endif

    ISAR_SPLIT_REND_CODEC *codec,

    ISAR_SPLIT_REND_POSE_CORRECTION_MODE *poseCorrection,

    int16_t *codec_frame_size_ms,
@@ -775,6 +778,24 @@ static ivas_error parseSRParamsFile( 
            trim( key );

            trim( value );



#ifdef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE

            if ( 0 == strncmp( key, "DOF", 3 ) )

            {

                int val = atoi( value );

                if ( val == 0 || val == 1 )

                {

                    *poseCorrection = ( val == 0 ) ? ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE : ISAR_SPLIT_REND_POSE_CORRECTION_MODE_CLDFB;

                }

            }

            else if ( 0 == strncmp( key, "LC3PLUS_HIGHRES", 15 ) )

            {

                int val = atoi( value );

                if ( val == 0 || val == 1 )

                {

                    *lc3plusHighRes = (int16_t) val;

                }

            }

#else

            if ( 0 == strncmp( key, "CODEC", 5 ) )

            {

                *codec = ( 0 == strncmp( value, "LCLD", 4 ) ) ? ISAR_SPLIT_REND_CODEC_LCLD : *codec;
@@ -812,10 +833,52 @@ static ivas_error parseSRParamsFile( 
                    *lc3plusHighRes = (int16_t) val;

                }

            }

#endif

        }

    }



    fclose( fParamSR );



#ifdef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE

    {

        /* Peek the RTP stream to ascertain the codec and codec_frame_size */

        ivas_error error = IVAS_ERR_OK;

        IVAS_RTP srRtp = { 0 };

        if ( ( error = IVAS_RTP_READER_Init( &srRtp, rtpFilePath, NULL, false, NULL ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "error in IVAS_RTP_READER_Init() for sr RTP peek: %d\n", error );

            return error;

        }



        /* read a frame */

        while ( 1 )

        {

            bool qBit = false;

            IVAS_RTP_SR_INFO srInfo = { 0 };

            uint8_t au[( IVAS_MAX_BITS_PER_FRAME + 7 ) >> 3];

            int16_t auSize = 0;

            uint16_t rtpSequenceNumber = 0;

            uint32_t rtpTimeStamp = 0, nextPacketRcvTime_ms = 0;



            error = IVAS_RTP_ReadNextFrame( &srRtp, au, &auSize, &rtpTimeStamp, &rtpSequenceNumber, &nextPacketRcvTime_ms, &srInfo, &qBit );

            if ( error != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nError in IVAS_RTP_ReadNextFrame, error code: %d\n", error );

                return error;

            }



            if ( srInfo.valid )

            {

                *codec = ( srInfo.codec == IVAS_SR_TRANSPORT_LCLD ) ? ISAR_SPLIT_REND_CODEC_LCLD : ISAR_SPLIT_REND_CODEC_LC3PLUS;

                *codec_frame_size_ms = (int16_t) srInfo.codecFrameSizeMs;

                *isar_frame_size_ms = *codec_frame_size_ms; /* for rtp force codec framesize as isar renderer frame size */

                break;

            }

        }

        IVAS_RTP_Term( &srRtp );

    }

#endif



    return IVAS_ERR_OK;

}

#endif
@@ -949,6 +1012,9 @@ int main( 
    if ( ( args.inConfig.numBinBuses > 0 ) && ( args.inConfig.binBuses[0].srRtp ) )

    {

        error = parseSRParamsFile( args.srParamsFilePath,

#ifdef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE

                                   args.inputFilePath,

#endif

                                   &bitsBuffer.config.codec,

                                   &bitsBuffer.config.poseCorrection,

                                   &bitsBuffer.config.codec_frame_size_ms,
@@ -960,12 +1026,21 @@ int main( 
            goto cleanup;

        }



#ifndef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE

        if ( ( error = IVAS_RTP_READER_Init( &srRTP, (uint32_t) bitsBuffer.config.codec_frame_size_ms, args.inputFilePath, NULL, false, NULL ) ) != IVAS_ERR_OK )

#else

        if ( ( error = IVAS_RTP_READER_Init( &srRTP, args.inputFilePath, NULL, false, NULL ) ) != IVAS_ERR_OK )

#endif

        {

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

            goto cleanup;

        }

        audioReader = NULL;



#ifdef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE

        /* Force owerwrite of command line provided rendersize to align with codec frame size */

        args.render_framesize = bitsBuffer.config.isar_frame_size_ms / 5;

#endif

    }

    /*if split renderer is running in post renderer mode*/

    else if ( ( args.inConfig.numBinBuses > 0 ) && ( args.inConfig.binBuses[0].audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) )
@@ -1202,6 +1277,9 @@ int main( 
                    if ( error == IVAS_ERR_END_OF_FILE )

                    {

                        numSamplesRead = 0;

#ifdef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE

                        break;

#endif

                    }

                    else

                    {

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ 
#define NONBE_FIX_2205_SATURATE_ALTERNATIVE

#define NONBE_FIX_2206_SATURATE_ALTERNATIVE

#define FIX_2226_ISAR_PRE_CRASH_CLDFB_NO_CHANNELS           /* Dolby: Fix crash of ISAR pre-renderer due to an attempt of re-scaling  uninitialized values in the CLDFB filter bank */

#define RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE                 /* Dolby: CR for split rendering codec framesize signalling in Toc Byte */





/* ################### End FIXES switches ########################### */

lib_util/ivas_rtp_api.h

+6 −3
Original line number Diff line number Diff line
@@ -275,6 +275,9 @@ typedef struct 
    bool valid;           /* Valid Split Rendering Info for/in the ToC */

    bool diegetic;        /* SR content digetic */

    uint32_t bitrateKbps; /* SR bitrate in kbps */

#ifdef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE

    uint32_t codecFrameSizeMs; /* SR transport codec framesize in ms (5/10/20) */

#endif

    IVAS_RTP_SR_TRANSPORT codec; /* SR Transport Codec used*/

} IVAS_RTP_SR_INFO;

#endif /* RTP_S4_251135_CR26253_0016_REV1 */

lib_util/ivas_rtp_file.c

+4 −0
Original line number Diff line number Diff line
@@ -920,8 +920,10 @@ ivas_error IVAS_RTP_WRITER_Init( 


ivas_error IVAS_RTP_READER_Init(

    IVAS_RTP *rtp, /* i/o : IVAS RTP File reader handle  */

#ifndef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE

#ifdef RTP_S4_251135_CR26253_0016_REV1

    uint32_t srCodecFrameSizeMs, /* i   : SR Codec Framesize in ms */

#endif

#endif

    const char *inputBitstreamFilename, /* i   : Input rtpdump filename       */

    const char *piOutputFilename,       /* i   : Output PI data json filename */
@@ -934,8 +936,10 @@ ivas_error IVAS_RTP_READER_Init( 
    memset( rtp, 0, sizeof( IVAS_RTP ) );



    rtp->unpackCfg.maxFramesPerPacket = IVAS_MAX_FRAMES_PER_RTP_PACKET;

#ifndef RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE

#ifdef RTP_S4_251135_CR26253_0016_REV1

    rtp->unpackCfg.srCodecFrameSizeMs = srCodecFrameSizeMs;

#endif

#endif

    rtp->rtpPacket.buffer = rtp->packet;

    rtp->rtpPacket.capacity = sizeof( rtp->packet );