Video streamer

mxcubecore/configuration/ansto/config.py

@@ -61,6 +61,8 @@ class MD3(BaseSettings):
         description="Timeout in seconds when polling for an image from MD3 Redis "
         "before emitting a placeholder image",
     )
+    MD3_IMAGE_WIDTH: int = Field(1224, env="MD3_IMAGE_WIDTH")
+    MD3_IMAGE_HEIGHT: int = Field(1024, env="MD3_IMAGE_HEIGHT")
 
 
 class RedisSettings(BaseSettings):

mxcubecore/configuration/ansto/md3/camera.xml

@@ -1,5 +1,4 @@
 <device class="ANSTO.MicrodiffCamera">
     <!-- Properties -->
     <username>Camera</username>
-    <interval>100</interval>
 </device>

mxcubecore/configuration/ansto/mockup/md3/camera.xml

@@ -1,9 +1,4 @@
-<object class="MDCameraMockup">
-  <username>Camera Microdiff</username>
-  <specversion>130.235.94.114:kappa</specversion>
-  <channel type="spec" name="UdiffVersion">UDIFF_VERSION</channel>
-  <tangoname>i9113/microdiff/newMD</tangoname>
-  <interval>100</interval>
-  <remote_interval>100</remote_interval>
-  <image_name>mxcube_sample_snapshot.jpeg</image_name>
-</object>
+<device class="ANSTO.MicrodiffCamera">
+    <!-- Properties -->
+    <username>Camera</username>
+</device>

mxcubecore/configuration/ansto/mockup/mxcube-web/server.yaml

@@ -12,11 +12,16 @@ server:
     - "http://localhost:8081"
     - "http://localhost:3000"
     - "http://localhost:5173"
-    - "ws://localhost:8000"
+    - "ws://localhost:8002"  # MPEG1 stream
 
 mxcube:
-  USE_EXTERNAL_STREAMER: false
-  VIDEO_FORMAT: MJPEG
+  USE_EXTERNAL_STREAMER: true
+  VIDEO_FORMAT: MPEG1  # MPEG1 stream
+  VIDEO_STREAM_URL: ws://localhost:8002/ws  # MPEG1 stream
+
+  # At which port to stream from
+  VIDEO_STREAM_PORT: 8002
+
   # Mode, SSX-CHIP, SSX-INJECTOR, OSC
   mode: OSC
 

mxcubecore/configuration/ansto/mxcube-web/server.yaml

@@ -12,11 +12,16 @@ server:
     - "http://localhost:8081"
     - "http://localhost:3000"
     - "http://localhost:5173"
-    - "ws://localhost:8000"
+    - "ws://localhost:8002"  # MPEG1 stream
 
 mxcube:
-  USE_EXTERNAL_STREAMER: false
-  VIDEO_FORMAT: MJPEG
+  USE_EXTERNAL_STREAMER: true
+  VIDEO_FORMAT: MPEG1  # MPEG1 stream
+  VIDEO_STREAM_URL: ws://localhost:8002/ws  # MPEG1 stream
+
+  # At which port to stream from
+  VIDEO_STREAM_PORT: 8002
+
   # Mode, SSX-CHIP, SSX-INJECTOR, OSC
   mode: OSC
 

pyproject.toml

@@ -52,6 +52,7 @@ colorama = "^0.4.6"
 prefect = { version = "3.6.10", optional = true, python = ">=3.10"  }
 cachetools = ">=5.3.3"
 mx3-beamline-library = { git = "https://github.com/AustralianSynchrotron/mx3-beamline-library.git", rev = "v2.5.0", python = ">=3.11,<3.12" }
+mxcube-video-streamer = { git = "https://github.com/fhernandezvivanco/video-streamer.git", rev = "mxcubecore_like_streamer", python = ">=3.11,<3.12" }
 
 [tool.poetry.dev-dependencies]
 pre-commit = "^3.5.0"