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

Fix: Corrupted JPEG #68

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Corrupted JPEG #68

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
22 changes: 12 additions & 10 deletions BabbleApp/camera.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
from utils.misc_utils import get_camera_index_by_name, list_camera_names
from enum import Enum
import sys
from PIL import Image
from io import BytesIO

WAIT_TIME = 0.1
BUFFER_SIZE = 32768
Expand Down Expand Up @@ -190,20 +192,21 @@ def get_next_packet_bounds(self):
beg = -1
while beg == -1:
self.buffer += self.serial_connection.read(2048)
beg = self.buffer.find(ETVR_HEADER)
beg = self.buffer.find(b"\xff\xd8\xff")
# Discard any data before the frame header.
if beg > 0:
self.buffer = self.buffer[beg:]
beg = 0
# We know exactly how long the jpeg packet is
end = int.from_bytes(self.buffer[4:6], signed=False, byteorder="little")
self.buffer += self.serial_connection.read(end - len(self.buffer))
end = -1
while end == -1:
self.buffer += self.serial_connection.read(128)
end = self.buffer.find(b"\xff\xd9")
return beg, end

def get_next_jpeg_frame(self):
beg, end = self.get_next_packet_bounds()
jpeg = self.buffer[beg + ETVR_HEADER_LEN : end + ETVR_HEADER_LEN]
self.buffer = self.buffer[end + ETVR_HEADER_LEN :]
jpeg = self.buffer[beg: end + 2]
self.buffer = self.buffer[end + 2 :]
return jpeg

def get_serial_camera_picture(self, should_push):
Expand All @@ -216,10 +219,9 @@ def get_serial_camera_picture(self, should_push):
jpeg = self.get_next_jpeg_frame()
if jpeg:
# Create jpeg frame from byte string
image = cv2.imdecode(
np.fromstring(jpeg, dtype=np.uint8), cv2.IMREAD_UNCHANGED
)
if image is None:
try:
image = np.array(Image.open(BytesIO(jpeg)))
Copy link
Contributor

@RamesTheGeneric RamesTheGeneric Dec 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to work as expected although is there a reason why imdecode was replaced with a method from pillow? Replacing that line with the old imdecode method seems to still work fine and avoids another dependency.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

imdecode can sometimes return corrupted data, but it rarely happens, so prioritizing dependencies should be fine.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose, seems like we're already importing pillow in other files anyways.

except Exception:
print(
f'{Fore.YELLOW}[{lang._instance.get_string("log.warn")}] {lang._instance.get_string("warn.frameDrop")}{Fore.RESET}'
)
Expand Down