Commit ba0be699 authored by sagnowski's avatar sagnowski
Browse files

Fix warnings on MacOS + AppleClang

parent 2df75393

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -2034,7 +2034,7 @@ static void parseMasa( 
    if ( strncmp( line, "MASA", 4 ) != 0 )

    {

        char numTcs = *line;

        sprintf( line, "MASA%c", numTcs );

        snprintf( line, 6 /* write at most 6 characters: MASAx + null termination */, "MASA%c", numTcs );

    }



    inConfig->masaBuses[idx].audioConfig = parseAudioConfig( line );

lib_rend/lib_rend.c

+1 −1
Original line number Diff line number Diff line
@@ -2563,7 +2563,7 @@ static IVAS_REND_InputId makeInputId( 
    /* Put config type in second byte (from LSB), put index + 1 in first byte

     *

     * Index is incremented here so that a valid ID can never be 0. */

    return (IVAS_REND_InputId) ( ( getAudioConfigType( config ) << 8 ) | ( inputIndex + 1 ) );

    return (IVAS_REND_InputId) ( ( ( (uint32_t) getAudioConfigType( config ) ) << 8 ) | ( inputIndex + 1 ) );

}



static ivas_error getInputById(

lib_util/ism_file_writer.c

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ ivas_error IsmFileWriter_open( 
    FILE *file;



    strncpy( metadata_filename_loc, filePathWav, sizeof( metadata_filename_loc ) - 1 );

    sprintf( ext_meta, ".%d.csv", obj_num );

    snprintf( ext_meta, sizeof( ext_meta ), ".%d.csv", obj_num );

    const int32_t maxNumCharactersToAppend = (int32_t) sizeof( metadata_filename_loc ) - strlen( metadata_filename_loc ) - 1;

    strncat( metadata_filename_loc, ext_meta, maxNumCharactersToAppend );
@@ -116,7 +116,7 @@ ivas_error IsmFileWriter_writeFrame( 
    file = ismWriter->file;



    /* IVAS_fmToDo: work in progress; currently position_azimuth, position_elevation, position_radius, spread, gain_factor */

    sprintf( char_buff, "%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f\n", ismMetadata.azimuth, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor );

    snprintf( char_buff, sizeof( char_buff ), "%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f\n", ismMetadata.azimuth, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor );



    if ( file )

    {

lib_util/masa_file_writer.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static void getExtMasaMetadataFileName( 
    /* sizeof( ext_meta ) accounts for terminating NULL, don't subtract extra 1 */

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

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

    sprintf( ext_meta, ".met" );

    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 );