Commit e0c0842c authored by vaclav's avatar vaclav
Browse files

Merge branch '211-ism-metadata-file-reader-does-not-report-errors-in-invalid-files' into 'main' 

Resolve "ISM metadata file reader does not report errors in invalid files"

See merge request !284
parents f9075692 ac1d72bf

apps/decoder.c

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ static 
#define NUM_BITS_SID_IVAS_9K3  186

#define NUM_BITS_SID_IVAS_10K2 204

#endif

#define META_LINE_LENGTH           200

#define MAX_FRAME_SIZE             ( 48000 / 50 )

#define MAX_NUM_OUTPUT_CHANNELS    16

#define MAX_OUTPUT_PCM_BUFFER_SIZE ( MAX_NUM_OUTPUT_CHANNELS * MAX_FRAME_SIZE )

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -303,8 +303,6 @@ typedef enum 
 * ISm Constants

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



#define META_LINE_LENGTH                        200                         /* max number of characters at one line of metadata input/output file */



#define ISM_NB_BITS_METADATA_NOMINAL            ( ( SCE_CORE_16k_LOW_LIMIT - ACELP_16k_LOW_LIMIT ) / FRAMES_PER_SEC ) /* nominal number of metadata bits - used for configuration of Core-Coder modules */



#define ISM_METADATA_VAD_FLAG_BITS              1

lib_com/ivas_error.h

+3 −0
Original line number Diff line number Diff line
@@ -89,6 +89,9 @@ 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

100644 → 100755
+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ 
#define FIX_I220_PARAMMC_CPROTO                         /* Issue 220: sanitizer error in the svd due to NaNs coming from negative energies in Cproto */

#define FIX_221_BR_SWITCH_STEREO                        /* Issue 221: Fix missing initialization when switchin from TD to MDCT stereo*/

#define FIX_DTX_RANGE                                   /* Issue 118: fix the DTX usage: default DTX up to 64 kbps, otherwise only in silence */

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





/* ################## End DEVELOPMENT switches ######################### */

lib_enc/lib_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -1406,6 +1406,10 @@ 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: