Commit 0fcb812a authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch '740-masa-pre-rendering-disabled-in-validity-check' into 'main' 

[ref-using-main] [rend-non-BE] Resolve "MASA pre-rendering disabled in validity check"

See merge request !1019
parents c83d31aa 3b6ab59d

apps/renderer.c

+4 −0
Original line number Diff line number Diff line
@@ -3792,7 +3792,11 @@ static void printSupportedAudioConfigs( void ) 
        "HOA2",

        "HOA3",

        "ISMx (input only)",

#ifdef FIX_740_MASA_PREREND_VALIDITY_CHECK

        "MASAx",

#else

        "MASAx (input only)",

#endif

        "BINAURAL (output only)",

#ifdef SPLIT_REND_WITH_HEAD_ROT

        "BINAURAL_SPLIT_PCM",

lib_com/options.h

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


#define FIX_879_USAN_ERROR_IN_MASA_DECODING             /* FhG: Issue 879 : avoid arithmetic with NULL pointer in the DirAC decoder to fix USAN error */



#define FIX_740_MASA_PREREND_VALIDITY_CHECK             /* Nokia: issue 740: fix incorrect validity check in lib_rend to allow use of MASA prerenderer */



/* #################### End BE switches ################################## */

lib_rend/lib_rend.c

+4 −0
Original line number Diff line number Diff line
@@ -561,6 +561,10 @@ static ivas_error validateOutputAudioConfig( 
#endif

        case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR:

        case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB:

#ifdef FIX_740_MASA_PREREND_VALIDITY_CHECK

        case IVAS_AUDIO_CONFIG_MASA1:

        case IVAS_AUDIO_CONFIG_MASA2:

#endif

            return IVAS_ERR_OK;

        default:

            break;

scripts/testv/mixed_mc714_foa_masa2_ism4.wav

0 → 100644LFS
+132 B

File added.

No diff preview for this file type.

View file

tests/renderer/constants.py

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ CUSTOM_LS_TO_TEST = [ 
""" Mixed scene ( metadata ) rendering """

METADATA_SCENES_TO_TEST = ["mixed_scene", "mixed_scene_simple"]

METADATA_SCENES_TO_TEST_NO_BE = ["masa_scene"]

METADATA_SCENES_TO_TEST_MASA_PREREND = ["mixed_mc714_foa_masa2_ism4"]



""" Binaural rendering """

OUTPUT_FORMATS_BINAURAL = ["BINAURAL", "BINAURAL_ROOM_IR", "BINAURAL_ROOM_REVERB"]