Commit 37925dc5 authored by norvell's avatar norvell
Browse files

Merge branch 'ci/update-basop-ci-branch' into 'basop-ci-branch' 

Update basop-ci-branch to get scripts/find_regressions_from_logs.py

See merge request !2234
parents a13f89a6 70bc133a

Workspace_msvc/lib_lc3plus.vcxproj

+15 −17
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ 
    <ClCompile Include="..\lib_lc3plus\apply_global_gain.c" />

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

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

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

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

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

    <ClCompile Include="..\lib_lc3plus\dct4.c" />
@@ -116,13 +115,13 @@ 
    <ClCompile Include="..\lib_lc3plus\enc_entropy.c" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <ClCompile Include="..\lib_lc3plus\noise_filling.c" />
@@ -133,35 +132,36 @@ 
    <ClCompile Include="..\lib_lc3plus\pc_update.c" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <ClCompile Include="..\lib_lc3plus\setup_com_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.c" />

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

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

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

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

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

  </ItemGroup>
@@ -169,14 +169,12 @@ 
    <ClInclude Include="..\lib_lc3plus\clib.h" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  </ItemGroup>

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

Workspace_msvc/lib_rend.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ 
    <ClCompile Include="..\lib_rend\ivas_rom_rend.c" />

    <ClCompile Include="..\lib_rend\ivas_shoebox.c" />

    <ClCompile Include="..\lib_rend\ivas_td_decorr.c" />

    <ClCompile Include="..\lib_rend\ivas_td_ring_buffer.c" />

    <ClCompile Include="..\lib_rend\ivas_vbap.c" />

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

  </ItemGroup>

Workspace_msvc/lib_rend.vcxproj.filters

+2 −71
Original line number Diff line number Diff line
@@ -32,30 +32,12 @@ 
    <ClCompile Include="..\lib_rend\ivas_hrtf.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_lc3plus_common.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_lc3plus_dec.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_lc3plus_enc.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_limiter.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_masa_merge.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_mcmasa_ana.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_MSPred.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_NoiseGen.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_objectRenderer.c">

      <Filter>rend_c</Filter>

    </ClCompile>
@@ -83,15 +65,6 @@ 
    <ClCompile Include="..\lib_rend\ivas_output_init.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_PerceptualModel.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_PredDecoder.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_PredEncoder.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_render_config.c">

      <Filter>rend_c</Filter>

    </ClCompile>
@@ -113,9 +86,6 @@ 
    <ClCompile Include="..\lib_rend\ivas_reverb_utils.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_RMSEnvGrouping.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_rom_binaural_crend_head.c">

      <Filter>rend_c</Filter>

    </ClCompile>
@@ -134,24 +104,6 @@ 
    <ClCompile Include="..\lib_rend\ivas_sba_rendering.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_splitRend_lcld_dec.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_splitRend_lcld_enc.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_splitRenderer_utils.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_splitRendererPLC.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_splitRendererPost.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_splitRendererPre.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_shoebox.c">

      <Filter>rend_c</Filter>

    </ClCompile>
@@ -161,30 +113,15 @@ 
    <ClCompile Include="..\lib_rend\ivas_vbap.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_lcld_rom_tables.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_lcld_decoder.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_lcld_encoder.c">

    <ClCompile Include="..\lib_rend\ivas_td_decorr.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_td_decorr.c">

    <ClCompile Include="..\lib_rend\ivas_td_ring_buffer.c">

      <Filter>rend_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_rend\lib_rend.h" />

    <ClInclude Include="..\lib_rend\ivas_lc3plus_common.h">

      <Filter>rend_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_rend\ivas_lc3plus_enc.h">

      <Filter>rend_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_rend\ivas_lc3plus_dec.h">

      <Filter>rend_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_rend\ivas_prot_rend.h">

      <Filter>rend_h</Filter>

    </ClInclude>
@@ -203,12 +140,6 @@ 
    <ClInclude Include="..\lib_rend\ivas_rom_TdBinauralRenderer.h">

      <Filter>rend_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_rend\ivas_lcld_prot.h">

      <Filter>rend_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_rend\ivas_lcld_rom_tables.h">

      <Filter>rend_h</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

    <Filter Include="rend_h">

apps/decoder.c

+14 −1
Original line number Diff line number Diff line
@@ -1617,6 +1617,18 @@ static bool parseCmdlIVAS_dec( 
        return false;

    }



#ifdef SUPPORT_JBM_TRACEFILE

    /* Validate options that depend on other options */

    if ( arg->jbmTraceFilename != NULL && arg->delayCompensationEnabled

         /* This decMode check should be removed once timestamp sync issues between JBM trace and audio are fixed in EVS */

         && arg->decMode != IVAS_DEC_MODE_EVS )

    {

        fprintf( stderr, "Error: Writing to a JBM trace file requires delay compensation to be disabled with -no_delay_cmp\n\n" );

        usage_dec();

        return false;

    }

#endif



    return true;

}
@@ -1653,7 +1665,8 @@ static void usage_dec( void ) 
    fprintf( stdout, "                      EVS RTP Payload Format. The SDP parameter hf_only is required.\n" );

    fprintf( stdout, "                      Reading RFC4867 AMR/AMR-WB RTP payload format is not supported.\n" );

#ifdef SUPPORT_JBM_TRACEFILE

    fprintf( stdout, "-Tracefile TF       : VoIP mode: Generate trace file named TF\n" );

    fprintf( stdout, "-Tracefile TF       : VoIP mode: Generate trace file named TF. Requires -no_delay_cmp to\n" );

    fprintf( stdout, "                      be enabled so that trace contents remain in sync with audio output.\n" );

#endif

#ifdef DEBUGGING

#ifdef VARIABLE_SPEED_DECODING

apps/renderer.c

+85 −66

File changed.

Preview size limit exceeded, changes collapsed.