From 950c702207246572a7034bd0141fb54a76d0f8b4 Mon Sep 17 00:00:00 2001 From: kinuthia Date: Tue, 26 Sep 2023 12:46:52 +0000 Subject: [PATCH 1/2] rename switch FIX_730_DPID_NOT_SET_CORRECTLY to NONBE_FIX_730_DPID_NOT_SET_CORRECTLY - switch should be NONBE since the decoder does not halt with an error if the render_config file contains more than one directivity pattern with the switch active. --- lib_com/options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 99120b3e3d..6aebc65d1f 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -163,7 +163,6 @@ #define IGF_MEMORY_ALLOC_OPT /* FhG: Issue 157: allocate IGF encoder structure only when needed */ #define FIX_732_PLANAR_SBA_OSBA /* Dlb : issue 732: fix for crash in planar mode in OSBA format*/ #define FIX_708_DPID_COMMAND_LINE /* issue 708: sanity checks for '-dpid' command-line */ -#define FIX_730_DPID_NOT_SET_CORRECTLY /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */ #define FIX_RAM_COUNTING_5MS_RENDERING /* FhG: fix for correct RAM reporting with 5ms rendering */ #define FIX_786_ERROR_ISM_METADATA_READ /* VA: fix error reading past the last line of .csv metadata files */ #define FIX_632_USAN_ERROR_NULL_POINTER /* FhG: issue 632 USAN offset to null pointer proto_diffuse_buffer_f in dirac rendering*/ @@ -213,6 +212,7 @@ #define NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ /* VA: issue 797: fix of crash when the separated object is inactive and the MASA metadata is using very few bits */ #define NONBE_FIX_798_OSBA_MC_DEC_CRASH #define NONBE_FIX_806_OMASA_ONE_SEP_TRANSPORT_MIX /* Nokia: issue 806: fix one separated object mode transport mix of the separated object */ +#define NONBE_FIX_730_DPID_NOT_SET_CORRECTLY /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */ /* ##################### End NON-BE switches ########################### */ -- GitLab From 29bf9c0bc9a234b44570c4c6969491b0f0f1c29b Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Wed, 27 Sep 2023 15:35:05 +0200 Subject: [PATCH 2/2] rename switch to NONBE_FIX_730_DPID_NOT_SET_CORRECTLY in all files --- apps/decoder.c | 4 ++-- apps/renderer.c | 2 +- lib_util/render_config_reader.c | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/decoder.c b/apps/decoder.c index 1493350f7b..e078159546 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -640,7 +640,7 @@ int main( if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, arg.directivityPatternId, renderConfig.directivity ) ) != IVAS_ERR_OK ) { -#ifdef FIX_730_DPID_NOT_SET_CORRECTLY +#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", arg.directivityPatternId[0], arg.directivityPatternId[1], arg.directivityPatternId[2], arg.directivityPatternId[3] ); #else fprintf( stderr, "Failed to get directivity for objects: %d %d %d %d\n\n", arg.directivityPatternId[0], arg.directivityPatternId[1], arg.directivityPatternId[2], arg.directivityPatternId[3] ); @@ -1041,7 +1041,7 @@ static bool parseCmdlIVAS_dec( #endif for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i ) { -#ifdef FIX_730_DPID_NOT_SET_CORRECTLY +#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY arg->directivityPatternId[i] = 65535; #else arg->directivityPatternId[i] = 0; diff --git a/apps/renderer.c b/apps/renderer.c index 2cddc68cb0..1198d1bdd7 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -2640,7 +2640,7 @@ static CmdlnArgs defaultArgs( for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i ) { -#ifdef FIX_730_DPID_NOT_SET_CORRECTLY +#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY args.directivityPatternId[i] = 65535; #else args.directivityPatternId[i] = 0; diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index e4b35451e0..235b7cbb67 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -2619,7 +2619,7 @@ ivas_error RenderConfigReader_read( return IVAS_ERR_INVALID_RENDER_CONFIG; } idx = strtol( strtok( NULL, ":" ), NULL, 0 ); -#ifndef FIX_730_DPID_NOT_SET_CORRECTLY +#ifndef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY pRenderConfigReader->pDP->id = idx; #endif @@ -2629,7 +2629,7 @@ ivas_error RenderConfigReader_read( { params_idx += (int32_t) ( strlen( item ) + strlen( pValue ) + 2 ); #ifdef DEBUGGING -#ifdef FIX_730_DPID_NOT_SET_CORRECTLY +#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY fprintf( stderr, " PARAM: %s -> %s, DIRECTIVITYPATTERN -> %u\n", item, pValue, idx ); #else fprintf( stderr, " PARAM: %s -> %s\n", item, pValue ); @@ -2640,7 +2640,7 @@ ivas_error RenderConfigReader_read( { return IVAS_ERR_FAILED_ALLOC; } -#ifdef FIX_730_DPID_NOT_SET_CORRECTLY +#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY pRenderConfigReader->pDP[accDPIdx].id = idx; #endif if ( strcmp( item, "DIRECTIVITY" ) == 0 ) @@ -2845,7 +2845,7 @@ ivas_error RenderConfigReader_getDirectivity( ) { uint16_t n, m; -#ifdef FIX_730_DPID_NOT_SET_CORRECTLY +#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY uint16_t last_specified_id; #endif bool idExists; @@ -2866,7 +2866,7 @@ ivas_error RenderConfigReader_getDirectivity( } else { -#ifdef FIX_730_DPID_NOT_SET_CORRECTLY +#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY last_specified_id = id[0]; /* set unpspecified Directivity Patterns ID to last specified ID */ @@ -2897,7 +2897,7 @@ ivas_error RenderConfigReader_getDirectivity( if ( id[n] == pRenderConfigReader->pDP[m].id ) { idExists = true; -#ifdef FIX_730_DPID_NOT_SET_CORRECTLY +#ifdef NONBE_FIX_730_DPID_NOT_SET_CORRECTLY mvr2r( pRenderConfigReader->pDP[m].pDirectivity, directivity + ( n * 3 ), 3 ); #else mvr2r( pRenderConfigReader->pDP[id[n]].pDirectivity, directivity + ( n * 3 ), 3 ); -- GitLab