Skip to content

AMWA NMOS IS-05 1.2-dev / MXL Support #483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jonathan-r-thorpe wants to merge 43 commits into
base: master
Choose a base branch
from
+2,087 −27
Draft

AMWA NMOS IS-05 1.2-dev / MXL Support #483

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
33c9902
Start with v1.1.x schemas
garethsb Feb 25, 2026
7f4d4a6
Add schema changes for MXL as a built-in transport
garethsb Feb 25, 2026
f28ca6a
Add IS-05 schema cpp generation
lo-simon Feb 25, 2026
d0c600e
Add IS-05 v1.2 as copy of IS-05 v1.1
garethsb Feb 25, 2026
19db280
Add MXL senders and receivers
garethsb Feb 25, 2026
de4b223
Fix no_auto_constraints
garethsb Feb 25, 2026
5f8b468
nmos-cpp-node support for MXL senders and receivers
garethsb Feb 25, 2026
9fa1650
Add flow_id as initial value (next, try making it a /constraints valu…
jonathan-r-thorpe Feb 25, 2026
18a9097
Add support for "auto" to MXL sender flow_id transport parameter
garethsb Feb 25, 2026
e175986
Merge pull request #1 from jonathan-r-thorpe/feature/mxl-sender-flow_…
jonathan-r-thorpe Feb 26, 2026
e5c0105
Fix audio sender
jonathan-r-thorpe Feb 26, 2026
a8b7535
update config.json to include mxl ports
jonathan-r-thorpe Mar 4, 2026
cfb3726
Added mxl_domain_id transport parameter to MXL sender and receiver co…
jonathan-r-thorpe May 5, 2026
4fb707f
Add missing JSON fields for MXL sender and receiver connections
jonathan-r-thorpe May 5, 2026
d36cf53
Make mxl domain id configurable
jonathan-r-thorpe May 6, 2026
b4389a7
Added mxl_domain_id to config.json
jonathan-r-thorpe May 6, 2026
d2f8dbf
Ensure consistent mxl_domain_id and mxl_flow_id ordering
jonathan-r-thorpe May 6, 2026
6a31cab
Update MXL configuration and implementation according to latest draft…
jonathan-r-thorpe May 15, 2026
c70da56
Apply suggestions from code review
jonathan-r-thorpe May 18, 2026
255da9b
Patch to fix the build-test workflow.
jonathan-r-thorpe May 18, 2026
9aefbc4
Moved IS-05 v1.2.x schemas to v1.2-dev.
jonathan-r-thorpe May 18, 2026
a873136
Responded to review comments on pull request
jonathan-r-thorpe May 19, 2026
d499aac
Fix Windows CI host IP discovery on windows-2022 runners.
jonathan-r-thorpe May 19, 2026
5410b2f
Ignore IS-04-01 test_19 due to conflict with MXL sender and receivers
jonathan-r-thorpe May 19, 2026
6f3496e
Refactor audio flow creation in node implementation to use make_coded…
jonathan-r-thorpe May 19, 2026
dc68fa1
Add auto resolution for transport parameters in node implementation i…
jonathan-r-thorpe May 20, 2026
253b8b6
Add support for null and auto values in MXL staged transport paramete…
jonathan-r-thorpe May 20, 2026
05f0f2f
Remove transport_file validation for MXL receivers in connection API …
jonathan-r-thorpe May 21, 2026
463fade
Refactor audio flow creation by adding an overload for make_raw_audio…
jonathan-r-thorpe May 21, 2026
e3ad404
Add MXL transport parameters constraints schema and update constraint…
jonathan-r-thorpe May 21, 2026
a64e1e1
Add MXL domain ID retrieval and auto resolution for transport paramet…
jonathan-r-thorpe May 21, 2026
09a8845
Refactor MXL domain ID handling by removing redundant function and im…
jonathan-r-thorpe May 22, 2026
7935a22
Test against NMOS Testing tool draft BCP-007-03 test suite. Update RE…
jonathan-r-thorpe May 22, 2026
9e42506
Remove test_19 ignore from IS-04-01 and update IS-05-02 version requi…
jonathan-r-thorpe May 22, 2026
76eedfe
Update NMOS Testing Tool branch to check for regressions
jonathan-r-thorpe May 26, 2026
42de1c2
Responding to review comments
jonathan-r-thorpe May 26, 2026
c7d18fc
Refactor MXL staged parameter schema to support both "auto" and "null…
jonathan-r-thorpe May 26, 2026
3aa3617
Test against BCP-007-03 branch of NMOS Testing tool.
jonathan-r-thorpe May 26, 2026
0f55ce3
Roll back some NMOS Testing tool mitigations
jonathan-r-thorpe May 26, 2026
b3e3180
Updates based on code review
jonathan-r-thorpe May 27, 2026
6a20dd4
Roll back NMOS Testing test fixtures
jonathan-r-thorpe May 27, 2026
c461383
Merge branch 'master' into nmos-mxl-test
jonathan-r-thorpe May 27, 2026
42d3941
Fixed line endings in yml files and regenerated build-test.yml
jonathan-r-thorpe May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 45 additions & 1 deletion Development/cmake/NmosCppLibraries.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,9 +407,50 @@ set(NMOS_IS05_SCHEMAS_HEADERS
nmos/is05_schemas/is05_schemas.h
)

set(NMOS_IS05_V1_2_TAG v1.2.x)
set(NMOS_IS05_V1_1_TAG v1.1.x)
set(NMOS_IS05_V1_0_TAG v1.0.x)

set(NMOS_IS05_V1_2_SCHEMAS_JSON
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/activation-response-schema.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/activation-schema.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/bulk-receiver-post-schema.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/bulk-response-schema.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/bulk-sender-post-schema.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/connectionapi-base.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/connectionapi-bulk.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/connectionapi-receiver.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/connectionapi-sender.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/connectionapi-single.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/constraint-schema.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/constraints-schema.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/constraints-schema-mqtt.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/constraints-schema-rtp.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/constraints-schema-websocket.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/error.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/receiver_transport_params.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/receiver_transport_params_dash.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/receiver_transport_params_ext.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/receiver_transport_params_mqtt.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/receiver_transport_params_mxl.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/receiver_transport_params_rtp.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/receiver_transport_params_websocket.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/receiver-response-schema.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/receiver-stage-schema.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/receiver-transport-file.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/sender_transport_params.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/sender_transport_params_dash.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/sender_transport_params_ext.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/sender_transport_params_mqtt.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/sender_transport_params_mxl.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/sender_transport_params_rtp.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/sender_transport_params_websocket.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/sender-receiver-base.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/sender-response-schema.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/sender-stage-schema.json
third_party/is-05/${NMOS_IS05_V1_2_TAG}/APIs/schemas/transporttype-response-schema.json
)

set(NMOS_IS05_V1_1_SCHEMAS_JSON
third_party/is-05/${NMOS_IS05_V1_1_TAG}/APIs/schemas/activation-response-schema.json
third_party/is-05/${NMOS_IS05_V1_1_TAG}/APIs/schemas/activation-schema.json
Expand Down Expand Up @@ -474,10 +515,11 @@ set(NMOS_IS05_V1_0_SCHEMAS_JSON

set(NMOS_IS05_SCHEMAS_JSON_MATCH "third_party/is-05/([^/]+)/APIs/schemas/([^;]+)\\.json")
set(NMOS_IS05_SCHEMAS_SOURCE_REPLACE "${CMAKE_CURRENT_BINARY_DIR_REPLACE}/nmos/is05_schemas/\\1/\\2.cpp")
string(REGEX REPLACE "${NMOS_IS05_SCHEMAS_JSON_MATCH}(;|$)" "${NMOS_IS05_SCHEMAS_SOURCE_REPLACE}\\3" NMOS_IS05_V1_2_SCHEMAS_SOURCES "${NMOS_IS05_V1_2_SCHEMAS_JSON}")
string(REGEX REPLACE "${NMOS_IS05_SCHEMAS_JSON_MATCH}(;|$)" "${NMOS_IS05_SCHEMAS_SOURCE_REPLACE}\\3" NMOS_IS05_V1_1_SCHEMAS_SOURCES "${NMOS_IS05_V1_1_SCHEMAS_JSON}")
string(REGEX REPLACE "${NMOS_IS05_SCHEMAS_JSON_MATCH}(;|$)" "${NMOS_IS05_SCHEMAS_SOURCE_REPLACE}\\3" NMOS_IS05_V1_0_SCHEMAS_SOURCES "${NMOS_IS05_V1_0_SCHEMAS_JSON}")

foreach(JSON ${NMOS_IS05_V1_1_SCHEMAS_JSON} ${NMOS_IS05_V1_0_SCHEMAS_JSON})
foreach(JSON ${NMOS_IS05_V1_2_SCHEMAS_JSON} ${NMOS_IS05_V1_1_SCHEMAS_JSON} ${NMOS_IS05_V1_0_SCHEMAS_JSON})
string(REGEX REPLACE "${NMOS_IS05_SCHEMAS_JSON_MATCH}" "${NMOS_IS05_SCHEMAS_SOURCE_REPLACE}" SOURCE "${JSON}")
string(REGEX REPLACE "${NMOS_IS05_SCHEMAS_JSON_MATCH}" "\\1" NS "${JSON}")
string(REGEX REPLACE "${NMOS_IS05_SCHEMAS_JSON_MATCH}" "\\2" VAR "${JSON}")
Expand Down Expand Up @@ -509,11 +551,13 @@ endforeach()
add_library(
nmos_is05_schemas STATIC
${NMOS_IS05_SCHEMAS_HEADERS}
${NMOS_IS05_V1_2_SCHEMAS_SOURCES}
${NMOS_IS05_V1_1_SCHEMAS_SOURCES}
${NMOS_IS05_V1_0_SCHEMAS_SOURCES}
)

source_group("nmos\\is05_schemas\\Header Files" FILES ${NMOS_IS05_SCHEMAS_HEADERS})
source_group("nmos\\is05_schemas\\${NMOS_IS05_V1_2_TAG}\\Source Files" FILES ${NMOS_IS05_V1_2_SCHEMAS_SOURCES})
source_group("nmos\\is05_schemas\\${NMOS_IS05_V1_1_TAG}\\Source Files" FILES ${NMOS_IS05_V1_1_SCHEMAS_SOURCES})
source_group("nmos\\is05_schemas\\${NMOS_IS05_V1_0_TAG}\\Source Files" FILES ${NMOS_IS05_V1_0_SCHEMAS_SOURCES})

Expand Down
12 changes: 8 additions & 4 deletions Development/nmos-cpp-node/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@

// senders, receivers: controls which kinds of sender and receiver are instantiated by the example node
// the values must be an array of unique strings identifying the kinds of 'port', like ["v", "a", "d"], see impl::ports
// for MXL Senders and Receivers, the values must be ["xv", "xa", "xd"]
Comment thread
jonathan-r-thorpe marked this conversation as resolved.
Outdated
// when omitted, all ports are instantiated
//"senders": ["v", "a"],
//"receivers": [],
//"senders": ["v", "a", "d"],
//"receivers": ["v", "a", "d"],
Comment thread
jonathan-r-thorpe marked this conversation as resolved.
Outdated

// frame_rate: controls the grain_rate of video, audio and ancillary data sources and flows
// and the equivalent parameter constraint on video receivers
Expand All @@ -51,8 +52,8 @@
// component_depth: controls the bits per component sample of video flows
//"component_depth": 10,

// video_type: media type of video flows, e.g. "video/raw" or "video/jxsv", see nmos::media_types
//"video_type": "video/jxsv",
// video_type: media type of video flows, e.g. "video/raw", "video/jxsv", or "video/v210" for MXL Senders and Receivers, see nmos::media_types
Comment thread
jonathan-r-thorpe marked this conversation as resolved.
Outdated
//"video_type": "video/raw",

// channel_count: controls the number of channels in audio sources
//"channel_count": 8,
Expand Down Expand Up @@ -198,6 +199,9 @@
// seed id [registry, node]: optional, used to generate repeatable id values when running with the same configuration
//"seed_id": uuid-string,

// mxl_domain_id [node]: optional, overrides the generated MXL domain id used by MXL sender/receiver transport params
//"mxl_domain_id": uuid-string,

// label [registry, node]: used in resource label field
//"label": "",

Expand Down
Loading
Loading