Commit 0c880f09 authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into formatting_ISAR

parents dfd6da7a 4f136fa6

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -1351,7 +1351,7 @@ ivas-conformance: 
  timeout: "60 minutes"

  rules:

    - if: ($CI_PIPELINE_SOURCE == 'web' || $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'

#    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

  allow_failure:

    exit_codes:

      - 123

lib_isar/lib_isar_post_rend.c

+0 −14
Original line number Diff line number Diff line
@@ -1169,20 +1169,6 @@ int16_t ISAR_POST_REND_GetRenderConfig( 
    }



    hRCin = hIvasRend->splitRenderConfig;

#ifdef DEBUGGINGaa

    switch ( hRCin->renderer_type_override )

    {

        case IVAS_RENDER_TYPE_OVERRIDE_CREND:

            hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_CREND;

            break;

        case IVAS_RENDER_TYPE_OVERRIDE_FASTCONV:

            hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_FASTCONV;

            break;

        default:

            hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE;

            break;

    }

#endif



    splitRenderConfig->splitRendBitRate = SPLIT_REND_768k;

    splitRenderConfig->dof = 3;

tests/conformance-test/test_26252.py

+0 −3
Original line number Diff line number Diff line
@@ -102,9 +102,6 @@ for s in scripts: 
        for proc in preproc:

            proc = replace_paths(proc, testv_path, ref_path, cut_path)

            path_arg = proc.split()[-1]

            if "rm" in proc:

                if os.path.exists(path_arg):

                    shutil.rmtree(path_arg, onerror=remove_readonly) # Needed for folder tree removal on Windows.

            if "mkdir" in proc:

                Path(path_arg).mkdir(parents=True, exist_ok=True)

lib_isar/lib_isar_post_rend.h

+2 −2

File changed.

Contains only whitespace changes.