yta-video-opengl 0.0.8__py3-none-any.whl → 0.0.9__py3-none-any.whl

yta_video_opengl/reader/__init__.py

@@ -398,9 +398,14 @@ class VideoReader:
         """
         The stream that includes the audio.
         """
-        self.cache: VideoFrameCache = None
+        self.video_cache: VideoFrameCache = None
         """
-        The frame cache system to optimize
+        The video frame cache system to optimize
+        the way we access to the frames.
+        """
+        self.audio_cache: VideoFrameCache = None
+        """
+        The audio frame cache system to optimize
         the way we access to the frames.
         """
 
@@ -434,7 +439,8 @@ class VideoReader:
             self.video_stream.thread_type = 'AUTO'
             self.audio_stream = self.container.streams.audio[0]
             self.audio_stream.thread_type = 'AUTO'
-            self.cache = VideoFrameCache(self)
+            self.video_cache = VideoFrameCache(self.container, self.video_stream)
+            self.audio_cache = VideoFrameCache(self.container, self.audio_stream)
 
     def seek(
         self,
@@ -564,10 +570,45 @@ class VideoReader:
         index: int
     ) -> 'VideoFrame':
         """
-        Get the frame with the given 'index', using
-        the cache system.
+        Get the video frame with the given 'index',
+        using the video cache system.
+        """
+        return self.video_cache.get_frame(index)
+    
+    # TODO: Will we use this (?)
+    def get_audio_frame(
+        self,
+        index: int
+    ) -> 'VideoFrame':
+        """
+        Get the audio frame with the given 'index',
+        using the audio cache system.
+        """
+        return self.video_cache.get_frame(index)
+    
+    def get_frames(
+        self,
+        start: float = 0.0,
+        end: Union[float, None] = None
+    ):
         """
-        return self.cache.get_frame(index)
+        Iterator to get the video frames in between
+        the provided 'start' and 'end' time moments.
+        """
+        for frame in self.video_cache.get_frames(start, end):
+            yield frame
+
+    def get_audio_frames(
+        self,
+        start: float = 0.0,
+        end: Union[float, None] = None
+    ):
+        """
+        Iterator to get the audio frames in between
+        the provided 'start' and 'end' time moments.
+        """
+        for frame in self.audio_cache.get_frames(start, end):
+            yield frame
     
     def close(
         self

yta_video_opengl/reader/cache.py

@@ -16,7 +16,16 @@ memory all those frames to be handled fast. It
 will remove the old frames if needed to use only
 the 'size' we set when creating it.
 """
+from yta_video_opengl.utils import t_to_pts, pts_to_t, pts_to_index
+from av.container import InputContainer
+from av.video.stream import VideoStream
+from av.audio.stream import AudioStream
+from av.video.frame import VideoFrame
+from av.audio.frame import AudioFrame
+from yta_validation.parameter import ParameterValidator
+from fractions import Fraction
 from collections import OrderedDict
+from typing import Union
 
 
 class VideoFrameCache:
@@ -26,33 +35,44 @@ class VideoFrameCache:
     """
 
     @property
-    def container(
+    def fps(
         self
-    ) -> 'InputContainer':
+    ) -> float:
         """
-        Shortcut to the video reader instance container.
+        The frames per second as a float.
         """
-        return self.reader_instance.container
+        return (
+            float(self.stream.average_rate)
+            if self.stream.type == 'video' else
+            float(self.stream.rate)
+        )
     
     @property
-    def stream(
+    def time_base(
         self
-    ) -> 'VideoStream':
+    ) -> Union[Fraction, None]:
         """
-        Shortcut to the video reader instance video
-        stream.
+        The time base of the stream.
         """
-        return self.reader_instance.video_stream
+        return self.stream.time_base
 
     def __init__(
         self,
-        reader: 'VideoReader',
+        container: InputContainer,
+        stream: Union[VideoStream, AudioStream],
         size: int = 50
     ):
-        self.reader_instance: 'VideoReader' = reader
+        ParameterValidator.validate_mandatory_instance_of('container', container, InputContainer)
+        ParameterValidator.validate_mandatory_instance_of('stream', stream, [VideoStream, AudioStream])
+        ParameterValidator.validate_mandatory_positive_int('size', size)
+
+        self.container: InputContainer = container
+        """
+        The pyav container.
         """
-        The video reader instance this cache belongs
-        to.
+        self.stream: Union[VideoStream, AudioStream] = stream
+        """
+        The pyav stream.
         """
         self.cache: OrderedDict = OrderedDict()
         """
@@ -69,21 +89,40 @@ class VideoFrameCache:
         end.
         """
 
+        self._prepare()
+
+    def _prepare(
+        self
+    ):
         # Index key frames
         for packet in self.container.demux(self.stream):
             if packet.is_keyframe:
                 self.key_frames_pts.append(packet.pts)
 
         self.container.seek(0)
-        # TODO: Maybe this is better (?)
-        #self.reader_instance.reset()
+
+    def _get_nearest_keyframe_fps(
+        self,
+        pts: int
+    ):
+        """
+        Get the fps of the keyframe that is the
+        nearest to the provided 'pts'. Useful to
+        seek and start decoding frames from that
+        keyframe.
+        """
+        return max([
+            key_frame_pts
+            for key_frame_pts in self.key_frames_pts
+            if key_frame_pts <= pts
+        ])
 
     def _get_frame_by_pts(
         self,
-        target_pts
+        pts: int
     ):
         """
-        Get the frame that has the provided 'target_pts'.
+        Get the frame that has the provided 'pts'.
 
         This method will start decoding frames from the
         most near key frame (the one with the nearer
@@ -94,11 +133,7 @@ class VideoFrameCache:
         requested is not stored in the caché.
         """
         # Look for the most near key frame
-        key_frame_pts = max([
-            key_frame_pts
-            for key_frame_pts in self.key_frames_pts
-            if key_frame_pts <= target_pts
-        ])
+        key_frame_pts = self._get_nearest_keyframe_fps(pts)
 
         # Go to the key frame that includes it
         self.container.seek(key_frame_pts, stream = self.stream)
@@ -106,21 +141,20 @@ class VideoFrameCache:
         decoded = None
         for frame in self.container.decode(self.stream):
             # TODO: Could 'frame' be None (?)
-            pts = frame.pts
-            if pts is None:
+            if frame.pts is None:
                 continue
 
             # Store in cache if needed
-            if pts not in self.cache:
+            if frame.pts not in self.cache:
                 # TODO: The 'format' must be dynamic
-                self.cache[pts] = frame.to_ndarray(format = "rgb24")
+                self.cache[frame.pts] = frame.to_ndarray(format = "rgb24")
 
                 # Clean cache if full
                 if len(self.cache) > self.size:
                     self.cache.popitem(last = False)
 
-            if pts >= target_pts:
-                decoded = self.cache[pts]
+            if frame.pts >= pts:
+                decoded = self.cache[frame.pts]
                 break
 
         return decoded
@@ -128,21 +162,65 @@ class VideoFrameCache:
     def get_frame(
         self,
         index: int
-    ) -> 'VideoFrame':
+    ) -> Union[VideoFrame, AudioFrame]:
         """
         Get the frame with the given 'index' from
         the cache.
         """
