Commit 0a6223ab authored by vaclav's avatar vaclav
Browse files

fix warnings + clang-formatting

parent 6aee1166

lib_dec/ivas_objectRenderer_internal.c

+5 −0
Original line number Diff line number Diff line
@@ -129,8 +129,13 @@ void ObjRenderIVASSubframe( 
    for ( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )

    {

        output_frame = st_ivas->hTcBuffer->subframe_nbslots[subframe_idx] * st_ivas->hTcBuffer->n_samples_granularity;



        /* Update object position(s) */

#ifdef FIX_356_ISM_METADATA_SYNC

        TDREND_Update_object_positions( st_ivas->hBinRendererTd, st_ivas->nchan_transport, st_ivas->ivas_format, st_ivas->hIsmMetaData );

#else

        TDREND_Update_object_positions( st_ivas->hBinRendererTd, st_ivas->nchan_transport, LFE_CHANNEL, st_ivas->ivas_format, st_ivas->hIsmMetaData, tc_local );

#endif



        /* Update the listener's location/orientation */

        TDREND_Update_listener_orientation( st_ivas->hBinRendererTd,

lib_rend/ivas_objectRenderer.c

+14 −7
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ ivas_error ivas_td_binaural_renderer_unwrap( 
        if ( subframe_idx == ISM_METADATA_DELAY_SUBFRAME )

        {

            /* Update object position(s) */

            TDREND_Update_object_positions( hBinRendererTd, num_src, lfe_idx, ivas_format, hIsmMetaData, output );

            TDREND_Update_object_positions( hBinRendererTd, num_src, ivas_format, hIsmMetaData );

        }

#endif

        /* Update the listener's location/orientation */
@@ -471,21 +471,28 @@ static void TDREND_Clear_Update_flags( 
void 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      */

#ifndef FIX_356_ISM_METADATA_SYNC

    const int16_t lfe_idx, /* i  : Input LFE index                  */

#endif

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

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

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

#ifndef FIX_356_ISM_METADATA_SYNC

    ,

#ifdef JBM_TSM_ON_TCS

    float *output[]

#else

    float output[][L_FRAME48k] /* i/o: SCE/MC channels                  */

#endif

#endif

)

{

    TDREND_DirAtten_t *DirAtten_p;

    int16_t nS;

    float Pos[3];

    float Dir[3];

#ifndef FIX_356_ISM_METADATA_SYNC

    int16_t c_indx;

#endif



    DirAtten_p = hBinRendererTd->DirAtten_p;

lib_rend/ivas_prot_rend.h

+6 −1
Original line number Diff line number Diff line
@@ -311,14 +311,19 @@ void TDREND_Update_listener_orientation( 
void 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             */

#ifndef FIX_356_ISM_METADATA_SYNC

    const int16_t lfe_idx,                                      /* i  : Input LFE index                         */

#endif

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

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

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

#ifndef FIX_356_ISM_METADATA_SYNC

    ,

#ifdef JBM_TSM_ON_TCS

    float *output[]                                             /* i/o: SCE/MC channels                         */

#else

    float output[][L_FRAME48k]                                  /* i/o: SCE/MC channels                         */

#endif

#endif

);



void BSplineModelEvalDealloc(

lib_dec/lib_dec.c

+3 −3

File changed.

Contains only whitespace changes.

lib_com/ivas_stat_com.h

+3 −3

File changed.

Contains only whitespace changes.