Commit 6ec12b76 authored by Mohammadreza Naghibzadeh's avatar Mohammadreza Naghibzadeh
Browse files

Merge remote-tracking branch 'origin/main' into 2086-fix-enable-hp20_fx_32_opt-for-encoder

parents 278986f1 c686cdd1

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ target_include_directories(lib_util PRIVATE lib_lc3plus lib_isar) 


if(NOT WMOPS)

  add_executable(ivas_lc3plus_unit_test ${CMAKE_SOURCE_DIR}/scripts/split_rendering/lc3plus_basop/ivas_lc3plus_unit_test.c)

  target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_basop lib_com lib_debug lib_isar)

  target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_basop lib_debug lib_isar)

endif()



file(GLOB libISARSrcs "lib_isar/*.c")

Workspace_msvc/lib_lc3plus.vcxproj

+11 −11
Original line number Diff line number Diff line
@@ -109,19 +109,20 @@ 
    <ClCompile Include="..\lib_lc3plus\basop_mpy_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\basop_util_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\constants.c" />

    <ClCompile Include="..\lib_lc3plus\com_entropy.c" />

    <ClCompile Include="..\lib_lc3plus\cutoff_bandwidth.c" />

    <ClCompile Include="..\lib_lc3plus\dct2_fx.c" />

    <ClCompile Include="..\lib_lc3plus\dct4_fx.c" />

    <ClCompile Include="..\lib_lc3plus\dec_entropy.c" />

    <ClCompile Include="..\lib_lc3plus\dec_lc3.c" />

    <ClCompile Include="..\lib_lc3plus\dec_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\detect_cutoff_warped_fx.c" />

    <ClCompile Include="..\lib_lc3plus\dynmem.c" />

    <ClCompile Include="..\lib_lc3plus\enc_entropy.c" />

    <ClCompile Include="..\lib_lc3plus\enc_lc3.c" />

    <ClCompile Include="..\lib_lc3plus\enc_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\estimate_global_gain_fx.c" />

    <ClCompile Include="..\lib_lc3plus\fft_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\imdct_fx.c" />

    <ClCompile Include="..\lib_lc3plus\lc3.c" />

    <ClCompile Include="..\lib_lc3plus\lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\levinson_fx.c" />

    <ClCompile Include="..\lib_lc3plus\ltpf_coder_fx.c" />

    <ClCompile Include="..\lib_lc3plus\ltpf_decoder_fx.c" />
@@ -166,8 +167,9 @@ 
    <ClCompile Include="..\lib_lc3plus\residual_decoding_fx.c" />

    <ClCompile Include="..\lib_lc3plus\rom_basop_util_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\scale_signal24_fx.c" />

    <ClCompile Include="..\lib_lc3plus\setup_dec_lc3.c" />

    <ClCompile Include="..\lib_lc3plus\setup_enc_lc3.c" />

    <ClCompile Include="..\lib_lc3plus\setup_com_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\setup_dec_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\setup_enc_lc3plus.c" />

    <ClCompile Include="..\lib_lc3plus\sns_compute_scf_fx.c" />

    <ClCompile Include="..\lib_lc3plus\sns_interpolate_scf_fx.c" />

    <ClCompile Include="..\lib_lc3plus\sns_quantize_scf_fx.c" />
@@ -181,13 +183,11 @@ 
    <ClInclude Include="..\lib_lc3plus\defines.h" />

    <ClInclude Include="..\lib_lc3plus\dynmem.h" />

    <ClInclude Include="..\lib_lc3plus\functions.h" />

    <ClInclude Include="..\lib_lc3plus\lc3.h" />

    <ClInclude Include="..\lib_lc3plus\lc3plus.h" />

    <ClInclude Include="..\lib_lc3plus\license.h" />

    <ClInclude Include="..\lib_lc3plus\rom_basop_util_lc3plus.h" />

    <ClInclude Include="..\lib_lc3plus\setup_dec_lc3.h" />

    <ClInclude Include="..\lib_lc3plus\setup_enc_lc3.h" />

    <ClInclude Include="..\lib_lc3plus\tinywavein_c.h" />

    <ClInclude Include="..\lib_lc3plus\tinywaveout_c.h" />

    <ClInclude Include="..\lib_lc3plus\setup_dec_lc3plus.h" />

    <ClInclude Include="..\lib_lc3plus\setup_enc_lc3plus.h" />

  </ItemGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  <ImportGroup Label="ExtensionTargets">

lib_com/ivas_prot_fx.h

