Commit 4efa070d authored by emerit's avatar emerit
Browse files

Merge branch 'main' into orange/fixpoint_crend_hrtf_file_format

parents ad728f2e 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

+1 −15
Original line number Diff line number Diff line
@@ -1164,20 +1164,6 @@ int16_t ISAR_POST_REND_GetRenderConfig( 
    }



    hRCin = hIvasRend->splitRenderConfig;

#ifdef DEBUGGING

    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;
@@ -1804,7 +1790,7 @@ ivas_error ISAR_REND_SetSplitRendBitstreamHeader( 
 *-------------------------------------------------------------------*/



int32_t ISAR_POST_REND_GetNoCLipping(

    IVAS_REND_CONST_HANDLE hIvasRend )

    ISAR_POST_REND_HANDLE hIvasRend )

{

    return hIvasRend->numClipping;

}

lib_isar/lib_isar_post_rend.h

+2 −2
Original line number Diff line number Diff line
@@ -207,11 +207,11 @@ ivas_error ISAR_REND_SetSplitRendBitstreamHeader( 


#ifdef DEBUGGING

int32_t ISAR_POST_REND_GetNoCLipping(

    IVAS_REND_CONST_HANDLE hIvasRend                /* i  : Renderer handle                                     */

    ISAR_POST_REND_HANDLE hIvasRend                /* i  : Renderer handle                                     */

);



int32_t ISAR_POST_REND_GetCntFramesLimited(

    IVAS_REND_CONST_HANDLE hIvasRend                /* i  : Renderer handle                                     */

    ISAR_POST_REND_CONST_HANDLE hIvasRend                /* i  : Renderer handle                                     */

);

#endif

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)