Commit 39c238b6 authored by norvell's avatar norvell
Browse files

Disable SPLIT_REND_WITH_HEAD_ROT and enable in related test jobs

parent 8988cbf3

.gitlab-ci.yml

+8 −0
Original line number Diff line number Diff line
@@ -121,6 +121,11 @@ stages: 
  - git pull

  - cd -



.enable-split-rendering: &enable-split-rendering

# automatically enable #define SPLIT_REND_WITH_HEAD_ROT in options.h, handling both /**/-comment and //-comment

  - sed -i.bak -e "s/\/\*[[:space:]]*\(#define[[:space:]]*SPLIT_REND_WITH_HEAD_ROT\)[[:space:]]*\*\//\1/g" ./lib_com/options.h

  - sed -i.bak -e "s/\/\/[[:space:]]*\(#define[[:space:]]*SPLIT_REND_WITH_HEAD_ROT\)/\1/g"        ./lib_com/options.h



# ---------------------------------------------------------------

# Job templates

# ---------------------------------------------------------------
@@ -569,6 +574,7 @@ split-rendering-smoke-test: 
  needs: ["build-codec-linux-make"]

  stage: test

  script:

    - .enable-split-rendering

    - make -j

    - python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/split_rendering/test_split_rendering.py

  artifacts:
@@ -609,6 +615,7 @@ split-rendering-pytest-on-merge-request: 
    - git checkout $target_commit



    # build reference binaries

    - .enable-split-rendering

    - make -j

    - mv IVAS_cod IVAS_cod_ref

    - mv IVAS_dec IVAS_dec_ref
@@ -617,6 +624,7 @@ split-rendering-pytest-on-merge-request: 
    # back to source branch

    - git checkout $source_branch_commit_sha

    - make clean

    - .enable-split-rendering

    - make -j



    # run test

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
#ifndef RELEASE

#define DEBUGGING                               /* Activate debugging part of the code */

#endif

/*#define WMOPS*/                               /* Activate complexity and memory counters */

#define WMOPS                               /* Activate complexity and memory counters */

/*#define WMOPS_PER_FRAME*/                     /* Output per-frame complexity (writes one float value per frame to the file "wmops_analysis") */

/*#define WMOPS_DETAIL*/                        /* Output detailed complexity printout for every function. Increases runtime overhead */

/*#define WMOPS_WC_FRAME_ANALYSIS*/             /* Output detailed complexity analysis for the worst-case frame */
@@ -151,7 +151,7 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */





#define SPLIT_REND_WITH_HEAD_ROT                        /* Dlb,FhG: Split Rendering contributions 21 and 35 */

/*#define SPLIT_REND_WITH_HEAD_ROT*/                    /* Dlb,FhG: Split Rendering contributions 21 and 35 */

#ifdef SPLIT_REND_WITH_HEAD_ROT

#define SPLIT_REND_PRED_QUANT_63_PNTS

#define SPLIT_REND_WITH_HEAD_ROT_PARAMBIN               /* Nokia: Issue 623: Split rendering support for parambin renderer */