Adjust to pixutils format module change

tomba · Aug 29, 2024 · 275309d · 275309d
1 parent 3ed177c
commit 275309d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/utils/cam-rx.py b/utils/cam-rx.py
@@ -8,7 +8,7 @@
 import traceback
 
 from pixutils.conv.qt import buffer_to_pix
-from pixutils import PixelFormats, MetaFormat, MetaFormats
+from pixutils.formats import PixelFormats, MetaFormat, MetaFormats
 from PyQt6 import QtCore, QtWidgets
 from PyQt6.QtCore import Qt
 import PyQt6.QtNetwork

diff --git a/utils/cam_helpers.py b/utils/cam_helpers.py
@@ -8,7 +8,6 @@
 import typing
 from typing import TYPE_CHECKING
 
-from pixutils import MetaFormat
 import v4l2
 import v4l2.uapi
 
@@ -82,7 +81,7 @@ def tx(self, stream, vbuf, is_drm):
 
         fmt = stream['format']
 
-        if isinstance(fmt, MetaFormat):
+        if isinstance(fmt, v4l2.MetaFormat):
             num_planes = 1
         else:
             num_planes = len(fmt.planes)

diff --git a/v4l2/__init__.py b/v4l2/__init__.py
@@ -1,7 +1,6 @@
 from __future__ import annotations
 
-from pixutils import *
-from pixutils.fourcc_str import fourcc_to_str, str_to_fourcc
+from pixutils.formats import *
 
 from .helpers import *
 from .mbusformats import *