Allow the base Encoder() to accept raw and other stream types

But only if the output supports completely arbitrary formats.

Also add the existing capture_video_raw.py to test_list.txt so that we
don't break this again.

Signed-off-by: David Plowman <[email protected]>

Author: davidplowman

picamera2/encoders/encoder.py

@@ -304,9 +304,11 @@ def _start(self):
                         "RGB888": "bgr24",
                         "XBGR8888": "rgba",
                         "XRGB8888": "bgra"}
-        pix_fmt = FORMAT_TABLE[self._format]
+        pix_fmt = FORMAT_TABLE.get(self._format)
         rate = Fraction(1000000, self._framerate)
         for out in self._output:
+            if pix_fmt is None and out.needs_add_stream:
+                raise RuntimeError(f"Output does not support {self._format}")
             out._add_stream("video", "rawvideo", pix_fmt=pix_fmt, rate=rate,
                             width=self.width, height=self.height)
 

picamera2/outputs/output.py

@@ -13,6 +13,7 @@ def __init__(self, pts=None):
         self.recording = False
         self.ptsoutput = pts
         self.needs_pacing = False
+        self.needs_add_stream = False
 
     def start(self):
         """Start recording"""

picamera2/outputs/pyavoutput.py

@@ -27,6 +27,7 @@ def __init__(self, output_name, format=None, pts=None, options=None):
         self._options = options
         # A user can set this to get notifications of failures.
         self.error_callback = None
+        self.needs_add_stream = True
 
     def _add_stream(self, encoder_stream, codec_name, **kwargs):
         # The output container that does the muxing needs to know about the streams for which packets

picamera2/outputs/splittableoutput.py

@@ -19,6 +19,7 @@ def __init__(self, output=None, *args, **kwargs):
         self._new_output = None
         self._split_done = Event()
         self._streams = []
+        self.needs_add_stream = True
 
     def split_output(self, new_output, wait_for_keyframe=True):
         """

tests/test_list.txt

@@ -12,6 +12,7 @@ examples/capture_to_buffer.py
 examples/capture_video.py
 examples/capture_video_multiple.py
 examples/capture_video_multiple_2.py
+examples/capture_video_raw.py
 examples/controls.py
 examples/controls_2.py
 examples/display_transform_qtgl.py