Commit 240b8acd authored by Malenovsky, Vladimir's avatar Malenovsky, Vladimir
Browse files

reanme macro to FIX_1456_SPLIT_REND_NO_HEAD_ROT

parent 8a29cbe8

apps/decoder.c

+2 −2
Original line number Diff line number Diff line
@@ -4391,7 +4391,7 @@ static ivas_error restartDecoder( 
        goto cleanup;

    }



#ifdef FIX_VE

#ifdef FIX_1456_SPLIT_REND_NO_HEAD_ROT

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

     * Configure Split rendering

     *------------------------------------------------------------------------------------------*/
@@ -4447,7 +4447,7 @@ static ivas_error restartDecoder( 
        }

    }



#ifdef FIX_VE

#ifdef FIX_1456_SPLIT_REND_NO_HEAD_ROT

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

     * Load custom loudspeaker layout data

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

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ 
#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

#define FIX_1456_SPLIT_REND_NO_HEAD_ROT                 /* Dolby: issue 1456: default ISAR behaviour in case of no head rotation */



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

lib_dec/ivas_objectRenderer_internal.c

+4 −4
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ ivas_error ivas_td_binaural_renderer_sf_splitBinaural( 
        }

    }



#ifdef FIX_VE

#ifdef FIX_1456_SPLIT_REND_NO_HEAD_ROT

    if ( pMultiBinPoseData->num_poses > 1 )

    {

#endif
@@ -329,7 +329,7 @@ ivas_error ivas_td_binaural_renderer_sf_splitBinaural( 
        {

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

        }

#ifdef FIX_VE

#ifdef FIX_1456_SPLIT_REND_NO_HEAD_ROT

    }

#endif
@@ -411,13 +411,13 @@ ivas_error ivas_td_binaural_renderer_sf_splitBinaural( 
        st_ivas->hCombinedOrientationData->Quaternions[i] = originalHeadRot[i];

    }



#ifdef FIX_VE

#ifdef FIX_1456_SPLIT_REND_NO_HEAD_ROT

    if ( pMultiBinPoseData->num_poses > 1 )

    {

#endif

        /* restore original td renderer handle */

        st_ivas->hBinRendererTd = origTdRendHandle;

#ifdef FIX_VE

#ifdef FIX_1456_SPLIT_REND_NO_HEAD_ROT

    }

#endif

lib_dec/lib_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ ivas_error IVAS_DEC_EnableSplitRendering( 


    hDecoderConfig = hIvasDec->st_ivas->hDecoderConfig;



#ifdef FIX_VE

#ifdef FIX_1456_SPLIT_REND_NO_HEAD_ROT

    if ( hDecoderConfig->Opt_Headrotation == 0 )

    {

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