Commit 17a2a7a0 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Support for multiple acoustic environments plus early reflections in... 

Support for multiple acoustic environments plus early reflections in text-based configuration (prototype)
parent 63246d1a

lib_util/render_config_reader.c

+17 −5
Original line number Diff line number Diff line
@@ -1856,6 +1856,12 @@ ivas_error RenderConfigReader_read( 
                        acIdx = 0;

                        roomAcHasAcEnvCount = TRUE;

                    }

#ifdef DEBUGGING

                    else

                    {

                        fprintf( stderr, "Rendering configuration: unsupported property %s\n", item );

                    }

#endif

                }

#ifdef DEBUGGING

                if ( roomAcHasFgCount == FALSE )
@@ -1884,7 +1890,7 @@ ivas_error RenderConfigReader_read( 
                if ( idx >= pRenderConfigReader->nFG )

                {

#ifdef DEBUGGING

                    fprintf( stderr, "Frequency grid with index %d does not fit into the frequency grid array of %d elements.\n", idx, pRenderConfigReader->nFG );

                    fprintf( stderr, "Rendering configuration: frequency grid with index %d does not fit into the frequency grid array of %d elements.\n", idx, pRenderConfigReader->nFG );

#endif

                    return IVAS_ERR_INVALID_RENDER_CONFIG;

                }
@@ -2055,6 +2061,9 @@ ivas_error RenderConfigReader_read( 
                            }

                            else

                            {

#ifdef DEBUGGING

                                fprintf( stderr, "Rendering configuration: unsupported property %s\n", item );

#endif

                                break;

                            }

                            params_idx += (int32_t) ( strlen( item ) + strlen( pValue ) + 2 );
@@ -2063,7 +2072,7 @@ ivas_error RenderConfigReader_read( 
                        if ( defGridOffset + defGridNrBands > defGridLen )

                        {

#ifdef DEBUGGING

                            fprintf( stderr, "Rendering configuration: Invalid default banding selection.\n\n" );

                            fprintf( stderr, "Rendering configuration: invalid default banding selection.\n\n" );

#endif

                            return IVAS_ERR_INVALID_RENDER_CONFIG;

                        }
@@ -2084,7 +2093,7 @@ ivas_error RenderConfigReader_read( 
#ifdef DEBUGGING

                    else

                    {

                        fprintf( stderr, "Unsupported configuration property %s\n", item );

                        fprintf( stderr, "Rendering configuration: unsupported configuration property %s\n", item );

                    }

#endif

                }
@@ -2248,6 +2257,9 @@ ivas_error RenderConfigReader_read( 
                                }

                                else

                                {

#ifdef DEBUGGING

                                    fprintf( stderr, "Rendering configuration: unsupported property %s\n", item );

#endif

                                    break;

                                }

                                params_idx += (int32_t) ( strlen( item ) + strlen( pValue ) + 2 );
@@ -2258,7 +2270,7 @@ ivas_error RenderConfigReader_read( 
#ifdef DEBUGGING

                    else

                    {

                        fprintf( stderr, "Unsupported configuration property %s\n", item );

                        fprintf( stderr, "Rendering configuration: unsupported configuration property %s\n", item );

                    }

#endif

                }
@@ -2286,7 +2298,7 @@ ivas_error RenderConfigReader_read( 
                }

                if ( aeHasER == TRUE && aeHasERabs == FALSE )

                {

                    fprintf( stderr, "Renderer configuration: early reflections absorption coeffs missing from 'acousticEnvironment' %d.\n\n", acIdx );

                    fprintf( stderr, "Renderer configuration: early reflections absorption coefficients missing from 'acousticEnvironment' %d.\n\n", acIdx );

                }

#endif

#endif