yta-video-opengl 0.0.20__tar.gz → 0.0.22__tar.gz

{yta_video_opengl-0.0.20 → yta_video_opengl-0.0.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: yta-video-opengl
-Version: 0.0.20
+Version: 0.0.22
 Summary: Youtube Autonomous Video OpenGL Module
 Author: danialcala94
 Author-email: danielalcalavalera@gmail.com
@@ -10,6 +10,7 @@ Classifier: Programming Language :: Python :: 3.9
 Requires-Dist: av (>=0.0.1,<19.0.0)
 Requires-Dist: moderngl (>=0.0.1,<9.0.0)
 Requires-Dist: numpy (>=0.0.1,<9.0.0)
+Requires-Dist: pillow (>=0.0.1,<99.0.0)
 Requires-Dist: quicktions (>=0.0.1,<9.0.0)
 Requires-Dist: yta_timer (>0.0.1,<1.0.0)
 Requires-Dist: yta_validation (>=0.0.1,<1.0.0)

{yta_video_opengl-0.0.20 → yta_video_opengl-0.0.22}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "yta-video-opengl"
-version = "0.0.20"
+version = "0.0.22"
 description = "Youtube Autonomous Video OpenGL Module"
 authors = [
     {name = "danialcala94",email = "danielalcalavalera@gmail.com"}
@@ -15,6 +15,10 @@ dependencies = [
     "moderngl (>=0.0.1,<9.0.0)",
     "numpy (>=0.0.1,<9.0.0)",
     "quicktions (>=0.0.1,<9.0.0)",
+    # I need this 'pillow' just to read an image
+    # and transform into a numpy array to be able
+    # to handle the ImageMedia
+    "pillow (>=0.0.1,<99.0.0)"
 ]
 
 [tool.poetry]

{yta_video_opengl-0.0.20 → yta_video_opengl-0.0.22}/src/yta_video_opengl/audio.py

@@ -1,3 +1,8 @@
+"""
+TODO: This class has not been refactored nor
+tested. I need to put some love on it to make
+it work and test that it is working properly.
+"""
 from yta_video_opengl.reader import VideoReader
 from yta_video_opengl.writer import VideoWriter
 from yta_video_opengl.t import T

{yta_video_opengl-0.0.20 → yta_video_opengl-0.0.22}/src/yta_video_opengl/complete/frame_combinator.py

@@ -201,93 +201,4 @@ class AudioFrameCombinator:
         )
         out.sample_rate = sample_rate
 
-        return out
-
-# TODO: This method below has been refactored
-# to the 'sum_tracks_frames', so delete it 
-# when the one above is working well
-def mix_audio_frames_by_index(
-    tracks_frames,
-    sample_rate: int,
-    layout = 'stereo',
-):
-    """
-    Combine all the columns of the given
-    matrix of audio frames 'tracks_frames'.
-    The rows are the different tracks and
-    the columns are the frame at that 't'
-    moment of each of those tracks.
-
-    The 'tracks_frames' matrix needs to be
-    pre-processed to have only 1 single
-    frame to combine, so we concatenate
-    all the frames if more than 1 per 
-    column.
-    """
-    # TODO: Please, improve and clean all this
-    # code is so sh*tty, and make utils to
-    # combine and those things, not here...
-    # Also the formats, make them dynamic and
-    # based on the output that is defined here
-    # in the Timeline class.
-    mixed_frames = []
-
-    # Iterate by columns (each row is a track)
-    for frames_at_index in zip(*tracks_frames):
-        arrays = []
-        for f in frames_at_index:
-            # Resample to output expected values
-            # TODO: This must be dynamic depending
-            # on the track values
-            resampler = AudioResampler(format = 'fltp', layout = 'stereo', rate = sample_rate)
-            arr = resampler.resample(f)
-
-            arr = f.to_ndarray()
-
-            # TODO: This below must change depending
-            # on the expected output, for us and now
-            # it is float32, fltp, stereo, 44_100
-            # Same format
-            if arr.dtype == np.int16:
-                arr = arr.astype(np.float32) / 32768.0
-
-            # Same layout (number of channels)
-            if arr.shape[0] == 1:
-                return np.repeat(arr, 2, axis = 0)
-            # elif arr.dtype == np.float32:
-            #     # Ya está en [-1,1], no lo toques
-            #     pass
-
-            arrays.append(arr)
-
-        # Alinear longitudes
-        max_len = max(a.shape[1] for a in arrays)
-        stacked = []
-        for a in arrays:
-            buf = np.zeros((a.shape[0], max_len), dtype = np.float32)
-            buf[:, :a.shape[1]] = a
-            stacked.append(buf)
-
-        # Mezcla
-        mix = np.sum(stacked, axis = 0) / len(stacked)
-        #mix = np.sum(stacked, axis = 0) 
-
-        # Limitar al rango [-1,1]
-        mix = np.clip(mix, -1.0, 1.0)
-
-        # Crear frame de salida
-        # TODO: What about the 'format' if they
-        # are all different (?)
-        out = AudioFrame.from_ndarray(mix, format = 'fltp', layout = layout)
-        out.sample_rate = sample_rate
-        # TODO: This will be written later when
-        # encoding
-        # out.pts = frames_at_index[0].pts
-        # out.time_base = frames_at_index[0].time_base
-
-        print(mix.min(), mix.max())
-
-        mixed_frames.append(out)
-
-    return mixed_frames
-
+        return out

{yta_video_opengl-0.0.20 → yta_video_opengl-0.0.22}/src/yta_video_opengl/complete/frame_generator.py

@@ -28,6 +28,9 @@ class _FrameGenerator:
     Class to generate frames as numpy arrays.
     """
 
+    # TODO: I have some library doing this with
+    # colors and numpy frames, so please refactor
+
     def full_black(
         self,
         size: tuple[int, int] = (1920, 1080),
@@ -57,8 +60,27 @@ class _FrameGenerator:
         """
         # TODO: I think 'ones' only work if dtype
         # is int
-        return np.ones(
+        return np.full(
+            shape = (size[1], size[0], 3),
+            fill_value = (255, 255, 255),
+            dtype = dtype
+        )
+
+    def full_red(
+        self,
+        size: tuple[int, int] = (1920, 1080),
+        dtype: np.dtype = np.uint8
+    ):
+        """
+        Get a numpy array that represents a full
+        red frame of the given 'size' and with
+        the given 'dtype'.
+        """
+        # TODO: I think 'ones' only work if dtype
+        # is int
+        return np.full(
             shape = (size[1], size[0], 3),
+            fill_value = (255, 0, 0),
             dtype = dtype
         )
 
@@ -115,6 +137,25 @@ class _BackgroundFrameGenerator:
             time_base = time_base
         )
 
+    def full_red(
+        self,
+        size: tuple[int, int] = (1920, 1080),
+        dtype: np.dtype = np.uint8,
+        format: str = 'rgb24',
+        pts: Union[int, None] = None,
+        time_base: Union['Fraction', None] = None   
+    ) -> VideoFrame:
+        """
+        Get a video frame that is completely red
+        and of the given 'size'.
+        """
+        return numpy_to_video_frame(
+            frame = self._frame_generator.full_red(size, dtype),
+            format = format,
+            pts = pts,
+            time_base = time_base
+        )
+
 class VideoFrameGenerator:
     """
     Class to wrap the functionality related to

{yta_video_opengl-0.0.20 → yta_video_opengl-0.0.22}/src/yta_video_opengl/complete/frame_wrapper.py

@@ -5,6 +5,12 @@ from typing import Union
 
 
 IS_FROM_EMPTY_PART_METADATA = 'is_from_empty_part'
+"""
+Metadata key to indicate if the frame
+has been generated by an empty part
+and should be ignored when trying to
+combine with others.
+"""
 
 class _FrameWrappedBase:
     """
@@ -35,7 +41,14 @@ class _FrameWrappedBase:
         ParameterValidator.validate_mandatory_dict('metadata', metadata)
 
         self._frame: Union[VideoFrame, AudioFrame] = frame
+        """
+        The VideoFrame or AudioFrame pyav instance.
+        """
         self.metadata: dict = metadata or {}
+        """
+        The metadata we want to include with the
+        frame.
+        """
 
     def __getattr__(
         self,