Commit 68fbd32e authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch '99-fix-for-incorrect-internal_config-when-output-format-is-hoa2' into 'main' 

[Non-BE] for HOA2 output format. issue 99 : Fix for incorrect internal_config when output format is HOA2

See merge request !118
parents ece8534d a68bf249

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ 


#define SPAR_SCALING_HARMONIZATION                      /* Issue 80: Changes to harmonize scaling in spar */



#define SBA_INTERN_CONFIG_FIX_HOA2                      /* Issue 99 : Fix for incorrect internal_config when output format is HOA2 or FOA*/



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

/* clang-format on */

lib_dec/ivas_output_init.c

+11 −0
Original line number Diff line number Diff line
@@ -511,7 +511,18 @@ void ivas_renderer_select( 
        if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR &&

             ( output_config != AUDIO_CONFIG_5_1 && output_config != AUDIO_CONFIG_5_1_2 && output_config != AUDIO_CONFIG_5_1_4 && output_config != AUDIO_CONFIG_7_1 && output_config != AUDIO_CONFIG_7_1_4 && output_config != AUDIO_CONFIG_LS_CUSTOM ) )

        {

#ifdef SBA_INTERN_CONFIG_FIX_HOA2

            if ( output_config == AUDIO_CONFIG_HOA2 || output_config == AUDIO_CONFIG_FOA )

            {

                *internal_config = output_config;

            }

            else

            {

                *internal_config = AUDIO_CONFIG_HOA3;

            }

#else

            *internal_config = AUDIO_CONFIG_HOA3;

#endif

            st_ivas->renderer_type = RENDERER_SBA_LINEAR_DEC;

        }

        else if ( ( st_ivas->ivas_format == MASA_FORMAT && output_config == AUDIO_CONFIG_MONO && st_ivas->nchan_transport == 1 ) ||