Commit 6d389458 authored by Ripinder Singh's avatar Ripinder Singh
Browse files

Merge branch 'main' of ssh://forge.3gpp.org:29419/ivas-codec-pc/ivas-codec... 

Merge branch 'main' of ssh://forge.3gpp.org:29419/ivas-codec-pc/ivas-codec into 1154-add-rtpdump-support
parents 384c6278 b5bd5e06

.gitlab-ci.yml

+13 −20
Original line number Diff line number Diff line
@@ -716,14 +716,15 @@ rtpdump-test: 
  stage: test

  script:

    - make -j

    - testcase_timeout=30

    - python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/rtp/test_rtp.py --testcase_timeout=$testcase_timeout

    - testcase_timeout=15

    - python3 -m pytest -q --tb=no -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/rtp/test_rtp.py --testcase_timeout=$testcase_timeout

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"

    expire_in: 1 week

    when: always

    paths:

      - report-junit.xml

      - report.html

    expose_as: "rtpdump pytest results"

    reports:

      junit:
@@ -1306,11 +1307,8 @@ ivas-conformance: 


    # Reference creation

    - python scripts/prepare_combined_format_inputs.py

    - $TEST_SET = "tests/codec_be_on_mr_nonselection", "tests/renderer/test_renderer.py", "tests/split_rendering/test_split_rendering.py"

    - python -m pytest $TEST_SET -v -n auto --update_ref 1 --create_ref --keep_files



    # Output creation

    - python -m pytest $TEST_SET -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html

    - $TEST_SET = "tests/codec_be_on_mr_nonselection", "tests/renderer_short/test_renderer.py", "tests/split_rendering/test_split_rendering.py"

    - python -m pytest -q $TEST_SET -v -n auto --update_ref 1 --create_ref --keep_files --html=report_cmd.html --self-contained-html

    - python scripts/parse_commands.py report_cmd.html Readme_IVAS.txt



    # Copy input data and output ref data
