Commit 7b44a28b authored by vaclav's avatar vaclav Committed by Vladimir Malenovsky
Browse files

changes under FIX_VE

parent c8dc9510

apps/decoder.c

+15 −0
Original line number Diff line number Diff line
@@ -497,6 +497,13 @@ int main( 
#endif

    }



#ifdef FIX_VE

    if ( arg.renderFramesize != asked_frame_size )

    {

        fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for decoding to split-rendering binaural output!\n" );

    }

#endif



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

     * Configure VoIP mode

     *------------------------------------------------------------------------------------------*/
@@ -2433,7 +2440,11 @@ static ivas_error decodeG192( 
        }



        /* Head-tracking input simulation */

#ifdef FIX_VE

        if ( arg.enableHeadRotation )

#else

        if ( arg.enableHeadRotation || isSplitRend )

#endif

        {

            if ( headRotReader == NULL )

            {
@@ -2858,7 +2869,11 @@ static ivas_error decodeG192( 
        }



        /* Head-tracking input simulation */

#ifdef FIX_VE

        if ( arg.enableHeadRotation )

#else

        if ( arg.enableHeadRotation || isSplitRend )

#endif

        {

            if ( headRotReader == NULL )

            {

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -184,6 +184,8 @@ 
#define FIX_1487_ACCESS_OF_UNINIT_VAL_FROM_ARR_ISM_DTX  /* FhG/VA: init nb_bits_metadata to zero */

#define FIX_1477_OOB_INDEX_IN_D_ACELP_INDEXING          /* FhG: fix oob indexing */



#define FIX_VE



/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */

lib_dec/ivas_objectRenderer_internal.c

+17 −3
Original line number Diff line number Diff line
@@ -320,11 +320,18 @@ ivas_error ivas_td_binaural_renderer_sf_splitBinaural( 
        }

    }



#ifdef FIX_VE

    if ( pMultiBinPoseData->num_poses > 1 )

    {

#endif

        /* Save current head positions */

        for ( i = 0; i < st_ivas->hCombinedOrientationData->num_subframes; ++i )

        {

            originalHeadRot[i] = st_ivas->hCombinedOrientationData->Quaternions[i];

        }

#ifdef FIX_VE

    }

#endif



    original_subframes_rendered = st_ivas->hTcBuffer->subframes_rendered;

    original_slots_rendered = st_ivas->hTcBuffer->slots_rendered;
@@ -398,11 +405,18 @@ ivas_error ivas_td_binaural_renderer_sf_splitBinaural( 
        mvr2r( output_local[i], output[i], nSamplesRendered );

    }



#ifdef FIX_VE

    if ( pMultiBinPoseData->num_poses > 1 )

    {

#endif

    /* Restore original head rotation */

    for ( i = 0; i < st_ivas->hCombinedOrientationData->num_subframes; ++i )

    {

        st_ivas->hCombinedOrientationData->Quaternions[i] = originalHeadRot[i];

    }

#ifdef FIX_VE

    }

#endif



    /* restore original td renderer handle */

    st_ivas->hBinRendererTd = origTdRendHandle;

lib_dec/lib_dec.c

+15 −1
Original line number Diff line number Diff line
@@ -530,11 +530,12 @@ ivas_error IVAS_DEC_Configure( 
    hDecoderConfig->Opt_aeid_on = acousticEnvironmentId != 65535 ? TRUE : FALSE;

    hDecoderConfig->Opt_ObjEdit_on = (int16_t) objEditEnabled;



#ifndef FIX_VE

    if ( outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

    {

        hDecoderConfig->Opt_Headrotation = 1;

    }



#endif

    if ( renderFramesize == IVAS_RENDER_FRAMESIZE_UNKNOWN )

    {

        return IVAS_ERR_WRONG_PARAMS;
@@ -593,8 +594,21 @@ ivas_error IVAS_DEC_EnableSplitRendering( 


    hDecoderConfig = hIvasDec->st_ivas->hDecoderConfig;



#ifdef FIX_VE

    if ( hDecoderConfig->Opt_Headrotation == 0 )

    {

        hIvasDec->st_ivas->hRenderConfig->split_rend_config.dof = 0;

        hIvasDec->st_ivas->hRenderConfig->split_rend_config.poseCorrectionMode = ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE;

    }



    if ( hIvasDec->st_ivas->hRenderConfig->split_rend_config.dof != 0 )

    {

        hDecoderConfig->render_framesize = IVAS_RENDER_FRAMESIZE_20MS;

    }

#else

    hDecoderConfig->Opt_Headrotation = 1;

    hDecoderConfig->render_framesize = IVAS_RENDER_FRAMESIZE_20MS;

#endif



    return IVAS_ERR_OK;

}