Commit 4aca7e15 authored by Lauros Pajunen's avatar Lauros Pajunen
Browse files

Remove diegetic PI interpretation from individual ISM rendering

parent 3d72a4bd

lib_dec/ivas_objectRenderer_internal.c

+0 −12
Original line number Diff line number Diff line
@@ -206,26 +206,14 @@ ivas_error ivas_td_binaural_renderer_sf( 
                    hIsmMetaData[nS] = &ismMetaData[nS];

                }



#ifdef RTP_S4_251135_CR26253_0016_REV1

                if ( ( error = TDREND_Update_object_positions( st_ivas->hBinRendererTd, nchan_ism, st_ivas->ivas_format, hIsmMetaData,

                                                               ( st_ivas->hCombinedOrientationData != NULL ) ? st_ivas->hCombinedOrientationData->isDiegeticInputPI : NULL,

                                                               ( st_ivas->hCombinedOrientationData != NULL ) ? st_ivas->hCombinedOrientationData->isDiegeticInputPISet : false ) ) != IVAS_ERR_OK )

#else

                if ( ( error = TDREND_Update_object_positions( st_ivas->hBinRendererTd, nchan_ism, st_ivas->ivas_format, hIsmMetaData ) ) != IVAS_ERR_OK )

#endif

                {

                    return error;

                }

            }

            else

            {

#ifdef RTP_S4_251135_CR26253_0016_REV1

                if ( ( error = TDREND_Update_object_positions( st_ivas->hBinRendererTd, nchan_ism, st_ivas->ivas_format, st_ivas->hIsmMetaData,

                                                               ( st_ivas->hCombinedOrientationData != NULL ) ? st_ivas->hCombinedOrientationData->isDiegeticInputPI : NULL,

                                                               ( st_ivas->hCombinedOrientationData != NULL ) ? st_ivas->hCombinedOrientationData->isDiegeticInputPISet : false ) ) != IVAS_ERR_OK )

#else

                if ( ( error = TDREND_Update_object_positions( st_ivas->hBinRendererTd, nchan_ism, st_ivas->ivas_format, st_ivas->hIsmMetaData ) ) != IVAS_ERR_OK )

#endif

                {

                    return error;

                }

lib_rend/ivas_objectRenderer.c

+0 −27
Original line number Diff line number Diff line
@@ -363,13 +363,7 @@ ivas_error ivas_td_binaural_renderer_unwrap( 
        if ( subframe_idx == ism_md_subframe_update )

        {

            /* Update object position(s) */

#ifdef RTP_S4_251135_CR26253_0016_REV1

            if ( ( error = TDREND_Update_object_positions( hBinRendererTd, num_src, ivas_format, hIsmMetaData,

                                                           ( hCombinedOrientationData != NULL ) ? hCombinedOrientationData->isDiegeticInputPI : NULL,

                                                           ( hCombinedOrientationData != NULL ) ? hCombinedOrientationData->isDiegeticInputPISet : false ) ) != IVAS_ERR_OK )

#else

            if ( ( error = TDREND_Update_object_positions( hBinRendererTd, num_src, ivas_format, hIsmMetaData ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }
@@ -537,13 +531,7 @@ ivas_error TDREND_Update_object_positions( 
    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD Renderer handle               */

    const int16_t num_src,                             /* i  : number of sources to render      */

    const IVAS_FORMAT in_format,                       /* i  : Format of input sources          */

#ifdef RTP_S4_251135_CR26253_0016_REV1

    const ISM_METADATA_HANDLE *hIsmMetaData,           /* i  : Input metadata for ISM objects   */

    const bool *isDiegeticInputPI,                     /* i  : diegetic values for the input streams from the PI data */

    const bool isDiegeticInputPISet                    /* i  : is diegetic values obtained from PI data */

#else

    const ISM_METADATA_HANDLE *hIsmMetaData            /* i  : Input metadata for ISM objects   */

#endif

)

{

#ifndef NONBE_1377_REND_DIRATT_CONF
@@ -556,9 +544,6 @@ ivas_error TDREND_Update_object_positions( 
#ifndef NONBE_1377_REND_DIRATT_CONF

    DirAtten_p = hBinRendererTd->DirAtten_p;

#endif

#ifdef RTP_S4_251135_CR26253_0016_REV1

    bool isDiegeticSrcPI;

#endif



    /* For each source, write the frame data to the source object*/

    for ( nS = 0; nS < num_src; nS++ )
@@ -586,19 +571,7 @@ ivas_error TDREND_Update_object_positions( 
                return error;

            }



#ifdef RTP_S4_251135_CR26253_0016_REV1

            isDiegeticSrcPI = false;

            if ( isDiegeticInputPISet && isDiegeticInputPI != NULL )

            {

                if ( isDiegeticInputPI[nS] )

                {

                    isDiegeticSrcPI = true;

                }

            }

            if ( hIsmMetaData[nS]->non_diegetic_flag || !isDiegeticSrcPI )

#else

            if ( hIsmMetaData[nS]->non_diegetic_flag )

#endif

            {

                Pos[0] = 0;

                Pos[1] = hIsmMetaData[nS]->azimuth / 90.f;

lib_rend/ivas_prot_rend.h

+0 −6
Original line number Diff line number Diff line
@@ -691,13 +691,7 @@ ivas_error TDREND_Update_object_positions( 
    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD Renderer handle                      */

    const int16_t num_src,                                      /* i  : number of sources to render             */

    const IVAS_FORMAT in_format,                                /* i  : Format of input sources                 */

#ifdef RTP_S4_251135_CR26253_0016_REV1

    const ISM_METADATA_HANDLE *hIsmMetaData,                    /* i  : Input metadata for ISM objects          */

    const bool *isDiegeticInputPI,                              /* i  : diegetic values for the input streams from the PI data */

    const bool isDiegeticInputPISet                             /* i  : is diegetic values obtained from PI data */

#else

    const ISM_METADATA_HANDLE *hIsmMetaData                     /* i  : Input metadata for ISM objects          */

#endif

);



void BSplineModelEvalDealloc(