From 25a09e20c0efdbc96be471d0420b366217d4b419 Mon Sep 17 00:00:00 2001
From: vaclav <vaclav.eksler@usherbrooke.ca>
Date: Wed, 7 May 2025 10:49:56 +0200
Subject: [PATCH] port FIX_699_FILE_READER_JBM_TSM

---
 apps/decoder.c                   | 4 ++++
 apps/encoder.c                   | 4 ++++
 lib_com/options.h                | 1 +
 lib_util/tsm_scale_file_reader.c | 6 ++++++
 lib_util/tsm_scale_file_reader.h | 4 ++++
 5 files changed, 19 insertions(+)

diff --git a/apps/decoder.c b/apps/decoder.c
index 0d750e140..fd962e3e0 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -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;
diff --git a/apps/encoder.c b/apps/encoder.c
index dfd3da593..bf9302d43 100644
--- a/apps/encoder.c
+++ b/apps/encoder.c
@@ -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;
             }
 
diff --git a/lib_com/options.h b/lib_com/options.h
index 2d952edea..6292a3e43 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -188,6 +188,7 @@
 #define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX      /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/
 #define FIX_969_USAN_IGF_ARITH                          /* FhG: issue 969: fix USAN error in igf_sce_dec; same issue as #962 */
 #define FIX_959_MASA_LINEAR_REND                        /* VA: issue 959: remove unused calling of ivas_sba_linear_renderer() in MASA rendering */
+#define FIX_699_FILE_READER_JBM_TSM                     /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_util/tsm_scale_file_reader.c b/lib_util/tsm_scale_file_reader.c
index 3b9a2895a..e61f80763 100644
--- a/lib_util/tsm_scale_file_reader.c
+++ b/lib_util/tsm_scale_file_reader.c
@@ -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
diff --git a/lib_util/tsm_scale_file_reader.h b/lib_util/tsm_scale_file_reader.h
index 7c5cb051d..897e15681 100644
--- a/lib_util/tsm_scale_file_reader.h
+++ b/lib_util/tsm_scale_file_reader.h
@@ -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 */
-- 
GitLab