daily-python: simplify Qt/Gtk demos

Author: aconchillo

demos/gtk/gtk_app.py

@@ -21,8 +21,6 @@
 gi.require_version("Gtk", "4.0")
 from gi.repository import GLib, Gtk
 
-import numpy as np
-
 from daily import *
 
 class DailyGtkApp(Gtk.Application):
@@ -45,7 +43,7 @@ def __init__(self, meeting_url, participant_id, save_audio, screen_share):
         self.__frame_width = self.__width
         self.__frame_height = self.__height
 
-        self.__black_frame = np.zeros(self.__width * self.__height * 4)
+        self.__black_frame = bytearray(self.__width * self.__height * 4)
 
         self.__joined = False
         self.__meeting_url = meeting_url
@@ -145,7 +143,7 @@ def leave(self):
 
     def drawing_area_draw(self, area, context, w, h, data):
         if self.__joined and not self.__frame is None:
-            image = self.__frame
+            image = bytearray(self.__frame.buffer)
         else:
             image = self.__black_frame
 
@@ -170,7 +168,7 @@ def on_audio_data(self, participant_id, audio_data):
     def on_video_frame(self, participant_id, video_frame):
         self.__frame_width = video_frame.width
         self.__frame_height = video_frame.height
-        self.__frame = np.frombuffer(video_frame.buffer, dtype=np.uint8).copy()
+        self.__frame = video_frame
         self.__drawing_area.queue_draw()
 
 

demos/qt/qt_app.py

@@ -15,22 +15,12 @@
 import sys
 import wave
 
-from dataclasses import dataclass
-
 from PySide6 import QtCore, QtGui, QtWidgets
 
-import numpy as np
-
 from daily import *
 
 class DailyQtWidget(QtWidgets.QWidget):
-    @dataclass
-    class VideoFrameData:
-        buffer: np.ndarray
-        width: int
-        height: int
-
-    frame_signal = QtCore.Signal(VideoFrameData)
+    frame_signal = QtCore.Signal(VideoFrame)
 
     def __init__(self, meeting_url, participant_id, save_audio, screen_share):
         super().__init__()
@@ -138,9 +128,9 @@ def join(self, meeting_url, participant_id):
     def leave(self):
         self.__client.leave(completion = self.on_left)
 
-    def draw_image(self, frame_data):
-        image = QtGui.QImage(frame_data.buffer, frame_data.width, frame_data.height,
-                             frame_data.width * 4, QtGui.QImage.Format.Format_ARGB32)
+    def draw_image(self, video_frame):
+        image = QtGui.QImage(video_frame.buffer, video_frame.width, video_frame.height,
+                             video_frame.width * 4, QtGui.QImage.Format.Format_ARGB32)
         scaled = image.scaled(self.__frame_width, self.__frame_height, QtCore.Qt.AspectRatioMode.KeepAspectRatio)
         pixmap = QtGui.QPixmap.fromImage(scaled)
         self.__image_label.setPixmap(pixmap)
@@ -149,9 +139,7 @@ def on_audio_data(self, participant_id, audio_data):
         self.__wave.writeframes(audio_data.audio_frames)
 
     def on_video_frame(self, participant_id, video_frame):
-        data = np.frombuffer(video_frame.buffer, dtype=np.uint8).copy()
-        frame_data = self.VideoFrameData(data, video_frame.width, video_frame.height)
-        self.frame_signal.emit(frame_data)
+        self.frame_signal.emit(video_frame)
 
 def main():
     parser = argparse.ArgumentParser()