Commit 5b128d31 authored by bayers's avatar bayers
Browse files

Merge branch... 

Merge branch '551-orientation-tracking-first-frame-has-always-head_orient_trk_none-as-type' into 'main'

[Non-BE] Resolve "Orientation Tracking: First frame has always `HEAD_ORIENT_TRK_NONE` as type"

See merge request !970
parents f80e08d7 3fa634af

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ 
#define FIX_694_OMASA_EXTREME                           /* Nokia: fix for crash in OMASA on extreme sample */

#define FIX_679_JBM_MC2SBA                              /* FhG: fix issue 679: check for transport vs. internal channel count in JBM prior to ivas_mc2sba() */

#define FIX_591_PARAMISM_JBM_ENER_CORRECTION            /* FhG: fix energy correction in ParamISM rendering */

#define FIX_551_HEADTRACKER_INIT                        /* FhG: move setting of orientation tracking type to earlier    */



#define FIX_LARGE_RENDERER_DELAY_COMP                   /* Fix renderer delay compensation with delays greater than 1 frame */

lib_dec/ivas_init_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -975,6 +975,12 @@ ivas_error ivas_init_decoder_front( 
        {

            return error;

        }

#ifdef FIX_551_HEADTRACKER_INIT

        if ( ( error = ivas_orient_trk_SetTrackingType( st_ivas->hHeadTrackData->OrientationTracker, st_ivas->hDecoderConfig->orientation_tracking ) ) != IVAS_ERR_OK )

        {

            return error;

        }

#endif

    }



    /*-------------------------------------------------------------------*
@@ -1180,6 +1186,7 @@ ivas_error ivas_init_decoder( 
        }

    }



#ifndef FIX_551_HEADTRACKER_INIT

    /*-----------------------------------------------------------------*

     * Set head/orientation tracking

     *-----------------------------------------------------------------*/
@@ -1191,6 +1198,7 @@ ivas_error ivas_init_decoder( 
            return error;

        }

    }

#endif



#ifdef SPLIT_REND_WITH_HEAD_ROT

    /*-----------------------------------------------------------------*