Commit affead7d authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_I87

parent 7fd05ea4

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ 
#define FIX_ADAP_STEFI_SHIFT                            /* Issue 89: fix bug in parameter shift of adaptive stereo filling */





#define FIX_I87                                         /*  fix for issue 86: incorrect Ambisonics order set for head rotation in SBA */

#define SBA_ORDER_BITSTREAM                             /* issue 76: Use input sba order for bitstream coding */



/* NTT switches */

lib_dec/ivas_output_init.c

+0 −21
Original line number Diff line number Diff line
@@ -263,9 +263,7 @@ void ivas_renderer_select( 
    AUDIO_CONFIG output_config;

    AUDIO_CONFIG transport_config;



#ifdef FIX_I87

    int16_t nchan_internal;

#endif



    renderer_type = &( st_ivas->renderer_type );

    internal_config = &( st_ivas->intern_config );
@@ -360,7 +358,6 @@ void ivas_renderer_select( 
            if ( st_ivas->hDecoderConfig->Opt_Headrotation )

            {



#ifdef FIX_I87

#ifdef SBA_ORDER_BITSTREAM

                nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order );

#else
@@ -382,24 +379,6 @@ void ivas_renderer_select( 
                {

                    st_ivas->hHeadTrackData->shd_rot_max_order = 3;

                }

#else

                if ( st_ivas->nchan_transport == 2 )

                {

                    st_ivas->hHeadTrackData->shd_rot_max_order = 1;

                }

                else if ( st_ivas->nchan_transport == 4 || st_ivas->nchan_transport == 3 )

                {

                    st_ivas->hHeadTrackData->shd_rot_max_order = 0;

                }

                else if ( st_ivas->nchan_transport == 6 || st_ivas->nchan_transport == 5 )

                {

                    st_ivas->hHeadTrackData->shd_rot_max_order = 2;

                }

                else if ( st_ivas->nchan_transport == 8 || st_ivas->nchan_transport == 7 )

                {

                    st_ivas->hHeadTrackData->shd_rot_max_order = 3;

                }

#endif

            }

        }

        else if ( st_ivas->ivas_format == MC_FORMAT )