Commit 14ea0b04 authored by vaclav's avatar vaclav
Browse files

Fix MSAN error

parent 1105f0c7

apps/renderer.c

+13 −3
Original line number Diff line number Diff line
@@ -557,11 +557,18 @@ int main( 
    CmdlnArgs args = parseCmdlnArgs( argc, argv );



#ifdef NON_DIEGETIC_PAN

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

   if ( args.nonDiegeticPan && !( args.inConfig.audioObjects[0].audioConfig != IVAS_REND_AUDIO_CONFIG_MONO || ( args.inConfig.audioObjects[0].audioConfig == IVAS_REND_AUDIO_CONFIG_OBJECT && args.inConfig.numAudioObjects == 1 ) ) )

    {

        fprintf( stderr, "invalid configuration - non-diegetic panning requires mono input" );

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

        exit( -1 );

    }



    if ( args.nonDiegeticPan && args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_STEREO )

    {

        fprintf( stderr, "\ninvalid configuration - non-diegetic panning requires stereo output\n" );

        exit( -1 );

    }



    if ( args.nonDiegeticPan )

    {

        args.outConfig.audioConfig = IVAS_REND_AUDIO_CONFIG_STEREO;
@@ -1948,6 +1955,9 @@ static void IsmPositionProvider_getNextFrame( 
            objectMetadataBuffer->positions[objIdx].radius = 1.0f;

            objectMetadataBuffer->positions[objIdx].yaw = 0.0f;

            objectMetadataBuffer->positions[objIdx].pitch = 0.0f;

#ifdef ISM_NON_DIEGETIC_PAN

            objectMetadataBuffer->positions[objIdx].non_diegetic_flag = 0;

#endif

        }



        /* Wrap azimuth to lie within (-180, 180] range */