Commit 1baa2feb authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into... 

Merge remote-tracking branch 'remotes/origin/main' into 731-etx-output-for-omasa-and-osba-api_5ms-wrong-implementation-in-decodeg192
parents 2ee4ffe5 c8080db1

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -159,6 +159,9 @@ 
#define ROM_TO_RAM                                     /*Dlb : ROM optimization in SR mode*/     

#define FIX_712_713_SPLIT_REND_MASA_MC                 /*Dlb : Fix for issue 712 and 713*/

#endif

#define FIX_705_REND_CONF_FALSE_WARNING                 /* Eri: Bug in MSVC ftell() for UNIX-style line endings trigger false warning messages in renderer configuration. */



/* #################### End BE switches ################################## */



#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*/

lib_util/render_config_reader.c

+3 −0
Original line number Diff line number Diff line
@@ -1857,6 +1857,9 @@ ivas_error RenderConfigReader_read( 
    pTemp = (char *) calloc( file_size + 1, sizeof( char ) );

    acIdx = 0;

    roomAcHasFgCount = roomAcHasAcEnvCount = FALSE;

#ifdef FIX_705_REND_CONF_FALSE_WARNING

    setvbuf( pRenderConfigReader->pConfigFile, pConfig_str, _IONBF, sizeof( char ) ); /* Work-around for VS bug that gives incorrect ftell for UNIX-style line endings */

#endif



    /* read file line by line */

    while ( fgets( pConfig_str, file_size, pRenderConfigReader->pConfigFile ) != NULL )