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.

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

[GSoC2024] feature: allow downloading video frames in custom extension #7697

Merged
merged 15 commits into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
### Changed

- Job and task `download_frames` now accepts custom extension for images
(<https://github.com/cvat-ai/cvat/pull/7697>)
20 changes: 12 additions & 8 deletions cvat-sdk/cvat_sdk/core/proxies/jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ def download_frames(
self,
frame_ids: Sequence[int],
*,
image_extension: Optional[str] = None,
outdir: StrPath = ".",
quality: str = "original",
filename_pattern: str = "frame_{frame_id:06d}{frame_ext}",
Expand All @@ -135,14 +136,17 @@ def download_frames(
frame_bytes = self.get_frame(frame_id, quality=quality)

im = Image.open(frame_bytes)
mime_type = im.get_format_mimetype() or "image/jpg"
im_ext = mimetypes.guess_extension(mime_type)

# FIXME It is better to use meta information from the server
# to determine the extension
# replace '.jpe' or '.jpeg' with a more used '.jpg'
if im_ext in (".jpe", ".jpeg", None):
im_ext = ".jpg"
if image_extension is None:
mime_type = im.get_format_mimetype() or "image/jpg"
im_ext = mimetypes.guess_extension(mime_type)

# FIXME It is better to use meta information from the server
# to determine the extension
# replace '.jpe' or '.jpeg' with a more used '.jpg'
if im_ext in (".jpe", ".jpeg", None):
im_ext = ".jpg"
else:
im_ext = f".{image_extension.strip('.')}"

outfile = filename_pattern.format(frame_id=frame_id, frame_ext=im_ext)
im.save(outdir / outfile)
Expand Down
23 changes: 13 additions & 10 deletions cvat-sdk/cvat_sdk/core/proxies/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,30 +220,33 @@ def download_frames(
self,
frame_ids: Sequence[int],
*,
image_extension: Optional[str] = None,
outdir: StrPath = ".",
quality: str = "original",
filename_pattern: str = "frame_{frame_id:06d}{frame_ext}",
) -> Optional[List[Image.Image]]:
"""
Download the requested frame numbers for a task and save images as outdir/filename_pattern
"""
# TODO: add arg descriptions in schema

outdir = Path(outdir)
outdir.mkdir(exist_ok=True)
outdir.mkdir(parents=True, exist_ok=True)

for frame_id in frame_ids:
frame_bytes = self.get_frame(frame_id, quality=quality)

im = Image.open(frame_bytes)
mime_type = im.get_format_mimetype() or "image/jpg"
im_ext = mimetypes.guess_extension(mime_type)

# FIXME It is better to use meta information from the server
# to determine the extension
# replace '.jpe' or '.jpeg' with a more used '.jpg'
if im_ext in (".jpe", ".jpeg", None):
im_ext = ".jpg"
if image_extension is None:
mime_type = im.get_format_mimetype() or "image/jpg"
im_ext = mimetypes.guess_extension(mime_type)

# FIXME It is better to use meta information from the server
# to determine the extension
# replace '.jpe' or '.jpeg' with a more used '.jpg'
if im_ext in (".jpe", ".jpeg", None):
im_ext = ".jpg"
else:
im_ext = f".{image_extension.strip('.')}"

outfile = filename_pattern.format(frame_id=frame_id, frame_ext=im_ext)
im.save(outdir / outfile)
Expand Down
1 change: 0 additions & 1 deletion tests/python/rest_api/test_jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,6 @@ def test_get_gt_job_in_org_task(
"restore_db_per_class"
)
class TestGetGtJobData:

def _delete_gt_job(self, user, gt_job_id):
with make_api_client(user) as api_client:
api_client.jobs_api.destroy(gt_job_id)
Expand Down
13 changes: 9 additions & 4 deletions tests/python/sdk/test_jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,18 +141,23 @@ def test_can_download_frame(self, fxt_new_task: Task, quality: str):
assert self.stdout.getvalue() == ""

@pytest.mark.parametrize("quality", ("compressed", "original"))
def test_can_download_frames(self, fxt_new_task: Task, quality: str):
@pytest.mark.parametrize("image_extension", (None, "bmp"))
def test_can_download_frames(self, fxt_new_task: Task, quality: str, image_extension: str):
fxt_new_task.get_jobs()[0].download_frames(
[0],
image_extension=image_extension,
quality=quality,
outdir=self.tmp_path,
filename_pattern="frame-{frame_id}{frame_ext}",
)

if quality == "original":
expected_frame_ext = "png"
if image_extension is not None:
expected_frame_ext = image_extension
else:
expected_frame_ext = "jpg"
if quality == "original":
expected_frame_ext = "png"
else:
expected_frame_ext = "jpg"

assert (self.tmp_path / f"frame-0.{expected_frame_ext}").is_file()
assert self.stdout.getvalue() == ""
Expand Down
13 changes: 9 additions & 4 deletions tests/python/sdk/test_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -322,18 +322,23 @@ def test_can_download_frame(self, fxt_new_task: Task, quality: str):
assert self.stdout.getvalue() == ""

@pytest.mark.parametrize("quality", ("compressed", "original"))
def test_can_download_frames(self, fxt_new_task: Task, quality: str):
@pytest.mark.parametrize("image_extension", (None, "bmp"))
def test_can_download_frames(self, fxt_new_task: Task, quality: str, image_extension: str):
zhiltsov-max marked this conversation as resolved.
Show resolved Hide resolved
zhiltsov-max marked this conversation as resolved.
Show resolved Hide resolved
fxt_new_task.download_frames(
[0],
image_extension=image_extension,
quality=quality,
outdir=self.tmp_path,
filename_pattern="frame-{frame_id}{frame_ext}",
)

if quality == "original":
expected_frame_ext = "png"
if image_extension is not None:
expected_frame_ext = image_extension
else:
expected_frame_ext = "jpg"
if quality == "original":
expected_frame_ext = "png"
else:
expected_frame_ext = "jpg"

assert (self.tmp_path / f"frame-0.{expected_frame_ext}").is_file()
assert self.stdout.getvalue() == ""
Expand Down
Loading