Commit b2caf075 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'main' into basop-2371-unused-isar-functions

parents 1706b0f8 98330c5e

Workspace_msvc/lib_dec.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ 
    <ClCompile Include="..\lib_dec\ivas_cpe_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_decision_matrix_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_dec_render.c" />

    <ClCompile Include="..\lib_dec\ivas_dirac_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_cov.c" />

    <ClCompile Include="..\lib_dec\ivas_entropy_decoder.c" />
@@ -219,7 +220,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_ism_metadata_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_ism_param_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_ism_renderer.c" />

    <ClCompile Include="..\lib_dec\ivas_jbm_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_lfe_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_lfe_plc.c" />

    <ClCompile Include="..\lib_dec\ivas_ls_custom_dec.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+3 −6
Original line number Diff line number Diff line
@@ -4,9 +4,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_agc_dec.c">

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_binRenderer_internal.c">

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_core_dec.c">

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>
@@ -49,9 +46,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_ism_renderer.c">

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_jbm_dec.c">

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_lfe_dec.c">

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>
@@ -515,6 +509,9 @@ 
      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\lib_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_dec_render.c">

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_dec\ivas_stat_dec.h">

lib_com/ivas_prot.h

+0 −12
Original line number Diff line number Diff line
@@ -160,11 +160,7 @@ ivas_error ivas_mct_enc( 
    const int16_t nb_bits_metadata                              /* i  : number of metadata bits                 */

);



#ifdef FIX_2344_ALIGN_PREPROC

void pre_proc_front_ivas(

#else

ivas_error pre_proc_front_ivas(

#endif

    SCE_ENC_HANDLE hSCE,                                        /* i/o: SCE encoder structure                      */

    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder structure                      */

    const int32_t element_brate,                                /* i  : SCE/CPE element bitrate                    */
@@ -211,11 +207,7 @@ ivas_error pre_proc_front_ivas( 
    const int32_t ivas_total_brate                              /* i  : IVAS total bitrate                         */

);



#ifdef FIX_2344_ALIGN_PREPROC

void pre_proc_ivas(

#else

ivas_error pre_proc_ivas(

#endif

    Encoder_State *st,                                          /* i/o: encoder state structure                 */

    const int16_t last_element_mode,                            /* i  : last element mode                       */

    const int32_t element_brate,                                /* i  : element bitrate                         */
@@ -243,11 +235,7 @@ ivas_error pre_proc_ivas( 
    const int16_t flag_16k_smc                                  /* i  : flag to indicate if the OL SMC is run at 16 kHz */

);



#ifdef FIX_2344_ALIGN_PREPROC

void ivas_compute_core_buffers(

#else

ivas_error ivas_compute_core_buffers(

#endif

    Encoder_State *st,                                          /* i/o: encoder state structure                 */

    float **inp16k_out,                                         /* o  : ptr. to inp. signal in the current frame*/

    float *old_inp_16k,                                         /* i/o: buffer of old input signal @ 16kHz      */

lib_com/options.h

+1 −6
Original line number Diff line number Diff line
@@ -162,9 +162,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_2344_ALIGN_PREPROC                          /* VA: basop issue 2344: Align pre_proc_ivas() between FLP and BASOP */

#define FIX_FLOAT_1501_UNIT_VALUE_IN_OMASA              /* Nokia: Fix float issue 1501, uninitialized value in ivas_masa_combine_directions for OMASA */

#define FIX_2331_CLANG18_MSAN_UNINIT_VARIABLE           /* FhG: Fix issue 2331: Uninitialized variable */

#define FIX_2371_REMOVE_UNUSED_ISAR_FCNS                /* Dolby: basop issue 2371: remove unused ISAR-related functions */      



/* #################### End BE switches ################################## */
@@ -172,9 +169,7 @@ 
/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt. TS 26.258 V3.0 */

#define FIX_1465_SWB_TBE_RANDOM_VECTOR_CREATION         /* Dolby: issue 1465: Fix constant in create_random_vector() to allow more reliable fixed point port */





#define FIX_1500_ISM_MD_DTX                             /* VA: float issue 1500: fix ISM elevation metadata smoothing in DTX */

#define FIX_BASOP_2317_UNINIT_VALUE_IN_STEREO_CNG       /* Eri: Basop issue 2317: Uninitialized value read in case of DTX and BW switching   */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_dec.c

+1202 −7

File changed.

Preview size limit exceeded, changes collapsed.