Commit 931351dd authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_740_MASA_PREREND_VALIDITY_CHECK

parent 9da320eb

apps/renderer.c

+0 −4
Original line number Diff line number Diff line
@@ -3792,11 +3792,7 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



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

#define FIX_865_MOVE_TD_DECORR                          /* VA: issue 865: Move ivas_td_decorr.c from lib_com to lib_rend */

#define FIX_888_INTERFACE_UNIFICATION                   /* Nokia: issue #888: fix mismatch in 2D array size */

#define FIX_889_MASA_FILE_WRITER_OPEN                   /* Nokia: issue #889: mismatch in function definition and use */

lib_rend/lib_rend.c

+0 −2
Original line number Diff line number Diff line
@@ -569,10 +569,8 @@ 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;