Commit 465ceeaa authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_94_VERIFY_WAV_NUM_CHANNELS

parent 61e88113

apps/encoder.c

+0 −19
Original line number Diff line number Diff line
@@ -213,23 +213,6 @@ int main( 
        goto cleanup;

    }



#ifndef FIX_94_VERIFY_WAV_NUM_CHANNELS

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

     * Open input audio file

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

    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;

    }

#endif



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

     * Open output bitstream file
@@ -452,7 +435,6 @@ int main( 
        goto cleanup;

    }



#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS

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

     * Open input audio file

     *------------------------------------------------------------------------------------------*/
@@ -511,7 +493,6 @@ int main( 
            fprintf( stderr, "\nError: %s\n", ivas_error_to_string( error ) );

            goto cleanup;

    }

#endif



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

     * Open input metadata files

apps/renderer.c

+0 −28
Original line number Diff line number Diff line
@@ -565,7 +565,6 @@ int main( 
        setupWithSingleFormatInput( args, audioFilePath, positionProvider, masaReaders );

    }



#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS

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

    {

        fprintf( stderr, "Error opening file: %s\n", audioFilePath );
@@ -609,28 +608,6 @@ int main( 
        fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );

        exit( -1 );

    }

#else

    int32_t inFileSampleRate = 0;

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

    {

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

        exit( -1 );

    }

    if ( args.sampleRate == 0 && inFileSampleRate == 0 )

    {

        fprintf( stderr, "Sampling rate must be specified on command line when using raw PCM input\n" );

        exit( -1 );

    }

    if ( args.sampleRate != 0 && inFileSampleRate != 0 && args.sampleRate != inFileSampleRate )

    {

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

        exit( -1 );

    }

    if ( args.sampleRate == 0 )

    {

        args.sampleRate = inFileSampleRate;

    }

#endif

    const int16_t frameSize_smpls = (int16_t) ( 20 * args.sampleRate / 1000 );



    IVAS_REND_InputId mcIds[RENDERER_MAX_MC_INPUTS] = { 0 };
@@ -798,12 +775,7 @@ int main( 


    const int16_t totalNumInChannels = getTotalNumInChannels( hIvasRend, mcIds, ismIds, sbaIds, masaIds );



#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS

    if ( inFileNumChannels != 0 /* inFileNumChannels is 0 with raw PCM input */ && totalNumInChannels != inFileNumChannels )

#else

    if ( AudioFileReader_getNumChannels( audioReader ) != 0 /* If input file is raw PCM, audio reader has no info about number of channels */

         && totalNumInChannels != AudioFileReader_getNumChannels( audioReader ) )

#endif

    {

        fprintf( stderr, "Number of channels in input file does not match selected configuration\n" );

        exit( -1 );

lib_com/ivas_error.h

+0 −2
Original line number Diff line number Diff line
@@ -123,10 +123,8 @@ typedef enum 
    IVAS_ERR_BITSTREAM_WRITER_INVALID_FORMAT,

    IVAS_ERR_BITSTREAM_READER_INVALID_DATA,

    IVAS_ERR_BITSTREAM_READER_INVALID_FORMAT,

#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS

    IVAS_ERR_NO_FILE_OPEN,

    IVAS_ERR_SAMPLING_RATE_UNKNOWN,

#endif



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

     *    renderer (lib_rend only)            *

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ 
/*#define SBA_HPF_TUNING_DEC*/



#define BINAURALIZATION_DELAY_REPORT                    /* VA: Issue 255 - Changes the way the decoder delay is reported */

#define FIX_94_VERIFY_WAV_NUM_CHANNELS                  /* FhG: Issue 94 - Check if number of channels in input wav file matches encoder/renderer configuration */

#define ISM_HIGHEST_BITRATE                             /* VA: Issue 284: Update highest bitrate limit in ISM format */

#define TUNE_360_OBJECT_WITH_NOISE                      /* VA: issue 360: consider objects being speech+noise for active speech coding */

#define FIX_350_MASA_DELAY_COMP                         /* Nokia: Issue 350: MASA audio/meta delay compensation */

lib_enc/lib_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -983,7 +983,6 @@ static int16_t getInputBufferSize( 
    return (int16_t) ( st_ivas->hEncoderConfig->input_Fs * st_ivas->hEncoderConfig->nchan_inp / FRAMES_PER_SEC );

}



#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS

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

 * IVAS_ENC_GetNumInChannels()

 *
@@ -1008,7 +1007,6 @@ ivas_error IVAS_ENC_GetNumInChannels( 


    return IVAS_ERR_OK;

}

#endif





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