Video Player

tagstudio/src/qt/resources_rc.py

@@ -1,6 +1,6 @@
 # Resource object code (Python 3)
 # Created by: object code
-# Created by: The Resource Compiler for Qt version 6.6.3
+# Created by: The Resource Compiler for Qt version 6.5.1
 # WARNING! All changes made in this file will be lost!
 
 from PySide6 import QtCore
@@ -16884,34 +16884,27 @@
 \x00\x00\x00\x00\x00\x02\x00\x00\x00\x08\x00\x00\x00\x02\
 \x00\x00\x00\x00\x00\x00\x00\x00\
 \x00\x00\x01\x1a\x00\x00\x00\x00\x00\x01\x00\x03\xf2%\
-\x00\x00\x01\x8a\xfb\xb4\xd6\xbe\
+\x00\x00\x01\x8f\x10b\x06\xcd\
 \x00\x00\x00\x12\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x01\x8a\xd2\x87V\xef\
+\x00\x00\x01\x8f\x10b\x06\xd2\
 \x00\x00\x00\xe6\x00\x00\x00\x00\x00\x01\x00\x03\xdf\x81\
-\x00\x00\x01\x8a\xfb\xc6t\x9f\
+\x00\x00\x01\x8f\x10b\x06\xca\
 \x00\x00\x01N\x00\x00\x00\x00\x00\x01\x00\x04\x0c\x00\
-\x00\x00\x01\x8a\xfb\xb4\xc1\x95\
+\x00\x00\x01\x8f\x10b\x06\xc8\
 \x00\x00\x00<\x00\x00\x00\x00\x00\x01\x00\x00\x0b\xa2\
-\x00\x00\x01\x8a\xd2\x8f\xdf\xf1\
+\x00\x00\x01\x8f\x10b\x06\xca\
 \x00\x00\x00n\x00\x00\x00\x00\x00\x01\x00\x00\x1b\x91\
-\x00\x00\x01\x8a\xfb\xc6\x86\xda\
+\x00\x00\x01\x8f\x10b\x06\xce\
 \x00\x00\x00\xcc\x00\x00\x00\x00\x00\x01\x00\x00I\xea\
-\x00\x00\x01\x8e\xfd%\xc3\xc7\
+\x00\x00\x01\x8f\x10b\x06\xcc\
 \x00\x00\x00\xa4\x00\x00\x00\x00\x00\x01\x00\x00>\x14\
-\x00\x00\x01\x8a\xd2\x83?\x9d\
+\x00\x00\x01\x8f\x10b\x06\xca\
 "
 
-
 def qInitResources():
-    QtCore.qRegisterResourceData(
-        0x03, qt_resource_struct, qt_resource_name, qt_resource_data
-    )
-
+    QtCore.qRegisterResourceData(0x03, qt_resource_struct, qt_resource_name, qt_resource_data)
 
 def qCleanupResources():
-    QtCore.qUnregisterResourceData(
-        0x03, qt_resource_struct, qt_resource_name, qt_resource_data
-    )
-
+    QtCore.qUnregisterResourceData(0x03, qt_resource_struct, qt_resource_name, qt_resource_data)
 
 qInitResources()

tagstudio/src/qt/widgets/preview_panel.py

@@ -41,6 +41,7 @@
     EditTextLine,
     ItemThumb,
 )
+from src.qt.widgets.video_player import VideoPlayer
 
 # Only import for type checking/autocompletion, will not be imported at runtime.
 if typing.TYPE_CHECKING:
@@ -93,6 +94,8 @@ def __init__(self, library: Library, driver: "QtDriver"):
         self.preview_img.setMinimumSize(*self.img_button_size)
         self.preview_img.setFlat(True)
         self.preview_img.setContextMenuPolicy(Qt.ContextMenuPolicy.ActionsContextMenu)
+        self.preview_vid = VideoPlayer(driver)
+        self.preview_vid.hide()
 
         self.preview_img.addAction(self.open_file_action)
         self.preview_img.addAction(self.open_explorer_action)
@@ -124,7 +127,9 @@ def __init__(self, library: Library, driver: "QtDriver"):
 
         image_layout.addWidget(self.preview_img)
         image_layout.setAlignment(self.preview_img, Qt.AlignmentFlag.AlignCenter)
-
+        image_layout.addWidget(self.preview_vid)
+        image_layout.setAlignment(self.preview_vid, Qt.AlignmentFlag.AlignCenter)
+        self.image_container.setMinimumSize(*self.img_button_size)
         self.file_label = FileOpenerLabel("Filename")
         self.file_label.setWordWrap(True)
         self.file_label.setTextInteractionFlags(
@@ -287,6 +292,9 @@ def update_image_size(self, size: tuple[int, int], ratio: float = None):
         self.img_button_size = (adj_width, adj_height)
         self.preview_img.setMaximumSize(adj_size)
         self.preview_img.setIconSize(adj_size)
+        self.preview_vid.resizeVideo(adj_size)
+        self.preview_vid.setMaximumSize(adj_size)
+        self.preview_vid.setMinimumSize(adj_size)
         # self.preview_img.setMinimumSize(adj_size)
 
         # if self.preview_img.iconSize().toTuple()[0] < self.preview_img.size().toTuple()[0] + 10:
@@ -359,7 +367,9 @@ def update_widgets(self):
                     pass
                 for i, c in enumerate(self.containers):
                     c.setHidden(True)
-
+            self.preview_img.show()
+            self.preview_vid.stop()
+            self.preview_vid.hide()
             self.selected = list(self.driver.selected)
             self.add_field_button.setHidden(True)
 
@@ -390,7 +400,9 @@ def update_widgets(self):
                     self.open_explorer_action.triggered.connect(
                         self.opener.open_explorer
                     )
-
+                    self.preview_img.show()
+                    self.preview_vid.stop()
+                    self.preview_vid.hide()
                     # TODO: Do this somewhere else, this is just here temporarily.
                     extension = os.path.splitext(filepath)[1][1:].lower()
                     try:
@@ -404,6 +416,7 @@ def update_widgets(self):
                             if image.mode != "RGB":
                                 image = image.convert(mode="RGB")
                         elif extension in VIDEO_TYPES:
+                            self.preview_img.hide()
                             video = cv2.VideoCapture(filepath)
                             video.set(
                                 cv2.CAP_PROP_POS_FRAMES,
@@ -418,6 +431,16 @@ def update_widgets(self):
                                 success, frame = video.read()
                             frame = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
                             image = Image.fromarray(frame)
+                            self.preview_vid.play(
+                                filepath, QSize(image.width, image.height)
+                            )
+                            self.resizeEvent(
+                                QResizeEvent(
+                                    QSize(image.width, image.height),
+                                    QSize(image.width, image.height),
+                                )
+                            )
+                            self.preview_vid.show()
 
                         # Stats for specific file types are displayed here.
                         if extension in (IMAGE_TYPES + VIDEO_TYPES):
@@ -466,6 +489,9 @@ def update_widgets(self):
 
         # Multiple Selected Items
         elif len(self.driver.selected) > 1:
+            self.preview_img.show()
+            self.preview_vid.stop()
+            self.preview_vid.hide()
             if self.selected != self.driver.selected:
                 self.file_label.setText(f"{len(self.driver.selected)} Items Selected")
                 self.file_label.setCursor(Qt.CursorShape.ArrowCursor)