Commit 51c92cbe authored by Jan Brouwer's avatar Jan Brouwer
Browse files

Merge branch 'philips/contribution-38-control-metadata-reverb-draft' of... 

Merge branch 'philips/contribution-38-control-metadata-reverb-draft' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into philips/contribution-38-control-metadata-reverb-draft
parents 9653165e 160e313d

apps/decoder.c

+4 −0
Original line number Diff line number Diff line
@@ -560,7 +560,11 @@ int main( 
        }



#ifdef CONTROL_METADATA_REVERB

#ifdef DEBUGGING

        if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename, &renderConfig ) != IVAS_ERR_OK )

#else

        if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename ) != IVAS_ERR_OK )

#endif

#else

        if ( RenderConfigReader_read( renderConfigReader, &renderConfig ) != IVAS_ERR_OK )

#endif

apps/renderer.c

+5 −1
Original line number Diff line number Diff line
@@ -785,7 +785,11 @@ int main( 
        }



#ifdef CONTROL_METADATA_REVERB

#ifdef DEBUGGING

        if ( RenderConfigReader_read( renderConfigReader, args.renderConfigFilePath, &renderConfig ) != IVAS_ERR_OK )

#else

        if ( RenderConfigReader_read( renderConfigReader, args.renderConfigFilePath ) != IVAS_ERR_OK )

#endif

#else

        if ( RenderConfigReader_read( renderConfigReader, &renderConfig ) != IVAS_ERR_OK )

#endif
@@ -801,7 +805,7 @@ int main( 
            {

                if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "Invalid reverberation configuration parameters\n\n" );

                    fprintf( stderr, "Invalid room acoustics configuration parameters\n\n" );

                    exit( -1 );

                }

            }

lib_util/render_config_reader.c

+5 −3
Original line number Diff line number Diff line
@@ -1794,8 +1794,11 @@ static ivas_error RenderConfigReader_readBinReverb( 
ivas_error RenderConfigReader_read(

#ifdef CONTROL_METADATA_REVERB

    RenderConfigReader *pRenderConfigReader, /* i  : RenderConfigReader handle              */

    const char *pRenderConfigPath,           /* i  : Renderer configuration file path       */

    const char *pRenderConfigPath            /* i  : Renderer configuration file path       */

#ifdef DEBUGGING

    ,

    IVAS_RENDER_CONFIG_HANDLE hRenderConfig  /* o  : Renderer configuration handle          */

#endif

#else

    RenderConfigReader *pRenderConfigReader, /* i  : RenderConfigReader handle              */

    IVAS_RENDER_CONFIG_HANDLE hRenderConfig  /* o  : Renderer configuration handle          */
@@ -1891,7 +1894,6 @@ ivas_error RenderConfigReader_read( 
            {

                params_idx = 0;

                pValue = (char *) calloc( strlen( pParams ), sizeof( char ) );

                hRenderConfig->room_acoustics.override = TRUE;



                while ( sscanf( pParams + params_idx, "%64[^=]=%[^;];", item, pValue ) == 2 )

                {
@@ -2543,7 +2545,7 @@ ivas_error RenderConfigReader_read( 
                    else if ( strcmp( item, "DIRECTIVITY" ) == 0 )

                    {

#ifdef CONTROL_METADATA_REVERB

                        if ( read_txt_vector( pValue, 3, hRenderConfig->directivity ) )

                        if ( read_txt_vector( pValue, 3, pRenderConfigReader->directivity ) )

#else

                        if ( read_vector( pValue, 3, hRenderConfig->directivity ) )

#endif

lib_util/render_config_reader.h

+4 −1
Original line number Diff line number Diff line
@@ -74,8 +74,11 @@ ivas_error RenderConfigReader_getDirectivity( 
ivas_error RenderConfigReader_read(

#ifdef CONTROL_METADATA_REVERB

    RenderConfigReader *pRenderConfigReader, /* i  : RenderConfigReader handle              */

    const char *pRenderConfigPath,           /* i  : Renderer configuration file path       */

    const char *pRenderConfigPath            /* i  : Renderer configuration file path       */

#ifdef DEBUGGING

    ,

    IVAS_RENDER_CONFIG_HANDLE hRenderConfig  /* o  : Renderer configuration handle          */

#endif

#else

    RenderConfigReader *pRenderConfigReader, /* i  : RenderConfigReader handle              */

    IVAS_RENDER_CONFIG_HANDLE hRenderConfig  /* o  : Renderer configuration handle          */