yta-video-opengl 0.0.12__py3-none-any.whl → 0.0.14__py3-none-any.whl

yta_video_opengl/reader/__init__.py

@@ -4,6 +4,7 @@ that, using ffmpeg, detects the video.
 """
 from yta_video_opengl.reader.cache import VideoFrameCache
 from yta_video_opengl.utils import iterate_stream_frames_demuxing
+from yta_video_opengl.t import T
 from yta_validation import PythonValidator
 from av.video.frame import VideoFrame
 from av.audio.frame import AudioFrame
@@ -11,7 +12,7 @@ from av.packet import Packet
 from av.video.stream import VideoStream
 from av.audio.stream import AudioStream
 from av.container.input import InputContainer
-from fractions import Fraction
+from quicktions import Fraction
 from av import open as av_open
 from typing import Union
 from dataclasses import dataclass
@@ -58,7 +59,7 @@ class VideoReaderFrame:
         self,
         # TODO: Add the type, please
         frame: any,
-        t: float = None,
+        t: Union[int, float, Fraction] = None,
         pixel_format: str = 'rgb24'
     ):
         self.value: Union[AudioFrame, VideoFrame] = frame
@@ -66,7 +67,7 @@ class VideoReaderFrame:
         The frame content, that can be audio or video
         frame.
         """
-        self.t: float = t
+        self.t: Fraction = Fraction(t)
         """
         The 't' time moment of the frame.
         """
@@ -139,6 +140,8 @@ class VideoReader:
         """
         return self.container.decode(self.video_stream)
     
+    # TODO: Remove this when possible, we are not
+    # using 'next' properties
     @property
     def next_frame(
         self
@@ -159,16 +162,6 @@ class VideoReader:
         """
         return self.container.decode(self.audio_stream)
         
-    @property
-    def next_audio_frame(
-        self
-    ) -> Union[AudioFrame, None]:
-        """
-        Get the next audio frame (decoded) from the
-        iterator.
-        """
-        return next(self.audio_frame_iterator)
-    
     @property
     def packet_iterator(
         self
@@ -179,16 +172,6 @@ class VideoReader:
         """
         return self.container.demux(self.video_stream)
     
-    @property
-    def next_packet(
-        self
-    ) -> Union[Packet, None]:
-        """
-        Get the next video packet (not decoded) from
-        the iterator.
-        """
-        return next(self.packet_iterator)
-    
     @property
     def audio_packet_iterator(
         self
@@ -199,16 +182,6 @@ class VideoReader:
         """
         return self.container.demux(self.audio_stream)
     
-    @property
-    def next_audio_packet(
-        self
-    ) -> Union[Packet, None]:
-        """
-        Get the next audio packet (not decoded) from
-        the iterator.
-        """
-        return next(self.packet_iterator)
-    
     @property
     def packet_with_audio_iterator(
         self
@@ -220,18 +193,6 @@ class VideoReader:
         """
         return self.container.demux((self.video_stream, self.audio_stream))
 
-    @property
-    def next_packet_with_audio(
-        self
-    ) -> Union[Packet, None]:
-        """
-        Get the next video frames packet (or audio
-        frames packet) from the iterator. Depending
-        on the position, the packet can be video or
-        audio.
-        """
-        return next(self.packet_with_audio_iterator)
-    
     @property
     def has_video(
         self
@@ -312,8 +273,6 @@ class VideoReader:
         The fps of the video.
         """
         return (
-            # They return it as a Fraction but we usually
-            # use it as float or even int
             self.video_stream.average_rate
             if self.has_video else
             None
@@ -515,6 +474,7 @@ class VideoReader:
             )
             # TODO: Should this be 'AUTO' (?)
             self.video_stream.thread_type = 'AUTO'
+
             self.audio_stream = (
                 self.container.streams.audio[0]
                 if self.container.streams.audio else
@@ -534,7 +494,7 @@ class VideoReader:
 
     def seek(
         self,
-        pts,
+        pts: int,
         stream = None
     ) -> 'VideoReader':
         """
@@ -567,7 +527,8 @@ class VideoReader:
         for frame in self.frame_iterator:
             yield VideoReaderFrame(
                 frame = frame,
-                t = float(frame.pts * self.time_base),
+                # TODO: Maybe use util to transform it (?)
+                t = frame.pts * self.time_base,
                 pixel_format = self.pixel_format
             )
 
@@ -659,50 +620,29 @@ class VideoReader:
         ):
             yield frame
 
-    # TODO: Will we use this (?)
-    def get_frame(
-        self,
-        index: int
-    ) -> 'VideoFrame':
-        """
-        Get the video frame with the given 'index',
-        using the video cache system.
-        """
-        return self.video_cache.get_frame(index)
-    
     def get_frame_from_t(
         self,
-        t: float
+        t: Union[int, float, Fraction]
     ) -> 'VideoFrame':
         """
         Get the video frame with the given 't' time
         moment, using the video cache system.
         """
-        return self.video_cache.get_frame_from_t(t)
+        return self.video_cache.get_video_frame(t)
     
-    def get_audio_frame(
-        self,
-        index: int
-    ) -> 'AudioFrame':
-        """
-        Get the audio frame with the given 'index',
-        using the audio cache system.
-        """
-        return self.audio_cache.get_frame(index)
-
     def get_audio_frame_from_t(
         self,
-        t: float
+        t: Union[int, float, Fraction]
     ) -> 'AudioFrame':
         """
         Get the audio frame with the given 't' time
         moment, using the audio cache system.
         """
-        return self.audio_cache.get_frame_from_t(t)
+        return self.audio_cache.get_audio_frame_from_t(t)
     
     def get_audio_frames_from_t(
         self,
-        t: float
+        t: Union[int, float, Fraction]
     ):
         """
         Get the sequence of audio frames for the 
@@ -715,14 +655,17 @@ class VideoReader:
         (remember that a video frame is associated
         with more than 1 audio frame).
         """
-        print(f'Getting audio frames from video, from t:{str(t)} - nt:{str(t + (1 / self.fps))}')
-        for frame in self.audio_cache.get_frames(t, t + (1 / self.fps)):
+        t: T = T.from_fps(t, self.fps)
+        # We want all the audios that must be played
+        # during the video frame that starts in the
+        # 't' time moment
+        for frame in self.audio_cache.get_audio_frames(t.truncated, t.next(1).truncated):
             yield frame
     
     def get_frames(
         self,
-        start: float = 0.0,
-        end: Union[float, None] = None
+        start: Union[int, float, Fraction] = 0.0,
+        end: Union[int, float, Fraction, None] = None
     ):
         """
         Iterator to get the video frames in between
@@ -733,14 +676,14 @@ class VideoReader:
 
     def get_audio_frames(
         self,
-        start: float = 0.0,
-        end: Union[float, None] = None
+        start: Union[int, float, Fraction] = 0.0,
+        end: Union[int, float, Fraction, 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):
+        for frame in self.audio_cache.get_audio_frames(start, end):
             yield frame
     
     def close(
@@ -752,6 +695,8 @@ class VideoReader:
         self.container.close()
 
 
+# TODO: I think I'm not using this...
+# Remove it please
 def audio_ts_for_video_t(
     t: float,
     video_fps: float,