mx-remote 4.7.5__tar.gz → 4.7.7__tar.gz

{mx_remote-4.7.5 → mx_remote-4.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mx_remote
-Version: 4.7.5
+Version: 4.7.7
 Summary: Python 3 library for interfacing with MX Remote compatible devices
 Project-URL: Homepage, https://github.com/opdenkamp/mx-remote/
 Project-URL: Documentation, https://github.com/opdenkamp/mx-remote/

{mx_remote-4.7.5 → mx_remote-4.7.7}/mx_remote/Interface.py

@@ -332,6 +332,11 @@ class V2IPStreamSources:
     All V2IP multicast IP addresses and port numbers used by a device
     """
 
+    @property
+    @abstractmethod
+    def uid(self) -> MxrDeviceUid|None:
+        ''' uid of the originating source device, when known '''
+
     @property
     @abstractmethod
     def video(self) -> V2IPStreamSource:

{mx_remote-4.7.5 → mx_remote-4.7.7}/mx_remote/Interface.pyi

@@ -102,6 +102,9 @@ class V2IPStreamSource(ABC):
     def port(self) -> int: ...
 
 class V2IPStreamSources:
+    @property
+    @abstractmethod
+    def uid(self) -> MxrDeviceUid | None: ...
     @property
     @abstractmethod
     def video(self) -> V2IPStreamSource: ...

{mx_remote-4.7.5 → mx_remote-4.7.7}/mx_remote/const.py

@@ -14,7 +14,7 @@ Default communication modes:
 """
 import os
 
-VERSION = '4.7.5'
+VERSION = '4.7.7'
 __version__ = VERSION
 
 MX_BCAST_UDP_PORT = 8811

{mx_remote-4.7.5 → mx_remote-4.7.7}/mx_remote/proto/FrameV2IPBayMapping.py

@@ -24,10 +24,12 @@ class FrameV2IPBayMapping(FrameBase):
     @cached_property
     def is_input(self) -> bool:
         '''Whether these are input bay mappings.'''
+        # Wire format: firmware sets bit 0 to ((mode == MBAY_MODE_INPUT) ? 1 : 0),
+        # so an input frame carries bit 0 = 1 (not 0).
         val = self.payload_u16(0)
         if (val is None):
             return False
-        return (val & 1 == 0)
+        return (val & 1 == 1)
 
     @cached_property
     def is_output(self) -> bool:
@@ -35,7 +37,7 @@ class FrameV2IPBayMapping(FrameBase):
         val = self.payload_u16(0)
         if (val is None):
             return False
-        return (val & 1 == 1)
+        return (val & 1 == 0)
 
     @cached_property
     def first_bay_id(self) -> int|None:

{mx_remote-4.7.5 → mx_remote-4.7.7}/mx_remote/proto/FrameV2IPSources.py

@@ -29,7 +29,7 @@ class FrameV2IPSources(FrameBase):
             if (pl is None):
                 break
             cfg = V2IPConfig(self, srcnum, pl)
-            rv.append(V2IPStreamSourcesImpl(video=cfg.video, audio=cfg.audio, anc=cfg.anc))
+            rv.append(V2IPStreamSourcesImpl(video=cfg.video, audio=cfg.audio, anc=cfg.anc, uid=cfg.uid))
             srcnum += 1
         return rv
 

{mx_remote-4.7.5 → mx_remote-4.7.7}/mx_remote/proto/V2IPConfig.py

@@ -71,11 +71,17 @@ class V2IPConfig:
 class V2IPStreamSourcesImpl(V2IPStreamSources):
     '''Concrete collection of V2IP stream sources (video, audio, ancillary, ARC).'''
 
-    def __init__(self, video:V2IPStreamSource, audio:V2IPStreamSource, anc:V2IPStreamSource, arc:V2IPStreamSource|None=None) -> None:
+    def __init__(self, video:V2IPStreamSource, audio:V2IPStreamSource, anc:V2IPStreamSource, arc:V2IPStreamSource|None=None, uid:MxrDeviceUid|None=None) -> None:
         self._video = video
         self._audio = audio
         self._anc = anc
         self._arc = arc
+        self._uid = uid
+
+    @property
+    @override
+    def uid(self) -> MxrDeviceUid|None:
+        return self._uid
 
     @property
     @override

{mx_remote-4.7.5 → mx_remote-4.7.7}/mx_remote/proto/V2IPConfig.pyi

@@ -28,7 +28,10 @@ class V2IPConfig:
     def uid(self) -> MxrDeviceUid: ...
 
 class V2IPStreamSourcesImpl(V2IPStreamSources):
-    def __init__(self, video: V2IPStreamSource, audio: V2IPStreamSource, anc: V2IPStreamSource, arc: V2IPStreamSource | None = None) -> None: ...
+    def __init__(self, video: V2IPStreamSource, audio: V2IPStreamSource, anc: V2IPStreamSource, arc: V2IPStreamSource | None = None, uid: MxrDeviceUid | None = None) -> None: ...
+    @property
+    @override
+    def uid(self) -> MxrDeviceUid | None: ...
     @property
     @override
     def video(self) -> V2IPStreamSource: ...

{mx_remote-4.7.5 → mx_remote-4.7.7}/mx_remote/remote/Bay.py

@@ -143,17 +143,21 @@ class Bay(BayBase):
     @property
     @override
     def bay_uid(self) -> MxrBayUid:
-        # In a OneIP mesh, the same physical source can be re-advertised by
-        # multiple devices (e.g. forwarded through the mesh) under different
-        # v2ip_uids. Dedup by multicast video IP — that uniquely identifies a
-        # stream — and return the originating TX's first-input bay_uid so the
-        # same source has the same bay_uid regardless of who is advertising it.
-        if self.is_v2ip_source and ((stream := self.v2ip_source) is not None):
-            video_ip = stream.video.ip if stream.video is not None else None
-            if (video_ip is not None) and (video_ip != '0.0.0.0'):
-                canonical = self.device.registry.get_by_stream_ip(ip=video_ip)
-                if canonical is not None:
-                    return MxrBayUid(canonical.device.remote_id, canonical.port)
+        # In a OneIP mesh the same source can be advertised by multiple devices
+        # (mesh forwarding etc.). Resolve a v2ip source bay to (source_uid, 0)
+        # — every OneIP unit has at most one input, always at port 0 — using the
+        # source uid from MXR_OP_SYS_BAY_V2IP_SOURCES, falling back to the bay
+        # mapping uid if the sources frame hasn't supplied one. Yields a single
+        # stable bay_uid regardless of who advertises the source.
+        if self.is_v2ip_source:
+            src_uid:MxrDeviceUid|None = None
+            stream = self.v2ip_source
+            if (stream is not None) and (stream.uid is not None) and not stream.uid.empty:
+                src_uid = stream.uid
+            elif (self._v2ip_uid is not None) and not self._v2ip_uid.empty:
+                src_uid = self._v2ip_uid
+            if src_uid is not None:
+                return MxrBayUid(src_uid, 0)
         return MxrBayUid(self.device.remote_id, self.port)
 
     @property

{mx_remote-4.7.5 → mx_remote-4.7.7}/mx_remote/remote/Device.py

@@ -203,9 +203,15 @@ class Device(DeviceBase):
 			return None
 		if self._v2ip_sources is None:
 			return None
-		if bay.bay >= len(self._v2ip_sources):
+		# Firmware fills MXR_OP_SYS_BAY_V2IP_SOURCES by iterating bays in order
+		# (MBAY_ITERATE). Devices with no local input (pure RX) skip bay 0, so
+		# the list starts at bay 1 — shift the lookup so bay.bay still maps to
+		# the right entry.
+		offset = 0 if self.has_local_source else 1
+		idx = bay.bay - offset
+		if (idx < 0) or (idx >= len(self._v2ip_sources)):
 			return None
-		return self._v2ip_sources[bay.bay]
+		return self._v2ip_sources[idx]
 
 	@property
 	def v2ip_stats(self) -> V2IPDeviceStats|None:
@@ -619,13 +625,13 @@ class Device(DeviceBase):
 		elif isinstance(data, FrameV2IPBayMapping):
 			if data.first_bay_id is None:
 				return
+			# Firmware iterates bays in MBAY_ITERATE order; the wire payload's
+			# first_bay_id tells us the bay number of payload[0], so payload[i]
+			# maps to bay number (first_bay_id + i). Devices without a local
+			# bay 0 (pure RX) emit first_bay_id=1 and skip the bay-0 slot.
+			mode = 'Input' if data.is_input else 'Output'
 			for idx in range(data.nb_bays):
-				if (idx == 0):
-					if data.is_input and self.is_oneip_rx:
-						continue
-					if data.is_output and (self.is_oneip_tx or self.is_oneip_multiviewer):
-						continue
-				bay = self.get_by_mode_bay(mode=('Input' if data.is_input else 'Output'), bay=idx)
+				bay = self.get_by_mode_bay(mode=mode, bay=data.first_bay_id + idx)
 				if (bay is not None):
 					bay.v2ip_uid = data.bay(idx=idx) # pyright: ignore[reportAttributeAccessIssue]
 		elif isinstance(data, FrameSystemStatus):