Commit d0ea56d3 authored by vaclav's avatar vaclav
Browse files

add exit codes

parent 407cba90

apps/decoder.c

+36 −27
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <stdio.h>

#include <string.h>

#include <stdlib.h>

#include <assert.h>

#include "options.h"

#include "lib_dec.h"

#include "cmdl_tools.h"
@@ -1608,13 +1607,19 @@ static ivas_error initOnFirstGoodFrame( 
    {

        int16_t delayNumSamples_temp[3];

        int32_t delayTimeScale_temp;

        IVAS_DEC_GetDelay( hIvasDec, delayNumSamples_temp, &delayTimeScale_temp );

        error = split_rend_writer_open( hSplitRendFileReadWrite, arg.outputWavFilename, delayNumSamples_temp[0], delayTimeScale_temp );

        if ( error != IVAS_ERR_OK )



        if ( ( error = IVAS_DEC_GetDelay( hIvasDec, delayNumSamples_temp, &delayTimeScale_temp ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) );

            return error;

        }



        if ( ( error = split_rend_writer_open( hSplitRendFileReadWrite, arg.outputWavFilename, delayNumSamples_temp[0], delayTimeScale_temp ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Could not open split rend metadata file %s\n", arg.outputWavFilename );

            exit( -1 );

            return error;

        }



        *ppAfWriter = NULL;

    }

    else
@@ -1623,13 +1628,17 @@ static ivas_error initOnFirstGoodFrame( 
        {

            int16_t delayNumSamples_temp[3];

            int32_t delayTimeScale_temp;

            IVAS_DEC_GetDelay( hIvasDec, delayNumSamples_temp, &delayTimeScale_temp );

            assert( arg.outputMdFilename != NULL );

            error = split_rend_writer_open( hSplitRendFileReadWrite, arg.outputMdFilename, delayNumSamples_temp[0], delayTimeScale_temp );

            if ( error != IVAS_ERR_OK )



            if ( ( error = IVAS_DEC_GetDelay( hIvasDec, delayNumSamples_temp, &delayTimeScale_temp ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) );

                return error;

            }



            if ( ( error = split_rend_writer_open( hSplitRendFileReadWrite, arg.outputMdFilename, delayNumSamples_temp[0], delayTimeScale_temp ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "Could not open split rend metadata file %s\n", arg.outputWavFilename );

                exit( -1 );

                return error;

            }

        }

#endif

apps/renderer.c

+5 −0
Original line number Diff line number Diff line
@@ -3653,8 +3653,10 @@ static void convertInputBuffer( 
    {

        int16_t slotIdx, numCldfbBands, numFloatPcmSamples;

        float fIn[MAX_OUTPUT_CHANNELS][L_FRAME48k];



        numFloatPcmSamples = numFloatSamplesPerChannel >> 1;

        numCldfbBands = numFloatPcmSamples / CLDFB_NO_COL_MAX;



        /* CLDFB Analysis*/

        assert( numIntSamplesPerChannel <= MAX_OUTPUT_CHANNELS * L_FRAME48k );

        for ( smpl = 0; smpl < numFloatPcmSamples; ++smpl )
@@ -3673,6 +3675,7 @@ static void convertInputBuffer( 
                ++i;

            }

        }



        for ( chnl = 0; chnl < numChannels; ++chnl )

        {

            for ( slotIdx = 0; slotIdx < CLDFB_NO_COL_MAX; slotIdx++ )
@@ -3742,8 +3745,10 @@ static void convertOutputBuffer( 
        float fIn[MAX_OUTPUT_CHANNELS][L_FRAME48k];

        float re[MAX_OUTPUT_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];

        float im[MAX_OUTPUT_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];



        numPcmSamples = numSamplesPerChannel >> 1;

        numCldfbBands = numPcmSamples / CLDFB_NO_COL_MAX;



        /* CLDFB Synthesis*/

        for ( chnl = 0; chnl < numChannels; ++chnl )

        {

lib_util/split_render_file_read_write.c

+5 −0
Original line number Diff line number Diff line
@@ -110,6 +110,11 @@ ivas_error split_rend_writer_open( SplitFileReadWrite **hhSplitRendFileReadWrite 
    size_t header_len, h;

    char header[SPLIT_RENDERER_FRAME_HEADER_LEN] = "MAIN_SPLITH";



    if ( filename == NULL )

    {

        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



    hSplitRendFileReadWrite = (SplitFileReadWrite *) malloc( sizeof( SplitFileReadWrite ) );

    hSplitRendFileReadWrite->file = fopen( filename, "wb" );

    if ( hSplitRendFileReadWrite->file == NULL )