Commit 29e345c2 authored by Jan Brouwer's avatar Jan Brouwer
Browse files

support directivity in absence of acoustic environments

parent 14b905b6

apps/decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ int main( 
            goto cleanup;

        }

#ifdef CONTROL_METADATA_DIRECTIVITY

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

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

        {

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

            goto cleanup;

lib_util/render_config_reader.c

+2 −10
Original line number Diff line number Diff line
@@ -2031,7 +2031,6 @@ ivas_error RenderConfigReader_getAcousticEnvironment( 


ivas_error RenderConfigReader_getDirectivity(

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

    uint16_t id,                             /* i  : Acoustic environment ID                */

    float *directivity                       /* o  : directivity                            */

)

{
@@ -2042,16 +2041,9 @@ ivas_error RenderConfigReader_getDirectivity( 
        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



    for ( n = 0; n < pRenderConfigReader->nAE; n++ )

    {

        if ( id == pRenderConfigReader->pAE[n].id )

        {

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

    return IVAS_ERR_OK;

}

    }

    return IVAS_ERR_ACOUSTIC_ENVIRONMENT_MISSING;

}

#endif

lib_util/render_config_reader.h

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ ivas_error RenderConfigReader_checkValues( 
#ifdef CONTROL_METADATA_DIRECTIVITY

ivas_error RenderConfigReader_getDirectivity(

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

    uint16_t id,                             /* i  : Acoustic environment ID                */

    float *directivity                       /* o  : directivity                            */

);

#endif