-
-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Help specify the version of the package on pip list and pip commands
- Loading branch information
Showing
4 changed files
with
111 additions
and
73 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| From 634b95cf2cdef89f63a1be8712c2853a4ad6a7ce Mon Sep 17 00:00:00 2001 | ||
| From: Nicolas Hug <[email protected]> | ||
| Date: Mon, 2 Dec 2024 13:51:08 +0000 | ||
| Subject: [PATCH 1/2] Fix pyav 14 error | ||
|
|
||
| --- | ||
| torchvision/io/video.py | 8 +++++++- | ||
| 1 file changed, 7 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/torchvision/io/video.py b/torchvision/io/video.py | ||
| index 9f768ed555d..d81b846c12f 100644 | ||
| --- a/torchvision/io/video.py | ||
| +++ b/torchvision/io/video.py | ||
| @@ -155,7 +155,13 @@ def write_video( | ||
|
|
||
| for img in video_array: | ||
| frame = av.VideoFrame.from_ndarray(img, format="rgb24") | ||
| - frame.pict_type = "NONE" | ||
| + try: | ||
| + frame.pict_type = "NONE" | ||
| + except TypeError: | ||
| + from av.video.frame import PictureType # noqa | ||
| + | ||
| + frame.pict_type = PictureType.NONE | ||
| + | ||
| for packet in stream.encode(frame): | ||
| container.mux(packet) | ||
|
|
||
|
|
||
| From 0c0cb14e2e180af75b742b890de722a50363c60e Mon Sep 17 00:00:00 2001 | ||
| From: Nicolas Hug <[email protected]> | ||
| Date: Mon, 2 Dec 2024 16:43:58 +0000 | ||
| Subject: [PATCH 2/2] oenfljanefa | ||
|
|
||
| --- | ||
| torchvision/io/video.py | 14 +++++++++----- | ||
| 1 file changed, 9 insertions(+), 5 deletions(-) | ||
|
|
||
| diff --git a/torchvision/io/video.py b/torchvision/io/video.py | ||
| index d81b846c12f..2e3dbed65a2 100644 | ||
| --- a/torchvision/io/video.py | ||
| +++ b/torchvision/io/video.py | ||
| @@ -26,6 +26,10 @@ | ||
| install PyAV on your system. | ||
| """ | ||
| ) | ||
| + try: | ||
| + FFmpegError = av.FFmpegError # from av 14 https://github.com/PyAV-Org/PyAV/blob/main/CHANGELOG.rst | ||
| + except AttributeError: | ||
| + FFmpegError = av.AVError | ||
| except ImportError: | ||
| av = ImportError( | ||
| """\ | ||
| @@ -221,7 +225,7 @@ def _read_from_stream( | ||
| try: | ||
| # TODO check if stream needs to always be the video stream here or not | ||
| container.seek(seek_offset, any_frame=False, backward=True, stream=stream) | ||
| - except av.AVError: | ||
| + except FFmpegError: | ||
| # TODO add some warnings in this case | ||
| # print("Corrupted file?", container.name) | ||
| return [] | ||
| @@ -234,7 +238,7 @@ def _read_from_stream( | ||
| buffer_count += 1 | ||
| continue | ||
| break | ||
| - except av.AVError: | ||
| + except FFmpegError: | ||
| # TODO add a warning | ||
| pass | ||
| # ensure that the results are sorted wrt the pts | ||
| @@ -356,7 +360,7 @@ def read_video( | ||
| ) | ||
| info["audio_fps"] = container.streams.audio[0].rate | ||
|
|
||
| - except av.AVError: | ||
| + except FFmpegError: | ||
| # TODO raise a warning? | ||
| pass | ||
|
|
||
| @@ -447,10 +451,10 @@ def read_video_timestamps(filename: str, pts_unit: str = "pts") -> Tuple[List[in | ||
| video_time_base = video_stream.time_base | ||
| try: | ||
| pts = _decode_video_timestamps(container) | ||
| - except av.AVError: | ||
| + except FFmpegError: | ||
| warnings.warn(f"Failed decoding frames for file {filename}") | ||
| video_fps = float(video_stream.average_rate) | ||
| - except av.AVError as e: | ||
| + except FFmpegError as e: | ||
| msg = f"Failed to open container for {filename}; Caught error: {e}" | ||
| warnings.warn(msg, RuntimeWarning) | ||
|
|