Commit dd49314e authored by vaclav's avatar vaclav
Browse files

add missing SPLIT_REND_WITH_HEAD_ROT defines

parent cf1a0f5a

lib_com/common_api_types.h

+15 −13
Original line number Diff line number Diff line
@@ -77,8 +77,10 @@ typedef enum _IVAS_AUDIO_CONFIG 
    IVAS_AUDIO_CONFIG_HOA3,      /* ambisonics, order 3                    */

    IVAS_AUDIO_CONFIG_OBA,       /* object based audio                     */

    IVAS_AUDIO_CONFIG_BINAURAL,  /* binaural with HRIR                     */

#ifdef SPLIT_REND_WITH_HEAD_ROT

    IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED, /* split binaural with CLDFB coded output */

    IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM,   /* split binaural with PCM coded output   */

#endif

    IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR,     /* binaural with BRIR                     */

    IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB, /* binaural with HRIR + reverb            */

    IVAS_AUDIO_CONFIG_ISM1,                 /* ISM1                                   */

lib_dec/ivas_spar_decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -1806,7 +1806,7 @@ void ivas_spar_dec_upmixer_sf( 
            }

            else

            {

#ifdef SPLIT_REND_WITH_HEAD_ROT

#ifndef SPLIT_REND_WITH_HEAD_ROT

                if ( ( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_FOA || !( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL || st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) &&

#else

                if ( ( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_FOA || !( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL || st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ) &&

lib_rend/lib_rend.c

+3 −1
Original line number Diff line number Diff line
@@ -628,8 +628,10 @@ IVAS_REND_AudioConfigType getAudioConfigType( 
        case IVAS_AUDIO_CONFIG_BINAURAL:

        case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR:

        case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB:

#ifdef SPLIT_REND_WITH_HEAD_ROT

        case IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM:

        case IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED:

#endif

            type = IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL;

            break;

        case IVAS_AUDIO_CONFIG_MASA1: