Commit f74f7688 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch... 

Merge branch '2122_ref_delay_alignment_split_rendering_and_external_rend_crashes_omasa' into 'ivas-float-update'

[rend-non-BE][split-non-BE]port MR 2173 from float repo - ivas-float-update

See merge request !2411
parents bc3d26f9 72824f01

apps/renderer.c

+63 −51
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "lib_rend.h"

#include <assert.h>

#include <math.h>

#include <stdint.h>

#include <string.h>

#include "audio_file_reader.h"

#include "audio_file_writer.h"
@@ -190,7 +191,7 @@ typedef struct 
    float lfeConfigElevation;

    bool lfeCustomRoutingEnabled;

    char inLfePanningMatrixFile[RENDERER_MAX_CLI_ARG_LENGTH];

    float syncMdDelay;

    int16_t syncMdDelay;

    IVAS_RENDER_FRAMESIZE render_framesize;

    uint16_t directivityPatternId[RENDERER_MAX_ISM_INPUTS];

    AcousticEnvironmentSequence aeSequence;
@@ -720,6 +721,7 @@ int main( 
    SplitFileReadWrite *hSplitRendFileReadWrite;

    int16_t delayNumSamples_temp;

    int32_t delayTimeScale_temp;

    bool flushRendererLastFrame = false;

    int16_t numSamplesRead;

    int16_t delayNumSamples = -1;

    int16_t delayNumSamples_orig = 0;
@@ -766,8 +768,11 @@ int main( 


    CmdlnArgs args = parseCmdlnArgs( argc, argv );



    if ( args.nonDiegeticPan && !( ( args.inConfig.numAudioObjects == 0 && args.inConfig.multiChannelBuses[0].audioConfig == IVAS_AUDIO_CONFIG_MONO ) ||

                                   ( args.inConfig.numAudioObjects > 0 && args.inConfig.audioObjects[0].audioConfig == IVAS_AUDIO_CONFIG_OBA && args.inConfig.numAudioObjects == 1 ) ) )

    if ( args.nonDiegeticPan &&

         !( ( args.inConfig.numAudioObjects == 0 &&

              args.inConfig.multiChannelBuses[0].audioConfig == IVAS_AUDIO_CONFIG_MONO ) ||

            ( args.inConfig.numAudioObjects > 0 &&

              args.inConfig.audioObjects[0].audioConfig == IVAS_AUDIO_CONFIG_OBA && args.inConfig.numAudioObjects == 1 ) ) )

    {

        fprintf( stderr, "\ninvalid configuration - non-diegetic panning requires mono or ISM1 input\n" );

        goto cleanup;
@@ -1088,7 +1093,10 @@ int main( 
        IVAS_RENDER_CONFIG_DATA renderConfig;

#endif

        /* sanity check */

        if ( ( args.outConfig.audioConfig != IVAS_AUDIO_CONFIG_BINAURAL ) && ( args.outConfig.audioConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) && ( args.outConfig.audioConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) && !is_split_pre_rend_mode( &args ) )

        if ( ( args.outConfig.audioConfig != IVAS_AUDIO_CONFIG_BINAURAL ) &&

             ( args.outConfig.audioConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) &&

             ( args.outConfig.audioConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) &&

             !is_split_pre_rend_mode( &args ) )

        {

            fprintf( stderr, "\nExternal Renderer Config is supported only when binaural output configurations is used as output OR when Split pre-rendering mode is enabled. Exiting. \n" );

            goto cleanup;
@@ -1402,7 +1410,7 @@ int main( 
    }



    int16_t numOutChannels;

    if ( ( error = IVAS_REND_NumOutChannels( hIvasRend, &numOutChannels ) ) != IVAS_ERR_OK )

    if ( ( error = IVAS_REND_GetNumOutChannels( hIvasRend, &numOutChannels ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nError in IVAS_REND_NumOutChannels(): %s\n", ivas_error_to_string( error ) );

        goto cleanup;
@@ -1417,31 +1425,16 @@ int main( 
        }

    }



    if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED )

    {

        if ( ( error = IVAS_REND_GetSplitRendBitstreamHeader( hIvasRend, &bitsBuffer.config.codec, &bitsBuffer.config.poseCorrection, &bitsBuffer.config.codec_frame_size_ms, &bitsBuffer.config.isar_frame_size_ms ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError in IVAS_REND_GetSplitRendBitstreamHeader()!\n" );

            goto cleanup;

        }



        if ( IVAS_REND_GetDelay( hIvasRend, &delayNumSamples_temp, &delayTimeScale_temp ) != IVAS_ERR_OK )

    if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

    {

            fprintf( stderr, "\nUnable to get delay of renderer!\n" );

            goto cleanup;

        }

        char *outFile = args.outMetadataFilePath;



        if ( ( error = split_rend_writer_open( &hSplitRendFileReadWrite, args.outputFilePath, delayNumSamples_temp, delayTimeScale_temp, bitsBuffer.config.codec, bitsBuffer.config.poseCorrection, bitsBuffer.config.codec_frame_size_ms, bitsBuffer.config.isar_frame_size_ms, args.sampleRate, bitsBuffer.config.lc3plus_highres ) ) != IVAS_ERR_OK )

        if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED )

        {

            fprintf( stderr, "\nCould not open split rend metadata file %s\n", args.outputFilePath );

            goto cleanup;

        }

            outFile = args.outputFilePath;

            audioWriter = NULL;

        }

    else

    {

        if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

        {



        if ( ( error = IVAS_REND_GetSplitRendBitstreamHeader( hIvasRend, &bitsBuffer.config.codec, &bitsBuffer.config.poseCorrection, &bitsBuffer.config.codec_frame_size_ms, &bitsBuffer.config.isar_frame_size_ms ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError in IVAS_REND_GetSplitRendBitstreamHeader()!\n" );
@@ -1454,13 +1447,15 @@ int main( 
            goto cleanup;

        }



            if ( ( error = split_rend_writer_open( &hSplitRendFileReadWrite, args.outMetadataFilePath, delayNumSamples_temp, delayTimeScale_temp, bitsBuffer.config.codec, bitsBuffer.config.poseCorrection, bitsBuffer.config.codec_frame_size_ms, bitsBuffer.config.isar_frame_size_ms, args.sampleRate, bitsBuffer.config.lc3plus_highres ) ) != IVAS_ERR_OK )

        if ( ( error = split_rend_writer_open( &hSplitRendFileReadWrite, outFile, delayNumSamples_temp, delayTimeScale_temp, bitsBuffer.config.codec, bitsBuffer.config.poseCorrection, bitsBuffer.config.codec_frame_size_ms, bitsBuffer.config.isar_frame_size_ms, args.sampleRate, bitsBuffer.config.lc3plus_highres ) ) != IVAS_ERR_OK )

        {

                fprintf( stderr, "\nCould not open split rend metadata file %s\n", args.outMetadataFilePath );

            fprintf( stderr, "\nCould not open split rend metadata file %s\n", outFile );

            goto cleanup;

        }

    }



    if ( args.outConfig.audioConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED )

    {

        if ( AudioFileWriter_open( &audioWriter, args.outputFilePath, args.sampleRate, numOutChannels ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nFailed to open file: %s\n", args.outputFilePath );
@@ -1590,16 +1585,23 @@ int main( 
        if ( numSamplesRead == 0 )

        {

            /* end of input data */

            break;

            flushRendererLastFrame = true;

        }



        /* Convert from int to float and from interleaved to packed */

        if ( !flushRendererLastFrame )

        {

            convertInputBuffer( inpInt16Buffer, numSamplesRead, inBuffer.config.numSamplesPerChannel, num_in_channels, inFloatBuffer, inBuffer.config.is_cldfb, cldfbAna );

        }

        else

        {

            memset( inBuffer.data, 0, inBuffer.config.numChannels * inBuffer.config.numSamplesPerChannel * sizeof( float ) );

        }



        int16_t num_subframes, sf_idx;

        num_subframes = (int16_t) args.render_framesize;



        if ( isCurrentFrameMultipleOf20ms )

        if ( isCurrentFrameMultipleOf20ms && !flushRendererLastFrame )

        {

            IsmPositionProvider_getNextFrame( positionProvider, &mtdBuffer );
@@ -1711,7 +1713,7 @@ int main( 
            }

            IVAS_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.multiChannelBuses[i].inputChannelIndex, numChannels );



            if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, mcIds[i], tmpBuffer ) ) != IVAS_ERR_OK )

            if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, mcIds[i], tmpBuffer, flushRendererLastFrame ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nIVAS_REND_FeedInputAudio failed: %s\n", ivas_error_to_string( error ) );

                goto cleanup;
@@ -1726,7 +1728,7 @@ int main( 
                {

                    IVAS_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.audioObjects[i].inputChannelIndex, args.inConfig.numAudioObjects );



                    if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, ismIds[i], tmpBuffer ) ) != IVAS_ERR_OK )

                    if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, ismIds[i], tmpBuffer, flushRendererLastFrame ) ) != IVAS_ERR_OK )

                    {

                        fprintf( stderr, "\nIVAS_REND_FeedInputAudio failed: %s\n", ivas_error_to_string( error ) );

                        goto cleanup;
@@ -1743,7 +1745,7 @@ int main( 
            {

                IVAS_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.audioObjects[i].inputChannelIndex, 1 );



                if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, ismIds[i], tmpBuffer ) ) != IVAS_ERR_OK )

                if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, ismIds[i], tmpBuffer, flushRendererLastFrame ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nIVAS_REND_FeedInputAudio failed: %s\n", ivas_error_to_string( error ) );

                    goto cleanup;
@@ -1766,7 +1768,7 @@ int main( 
            }

            IVAS_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.ambisonicsBuses[i].inputChannelIndex, numChannels );



            if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, sbaIds[i], tmpBuffer ) ) != IVAS_ERR_OK )

            if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, sbaIds[i], tmpBuffer, flushRendererLastFrame ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nIVAS_REND_FeedInputAudio failed: %s\n", ivas_error_to_string( error ) );

                goto cleanup;
@@ -1782,13 +1784,13 @@ int main( 
            }

            IVAS_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.masaBuses[i].inputChannelIndex, numChannels );



            if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, masaIds[i], tmpBuffer ) ) != IVAS_ERR_OK )

            if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, masaIds[i], tmpBuffer, flushRendererLastFrame ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "IVAS_REND_FeedInputAudio failed: %s\n", ivas_error_to_string( error ) );

                goto cleanup;

            }



            if ( isCurrentFrameMultipleOf20ms )

            if ( isCurrentFrameMultipleOf20ms && !flushRendererLastFrame )

            {

                if ( masaReaders[i] != NULL )

                {
@@ -1851,7 +1853,7 @@ int main( 
            zeroPad = delayNumSamples;

        }



        if ( is_split_pre_rend_mode( &args ) )

        if ( is_split_pre_rend_mode( &args ) && !flushRendererLastFrame )

        {

            if ( split_rend_write_bitstream_to_file( hSplitRendFileReadWrite, bitsBuffer.bits, &bitsBuffer.config.bitsRead,

                                                     &bitsBuffer.config.bitsWritten ) != IVAS_ERR_OK )
@@ -1861,7 +1863,7 @@ int main( 
            }

        }



        if ( audioWriter != NULL )

        if ( audioWriter != NULL && !flushRendererLastFrame )

        {

            if ( delayNumSamples * num_out_channels < outBufferSize )

            {
@@ -1882,7 +1884,7 @@ int main( 
        bitsBuffer.config.bitsWritten = 0;



        /* Write MASA metadata for MASA outputs */

        if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_MASA1 || args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_MASA2 )

        if ( !flushRendererLastFrame && ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_MASA1 || args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_MASA2 ) )

        {

            IVAS_REND_AudioConfigType inputType1;

            IVAS_REND_AudioConfigType inputType2;
@@ -1954,7 +1956,8 @@ int main( 
                    }

                }



                if ( ( args.inConfig.numAmbisonicsBuses > 0 || args.inConfig.numMultiChannelBuses > 0 || args.inConfig.numMasaBuses > 0 ) && args.inConfig.numAudioObjects > 0 )

                if ( ( args.inConfig.numAmbisonicsBuses > 0 || args.inConfig.numMultiChannelBuses > 0 || args.inConfig.numMasaBuses > 0 ) &&

                     args.inConfig.numAudioObjects > 0 )

                {

                    inputType2 = IVAS_REND_AUDIO_CONFIG_TYPE_OBJECT_BASED;

                    if ( ( error = IVAS_REND_MergeMasaMetadata( hIvasRend, &hMetaOutput, inputType1, inputType2 ) ) != IVAS_ERR_OK )
@@ -1970,6 +1973,13 @@ int main( 
            }

        }



        /* no new input was actually read, only delay buffers were flushed

         * therefore this is not a real frame */

        if ( flushRendererLastFrame )

        {

            break;

        }



        frame++;

        if ( !args.quietModeEnabled )

        {
@@ -1982,12 +1992,13 @@ int main( 
#endif

    }



    /* add zeros at the end to have equal length of synthesized signals */

    /* add zeros at the end to have equal length of synthesized signals

     * the output buffer will contain either leftover input samples from delay aligned inputs

     * or zeros for padding */

    if ( audioWriter != NULL )

    {

        for ( zeroPadToWrite = zeroPad; zeroPadToWrite > frameSize_smpls; zeroPadToWrite -= frameSize_smpls )

        {

            memset( outInt16Buffer, 0, outBufferSize * sizeof( int16_t ) );

            if ( ( error = AudioFileWriter_write( audioWriter, outInt16Buffer, outBufferSize ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nOutput audio file writer error\n" );
@@ -1995,7 +2006,6 @@ int main( 
            }

        }



        memset( outInt16Buffer, 0, zeroPadToWrite * outBuffer.config.numChannels * sizeof( int16_t ) );

        if ( ( error = AudioFileWriter_write( audioWriter, outInt16Buffer, zeroPadToWrite * outBuffer.config.numChannels ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nOutput audio file writer error\n" );
@@ -2004,9 +2014,10 @@ int main( 
        zeroPadToWrite = 0;

    }



    if ( args.inConfig.numAudioObjects != 0 && ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL || args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

    if ( args.inConfig.numAudioObjects != 0 &&

         ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL || args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

    {

        fprintf( stdout, "\n\nMetadata delayed %d subframes\n\n", (int16_t) round( args.syncMdDelay / ( 1000 / IVAS_NUM_FRAMES_PER_SEC / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES ) ) );

        fprintf( stdout, "\n\nMetadata delayed %d subframes\n\n", (int16_t) round( args.syncMdDelay / ( (float) BINAURAL_RENDERING_FRAME_SIZE_MS ) ) );

    }



    if ( !args.quietModeEnabled && args.delayCompensationEnabled )
@@ -2917,7 +2928,7 @@ static void parseOption( 
        case CmdLnOptionId_syncMdDelay:

            assert( numOptionValues == 1 );

            /* Metadata Delay to sync with audio delay in ms */

            args->syncMdDelay = strtof( optionValues[0], NULL );

            args->syncMdDelay = (int16_t) strtol( optionValues[0], NULL, 10 );

            break;

        default:

            assert( 0 && "This should be unreachable - all command line options should be explicitly handled." );
@@ -3400,7 +3411,8 @@ static void parseObjectPosition( 
    *positionDuration = (uint16_t) strtol( line, &endptr, 10 );

    readNextMetadataChunk( line, "\n" );



    read_values = (int16_t) sscanf( line, "%f,%f,%f,%f,%f,%f,%f,%f", &meta_prm[0], &meta_prm[1], &meta_prm[2], &meta_prm[3], &meta_prm[4], &meta_prm[5], &meta_prm[6], &meta_prm[7] );

    read_values = (int16_t) sscanf( line, "%f,%f,%f,%f,%f,%f,%f,%f",

                                    &meta_prm[0], &meta_prm[1], &meta_prm[2], &meta_prm[3], &meta_prm[4], &meta_prm[5], &meta_prm[6], &meta_prm[7] );



    if ( read_values < 2 )

    {

lib_isar/lib_isar_pre_rend.c

+1 −3
Original line number Diff line number Diff line
@@ -115,9 +115,7 @@ ivas_error ISAR_PRE_REND_open( 
        isCldfbNeeded = 1;

    }



    hSplitBinRend->hCldfbHandles = NULL;



    if ( isCldfbNeeded )

    if ( isCldfbNeeded && hSplitBinRend->hCldfbHandles == NULL )

    {

        if ( ( hSplitBinRend->hCldfbHandles = (CLDFB_HANDLES_WRAPPER_HANDLE) malloc( sizeof( CLDFB_HANDLES_WRAPPER ) ) ) == NULL )

        {

lib_rend/lib_rend.c

+604 −261

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/lib_rend.h

+16 −15
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ ivas_error IVAS_REND_ConfigureCustomOutputLoudspeakerLayout( 


/* Functions to be called before/during rendering */



ivas_error IVAS_REND_NumOutChannels(

ivas_error IVAS_REND_GetNumOutChannels(

    IVAS_REND_CONST_HANDLE hIvasRend,               /* i  : Renderer handle                                     */

    int16_t *numOutChannels                         /* o  : number of output channels                           */

);
@@ -226,7 +226,8 @@ ivas_error IVAS_REND_GetHrtfStatisticsHandle( 
ivas_error IVAS_REND_FeedInputAudio(

    IVAS_REND_HANDLE hIvasRend,                      /* i/o: Renderer handle                                    */

    const IVAS_REND_InputId inputId,                 /* i  : ID of the input                                    */

    const IVAS_REND_ReadOnlyAudioBuffer inputAudio  /* i  : buffer with input audio                             */

    const IVAS_REND_ReadOnlyAudioBuffer inputAudio,  /* i  : buffer with input audio                            */

    const bool flushInputs                           /* i  : flush input audio                                  */

);



ivas_error IVAS_REND_FeedInputObjectMetadata(
@@ -371,7 +372,7 @@ ivas_error IVAS_REND_SetTotalNumberOfObjects( 


ivas_error IVAS_REND_SetIsmMetadataDelay(

    IVAS_REND_HANDLE hIvasRend,                     /* i/o: IVAS renderer handle                                */

    const float sync_md_delay                       /* i  :   Metadata Delay in ms to sync with audio delay     */

    const int16_t sync_md_delay                       /* i  :   Metadata Delay in ms to sync with audio delay     */

);



ivas_error IVAS_REND_GetNumAllObjects(