Commit f3281b00 authored by bayers's avatar bayers
Browse files

local fix for #713, assure to use only the first subframe rotation for the... 

local fix for #713, assure to use only the first subframe rotation for the default pose in MASA split pre rendering
parent 0a0027ac

lib_com/options.h

+4 −2
Original line number Diff line number Diff line
@@ -152,13 +152,15 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define API_5MS                                         /* FhG: 5ms rendering capability */



#define FIX_RENDMC_LOCAL_ORIENTATION





#define SPLIT_REND_WITH_HEAD_ROT                        /* Dlb,FhG: Split Rendering contributions 21 and 35 */

#ifdef SPLIT_REND_WITH_HEAD_ROT

#define SPLIT_REND_PRED_QUANT_63_PNTS

#define SPLIT_REND_WITH_HEAD_ROT_PARAMBIN               /* Nokia: Issue 623: Split rendering support for parambin renderer */

#define FIX_658_SPLIT_REND_MASA                         /*Dlb : Fix for issue 658, uninitialized memory access in MASA in Split rendering 0DOF mode*/ 

#define FIX_RENDMC_LOCAL_ORIENTATION

#define FIX_SPLITREND_MASA_PRERENDERING

#endif



#define MASA_AND_OBJECTS                                /* Nokia: Combination of MASA and objects */

lib_rend/ivas_dirac_dec_binaural_functions.c

+21 −4
Original line number Diff line number Diff line
@@ -935,7 +935,24 @@ static void ivas_dirac_dec_binaural_internal( 
    }

#endif



#ifdef FIX_SPLITREND_MASA_PRERENDERING

    pMultiBinPoseData = &st_ivas->splitBinRend.splitrend.multiBinPoseData;

#endif

    if ( hCombinedOrientationData )

    {

#ifdef FIX_SPLITREND_MASA_PRERENDERING

        if ( pMultiBinPoseData != NULL && pMultiBinPoseData->num_poses > 1 )

        {

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

            {

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

                {

                    Rmat[i][j] = hCombinedOrientationData->Rmat[0][i][j];

                }

            }

        }

        else

#endif

        {

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

            {
@@ -944,7 +961,7 @@ static void ivas_dirac_dec_binaural_internal( 
                    Rmat[i][j] = hCombinedOrientationData->Rmat[subframe][i][j];

                }

            }



        }

        if ( nchan_transport == 2 )

        {

#ifdef SPLIT_REND_WITH_HEAD_ROT_PARAMBIN