Commit 0cd7d42d authored by norvell's avatar norvell
Browse files

Merge branch '1451-compilation-error-in-lib_dec-c-with-debugging-on' into 'main' 

Remove debugging parameter 'renderer_type_override'

See merge request !2416
parents c5be0c8d f1c509cc

lib_com/common_api_types.h

+0 −3
Original line number Diff line number Diff line
@@ -340,9 +340,6 @@ typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG 


typedef struct _IVAS_RENDER_CONFIG

{

#ifdef DEBUGGING

    IVAS_RENDER_TYPE_OVERRIDE renderer_type_override;

#endif

    IVAS_ROOM_ACOUSTICS_CONFIG_DATA roomAcoustics;

    ISAR_SPLIT_REND_CONFIG_DATA split_rend_config;

    float directivity[IVAS_MAX_NUM_OBJECTS * 3];

lib_dec/ivas_output_config.c

+0 −16
Original line number Diff line number Diff line
@@ -127,12 +127,6 @@ void ivas_renderer_select( 
                else

                {

                    *renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM;

#ifdef DEBUGGING

                    if ( st_ivas->hRenderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )

                    {

                        *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM;

                    }

#endif

                    *internal_config = IVAS_AUDIO_CONFIG_7_1_4;

                }

            }
@@ -243,16 +237,6 @@ void ivas_renderer_select( 
                    {

                        *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM;

                    }

#ifdef DEBUGGING

                    if ( st_ivas->hRenderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_CREND )

                    {

                        *renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM;

                    }

                    else if ( st_ivas->hRenderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )

                    {

                        *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM;

                    }

#endif

                }

            }

        }

lib_dec/lib_dec.c

+0 −36
Original line number Diff line number Diff line
@@ -3220,20 +3220,6 @@ static ivas_error copyRendererConfigStruct( 
        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



#ifdef DEBUGGING

    switch ( hRCin->renderer_type_override )

    {

        case IVAS_RENDER_TYPE_OVERRIDE_CREND:

            hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_CREND;

            break;

        case IVAS_RENDER_TYPE_OVERRIDE_FASTCONV:

            hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_FASTCONV;

            break;

        default:

            hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE;

            break;

    }

#endif

    hRCout->roomAcoustics.aeID = hRCin->roomAcoustics.aeID;

    hRCout->roomAcoustics.nBands = hRCin->roomAcoustics.nBands;

    hRCout->roomAcoustics.acousticPreDelay = hRCin->roomAcoustics.acousticPreDelay;
@@ -3321,17 +3307,6 @@ ivas_error IVAS_DEC_FeedRenderConfig( 
    hRenderConfig = hIvasDec->st_ivas->hRenderConfig;

    st_ivas = hIvasDec->st_ivas;



#ifdef DEBUGGING

    hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE;

    if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )

    {

        hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_FASTCONV;

    }

    if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_CREND )

    {

        hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_CREND;

    }

#endif

    hRenderConfig->roomAcoustics.aeID = renderConfig.roomAcoustics.aeID;

    hRenderConfig->roomAcoustics.nBands = renderConfig.roomAcoustics.nBands;

    hRenderConfig->roomAcoustics.acousticPreDelay = renderConfig.roomAcoustics.acousticPreDelay;
@@ -3442,17 +3417,6 @@ static ivas_error feedAcousticEnvPI( 
    hRenderConfig = hIvasDec->st_ivas->hRenderConfig;

    st_ivas = hIvasDec->st_ivas;



#ifdef DEBUGGING

    hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE;

    if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )

    {

        hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_FASTCONV;

    }

    if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_CREND )

    {

        hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_CREND;

    }

#endif

    /* Ignore if AE ID already in use */

    if ( hRenderConfig->roomAcoustics.aeID == hAcoustEnvPI.aeid )

    {

lib_rend/ivas_render_config.c

+0 −3
Original line number Diff line number Diff line
@@ -116,9 +116,6 @@ ivas_error ivas_render_config_init_from_rom( 
        return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "Unexpected null pointer while attempting to fill renderer configuration from ROM" );

    }



#ifdef DEBUGGING

    ( *hRenderConfig )->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE;

#endif

    ( *hRenderConfig )->roomAcoustics.aeID = IVAS_DEFAULT_AEID;

    ( *hRenderConfig )->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_L_N_BANDS;

    ( *hRenderConfig )->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_L_PRE_DELAY;

lib_rend/ivas_reverb.c

+0 −3
Original line number Diff line number Diff line
@@ -1123,9 +1123,6 @@ ivas_error ivas_reverb_open( 
    params.pHrtf_inter_aural_coherence_const = hHrtfStatistics->inter_aural_coherence;



    /* set reverb acoustic configuration based on renderer config  */

#ifdef DEBUGGING

    pState->pConfig.renderer_type_override = hRenderConfig->renderer_type_override;

#endif

    pState->pConfig.roomAcoustics.nBands = hRenderConfig->roomAcoustics.nBands;



    if ( hRenderConfig->roomAcoustics.use_er == 1 )