Commit c3479a56 authored by vaclav's avatar vaclav
Browse files

Merge branch... 

Merge branch '2109-basop-PortMr2060-from-float-test-binaural-renderers-granularity-changing' into 'main'

[non-BE] [allow regression] Port MR2060 from float to BASOP - test binaural renderers granularity changing

Closes #2109

See merge request !2391
parents 0f40ff99 c183dd3d

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ 
#define NONBE_1293_CRASH_FIRST_FRAME_LOST               /* VA: issue 1293: fix G.192 decoder crash when first frame is lost */

#define FIX_1384_MSAN_stereo_tcx_core_enc               /* VA: issue 1384: fix use-of-uninitialized value in stereo_tcx_core_enc() */

#define NONBE_FIX_1297_SPAR_JBM_MEM_SAN                 /* Dolby: issue 1297, SPAR + JBM + BR switch memory sanitizer */

#define NONBE_1303_GRANULARITY_OSBA_REND                /* VA: issue 1303: Correctly set the granularity in OSBA, Disc mode, and BINAURAL_ROOM_REVERB output */



// object-editing feature porting

#define OBJ_EDITING_API                                 /* object editing changes related to the API */

lib_dec/ivas_sba_dec_fx.c

+6 −0
Original line number Diff line number Diff line
@@ -215,7 +215,13 @@ ivas_error ivas_sba_dec_reconfigure_fx( 
        ELSE

        {

            test();

#ifdef NONBE_1303_GRANULARITY_OSBA_REND

            test();

            test();

            IF( EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

#else

            IF( EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

#endif

            {

                renderer_type_new = RENDERER_BINAURAL_FASTCONV;

                move16();