Commit 350ba166 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

delete code under ifdef NONBE_FIX_998_DIRAC_ROTATION

parent dd198a20

lib_com/options.h

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


#define NONBE_FIX_984_OMASA_EXT_OUTPUT                        /* Nokia: issue #984: complete the OMASA EXT output implementation */



#define NONBE_FIX_998_DIRAC_ROTATION                          /* FhG: fix issue 998: DirAC scene rotation accidentially deactivated */



/* ##################### End NON-BE switches ########################### */



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_output_config.c

+0 −10
Original line number Diff line number Diff line
@@ -198,20 +198,10 @@ void ivas_renderer_select( 


                nchan_internal = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );



#ifdef NONBE_FIX_998_DIRAC_ROTATION

                if ( nchan_internal == 4 || nchan_internal == 3 || nchan_internal == 2 )

#else

                if ( nchan_internal == 2 )

#endif

                {

                    st_ivas->hCombinedOrientationData->shd_rot_max_order = 1;

                }

#ifndef NONBE_FIX_998_DIRAC_ROTATION

                else if ( nchan_internal == 4 || nchan_internal == 3 )

                {

                    st_ivas->hCombinedOrientationData->shd_rot_max_order = 0;

                }

#endif

                else if ( nchan_internal == 6 || nchan_internal == 5 )

                {

                    st_ivas->hCombinedOrientationData->shd_rot_max_order = 2;