Commit 6559342d authored by multrus's avatar multrus
Browse files

Merge branch 'main' into 1664_basop_portFlp1685

parents 820cf6a9 634348e8

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ 
#define ISSUE_1866_replace_overflow_libdec                    /* FhG: BE - Replace BASOPoverflow operators all over the lib_dec module if Overflow result is not used */



#define NONBE_FIX_TCX5_INTERLEAVING_FOR_FS_IN_UNEQUAL_FS_OUT /* FhG: apply correct TCX5 grouping/interleaving when input_fs != output_fs */

#define FIX_1917_DIRAC_RENDER_PTR_INCR                       /* FhG: fix wrong pointer increment in ivas_dirac_dec_render_sf_fx() for object rendering */



#define FIX_1824

#define FIX_1822
@@ -140,6 +141,8 @@ 
#define NONBE_FIX_1141_OSBA_ROOM_RENDERING               /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect */

#define NONBE_1360_LFE_DELAY                           /* Dlb: LFE delay alignment when rendering in CLDFB domain*/



#define NONBE_1229_FIX_ISM1_DPID                        /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */



/* #################### End BASOP porting switches ############################ */



#define FIX_1766_TCX2ACELP_BWE_ISSUE    /* VA : Fix rare BWE issue when switching from TCX to ACELP */

lib_dec/ivas_dirac_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -3809,7 +3809,11 @@ void ivas_dirac_dec_render_sf_fx( 
                                    tc_re_fx++;

                                    Cldfb_ImagBuffer_fx[j2][k][l] = Madd_32_32( Cldfb_ImagBuffer_fx[j2][k][l], g_fx, *tc_im_fx );

                                    move32();

#ifdef FIX_1917_DIRAC_RENDER_PTR_INCR

                                    tc_im_fx++;

#else

                                    tc_re_fx++;

#endif

                                }

                                w1_fx += hSpatParamRendCom->num_freq_bands;

                            }

lib_util/render_config_reader.c

+5 −0
Original line number Diff line number Diff line
@@ -2940,7 +2940,12 @@ ivas_error RenderConfigReader_getDirectivity( 
            }

        }

        /* case when -dpid is not specified, select first directivity pattern from config file */

#ifdef NONBE_1229_FIX_ISM1_DPID

        move16();

        if ( last_specified_id == 65535 )

#else

        if ( n == 0 )

#endif

        {

            last_specified_id = (uint16_t) pRenderConfigReader->pDP[0].id;

        }