Commit 3ee74b53 authored by vaclav's avatar vaclav
Browse files

encapsulate rendering debugging options with DEBUGGING; under REND_DEBUGGING_REVISION

parent 4cbab360

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -171,6 +171,8 @@ 


#define FIX_401_DIRAC_RENDERER_META_READ_INDICES        /* Nokia: Issue 401: Fix metadata reading indices in DirAC renderer. */



#define REND_DEBUGGING_REVISION                         /* VA: encapsulate rendering debugging options with DEBUGGING */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

#endif

lib_dec/ivas_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -266,7 +266,15 @@ ivas_error ivas_dec( 
                /* Convert to CICPxx; used also for ISM->CICP19->binaural_room rendering */

                ivas_ism_render( st_ivas, output, output_frame );

            }

#ifdef REND_DEBUGGING_REVISION

#ifdef DEBUGGINGaa

            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

#else

            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC )

#endif

#else

            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

#endif

            {

                /* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */

#ifdef NCHAN_ISM_PARAMETER

lib_dec/ivas_output_config.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ void ivas_renderer_select( 
                else

                {

                    *renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM;

#if defined( DEBUGGING )

#ifdef DEBUGGING

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

                    {

                        *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM;