Commit 335cf94b authored by vaclav's avatar vaclav
Browse files

Merge branch '1556_ref_PortFlpMR1397' into 'float-pc' 

Port float MR1397 to float-pc

See merge request !1534
parents 14175bc0 e91c858b

apps/decoder.c

+4 −0
Original line number Diff line number Diff line
@@ -2423,7 +2423,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;

apps/encoder.c

+4 −0
Original line number Diff line number Diff line
@@ -709,7 +709,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

+2 −1
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ 
#define FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING   /* FhG: fix usan error in MCT with bw swicthing */

#define NONBE_FIX_986_MC_BW_SWITCHING                   /* FhG: fix crash in bw and br switching with MC */

#define NONBE_FIX_1000_G1_G2_SWB_TBE                    /* VA: issue 1000: avoid div by zero due to g1 + g2 being zero in SWB TBE */

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



/* #################### End BASOP porting switches ############################ */

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

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
#include "common_api_types.h"



/* clang-format off */

#ifdef DEBUGGING

#ifdef VARIABLE_SPEED_DECODING



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

);



#endif

#endif

/* clang-format on */



#endif /* IVAS_TSM_SCALE_FILE_READER_H */