+11 −1
Original line number Diff line number Diff line
@@ -1055,8 +1055,12 @@ void ivas_omasa_separate_object_render_jbm_fx( 
    const UWord16 nSamplesRendered,                             /* i  : number of samples rendered              */

    Word32 input_fx_in[][L_FRAME48k],                           /* i  : separated object signal                 */

    Word32 *output_fx[],                                        /* o  : rendered time signal                    */

#ifdef FIX_1330_JBM_MEMORY

    const Word16 subframes_rendered                             /* i  : number of subframes rendered            */

#else

    const Word16 subframes_rendered,                            /* i  : number of subframes rendered            */

    const Word16 slots_rendered                                 /* i  : number of CLDFB slots rendered          */

#endif

);



void get_panning_gain_fx(
@@ -4024,8 +4028,14 @@ ivas_error ivas_init_encoder_fx( 


ivas_error ivas_output_buff_dec_fx(

    Word32 *p_output_fx[],                                      /* i/o: output audio buffers                        */

#ifdef FIX_1330_JBM_MEMORY

    const Word16 nchan_out_buff,                                /* i  : number of output channels                   */

    const Word16 Opt_tsm,                                       /* i  : TSM option flag                             */

    DECODER_TC_BUFFER_HANDLE hTcBuffer                          /* i  : TSM buffer handle                           */

#else

    const Word16 nchan_out_buff_old,                            /* i  : previous frame number of output channels    */

    const Word16 nchan_out_buff                                 /* i  : number of output channels                   */

    #endif

);



ivas_error ivas_dec_get_format_fx(
@@ -6239,7 +6249,7 @@ TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode_fx( 
Word16 ivas_jbm_dec_get_render_granularity_fx(

    const RENDERER_TYPE renderer_type,                          /* i  : renderer type                                               */

    const RENDERER_TYPE renderer_type_sec,                      /* i  : secondary renderer type                                     */

    const int32_t output_Fs                                     /* i  : sampling rate                                               */

    const Word32 output_Fs                                      /* i  : sampling rate                                               */

);



ivas_error ivas_jbm_dec_tc_buffer_open_fx(

lib_com/ivas_tools_fx.c

+13 −0
Original line number Diff line number Diff line
@@ -202,12 +202,25 @@ void ivas_buffer_deinterleaved_to_interleaved_fx( 
)

{

    Word16 ch, m;

#ifdef FIX_1330_JBM_MEMORY

    Word32 buffer[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS][L_FRAME48k]; /* temp buffer needed when "*audio[]" and "*audio_out[]" are the same */



    FOR( ch = 0; ch < n_channels; ch++ )

    {

        Copy32( audio[ch], buffer[ch], frame_length );

    }

#endif





    FOR( ch = 0; ch < n_channels; ch++ )

    {

        FOR( m = 0; m < frame_length; m++ )

        {

#ifdef FIX_1330_JBM_MEMORY

            audio_out[m * n_channels + ch] = buffer[ch][m];

#else

            audio_out[m * n_channels + ch] = audio[ch][m];

#endif

            move32();

        }

    }

lib_com/options.h

+6 −0
Original line number Diff line number Diff line
@@ -86,6 +86,10 @@ 
#define FIX_2166_ASSERT_OSBA_PLC_STEREO_OUT                  /* FhG: fix for issue 2166 - add missing averaging factor 0.5 in for the sum of energies in function stereo_dft_dmx_swb_nrg_fx()*/

#define FIX_2086_ENABLE_HP20_OPT_FOR_ENC                     /* FhG: Enable hp20_fx_32_opt() for Encoder */

#define FIX_1793_DEC_MC_TO_MONO_SCALING_ISSUE                /* FhG: Use dynamic Q factor for synth_fx and synthFB_fx to prevent overflow */

#define FIX_2082_FP_LEFTOVERS_OMASA_DEC                      /* Nokia: fix for issue 2082, cleaning remaining floating point code */

#define FIX_2174_JBM_BASOP_ALIGNMENT                         /* VoiceAge, Nokia: Fixes to JBM BASOP implementation and alignment to float */





/* ################### End FIXES switches ########################### */



/* #################### Start BASOP porting switches ############################ */
@@ -120,6 +124,8 @@ 
#define NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS /* Nokia: issue 1339: Apply scaling to the object-part of OMASA for binaural rendering in IVAS_rend. */

#define NONBE_1362_FIX_OMASA_TO_MASA1_RENDERING         /* Nokia: Fix OMASA to MASA1 rendering in IVAS_rend */

#define FIX_1383_HEAD_TRACK_SANITIZER                   /* Nok: issue 1383: Fix head tracking struc values reading in renderer */

#define FIX_1330_JBM_MEMORY                             /* VA: issue 1330: memory savings in the JBM decoder */

#define FIX_1411_IGF_CRASH_BW_SWITCHING                 /* FhG: Fix for issue 1411: fixes crash that can happen for IGF with BW switching and DTX*/



// object-editing feature porting

#define TMP_FIX_SPLIT_REND                              // temporary fix to split-rendering (it follows the later state of the framework but it is needed now because of current test-conditions)