Commit 432497b1 authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch 'ivas-float-update' into 1680_ref_port_object_editing_implementation

parents e9f27d3a d74ec907

.gitlab-ci-custom.yml

0 → 100644
+4 −0
Original line number Diff line number Diff line 
include:

  - project: $CUSTOM_CI_PROJECT

    ref: $CUSTOM_CI_REF

    file: $CUSTOM_CI_FILE
 
 No newline at end of file

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -203,6 +203,8 @@ 
#define FIX_1376_MISSING_ISM_METADATA                   /* FhG: IVAS_rend: throw error if there exists an ISM input without a corresponding metadata file path */

#define FIX_1385_INIT_IGF_STOP_FREQ                     /* FhG: Initialize infoIGFStopFreq in init_igf_dec() */

#define FIX_1387_INIT_PRM_SQQ                           /* FhG: initialize pointer prm_sqQ, which might be uninitialized in case of bfi == 1 */

#define NONBE_1296_TDREND_ITD_OUT_OF_BOUNDS_ACCESS      /* Eri: issue 1296: ITD resampling can occasionally read out of bounds, especially when the requested subframes are short (1.25 ms). Seen for headtracking+JBM. */

#define FIX_1349_TNS_CRASH                              /* FhG: Fix crash in TNS entropy coding, in case order of joint TNS coding is reduced to 0 */



// objject-editing feature porting

#define OBJ_EDITING_INTERFACE                         /* Interface for object editing */

lib_enc/cod_tcx.c

+9 −0
Original line number Diff line number Diff line
@@ -332,6 +332,15 @@ void TNSAnalysisStereo( 


                                        pFilter[0]->order = pFilter[1]->order = maxOrder;

                                    }

#ifdef FIX_1349_TNS_CRASH

                                    else

                                    {

                                        pFilter[0]->filterType = TNS_FILTER_OFF;

                                        pFilter[1]->filterType = TNS_FILTER_OFF;

                                        sts[0]->hTcxEnc->tnsData[k].nFilters = 0;

                                        sts[1]->hTcxEnc->tnsData[k].nFilters = 0;

                                    }

#endif

                                }

                            }

                        }

lib_rend/ivas_objectRenderer_sfx.c

+2 −1
Original line number Diff line number Diff line
@@ -216,8 +216,9 @@ static void sincResample( 
            p_forward++;

            p_backward--;

        }

#ifndef NONBE_1296_TDREND_ITD_OUT_OF_BOUNDS_ACCESS

        tmp += ( *p_forward ) * ( *p_sinc_forward ); /* Integer index always rounded down --> 4 steps backward, 5 steps forward */



#endif

        output[i] = tmp;



        /* Advance fractional time */