Commit c405146b authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_889_MASA_FILE_WRITER_OPEN

parent 874f9560

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_889_MASA_FILE_WRITER_OPEN                   /* Nokia: issue #889: mismatch in function definition and use */

#define FIX_890_ARRAY_SIZE                              /* Nokia: issue #890: mismatch in 2D array size declaration and use */

#define BE_FIX_887_GCC_WARNING_ARRAY_SIZE               /* VoiceAge: Issue 887: change array size definition to avoid warning with gcc 11.4.0 */

#define FIX_247_EXTERNAL_RENDERER_COMMAND_LINE          /* VA: issue 247: harmonize command-line options names of external renderer with the decoder */

lib_util/masa_file_writer.c

+0 −18
Original line number Diff line number Diff line
@@ -67,18 +67,13 @@ struct MasaFileWriter 


static void getExtMasaMetadataFileName(

    const char *outputWavFilename, /* i  : name of the output audio file         */

#ifdef FIX_889_MASA_FILE_WRITER_OPEN

    char *metadata_filename, /* o  : name of the output MASA metadata file */

    int32_t max_name_len     /* i  : size of metadata_filename in chars    */

#else

    char metadata_filename[IVAS_MAX_NUM_OBJECTS][FILENAME_MAX - 12] /* o  : name of the output masa metadata file */

#endif

)

{

    char ext_meta[5];



    /* sizeof( ext_meta ) accounts for terminating NULL, don't subtract extra 1 */

#ifdef FIX_889_MASA_FILE_WRITER_OPEN

    const int32_t maxNameLenWithoutExt = max_name_len - (int32_t) sizeof( ext_meta );

    strncpy( metadata_filename, outputWavFilename, maxNameLenWithoutExt );

    snprintf( ext_meta, sizeof( ext_meta ), ".met" );
@@ -86,15 +81,6 @@ static void getExtMasaMetadataFileName( 
    /* strlen( metadata_filename[0] ) doesn't account for terminating NULL, subtract extra 1 */

    const int32_t maxNumCharactersToAppend = max_name_len - (int32_t) strlen( metadata_filename ) - 1;

    strncat( metadata_filename, ext_meta, maxNumCharactersToAppend );

#else

    const int32_t maxNameLenWithoutExt = sizeof( metadata_filename[0] ) - sizeof( ext_meta );

    strncpy( metadata_filename[0], outputWavFilename, maxNameLenWithoutExt );

    snprintf( ext_meta, sizeof( ext_meta ), ".met" );



    /* strlen( metadata_filename[0] ) doesn't account for terminating NULL, subtract extra 1 */

    const int32_t maxNumCharactersToAppend = (int32_t) ( sizeof( metadata_filename[0] ) - strlen( metadata_filename[0] ) - 1 );

    strncat( metadata_filename[0], ext_meta, maxNumCharactersToAppend );

#endif



    return;

}
@@ -179,11 +165,7 @@ ivas_error MasaFileWriter_open( 
        return IVAS_ERR_FAILED_FILE_OPEN;

    }



#ifdef FIX_889_MASA_FILE_WRITER_OPEN

    getExtMasaMetadataFileName( outputWavFilename, filePath, FILENAME_MAX - 12 );

#else

    getExtMasaMetadataFileName( outputWavFilename, &filePath );

#endif



    file = fopen( filePath, "wb" );