AMWA NMOS IS-05 1.2-dev / MXL Support

.github/workflows/build-test.yml

@@ -122,16 +122,22 @@ jobs:
       run: |
         # set compiler to cl.exe to avoid building with gcc.
         echo "CMAKE_COMPILER_ARGS=-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe" >> $env:GITHUB_ENV
-        # disable unused network interface
-        netsh interface set interface name="vEthernet (nat)" admin=DISABLED
-        # get host IP address
+        # disable unused network interface (may not exist on windows-2022 runners)
+        $nat = Get-NetAdapter -Name 'vEthernet (nat)' -ErrorAction SilentlyContinue
+        if ($nat) {
+          netsh interface set interface name="vEthernet (nat)" admin=DISABLED
+        }
+        # get host IP address (avoid Get-NetIPConfiguration which fails when multiple adapters map to one interface)
+        $ifIndex = (
+          Get-NetRoute -DestinationPrefix '0.0.0.0/0' |
+          Sort-Object RouteMetric |
+          Select-Object -First 1
+        ).InterfaceIndex
         $env:hostip = (
-          Get-NetIPConfiguration |
-          Where-Object {
-              $_.IPv4DefaultGateway -ne $null -and
-              $_.NetAdapter.Status -ne "Disconnected"
-          }
-        ).IPv4Address.IPAddress
+          Get-NetIPAddress -InterfaceIndex $ifIndex -AddressFamily IPv4 |
+          Where-Object { $_.IPAddress -notlike '169.254.*' } |
+          Select-Object -First 1
+        ).IPAddress
         echo "HOST_IP_ADDRESS=$env:hostip" >> $env:GITHUB_ENV
         ipconfig
         # add the CRL Distribution Point to hosts so that it's discoverable when running the AMWA test suite in mDNS mode
@@ -429,6 +435,8 @@ jobs:
           run_python="python"
         fi
         pip install -r utilities/run-test-suites/gsheetsImport/requirements.txt
+        # PyOpenSSL 26.2+ removed OpenSSL.crypto.X509Extension; nmos-testing still uses it for certificate tests.
+        $run_python -m pip install 'pyOpenSSL<26.2'
 
         if [[ "${{ runner.os }}" == "Windows" ]]; then
           # install certificates

.github/workflows/src/amwa-test.yml

@@ -76,6 +76,8 @@
       run_python="python"
     fi
     pip install -r utilities/run-test-suites/gsheetsImport/requirements.txt
+    # PyOpenSSL 26.2+ removed OpenSSL.crypto.X509Extension; nmos-testing still uses it for certificate tests.
+    $run_python -m pip install 'pyOpenSSL<26.2'
 
     if [[ "${{ runner.os }}" == "Windows" ]]; then
       # install certificates

.github/workflows/src/build-setup.yml

@@ -24,16 +24,22 @@
   run: |
     # set compiler to cl.exe to avoid building with gcc.
     echo "CMAKE_COMPILER_ARGS=-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe" >> $env:GITHUB_ENV
-    # disable unused network interface
-    netsh interface set interface name="vEthernet (nat)" admin=DISABLED
-    # get host IP address
+    # disable unused network interface (may not exist on windows-2022 runners)
+    $nat = Get-NetAdapter -Name 'vEthernet (nat)' -ErrorAction SilentlyContinue
+    if ($nat) {
+      netsh interface set interface name="vEthernet (nat)" admin=DISABLED
+    }
+    # get host IP address (avoid Get-NetIPConfiguration which fails when multiple adapters map to one interface)
+    $ifIndex = (
+      Get-NetRoute -DestinationPrefix '0.0.0.0/0' |
+      Sort-Object RouteMetric |
+      Select-Object -First 1
+    ).InterfaceIndex
     $env:hostip = (
-      Get-NetIPConfiguration |
-      Where-Object {
-          $_.IPv4DefaultGateway -ne $null -and
-          $_.NetAdapter.Status -ne "Disconnected"
-      }
-    ).IPv4Address.IPAddress
+      Get-NetIPAddress -InterfaceIndex $ifIndex -AddressFamily IPv4 |
+      Where-Object { $_.IPAddress -notlike '169.254.*' } |
+      Select-Object -First 1
+    ).IPAddress
     echo "HOST_IP_ADDRESS=$env:hostip" >> $env:GITHUB_ENV
     ipconfig
     # add the CRL Distribution Point to hosts so that it's discoverable when running the AMWA test suite in mDNS mode

Development/cmake/NmosCppLibraries.cmake

@@ -407,9 +407,50 @@ set(NMOS_IS05_SCHEMAS_HEADERS
     nmos/is05_schemas/is05_schemas.h
     )
 
+set(NMOS_IS05_V1_2_TAG v1.2-dev)
 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
@@ -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}")
@@ -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})
 
@@ -1170,6 +1214,7 @@ set(NMOS_CPP_NMOS_HEADERS
     nmos/mdns_api.h
     nmos/mdns_versions.h
     nmos/media_type.h
+    nmos/mxl.h
     nmos/model.h
     nmos/mutex.h
     nmos/node_api.h

Development/nmos-cpp-node/config.json

@@ -22,6 +22,7 @@
 
     // 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 like ["xv", "xa", "xd"]
     // when omitted, all ports are instantiated
     //"senders": ["v", "a"],
     //"receivers": [],
@@ -51,8 +52,11 @@
     // 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" for ST 2110 senders and receivers, see nmos::media_types
+    //"video_type": "video/raw",
+
+    // mxl_video_type: media type of MXL video flows and receivers, e.g. "video/v210" or "video/v210a", see nmos/mxl.h
+    //"mxl_video_type": "video/v210",
 
     // channel_count: controls the number of channels in audio sources
     //"channel_count": 8,
@@ -198,6 +202,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": "",