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

Jump to bottom

Read WebP duration after opening #7311

Merged
merged 7 commits into from
Aug 11, 2023
Merged

Read WebP duration after opening #7311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
27a0339
Update WebPImagePlugin.py
k128 Jul 31, 2023
2f5493a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 31, 2023
15e5229
Update WebPImagePlugin.py
k128 Jul 31, 2023
230a2e3
If "reset" is always true, then the argument can be removed
radarhere Aug 1, 2023
6115d59
_decoder.get_next() may return None
radarhere Aug 1, 2023
60433d5
Added test
radarhere Aug 1, 2023
9c6b8c4
Merge pull request #1 from radarhere/webp
k128 Aug 1, 2023
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
1 change: 0 additions & 1 deletion Tests/test_file_webp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,5 +233,4 @@ def test_duration(self, tmp_path):
im.save(out_webp, save_all=True)

with Image.open(out_webp) as reloaded:
reloaded.load()
assert reloaded.info["duration"] == 1000
10 changes: 6 additions & 4 deletions src/PIL/WebPImagePlugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ def _open(self):
self.info["background"] = (bg_r, bg_g, bg_b, bg_a)
self.n_frames = frame_count
self.is_animated = self.n_frames > 1
ret = self._decoder.get_next()
if ret is not None:
self.info["duration"] = ret[1]
self._mode = "RGB" if mode == "RGBX" else mode
self.rawmode = mode
self.tile = []
Expand All @@ -90,7 +93,7 @@ def _open(self):
self.info["xmp"] = xmp

# Initialize seek state
self._reset(reset=False)
self._reset()

def _getexif(self):
if "exif" not in self.info:
Expand All @@ -113,9 +116,8 @@ def seek(self, frame):
# Set logical frame to requested position
self.__logical_frame = frame

def _reset(self, reset=True):
if reset:
self._decoder.reset()
def _reset(self):
self._decoder.reset()
self.__physical_frame = 0
self.__loaded = -1
self.__timestamp = 0
Expand Down
Loading