Commit a0dd9b56 authored by vaclav's avatar vaclav
Browse files

correction

parent 20ca8ee5

lib_dec/ivas_jbm_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -1287,8 +1287,6 @@ ivas_error ivas_jbm_dec_render( 
                }

                else

                {

#endif

#if defined SPLIT_REND_WITH_HEAD_ROT

                    if ( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig, st_ivas->hCombinedOrientationData,

                                                                   &st_ivas->hIntSetup, st_ivas->hEFAPdata, st_ivas->hTcBuffer, crendInPlaceRotation ? p_output : p_tc, p_output, *nSamplesRendered, output_Fs, 0 ) ) != IVAS_ERR_OK )

#else

lib_rend/ivas_crend.c

+0 −1
Original line number Diff line number Diff line
@@ -2026,7 +2026,6 @@ ivas_error ivas_rend_crendProcessSubframe( 
            if ( ( error = ivas_rend_crendConvolver( pCrend, inConfig, outConfig, tc_local, p_pcm_tmp, output_Fs, 0, pos_idx ) ) != IVAS_ERR_OK )

#else

            if ( ( error = ivas_rend_crendConvolver( pCrend, inConfig, outConfig, tc_local, p_pcm_tmp, output_Fs, 0 ) ) != IVAS_ERR_OK )



#endif

            {

                return error;

lib_rend/ivas_rotation.c

+5 −10
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ ivas_error ivas_headTrack_open( 
    ( *hHeadTrackData )->lrSwitchInterpVal = 0.0f;

    ( *hHeadTrackData )->lrSwitchedCurrent = 0;

    ( *hHeadTrackData )->lrSwitchedNext = 0;



    if ( ( ( *hHeadTrackData )->OrientationTracker = (ivas_orient_trk_state_t *) malloc( sizeof( ivas_orient_trk_state_t ) ) ) == NULL )

    {

        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Orientation tracking" );
@@ -440,14 +441,10 @@ void rotateFrame_shd( 
    /* move Rmat to Rmat_prev */

    for ( i = 0; i < 3; i++ )

    {

#ifdef SPLIT_REND_WITH_HEAD_ROT

        mvr2r( hCombinedOrientationData->Rmat[hCombinedOrientationData->subframe_idx][i], hCombinedOrientationData->Rmat_prev[0][i], 3 );

#else

#ifdef SPLIT_REND_WITH_HEAD_ROT

        mvr2r( hCombinedOrientationData->Rmat[subframe_idx][i], hCombinedOrientationData->Rmat_prev[0][i], 3 );

#else

        mvr2r( hCombinedOrientationData->Rmat[subframe_idx][i], hCombinedOrientationData->Rmat_prev[i], 3 );

#endif

#endif

    }
@@ -578,11 +575,7 @@ void rotateFrame_sd( 
#ifdef SPLIT_REND_WITH_HEAD_ROT

        mvr2r( hCombinedOrientationData->Rmat[hCombinedOrientationData->subframe_idx][i], hCombinedOrientationData->Rmat_prev[0][i], 3 );

#else

#ifdef SPLIT_REND_WITH_HEAD_ROT

        mvr2r( hCombinedOrientationData->Rmat[subframe_idx][i], hCombinedOrientationData->Rmat_prev[0][i], 3 );

#else

        mvr2r( hCombinedOrientationData->Rmat[subframe_idx][i], hCombinedOrientationData->Rmat_prev[i], 3 );

#endif

        mvr2r( hCombinedOrientationData->Rmat[hCombinedOrientationData->subframe_idx][i], hCombinedOrientationData->Rmat_prev[i], 3 );

#endif

    }
@@ -821,7 +814,9 @@ ivas_error ivas_external_orientation_open( 
    {

        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for external orientation memory\n" ) );

    }



    ( *hExtOrientationData )->num_subframes = num_subframes;



    /* Enable head rotation and disable external orientation as default */

    for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )

    {
@@ -831,6 +826,7 @@ ivas_error ivas_external_orientation_open( 
        ( *hExtOrientationData )->numFramesToTargetOrientation[i] = 0;

        ( *hExtOrientationData )->Quaternions[i] = identity;

    }



    return IVAS_ERR_OK;

}
@@ -943,7 +939,6 @@ ivas_error ivas_combined_orientation_open( 
    ( *hCombinedOrientationData )->Quaternion_frozen_ext = identity;

    ( *hCombinedOrientationData )->Quaternion_frozen_head = identity;





    set_zero( ( *hCombinedOrientationData )->chEneIIR[0], MASA_FREQUENCY_BANDS );

    set_zero( ( *hCombinedOrientationData )->chEneIIR[1], MASA_FREQUENCY_BANDS );

    set_zero( ( *hCombinedOrientationData )->procChEneIIR[0], MASA_FREQUENCY_BANDS );