Commit 89945ee4 authored by bayers's avatar bayers
Browse files

Merge branch '500-head-tracking-api-causes-extra-15ms-of-delay' of... 

Merge branch '500-head-tracking-api-causes-extra-15ms-of-delay' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 500-head-tracking-api-causes-extra-15ms-of-delay
parents a99b3504 e4cddc90

.gitlab-ci.yml

+8 −4
Original line number Diff line number Diff line
@@ -518,8 +518,7 @@ renderer-pytest-on-merge-request: 


    # some helper variables - "|| true" to prevent failures from grep not finding anything

    - non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[rend\(erer\)*[ -]*non[ -]*be\]") || true

    # TODO: needs splitting the test between reference and cut generation

    #- ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[ref[ -]*using[ -]*main\]") || true

    - ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[ref[ -]*using[ -]*main\]") || true



    # store the current commit hash

    - source_branch_commit_sha=$(git rev-parse HEAD)
@@ -537,6 +536,9 @@ renderer-pytest-on-merge-request: 
    - make clean

    - make -j IVAS_rend



    ### Run test using scripts and input from main

    - if [ $ref_using_main == 1 ]; then git checkout $target_commit; fi



    # run test

    - exit_code=0

    - python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/renderer/test_renderer_be_comparison.py || exit_code=$?
@@ -594,8 +596,7 @@ split-rendering-pytest-on-merge-request: 


    # some helper variables - "|| true" to prevent failures from grep not finding anything

    - non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[split*[ -]*non[ -]*be\]") || true

    # TODO: needs splitting the test between reference and cut generation

    #- ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[ref[ -]*using[ -]*main\]") || true

    - ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[ref[ -]*using[ -]*main\]") || true



    # store the current commit hash

    - source_branch_commit_sha=$(git rev-parse HEAD)
@@ -615,6 +616,9 @@ split-rendering-pytest-on-merge-request: 
    - make clean

    - make -j



    ### Run test using scripts and input from main

    - if [ $ref_using_main == 1 ]; then git checkout $target_commit; fi



    # run test

    - exit_code=0

    - python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/split_rendering/test_split_rendering_be_comparison.py || exit_code=$?

lib_dec/lib_dec.c

+3 −2
Original line number Diff line number Diff line
@@ -1146,7 +1146,7 @@ ivas_error IVAS_DEC_GetSplitBinaural( 
    *nOutSamples = 0;

    *needNewFrame = FALSE;



    while ( error == IVAS_ERR_OK && !*needNewFrame )

    while ( error == IVAS_ERR_OK && !*needNewFrame /*TODO(jbm): && numOutSamples < numAskedSamples */ )

    {

        int16_t nOutSamplesLocal;

        IVAS_DEC_SPLIT_REND_WRAPPER *hSplitBinRend;
@@ -1165,7 +1165,7 @@ ivas_error IVAS_DEC_GetSplitBinaural( 
            output_int,

            &nOutSamplesLocal,

            needNewFrame );

        if ( error != IVAS_ERR_OK || *needNewFrame )

        if ( error != IVAS_ERR_OK )

        {

            return error;

        }
@@ -1186,6 +1186,7 @@ ivas_error IVAS_DEC_GetSplitBinaural( 
        max_band = (int16_t) ( ( BINAURAL_MAXBANDS * output_Fs ) / 48000 );

        pcm_out = ( output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0;



        /* TODO(jbm): need to wait 20ms before writing split bitstream in 5ms mode */

        error = ivas_renderMultiBinToSplitBinaural( &hSplitBinRend->splitrend,

                                                    st_ivas->hHeadTrackData->Quaternion,

                                                    st_ivas->hRenderConfig->split_rend_config.splitRendBitRate,