From bb67660aa60519832bcfca6f6ae77ba353466ce5 Mon Sep 17 00:00:00 2001 From: Lijun Yu Date: Wed, 21 Oct 2020 13:26:58 -0400 Subject: [PATCH] v1.3.7 --- avi_r/reader.py | 9 +++++---- docs/version.md | 5 +++++ setup.py | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/avi_r/reader.py b/avi_r/reader.py index ac5112b..723d19e 100644 --- a/avi_r/reader.py +++ b/avi_r/reader.py @@ -12,7 +12,8 @@ class AVIReader(object): def __init__(self, video_path: str, parent_dir: str = '', - fix_missing: bool = True, silence_warning: bool = True): + fix_missing: bool = True, silence_warning: bool = True, + **kwargs): """Read frames from a video file. Parameters @@ -57,7 +58,7 @@ def __init__(self, video_path: str, parent_dir: str = '', self.fix_missing = fix_missing if not self.fix_missing: self._logger.warning('NOT fixing missing frames.') - self._init() + self._init(**kwargs) self.num_frames = self._stream.duration self.frame_rate = float(self._stream.average_rate) self.height = self._stream.codec_context.height @@ -229,9 +230,9 @@ def __del__(self): if hasattr(self, '_container'): self._del() - def _init(self, video_stream_id=0): + def _init(self, video_stream_id=0, timeout=None): self._container = av.open( - self.path, metadata_errors='replace', timeout=60) + self.path, metadata_errors='replace', timeout=timeout) self._stream = self._container.streams.video[video_stream_id] self._frame_gen = self._get_frame_gen() self.reorder_buffer = [] diff --git a/docs/version.md b/docs/version.md index ce90ff1..112b583 100644 --- a/docs/version.md +++ b/docs/version.md @@ -1,5 +1,10 @@ # Version History +## AVI-R v1.3.7 + +* Remove default timeout. +* Bypass kwargs to _init. + ## AVI-R v1.3.6 * Add timeout for PyAV. diff --git a/setup.py b/setup.py index 6fd2637..a4c0f45 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setuptools.setup( name='avi-r', - version='1.3.6', + version='1.3.7', author='Lijun Yu', author_email='lijun@lj-y.com', description='A robust reader for avi videos.',