Commit ff3eff67 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge from 109-harmonize-head-and-orientation-tracking

parents 2c27bede 3a83b608

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -165,9 +165,10 @@ 


#define BINAURALIZATION_DELAY_REPORT                    /* VA: Issue 255 - Changes the way the decoder delay is reported */

#define FIX_351_HRTF_COMMAND                            /* VA: Issue 354 - improve "-hrtf" command-line option */



#define FIX_94_VERIFY_WAV_NUM_CHANNELS                  /* FhG: Issue 94 - Check if number of channels in input wav file matches encoder/renderer configuration */

#define ISM_HIGHEST_BITRATE                             /* VA: Issue 284: Update highest bitrate limit in ISM format */

#define TUNE_360_OBJECT_WITH_NOISE                      /* VA: issue 360: consider objects being speech+noise for active speech coding */





#ifdef FIX_I109_ORIENTATION_TRACKING

#define OTR_REFERENCE_VECTOR_TRACKING                 /* FhG: enables the reference position orientation tracking mode */

lib_enc/ivas_ism_metadata_enc.c

+6 −1
Original line number Diff line number Diff line
@@ -210,6 +210,9 @@ ivas_error ivas_ism_metadata_enc( 
        }

        else if ( ism_mode == ISM_MODE_DISC )

        {

#ifdef TUNE_360_OBJECT_WITH_NOISE

            hIsmMeta[ch]->ism_metadata_flag = localVAD[ch] || hSCE[ch]->hCoreCoder[0]->lp_noise > 10;

#else

            hIsmMeta[ch]->ism_metadata_flag = localVAD[ch];



            if ( hIsmMeta[ch]->ism_metadata_flag == 0 )
@@ -223,6 +226,7 @@ ivas_error ivas_ism_metadata_enc( 
                    hIsmMeta[ch]->ism_metadata_flag = 1;

                }

            }

#endif



            if ( hSCE[ch]->hCoreCoder[0]->tcxonly )

            {
@@ -238,6 +242,7 @@ ivas_error ivas_ism_metadata_enc( 


    rate_ism_importance( nchan_transport, hIsmMeta, hSCE, ism_imp );



#ifndef TUNE_360_OBJECT_WITH_NOISE

    /* relax the importance decision in "stereo" coding for noisy audio */

    if ( ism_mode == ISM_MODE_DISC && num_obj == 2 )

    {
@@ -257,7 +262,7 @@ ivas_error ivas_ism_metadata_enc( 
            }

        }

    }



#endif

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

     * Write ISm common signaling

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

lib_rend/ivas_rotation.c

+24 −6
Original line number Diff line number Diff line
@@ -258,6 +258,15 @@ void Euler2Quat( 
 *------------------------------------------------------------------------*/

float deg2rad( float degrees )

{

    if ( degrees >= 180.0f )

    {

        degrees = degrees - 360.0f;

    }

    if ( degrees <= -180.0f )

    {

        degrees = degrees + 360.0f;

    }



    return PI_OVER_180 * degrees;

}
@@ -268,6 +277,15 @@ float deg2rad( float degrees ) 
 *------------------------------------------------------------------------*/

float rad2deg( float radians )

{

    if ( radians >= EVS_PI )

    {

        radians = radians - PI2;

    }

    if ( radians <= -EVS_PI )

    {

        radians = radians + PI2;

    }



    return _180_OVER_PI * radians;

}

lib_rend/ivas_orient_trk.c

+2 −2

File changed.

Contains only whitespace changes.