Commit c810f632 authored by bayers's avatar bayers
Browse files

fix missing gain adjustement for binaural rendering ParamISM with TSM, fix... 

fix missing gain adjustement for binaural rendering ParamISM with TSM, fix external orientation tracking (one update was wrong)
parent 989c5bd3

lib_dec/ivas_jbm_dec.c

+7 −0
Original line number Diff line number Diff line
@@ -181,6 +181,13 @@ ivas_error ivas_jbm_dec_tc( 
        {

            ivas_mono_downmix_render_passive( st_ivas, output, output_frame );

        }

        else if ( st_ivas->ism_mode == ISM_MODE_PARAM && ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) )

        {

#ifdef FIX_549_PARAM_ISM_BIN_GAIN

            /* loudness correction */

            ivas_dirac_dec_binaural_sba_gain( output, st_ivas->nchan_transport, output_frame );

#endif

        }

    }

    else if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT )

    {

lib_rend/ivas_rotation.c

+4 −9
Original line number Diff line number Diff line
@@ -1527,14 +1527,9 @@ ivas_error combine_external_and_head_orientations( 
    if ( hExtOrientationData != NULL )

    {

#ifdef API_5MS

        if ( hExtOrientationData->enableExternalOrientation > 0 )

        {

            hCombinedOrientationData->Quaternion_prev_extOrientation = hCombinedOrientationData->Quaternion;

        }

        else

        {

            hCombinedOrientationData->Quaternion_prev_extOrientation = identity;

        }



        hCombinedOrientationData->Quaternion_prev_extOrientation = hExtOrientationData->Quaternion;



#elif defined FIX_570_SF_EXT_ORIENTATION

        if ( hExtOrientationData->enableExternalOrientation[MAX_PARAM_SPATIAL_SUBFRAMES - 1] > 0 )

        {