Commit 95f78042 authored by kinuthia's avatar kinuthia
Browse files

Merge branch 'ericsson/contribution-38-control-metadata-directivity' into... 

Merge branch 'ericsson/contribution-38-control-metadata-directivity' into 'philips/contribution-38-control-metadata-reverb'

Issue related to contribution 38 - reverb control metadata branch

See merge request !844
parents 9e077d6d dc79ed90

apps/decoder.c

+0 −7
Original line number Diff line number Diff line
@@ -630,13 +630,6 @@ int main( 
            fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", ACOUSTIC_ENVIRONMENT_ID );

            goto cleanup;

        }

#ifdef CONTROL_METADATA_DIRECTIVITY

        if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, renderConfig.directivity ) ) != IVAS_ERR_OK )

        {

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

            goto cleanup;

        }

#endif

#endif

        renderConfig.room_acoustics.override = true;

lib_util/render_config_reader.c

+0 −22
Original line number Diff line number Diff line
@@ -2130,28 +2130,6 @@ ivas_error RenderConfigReader_getAcousticEnvironment( 
    return IVAS_ERR_ACOUSTIC_ENVIRONMENT_MISSING;

}



#ifdef CONTROL_METADATA_DIRECTIVITY

/*------------------------------------------------------------------------------------------*

 * RenderConfigReader_getDirectivity()

 *

 * Gets Acoustic environment with a given ID

 *------------------------------------------------------------------------------------------*/



ivas_error RenderConfigReader_getDirectivity(

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

    float *directivity                       /* o  : directivity                            */

)

{

    if ( pRenderConfigReader == NULL )

    {

        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



    mvr2r( pRenderConfigReader->directivity, directivity, 3 );

    return IVAS_ERR_OK;

}

#endif





#endif

lib_util/render_config_reader.h

+0 −6
Original line number Diff line number Diff line
@@ -62,12 +62,6 @@ ivas_error RenderConfigReader_getAcousticEnvironment( 
ivas_error RenderConfigReader_checkValues(

    IVAS_RENDER_CONFIG_HANDLE hRenderConfig /* o  : Renderer configuration handle           */

);

#ifdef CONTROL_METADATA_DIRECTIVITY

ivas_error RenderConfigReader_getDirectivity(

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

    float *directivity                       /* o  : directivity                            */

);

#endif

#endif



/* Reads a configuration                                                                    */