Commit 65f59451 authored by Lauros Pajunen's avatar Lauros Pajunen
Browse files

Reset external orientations after combinin orientations, remove decoder api... 

Reset external orientations after combinin orientations, remove decoder api call for ext orientation reset
parent c37b61de

apps/decoder.c

+0 −3
Original line number Diff line number Diff line
@@ -3708,9 +3708,6 @@ static ivas_error decodeVoIP( 
                }

            }

        }

#ifdef IVAS_RTPDUMP

        IVAS_DEC_resetExternalOrientations( hIvasDec );

#endif



        vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;

        if ( vec_pos_update == 0 )

lib_dec/lib_dec.c

+0 −12
Original line number Diff line number Diff line
@@ -5607,18 +5607,6 @@ static ivas_error IVAS_DEC_feedSinglePIorientation( 
    return error;

}



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

 * IVAS_DEC_resetExternalOrientations( )

 *

 * Reset external orientations

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



void IVAS_DEC_resetExternalOrientations(

    IVAS_DEC_HANDLE hIvasDec /* i/o: IVAS decoder handle                                                     */

)

{

    ivas_external_orientation_reset( &( hIvasDec->st_ivas->hExtOrientationData ) );

}



#ifdef RTP_S4_251135_CR26253_0016_REV1

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

lib_dec/lib_dec.h

+0 −1
Original line number Diff line number Diff line
@@ -560,7 +560,6 @@ void IVAS_DEC_PrintDisclaimer( 
#ifdef IVAS_RTPDUMP

#include "ivas_rtp_pi_data.h"

ivas_error IVAS_RTP_ApplyPiData( IVAS_DEC_HANDLE hIvasDec, PIDATA_TS *piData, uint32_t numPiData );

void IVAS_DEC_resetExternalOrientations(IVAS_DEC_HANDLE hIvasDec);

#endif



/* clang-format on */

lib_rend/ivas_prot_rend.h

+0 −6
Original line number Diff line number Diff line
@@ -1301,12 +1301,6 @@ ivas_error ivas_external_orientation_open( 
    const int16_t num_subframes                                                   /* i  : number of subframes                                      */

);



#ifdef IVAS_RTPDUMP

void ivas_external_orientation_reset(

    EXTERNAL_ORIENTATION_HANDLE *hExtOrientationData                              /* i/o  : external orientation handle                            */

);



#endif

void ivas_external_orientation_close(

    EXTERNAL_ORIENTATION_HANDLE *hExtOrientationData                              /* i/o: external orientation handle                              */

);

lib_rend/ivas_rotation.c

+7 −1
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ static void external_target_interpolation( EXTERNAL_ORIENTATION_HANDLE hExtOrien 


static bool are_orientations_same( const IVAS_QUATERNION *orientation1, const IVAS_QUATERNION *orientation2 );



#ifdef IVAS_RTPDUMP

static void ivas_external_orientation_reset( EXTERNAL_ORIENTATION_HANDLE *hExtOrientationData );

#endif



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

 * ivas_headTrack_open()
@@ -732,7 +735,7 @@ ivas_error ivas_external_orientation_open( 
 * Reset external orientation values

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



void ivas_external_orientation_reset(

static void ivas_external_orientation_reset(

    EXTERNAL_ORIENTATION_HANDLE *hExtOrientationData /* i/o  : external orientation handle    */

)

{
@@ -1294,6 +1297,9 @@ ivas_error combine_external_and_head_orientations( 
    hCombinedOrientationData->subframe_idx_start = 0;

    hCombinedOrientationData->cur_subframe_samples_rendered_start = 0;



#ifdef IVAS_RTPDUMP

    ivas_external_orientation_reset( &hExtOrientationData );

#endif

    return IVAS_ERR_OK;

}