Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support yuv444p/yuvj444p in to_ndarray/from_ndarray #788

Merged
merged 1 commit into from
Oct 30, 2023
Merged

Support yuv444p/yuvj444p in to_ndarray/from_ndarray #788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions av/video/frame.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,12 @@ cdef class VideoFrame(Frame):
useful_array(frame.planes[1]),
useful_array(frame.planes[2])
)).reshape(-1, frame.width)
elif frame.format.name in ('yuv444p', 'yuvj444p'):
return np.hstack((
useful_array(frame.planes[0]),
useful_array(frame.planes[1]),
useful_array(frame.planes[2])
)).reshape(-1, frame.height, frame.width)
elif frame.format.name == 'yuyv422':
assert frame.width % 2 == 0
assert frame.height % 2 == 0
Expand Down Expand Up @@ -372,6 +378,16 @@ cdef class VideoFrame(Frame):
copy_array_to_plane(flat[u_start:v_start], frame.planes[1], 1)
copy_array_to_plane(flat[v_start:], frame.planes[2], 1)
return frame
elif format in ('yuv444p', 'yuvj444p'):
check_ndarray(array, 'uint8', 3)
check_ndarray_shape(array, array.shape[0] == 3)

frame = VideoFrame(array.shape[2], array.shape[1], format)
array = array.reshape(3, -1)
copy_array_to_plane(array[0], frame.planes[0], 1)
copy_array_to_plane(array[1], frame.planes[1], 1)
copy_array_to_plane(array[2], frame.planes[2], 1)
return frame
elif format == 'yuyv422':
check_ndarray(array, 'uint8', 3)
check_ndarray_shape(array, array.shape[0] % 2 == 0)
Expand Down
16 changes: 16 additions & 0 deletions tests/test_videoframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,22 @@ def test_ndarray_yuyv422(self):
self.assertEqual(frame.format.name, "yuyv422")
self.assertNdarraysEqual(frame.to_ndarray(), array)

def test_ndarray_yuv444p(self):
array = numpy.random.randint(0, 256, size=(3, 480, 640), dtype=numpy.uint8)
frame = VideoFrame.from_ndarray(array, format="yuv444p")
self.assertEqual(frame.width, 640)
self.assertEqual(frame.height, 480)
self.assertEqual(frame.format.name, "yuv444p")
self.assertNdarraysEqual(frame.to_ndarray(), array)

def test_ndarray_yuvj444p(self):
array = numpy.random.randint(0, 256, size=(3, 480, 640), dtype=numpy.uint8)
frame = VideoFrame.from_ndarray(array, format="yuvj444p")
self.assertEqual(frame.width, 640)
self.assertEqual(frame.height, 480)
self.assertEqual(frame.format.name, "yuvj444p")
self.assertNdarraysEqual(frame.to_ndarray(), array)

def test_ndarray_yuyv422_align(self):
array = numpy.random.randint(0, 256, size=(238, 318, 2), dtype=numpy.uint8)
frame = VideoFrame.from_ndarray(array, format="yuyv422")
Expand Down
Loading