Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-24 00:55:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

py: cam: Drop PIL dependency

Browse source 
We can use Qt directly to accomplish the same as we do with PIL.

A minor downside is that loading MJPEG frame with Qt produces a "Corrupt
JPEG data" warning. The resulting picture looks fine, though. So add a
message handler to ignore that warning.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Tomi Valkeinen 2022-05-30 17:27:10 +03:00 • committed by Laurent Pinchart
parent 0971ea7c8b
commit 7330474762
1 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/py/cam/cam_qt.py
View file

@ -2,18 +2,32 @@
# Copyright (C) 2022, Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
from helpers import mfb_to_rgb
from io import BytesIO
from PIL import Image
from PIL.ImageQt import ImageQt
from PyQt5 import QtCore, QtGui, QtWidgets
import libcamera as libcam
import libcamera.utils
import sys
# Loading MJPEG to a QPixmap produces corrupt JPEG data warnings. Ignore these.
def qt_message_handler(msg_type, msg_log_context, msg_string):
if msg_string.startswith("Corrupt JPEG data"):
return
# For some reason qInstallMessageHandler returns None, so we won't
# call the old handler
if old_msg_handler is not None:
old_msg_handler(msg_type, msg_log_context, msg_string)
else:
print(msg_string)
old_msg_handler = QtCore.qInstallMessageHandler(qt_message_handler)
def rgb_to_pix(rgb):
img = Image.frombuffer('RGB', (rgb.shape[1], rgb.shape[0]), rgb)
qim = ImageQt(img).copy()
w = rgb.shape[1]
h = rgb.shape[0]
qim = QtGui.QImage(rgb, w, h, QtGui.QImage.Format.Format_RGB888)
pix = QtGui.QPixmap.fromImage(qim)
return pix
@ -136,9 +150,8 @@ class MainWindow(QtWidgets.QWidget):
cfg = stream.configuration
if cfg.pixel_format == libcam.formats.MJPEG:
img = Image.open(BytesIO(mfb.planes[0]))
qim = ImageQt(img).copy()
pix = QtGui.QPixmap.fromImage(qim)
pix = QtGui.QPixmap(cfg.size.width, cfg.size.height)
pix.loadFromData(mfb.planes[0])
else:
rgb = mfb_to_rgb(mfb, cfg)
if rgb is None: