Commit 5fda5095 authored by vaclav's avatar vaclav
Browse files

issue 699: complement FileReader_getFilePath() logic for TSM and JBM; under... 

issue 699: complement FileReader_getFilePath() logic for TSM and JBM; under FIX_699_FILE_READER_JBM_TSM
parent a63580d4

apps/decoder.c

+34 −31
Original line number Diff line number Diff line
@@ -2334,7 +2334,11 @@ static ivas_error decodeG192( 
                {

                    if ( ( error = TsmScaleFileReader_readScale( tsmScaleFileReader, &scale ) ) != IVAS_ERR_OK )

                    {

#ifdef FIX_699_FILE_READER_JBM_TSM

                        fprintf( stderr, "\nError (%s) when reading TSM data from %s \n\n", arg.inputBitstreamFilename, TsmScaleFileReader_getFilePath( tsmScaleFileReader ) );

#else

                        fprintf( stderr, "\nError: input bitstream file couldn't be read: %s \n\n", arg.inputBitstreamFilename );

#endif

                        goto cleanup;

                    }

                    int16_t maxScaling;
@@ -2426,7 +2430,6 @@ static ivas_error decodeG192( 
#endif

                }

            }



        } while ( nSamplesRendered < nOutSamples && error == IVAS_ERR_OK );



        if ( error == IVAS_ERR_END_OF_FILE )

apps/encoder.c

+4 −0
Original line number Diff line number Diff line
@@ -686,7 +686,11 @@ int main( 
        {

            if ( ( error = JbmFileReader_readCAconfig( jbmReader, &caConfig ) ) != IVAS_ERR_OK )

            {

#ifdef FIX_699_FILE_READER_JBM_TSM

                fprintf( stderr, "\nError (%s) while reading Channel-Aware Config. from: %s\n\n", IVAS_ENC_GetErrorMessage( error ), JbmFileReader_getFilePath( jbmReader ) );

#else

                fprintf( stderr, "JbmFileReader_readCAconfig() failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );

#endif

                goto cleanup;

            }

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ 
/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */



#define FIX_699_FILE_READER_JBM_TSM                     /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */

lib_util/tsm_scale_file_reader.c

+6 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ 
#include <stdlib.h>

#include <string.h>



#ifdef DEBUGGING

#ifdef VARIABLE_SPEED_DECODING



struct TsmScaleFileReader

{

    FILE *file;
@@ -146,3 +149,6 @@ const char *TsmScaleFileReader_getFilePath( 


    return self->file_path;

}



#endif

#endif

lib_util/tsm_scale_file_reader.h

+6 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ 


/* clang-format off */



#ifdef DEBUGGING

#ifdef VARIABLE_SPEED_DECODING



typedef struct TsmScaleFileReader TsmScaleFileReader;
@@ -59,6 +62,9 @@ const char *TsmScaleFileReader_getFilePath( 
    TsmScaleFileReader* self                 /* i/o: TsmScaleFileReader handle              */

);



#endif

#endif



/* clang-format on */



#endif /* IVAS_TSM_SCALE_FILE_READER_H */