Commit bc282dbb authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

delete code under ifdef ALLOW_HOA3_ROTATION

parent c4c4f379
Loading
Loading
Loading
Loading
Loading
+1 −5
Original line number Diff line number Diff line
@@ -306,11 +306,7 @@ int main(
    if ( arg.enableHeadRotation )
    {
        /* sanity check */
        if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR
#ifdef ALLOW_HOA3_ROTATION
             && arg.outputConfig != IVAS_AUDIO_CONFIG_HOA3
#endif
             && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB
        if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB
#ifdef SPLIT_REND_WITH_HEAD_ROT
             && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM
#endif
+0 −1
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@
/*#define DEBUG_OSBA */
/*#define DEBUG_BINAURAL_FILTER_DESIGN*/        /* debugging of Crend binaural filter design */
/*#define DEBUG_AGC_ENCODER_CMD_OPTION*/        /* Ability to force enable or disable AGC behaviour in DIRAC/SPAR via command line option */
/*#define ALLOW_HOA3_ROTATION*/                 /* Allow outputting rotated HOA3 signals */
/*#define DEBUG_JBM_CMD_OPTION*/                /* ability for telling the decoder the frontend fetch size and to not delay compensate for bad frames at the beginning */
/*#define VARIABLE_SPEED_DECODING*/             /* variable speed decoding employing the JBM functioniality; move to DEBUGGING after build for disabled is fixed */

+0 −3
Original line number Diff line number Diff line
@@ -3136,9 +3136,6 @@ static ivas_error doSanityChecks_IVAS(
        if ( !( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB
#ifdef SPLIT_REND_WITH_HEAD_ROT
                || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM
#endif
#ifdef ALLOW_HOA3_ROTATION
                || output_config == IVAS_AUDIO_CONFIG_HOA3
#endif
                ) )
        {
+0 −15
Original line number Diff line number Diff line
@@ -79,21 +79,6 @@ void ivas_renderer_select(
        st_ivas->hCombinedOrientationData->shd_rot_max_order = -1;
    }

#ifdef ALLOW_HOA3_ROTATION
    if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT )
    {
        nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );
        if ( output_config == IVAS_AUDIO_CONFIG_HOA3 && st_ivas->hDecoderConfig->Opt_Headrotation && nchan_internal >= 2 )
        {
#ifdef NONBE_FIX_998_DIRAC_ROTATION
            st_ivas->hCombinedOrientationData->shd_rot_max_order = 1;
#else
            st_ivas->hCombinedOrientationData->shd_rot_max_order = 0;
#endif
        }
    }

#endif
    if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB
#ifdef SPLIT_REND_WITH_HEAD_ROT
         || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM