Commit 99f25ef6 authored by norvell's avatar norvell
Browse files

Merge branch '1897_ref_port_mr1848_from_float_td_renderer_discontinuities' into 'ivas-float-update' 

[non-BE][Rend non-BE][split non be] mr1848 from float to ivas-float-update

See merge request !2087
parents c9b8166b 1865324d

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ 
#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */

#define NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC      /* FhG: fix out-of-bound errors when switching from SID frame to active frame*/

#define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */



#define NONBE_FIX_1196_TD_HEADTRACKING_INTERPOLATION    /* Ericsson: Issue 1196, Always apply filter interpolation for each subframe */

#define FIX_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */

#define NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING       /* VA: issue 1110: fix encoder crash in the stereo DTX bitrate switching condition */

#define FIX_1099_JBM_MD_HANDLE_ALLOC                    /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */

lib_dec/ivas_objectRenderer_internal.c

+5 −0
Original line number Diff line number Diff line
@@ -204,7 +204,12 @@ ivas_error ivas_td_binaural_renderer_sf( 
        /* Render subframe */

        /* ism_md_subframe_update_jbm != subframe_idx: trigger update only for ism_md_subframe_update_jbm == subframe_idx,

           where then the two TDREND_GetMix()-arguments subframe_idx and ism_md_subframe_update are equal, and we want to enforce the update inside TDREND_GetMix to use subframe_idx == 0 */



#ifdef NONBE_FIX_1196_TD_HEADTRACKING_INTERPOLATION

        if ( ( error = TDREND_GetMix( st_ivas->hBinRendererTd, output_f_local, output_frame, 0 ) ) != IVAS_ERR_OK )

#else

        if ( ( error = TDREND_GetMix( st_ivas->hBinRendererTd, output_f_local, output_frame, 0, ism_md_subframe_update_jbm != subframe_idx ) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }

lib_rend/ivas_objectRenderer.c

+18 −3
Original line number Diff line number Diff line
@@ -396,7 +396,11 @@ ivas_error ivas_td_binaural_renderer_unwrap( 
        }



        /* Render subframe */

#ifdef NONBE_FIX_1196_TD_HEADTRACKING_INTERPOLATION

        if ( ( error = TDREND_GetMix( hBinRendererTd, output, subframe_length, subframe_idx ) ) != IVAS_ERR_OK )

#else

        if ( ( error = TDREND_GetMix( hBinRendererTd, output, subframe_length, subframe_idx, ism_md_subframe_update ) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }
@@ -437,8 +441,12 @@ ivas_error TDREND_GetMix( 
    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle                        */

    float *output[],                                   /* i/o: ISM object synth / rendered output in 0,1 */

    const int16_t subframe_length,                     /* i/o: subframe length                           */

#ifdef NONBE_FIX_1196_TD_HEADTRACKING_INTERPOLATION

    const int16_t subframe_idx /* i  : Subframe index to 5 ms subframe           */

#else

    const int16_t subframe_idx,          /* i  : Subframe index to 5 ms subframe           */

    const int16_t ism_md_subframe_update /* i  : Number of subframes to delay ism metadata to sync with audio */

#endif

)

{

    int16_t i;
@@ -450,10 +458,12 @@ ivas_error TDREND_GetMix( 
    float hrf_left_delta[SFX_SPAT_BIN_MAX_FILTER_LENGTH];

    float hrf_right_delta[SFX_SPAT_BIN_MAX_FILTER_LENGTH];

    int16_t intp_count;



#ifndef NONBE_FIX_1196_TD_HEADTRACKING_INTERPOLATION

    int16_t subframe_update_flag;



    subframe_update_flag = subframe_idx == ism_md_subframe_update;



#endif

    error = IVAS_ERR_OK;



    /* Clear the output buffer to accumulate rendered sources */
@@ -476,8 +486,13 @@ ivas_error TDREND_GetMix( 
        /* Update rendering params if needed */

        if ( ( SrcRend_p->PlayStatus == TDREND_PLAYSTATUS_PLAYING ) && ( hBinRendererTd->Listener_p->PoseUpdated || SrcSpatial_p->Updated ) )

        {

#ifdef NONBE_FIX_1196_TD_HEADTRACKING_INTERPOLATION

            TDREND_SRC_REND_UpdateFiltersFromSpatialParams( hBinRendererTd, SrcRend_p, SrcSpatial_p, Src_p->hrf_left_prev,

                                                            Src_p->hrf_right_prev, hrf_left_delta, hrf_right_delta, &intp_count, &Src_p->filterlength, &Src_p->itd, &Src_p->Gain, Src_p );

#else

            TDREND_SRC_REND_UpdateFiltersFromSpatialParams( hBinRendererTd, SrcRend_p, SrcSpatial_p, Src_p->hrf_left_prev,

                                                            Src_p->hrf_right_prev, hrf_left_delta, hrf_right_delta, &intp_count, &Src_p->filterlength, &Src_p->itd, &Src_p->Gain, Src_p, subframe_update_flag );

#endif

        }



        /* Render source if needed */

lib_rend/ivas_objectRenderer_sources.c

+10 −1
Original line number Diff line number Diff line
@@ -289,8 +289,13 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( 
    int16_t *filterlength,                             /* o  : Length of filters                */

    int16_t *itd,                                      /* o  : ITD value                        */

    float *Gain,                                       /* o  : Gain value                       */

#ifdef NONBE_FIX_1196_TD_HEADTRACKING_INTERPOLATION

    TDREND_SRC_t *Src_p /* i/o: Source pointer                   */

)

#else

    TDREND_SRC_t *Src_p, /* i/o: Source pointer                   */

    const int16_t subframe_update_flag )

#endif

{

    TDREND_MIX_Listener_t *Listener_p;

    TDREND_HRFILT_FiltSet_t *HrFiltSet_p;
@@ -381,7 +386,11 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( 
        Src_p->azim_prev = 360.0f; /* Dummy angle -- sets max interpolation if switching to TDREND_POSTYPE_ABSOLUTE */

    }



#ifdef NONBE_FIX_1196_TD_HEADTRACKING_INTERPOLATION

    if ( ( *intp_count > 0 ) )

#else

    if ( ( *intp_count > 0 ) && subframe_update_flag )

#endif

    {

        /* Set deltas for interpolation */

        v_sub( hrf_left, hrf_left_prev, hrf_left_delta, *filterlength );

lib_rend/ivas_prot_rend.h

+8 −0
Original line number Diff line number Diff line
@@ -658,8 +658,12 @@ ivas_error TDREND_GetMix( 
    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd,          /* i/o: TD renderer handle                        */

    float *output[],                                            /* i/o: ISM object synth/rendered output in 0,1 */

    const int16_t subframe_length,                              /* i/o: subframe length                           */

#ifdef NONBE_FIX_1196_TD_HEADTRACKING_INTERPOLATION

    const int16_t subframe_idx                                  /* i  : Subframe index to 5 ms subframe           */

#else

    const int16_t subframe_idx,                                 /* i  : Subframe index to 5 ms subframe           */

    const int16_t ism_md_subframe_update                        /* i  : Number of subframes to delay metadata to sync with audio */

#endif

);



ivas_error TDREND_Update_listener_orientation(
@@ -750,8 +754,12 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams( 
    int16_t *filterlength,                                      /* o  : Length of filters                       */

    int16_t *itd,                                               /* o  : ITD value                               */

    float *Gain,                                                /* o  : Gain value                              */

#ifdef NONBE_FIX_1196_TD_HEADTRACKING_INTERPOLATION

    TDREND_SRC_t *Src_p                                         /* i/o: Source pointer                          */

#else

    TDREND_SRC_t *Src_p,

    const int16_t subframe_update_flag                          /* i  : Flag to determine update subframe idx   */

#endif

);



ivas_error TDREND_SRC_Alloc(