-        # convertir frame_number a PTS (timestamps internos)
-        time_base = self.stream.time_base
-        fps = float(self.stream.average_rate)
-        target_pts = int(index / fps / time_base)
+        # TODO: Maybe we can accept 't' and 'pts' also
+        target_pts = int(index / self.fps / self.time_base)
 
         return (
             self.cache[target_pts]
             if target_pts in self.cache else
             self._get_frame_by_pts(target_pts)
         )
+
+    def get_frames(
+        self,
+        start: float = 0,
+        end: Union[float, None] = None
+    ):
+        """
+        Get all the frames in the range between
+        the provided 'start' and 'end' time in
+        seconds.
+        """
+        # TODO: I create this method by default using
+        # the cache. Think about how to implement it
+        # and apply it here, please.
+        # Go to the nearest key frame
+        start = t_to_pts(start, self.time_base)
+        end = (
+            t_to_pts(end, self.time_base)
+            if end is not None else
+            None
+        )
+        key_frame_pts = self._get_nearest_keyframe_fps(start)
+
+        # Go to the nearest key frame to start decoding
+        self.container.seek(key_frame_pts, stream = self.stream)
+
+        for packet in self.container.demux(self.stream):
+            for frame in packet.decode():
+                if frame.pts is None:
+                    continue
+
+                if frame.pts < start:
+                    continue
+
+                if (
+                    end is not None and
+                    frame.pts > end
+                ):
+                    return
+                
+                # TODO: Maybe send a @dataclass instead (?)
+                yield (
+                    frame,
+                    pts_to_t(frame.pts, self.time_base),
+                    pts_to_index(frame.pts, self.time_base, self.fps)
+                )
     
     def clear(
         self

yta_video_opengl/tests.py

@@ -583,7 +583,7 @@ def video_modified_stored():
     from yta_video_opengl.utils import texture_to_frame, frame_to_texture
     from yta_video_opengl.video import Video
 
-    Video(VIDEO_PATH, 0, 0.5).save_as(OUTPUT_PATH)
+    Video(VIDEO_PATH, 0.25, 0.75).save_as(OUTPUT_PATH)
 
     return
 

yta_video_opengl/video.py

@@ -89,17 +89,23 @@ class Video:
         - `t` as the frame time moment
         - `index` as the frame index
         """
-        for frame in iterate_stream_frames_demuxing(
-            container = self.reader.container,
-            video_stream = self.reader.video_stream,
-            audio_stream = self.reader.audio_stream,
-            video_start_pts = self.start_pts,
-            video_end_pts = self.end_pts,
-            audio_start_pts = self.audio_start_pts,
-            audio_end_pts = self.audio_end_pts
-        ):
+        for frame in self.reader.get_frames(self.start, self.end):
             yield frame
 
+        for frame in self.reader.get_audio_frames(self.start, self.end):
+            yield frame
+
+        # for frame in iterate_stream_frames_demuxing(
+        #     container = self.reader.container,
+        #     video_stream = self.reader.video_stream,
+        #     audio_stream = self.reader.audio_stream,
+        #     video_start_pts = self.start_pts,
+        #     video_end_pts = self.end_pts,
+        #     audio_start_pts = self.audio_start_pts,
+        #     audio_end_pts = self.audio_end_pts
+        # ):
+        #     yield frame
+
     def __init__(
         self,
         filename: str,

{yta_video_opengl-0.0.8.dist-info → yta_video_opengl-0.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: yta-video-opengl
-Version: 0.0.8
+Version: 0.0.9
 Summary: Youtube Autonomous Video OpenGL Module
 Author: danialcala94
 Author-email: danielalcalavalera@gmail.com

yta_video_opengl-0.0.9.dist-info/RECORD

@@ -0,0 +1,12 @@
+yta_video_opengl/__init__.py,sha256=ycAx_XYMVDfkuObSvtW6irQ0Wo-fgxEz3fjIRMe8PpY,205
+yta_video_opengl/classes.py,sha256=VUw73kfz8kxYLE0x0LxNHqFekF3CklcyofCNN-z57Lg,37706
+yta_video_opengl/reader/__init__.py,sha256=rAWISZ7OzDnzar0At-LCfDA-MmWzax2jT2l5gySv4aw,16911
+yta_video_opengl/reader/cache.py,sha256=UKhZvgY80ySuOYH52ikco6affsm8bjP656EroVR9Utg,6960
+yta_video_opengl/tests.py,sha256=NZ-W1ak-ygwL9wATzEXtlCeCZX74ij_TZhktetMnOD4,25810
+yta_video_opengl/utils.py,sha256=y0N1mS9FjpB4nFnx00K7sIs5EsqMkTe8C0bzLXZe9YM,10479
+yta_video_opengl/video.py,sha256=Y14-Bsq7AH0GenwbPk61giD9eLHZDmWeZvP_iZn0e7w,5182
+yta_video_opengl/writer.py,sha256=7xglz8xHOXMtWkctzuB21Y-e9xWFXYcklt3jVUN4svQ,8198
+yta_video_opengl-0.0.9.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+yta_video_opengl-0.0.9.dist-info/METADATA,sha256=iYodm7r8DJD5lpPAs92lAClPcJ4dFrS94Dv5WjHcx5Q,670
+yta_video_opengl-0.0.9.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+yta_video_opengl-0.0.9.dist-info/RECORD,,

yta_video_opengl-0.0.8.dist-info/RECORD

@@ -1,12 +0,0 @@
-yta_video_opengl/__init__.py,sha256=ycAx_XYMVDfkuObSvtW6irQ0Wo-fgxEz3fjIRMe8PpY,205
-yta_video_opengl/classes.py,sha256=VUw73kfz8kxYLE0x0LxNHqFekF3CklcyofCNN-z57Lg,37706
-yta_video_opengl/reader/__init__.py,sha256=95thY3A2_QOPdKInQIN7eOlxwzZanFNi5yePmlsvdXc,15620
-yta_video_opengl/reader/cache.py,sha256=Y3lQrirQJz7zFeiJQeJnkzyghYeMahkpKzsouzB90VI,4421
-yta_video_opengl/tests.py,sha256=h_7juB8iV-pUj9EUMO_zzPZGj2IGIe60lK7xskI2n9I,25806
-yta_video_opengl/utils.py,sha256=y0N1mS9FjpB4nFnx00K7sIs5EsqMkTe8C0bzLXZe9YM,10479
-yta_video_opengl/video.py,sha256=xPlWP6ulTKsTqJd_7SwudAGUPFNOS6Hr6IRntdAvfx4,4966
-yta_video_opengl/writer.py,sha256=7xglz8xHOXMtWkctzuB21Y-e9xWFXYcklt3jVUN4svQ,8198
-yta_video_opengl-0.0.8.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-yta_video_opengl-0.0.8.dist-info/METADATA,sha256=LBw62abHLEFbp1x2bFcqs9CNCmr0a16pQ_UsvlFta2E,670
-yta_video_opengl-0.0.8.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-yta_video_opengl-0.0.8.dist-info/RECORD,,