@@ -1324,7 +1322,7 @@ ivas-conformance: 
    - mkdir testvec

    - mkdir testvec/binauralRenderer_interface

    - mkdir testvec/testv

    - mkdir testvec/testv/renderer

    - mkdir testvec/testv/renderer_short

    - mkdir testvec/testv/split_rendering

    - mkdir testvec/bin

    - cp    -force -ErrorAction Ignore scripts/testv/* testvec/testv
@@ -1334,9 +1332,8 @@ ivas-conformance: 
    - cp -r -force -ErrorAction Ignore scripts/trajectories testvec

    - cp -r -force -ErrorAction Ignore scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface

    - cp -r -force -ErrorAction Ignore tests/ref testvec/testv/ref

    - cp -r -force -ErrorAction Ignore tests/dut/* testvec/testv/ref

    - cp -r -force -ErrorAction Ignore tests/renderer/cut testvec/testv/renderer/ref

    - cp -r -force -ErrorAction Ignore tests/split_rendering/cut testvec/testv/split_rendering/ref

    - cp -r -force -ErrorAction Ignore tests/renderer_short/ref testvec/testv/renderer_short/ref

    - cp -r -force -ErrorAction Ignore tests/split_rendering/ref testvec/testv/split_rendering/ref

    - cp -r -force -ErrorAction Ignore tests/split_rendering/renderer_configs testvec/testv/split_rendering/renderer_configs

    - cp -r -force -ErrorAction Ignore tests/split_rendering/error_patterns testvec/testv/split_rendering/error_patterns
@@ -1406,11 +1403,8 @@ ivas-conformance-linux: 


    # Reference creation

    - python3 scripts/prepare_combined_format_inputs.py

    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py tests/split_rendering/test_split_rendering.py"

    - python3 -m pytest -q $TEST_SET -v -n auto --update_ref 1 --create_ref --keep_files



    # Output creation

    - python3 -m pytest -q $TEST_SET -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html

    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer_short/test_renderer.py tests/split_rendering/test_split_rendering.py"

    - python3 -m pytest -q $TEST_SET -v -n auto --update_ref 1 --create_ref --keep_files --html=report_cmd.html --self-contained-html

    - python3 scripts/parse_commands.py report_cmd.html Readme_IVAS.txt



    # Copy input data and output ref data
@@ -1418,7 +1412,7 @@ ivas-conformance-linux: 
    - mkdir testvec

    - mkdir testvec/binauralRenderer_interface

    - mkdir testvec/testv

    - mkdir testvec/testv/renderer

    - mkdir testvec/testv/renderer_short

    - mkdir testvec/testv/split_rendering

    - mkdir testvec/bin

    - cp -r scripts/testv/* testvec/testv
@@ -1428,9 +1422,8 @@ ivas-conformance-linux: 
    - cp -r scripts/trajectories testvec

    - cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface

    - cp -r tests/ref testvec/testv/ref

    - cp -r tests/dut/* testvec/testv/ref

    - cp -r tests/renderer/cut testvec/testv/renderer/ref

    - cp -r tests/split_rendering/cut testvec/testv/split_rendering/ref

    - cp -r tests/renderer_short/ref testvec/testv/renderer_short/ref

    - cp -r tests/split_rendering/ref testvec/testv/split_rendering/ref

    - cp -r tests/split_rendering/renderer_configs testvec/testv/split_rendering/renderer_configs

    - cp -r tests/split_rendering/error_patterns testvec/testv/split_rendering/error_patterns

lib_com/bitstream.c

+2 −1
Original line number Diff line number Diff line
@@ -5409,7 +5409,7 @@ void evs_dec_previewFrame( 


    return;

}



#ifndef NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG



void dtx_read_padding_bits(

    DEC_CORE_HANDLE st,
@@ -5425,3 +5425,4 @@ void dtx_read_padding_bits( 


    return;

}

#endif

lib_com/fd_cng_com.c

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0

  ====================================================================================*/



#include "ivas_cnst.h"

#include <assert.h>

#include <stdint.h>

#include "options.h"
@@ -140,7 +141,11 @@ void initFdCngCom( 
    hFdCngCom->msMinBufferPtr = 0;

    set_f( hFdCngCom->msAlphaCor, 0.3f, 2 );



#ifdef NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG

    set_f( hFdCngCom->coherence, 0.5f, MDCT_ST_DTX_NUM_COHERENCE_BANDS );

#else

    hFdCngCom->coherence = 0.5f;

#endif



    return;

}

lib_com/ivas_cnst.h

+5 −0
Original line number Diff line number Diff line
@@ -850,6 +850,11 @@ enum fea_names 
#define MDCT_ST_PLC_FADEOUT_TO_ZERO_LEN         20

#define MDCT_ST_PLC_FADEOUT_DELAY_4_LSP_FADE    3



#ifdef NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG

#define MDCT_ST_DTX_NUM_COHERENCE_BANDS         5

#define MDCT_ST_DTX_FIRST_BAND_OFFSET           2

#endif



typedef enum {

    NOISE_GEN_MODE_UNDEF = -1,

    EQUAL_CORES = 0,

lib_com/ivas_prot.h

+2 −0
Original line number Diff line number Diff line
@@ -793,12 +793,14 @@ Word16 matrix_product_q30_fx( 
    Word32 *Z_fx          /* o  : resulting matrix after the matrix multiplication                                       Q30*/

);



#ifndef NONBE_MDCT_ST_DTX_FIX_SUBOPT_SPATIAL_CNG



void dtx_read_padding_bits(

    DEC_CORE_HANDLE st,

    const int16_t num_bits 

);



#endif

void ivas_apply_non_diegetic_panning( 

    float *input_f,                                             /* i  : non-diegetic object                                         */

    float *output_f[],                                          /* o  : core-coder transport mono channel/stereo output             */