Commit 7317bafd authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '1172_basop_CR_FIX_JBM_FLUSH_OFFSET_switches' into 'main-pc' 

1172 basop cr fix jbm flush offset switches

See merge request !955
parents 6b9de481 1cf8c888

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -1063,6 +1063,7 @@ check-naming-of-branch-for-main-pc-merges: 
  script:

    - *update-scripts-repo

    - if [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[skip[[:space:]_-]name[[:space:]_-]check\] ]] && [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[CI\] ]]; then

    -   git fetch

    -   ci/get_float_ref_branch_name.sh $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME

    - fi
@@ -1339,8 +1340,7 @@ split-rendering-pytest-on-merge-request: 
    - .test-job-linux-needs-testv-dir

    - .rules-merge-request

  needs: ["build-codec-linux-make"]

  # TODO: set reasonable timeout, will most likely take less

  timeout: "30 minutes"

  timeout: "45 minutes"

  stage: compare

  script:

    - *print-common-info

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -181,6 +181,8 @@ 
#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#endif



#define NONBE_FIX_855_JBM_FLUSH_OFFSET                        /* FhG: issue #855: add missing switch here for the code in JBM flushing                 */



/* #################### End BASOP porting switches ############################ */



#endif

lib_dec/ivas_jbm_dec_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -2789,7 +2789,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
        hTcBuffer->n_samples_buffered = add( hTcBuffer->n_samples_granularity, n_samples_still_available );

        hTcBuffer->n_samples_available = 0;

        hTcBuffer->n_samples_flushed = n_samples_to_render;

#ifdef CR_FIX_JBM_FLUSH_OFFSET

#ifdef NONBE_FIX_855_JBM_FLUSH_OFFSET

        hTcBuffer->n_samples_rendered = 0;

#else

        hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity;
@@ -2994,7 +2994,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
        {

            return IVAS_ERROR( IVAS_ERR_WRONG_MODE, "Wrong IVAS format in VoIP renderer flushing!" );

        }

#ifdef CR_FIX_JBM_FLUSH_OFFSET

#ifdef NONBE_FIX_855_JBM_FLUSH_OFFSET

        hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity;

#endif

    }