Commit 9966029e authored by sagnowski's avatar sagnowski
Browse files

Remove config limitations that no longer hold

parent b2efcf15

lib_isar/isar_splitRenderer_utils.c

+5 −0
Original line number Diff line number Diff line
@@ -751,14 +751,19 @@ ivas_error isar_split_rend_validate_config( 
                break;

            case SPLIT_REND_384k:

            case SPLIT_REND_512k:

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

            case SPLIT_REND_768k:

#endif

                /* Always valid */

                break;

#ifndef ISAR_BITSTREAM_UPDATE_LC3PLUS

            case SPLIT_REND_768k:

                if ( pSplitRendConfig->dof == 0 && pSplitRendConfig->codec == ISAR_SPLIT_REND_CODEC_LC3PLUS )

                {

                    return IVAS_ERROR( IVAS_ERR_INVALID_SPLIT_REND_CONFIG, "Bitrate is too high for LC3plus with 0 DOF" );

                }

                break;

#endif

            default:

                return IVAS_ERR_LC3PLUS_INVALID_BITRATE;

        }

tests/split_rendering/utils.py

+6 −19
Original line number Diff line number Diff line
@@ -86,13 +86,6 @@ def check_xfail( 


    lc3plus_in_use = lc3plus_used(test_info, in_fmt, render_config)



    if (

        "768k" in render_config

        and "0dof" in render_config

        and lc3plus_in_use

    ):

        pytest.xfail("0DOF 768kbps LC3plus codec is unsupported")



    if (

        "256k" in render_config or "320k" in render_config

    ) and "0dof" not in render_config:
@@ -103,21 +96,13 @@ def check_xfail( 
        and (in_fmt in INPUT_FORMATS_ISM_SPLIT_REND)

        and (int(ivas_bitrate) > int(IVAS_MAX_ISM_BITRATE[in_fmt[-1]]))

    ):

        pytest.skip(f"Unsupported configuration with {in_fmt} at IVAS bitrate {ivas_bitrate}bps")

        pytest.skip(

            f"Unsupported configuration with {in_fmt} at IVAS bitrate {ivas_bitrate}bps"

        )



    if not "0dof" in render_config and pre_rend_fr != 20:

        pytest.xfail("pose correction (== !0dof) is expected to use 20ms")



    if (

        # If no pose correction

        "0dof" in render_config

        # ...and LC3plus codec used

        and lc3plus_in_use

        # ...and split prerendering at frame size 20ms

        and pre_rend_fr == 20

    ):

        pytest.xfail("lc3plus at 0dof must use a native lc3plus frame size (5 or 10ms)")



    if (

        "1dof" in render_config or "2dof" in render_config or "3dof" in render_config

    ) and pre_rend_fr != 20:
@@ -131,7 +116,9 @@ def check_xfail( 
            "unsupported framing: Post-renderer frame size must be equal or smaller than ISAR codec frame size"

        )



    transport_codec_frame_size = transport_codec_frame_size_ms(test_info, in_fmt, render_config, pre_rend_fr)

    transport_codec_frame_size = transport_codec_frame_size_ms(

        test_info, in_fmt, render_config, pre_rend_fr

    )

    if pre_rend_fr < transport_codec_frame_size:

        pytest.xfail(

            "unsupported framing: ISAR codec frame must fit in one output frame"