Commit 1361aa52 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_ISM_METADATA_READER

parent b814dd8a

lib_com/ivas_error.h

+0 −2
Original line number Diff line number Diff line
@@ -83,9 +83,7 @@ typedef enum 
    IVAS_ERR_NOT_IMPLEMENTED,

    IVAS_ERR_FILE_READER_TIMESTAMP_MISMATCH,

    IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT,

#ifdef FIX_ISM_METADATA_READER

    IVAS_ERR_ISM_INVALID_METADATA_VALUE,

#endif

    IVAS_ERR_INVALID_MASA_FORMAT_METADATA_FILE,

#ifdef DEBUGGING

    IVAS_ERR_INVALID_FORCE_MODE,

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ 
#define SBA_BR_SWITCHING                                /* Issue 114: Changes for sba bit rate switching*/

#define FIX_ITD                                         /* Contribution 16: TD renderer ITD improvement and code cleanup */

#define BRATE_SWITCHING_RENDERING                       /* Bitrate switching changes related to the renderers */

#define FIX_ISM_METADATA_READER                         /* Issue 211: make ISM metadata file reader robust against invalid files */

#define FIX_GET_DELAY_RETURN                            /* Issue 223: change return data type in function get_delay() */

#define NTT_REDUC_COMP_POC                              /* NTT Contribution 10: Complexity reduction of phase spectrum in stereo downmix*/

#define FIX_ISM_DECODER_PRINTOUT                        /* Issue 229: fix ISM decoder printout */

lib_enc/lib_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -1394,10 +1394,8 @@ const char *IVAS_ENC_GetErrorMessage( 
            return "mismatched timestamp";

        case IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT:

            return "invalid metadata format";

#ifdef FIX_ISM_METADATA_READER

        case IVAS_ERR_ISM_INVALID_METADATA_VALUE:

            return "invalid metadata value provided";

#endif

        case IVAS_ERR_FAILED_FILE_READ:

            return "could not read from file";

        case IVAS_ERR_NOT_SUPPORTED_OPTION:

lib_util/ism_file_reader.c

+0 −10
Original line number Diff line number Diff line
@@ -31,9 +31,7 @@ 
*******************************************************************************************************/



#include "ism_file_reader.h"

#ifdef FIX_ISM_METADATA_READER

#include "cmdl_tools.h"

#endif

#include <stdio.h>

#include <stdlib.h>

#include <string.h>
@@ -117,20 +115,16 @@ ivas_error IsmFileReader_readNextFrame( 
    char_ptr = strtok( char_buff, "," );

    i = 0;

    meta_prm[i++] = (float) atof( char_ptr );

#ifdef FIX_ISM_METADATA_READER

    if ( is_number( char_ptr ) == false )

    {

        return IVAS_ERR_ISM_INVALID_METADATA_VALUE;

    }

#endif

    while ( ( char_ptr = strtok( NULL, "," ) ) != NULL && i < NUM_ISM_METADATA_PER_LINE )

    {

#ifdef FIX_ISM_METADATA_READER

        if ( is_number( char_ptr ) == false )

        {

            return IVAS_ERR_ISM_INVALID_METADATA_VALUE;

        }

#endif



        meta_prm[i++] = (float) atof( char_ptr );

    }
@@ -141,13 +135,11 @@ ivas_error IsmFileReader_readNextFrame( 
        return IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT;

    }



#ifdef FIX_ISM_METADATA_READER

    if ( char_ptr != NULL )

    {

        /* Too many values provided in one line */

        return IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT;

    }

#endif



    ismMetadata->azimuth = meta_prm[0];

    ismMetadata->elevation = meta_prm[1];
@@ -155,7 +147,6 @@ ivas_error IsmFileReader_readNextFrame( 
    ismMetadata->spread = meta_prm[3];

    ismMetadata->gainFactor = meta_prm[4];



#ifdef FIX_ISM_METADATA_READER

    /* verify whether the read metadata values are in an expected range */

    if ( ismMetadata->azimuth > 180 || ismMetadata->azimuth < -180 )

    {
@@ -181,7 +172,6 @@ ivas_error IsmFileReader_readNextFrame( 
    {

        return IVAS_ERR_ISM_INVALID_METADATA_VALUE;

    }

#endif



    return IVAS_ERR_OK;

}