Commit dd2f16ea authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

revert changes from 005ccc4b for AudioFileReader_open() - required and cannot... 

revert changes from 005ccc4b for AudioFileReader_open() -  required and cannot be wrapped in EXT_RENDERER
parent 5d812f05

apps/encoder.c

+8 −2
Original line number Diff line number Diff line
@@ -264,12 +264,18 @@ int main( 
    /*------------------------------------------------------------------------------------------*

     * Open input audio file

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



    if ( AudioFileReader_open( &audioReader, arg.inputWavFilename, arg.inputFs ) != IVAS_ERR_OK )

    int32_t inFileSampleRate = 0;

    if ( AudioFileReader_open( &audioReader, arg.inputWavFilename, &inFileSampleRate ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nCan't open %s\n\n", arg.inputWavFilename );

        goto cleanup;

    }

    if ( inFileSampleRate != 0 && /* inFileSampleRate will remain zero if input file is raw PCM */

         inFileSampleRate != arg.inputFs )

    {

        fprintf( stderr, "Sampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n", arg.inputFs, inFileSampleRate, arg.inputWavFilename );

        goto cleanup;

    }



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

     * Open output bitstream file

apps/renderer.c

+3 −3
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ typedef struct 
    char executableName[RENDERER_MAX_CLI_ARG_LENGTH];

    char inputFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char outputFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    uint32_t sampleRate;

    int32_t sampleRate;

    InputConfig inConfig;

    OutputConfig outConfig;

    char inMetadataFilePaths[RENDERER_MAX_ISM_INPUTS][RENDERER_MAX_CLI_ARG_LENGTH];
@@ -626,8 +626,8 @@ int main( 
        setupWithSingleFormatInput( args, audioFilePath, positionProvider, masaReaders );

    }



    uint32_t inFileSampleRate = 0;

    if ( AudioFileReader_open( &audioReader, audioFilePath, args.sampleRate ) != IVAS_ERR_OK )

    int32_t inFileSampleRate = 0;

    if ( AudioFileReader_open( &audioReader, audioFilePath, &inFileSampleRate ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "Error opening file: %s\n", audioFilePath );

        exit( -1 );

lib_util/audio_file_reader.c

+7 −11
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


#include "audio_file_reader.h"

#include "tinywavein_c.h"

#include <stdint.h>

#include <stdio.h>

#include "wmops.h"
@@ -54,12 +55,13 @@ static int8_t AudioFileReader_open_raw( 
static int8_t AudioFileReader_open_wav(

    AudioFileReader *self,

    const char *fileName,

    uint32_t expSampleRate )

    int32_t *sampleRate )

{

    uint32_t sampleRate, samplesInFile;

    uint32_t sampleRate_, samplesInFile;

    int16_t bps;



    self->wavFile = OpenWav( fileName, &sampleRate, &self->numChannels, &samplesInFile, &bps );

    self->wavFile = OpenWav( fileName, &sampleRate_, &self->numChannels, &samplesInFile, &bps );

    *sampleRate = sampleRate_;



    if ( !self->wavFile )

    {
@@ -67,12 +69,6 @@ static int8_t AudioFileReader_open_wav( 
        return -1;

    }



    if ( sampleRate != expSampleRate )

    {

        fprintf( stderr, "Input wav file has unexpected samplerate (should be %d): %s\n", expSampleRate, fileName );

        return -1;

    }



    return 0;

}
@@ -81,7 +77,7 @@ static int8_t AudioFileReader_open_wav( 
ivas_error AudioFileReader_open(

    AudioFileReader **audioReader, /* o  : AudioFileReader handle                   */

    const char *fileName,          /* i  : path to wav/raw pcm file                 */

    uint32_t expSampleRate         /* i  : expected sample rate                */

    int32_t *sampleRate            /* o  : sample rate of wav file, unused with pcm */

)

{

    AudioFileReader *self;
@@ -108,7 +104,7 @@ ivas_error AudioFileReader_open( 


    if ( fileNameLen > wavSuffixLen && strncmp( fileName + fileNameLen - wavSuffixLen, wavSuffix, wavSuffixLen ) == 0 )

    {

        retCode = AudioFileReader_open_wav( self, fileName, expSampleRate );

        retCode = AudioFileReader_open_wav( self, fileName, sampleRate );

    }

    else

    {

lib_util/audio_file_reader.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ typedef struct AudioFileReader AudioFileReader; 
ivas_error AudioFileReader_open(

    AudioFileReader **audioReader,            /* o  : AudioFileReader handle                    */

    const char *fileName,                     /* i  : path to wav/raw pcm file                  */

    uint32_t expSampleRate                    /* i  : expected sample rate                */

    int32_t *sampleRate                       /* o  : sample rate of wav file, unused with pcm  */

);



/*! r: number of read samples */