yta-video-opengl 0.0.25__py3-none-any.whl → 0.0.27__py3-none-any.whl

yta_video_opengl/effects.py

@@ -1,7 +1,9 @@
 from yta_video_opengl.nodes.video.opengl import WavingNode
 from yta_video_opengl.nodes.audio import ChorusNode
 from yta_video_opengl.nodes import TimedNode
+from yta_video_opengl.utils import texture_to_frame
 from yta_validation.parameter import ParameterValidator
+from yta_validation import PythonValidator
 from yta_programming.decorators import singleton_old
 from typing import Union
 
@@ -379,4 +381,46 @@ class EffectsStack:
 
         return self
     
+    def apply_video_effects(
+        self,
+        frame: 'np.ndarray',
+        t: Union[int, float, 'Fraction']
+    ) -> 'np.ndarray':
+        """
+        Apply all the video effects that must be
+        applied for the given 't' time moment to
+        the provided 'frame' (that must be the
+        video frame of that time moment).
+        """
+        for effect in self.get_video_effects_for_t(t):
+            frame = effect.process(frame, t)
+
+        # TODO: Check when the frame comes as a
+        # Texture and when as a numpy array. I
+        # think when we apply an opengl node it
+        # is a texture, but we need to return it
+        # as a numpy, always
+        return (
+            texture_to_frame(frame)
+            if PythonValidator.is_instance_of(frame, moderngl.Texture) else
+            frame
+        )
+    
+    def apply_audio_effects(
+        self,
+        frame: 'np.ndarray',
+        t: Union[int, float, 'Fraction']
+    ) -> 'np.ndarray':
+        """
+        Apply all the video effects that must be
+        applied for the given 't' time moment to
+        the provided 'frame' (that must be the
+        audio frame of that time moment).
+        """
+        for effect in self.get_audio_effects_for_t(t):
+            frame = effect.process(frame, t)
+
+        # Frame can only by a numpy array here
+        return frame
+    
     # TODO: Create 'remove_effect'

yta_video_opengl/nodes/__init__.py

@@ -131,11 +131,11 @@ class TimedNode:
 
     def process(
         self,
-        frame: Union['VideoFrame', 'AudioFrame', moderngl.Texture],
+        frame: Union[moderngl.Texture, 'np.ndarray'],
         t: float
         # TODO: Maybe we need 'fps' and 'number_of_frames'
         # to calculate progressions or similar...
-    ) -> Union['VideoFrame', 'AudioFrame', 'Texture']:
+    ) -> Union[moderngl.Texture, 'np.ndarray']:
         """
         Process the frame if the provided 't' time
         moment is in the range of this TimedNode

yta_video_opengl/nodes/audio/__init__.py

@@ -32,9 +32,9 @@ class _AudioNode:
     @abstractmethod
     def process(
         self,
-        input: Union['AudioFrame', 'np.ndarray'],
+        input: np.ndarray,
         t: float
-    ) -> Union['AudioFrame', 'np.ndarray']:
+    ) -> np.ndarray:
         """
         Process the provided audio 'input' that
         is played on the given 't' time moment.
@@ -59,20 +59,13 @@ class VolumeNode(_AudioNode):
 
     def process(
         self,
-        input: Union['AudioFrame', 'np.ndarray'],
+        input: np.ndarray,
         t: float
-    ) -> Union['AudioFrame', 'np.ndarray']:
+    ) -> np.ndarray:
         """
         Process the provided audio 'input' that
         is played on the given 't' time moment.
         """
-        # if PythonValidator.is_instance_of(input, 'AudioFrame'):
-        #     input = input.to_ndarray().astype(np.float32)
-
-        # TODO: I think we should receive only 
-        # numpy arrays and the AudioFrame should
-        # be handled outside, but I'm not sure
-
         factor = self.factor_fn(t, 0)
 
         samples = input
@@ -86,15 +79,6 @@ class VolumeNode(_AudioNode):
         #     samples.astype(np.float32)
         # )
 
-        # new_frame = AudioFrame.from_ndarray(
-        #     samples,
-        #     format = input.format.name,
-        #     layout = input.layout.name
-        # )
-        # new_frame.sample_rate = input.sample_rate
-        # new_frame.pts = input.pts
-        # new_frame.time_base = input.time_base
-
         return samples
     
 class ChorusNode(_AudioNode):
@@ -121,17 +105,13 @@ class ChorusNode(_AudioNode):
 
     def process(
         self,
-        input: Union['AudioFrame', 'np.ndarray'],
+        input: Union[np.ndarray],
         t: float
-    ) -> Union['AudioFrame', 'np.ndarray']:
+    ) -> np.ndarray:
         """
         Process the provided audio 'input' that
         is played on the given 't' time moment.
         """
-        # TODO: I think we should receive only 
-        # numpy arrays and the AudioFrame should
-        # be handled outside, but I'm not sure
-
         n_samples = input.shape[0]
         t = np.arange(n_samples) / self.rate
 
@@ -143,81 +123,11 @@ class ChorusNode(_AudioNode):
 
         for i in range(n_samples):
             d = delay[i]
-            if i - d >= 0:
-                output[i] = 0.7 * input[i] + 0.7 * input[i - d]
-            else:
-                output[i] = input[i]
 
-        return output
+            output[i]= (
+                0.7 * input[i] + 0.7 * input[i - d]
+                if (i - d) >= 0 else
+                input[i]
+            )
 
-# TODO: Remove this below
-"""
-Here you have an example. The 'private'
-node class is the modifier, that we don't
-want to expose, and the 'public' class is
-the one that inherits from TimedNode and
-wraps the 'private' class to build the
-functionality.
-"""
-# class VolumeAudioNode(TimedNode):
-#     """
-#     TimedNode to set the audio volume of a video
-#     in a specific frame.
-#     """
-
-#     def __init__(
-#         self,
-#         factor_fn,
-#         start: float = 0.0,
-#         end: Union[float, None] = None
-#     ):
-#         super().__init__(
-#             node = _SetVolumeAudioNode(factor_fn),
-#             start = start,
-#             end = end
-#         )
-
-# class _SetVolumeAudioNode(AudioNode):
-#     """
-#     Audio node to change the volume of an
-#     audio frame.
-#     """
-
-#     def __init__(
-#         self,
-#         factor_fn
-#     ):
-#         """
-#         factor_fn: function (t, index) -> factor volumen
-#         """
-#         self.factor_fn = factor_fn
-
-#     def process(
-#         self,
-#         frame: av.AudioFrame,
-#         t: float,
-#     ) -> av.AudioFrame:
-#         # TODO: Why index (?) Maybe 'total_frames'
-#         factor = self.factor_fn(t, 0)
-
-#         samples = frame.to_ndarray().astype(np.float32)
-#         samples *= factor
-
-#         # Determine dtype according to format
-#         samples = (
-#             samples.astype(np.int16)
-#             # 'fltp', 's16', 's16p'
-#             if 's16' in frame.format.name else
-#             samples.astype(np.float32)
-#         )
-
-#         new_frame = av.AudioFrame.from_ndarray(
-#             samples,
-#             format = frame.format.name,
-#             layout = frame.layout.name
-#         )
-#         new_frame.sample_rate = frame.sample_rate
-#         new_frame.pts = frame.pts
-#         new_frame.time_base = frame.time_base
-
-#         return new_frame
+        return output

yta_video_opengl/nodes/video/opengl/__init__.py

@@ -199,7 +199,7 @@ class OpenglNodeBase(_VideoNode):
 
     def process(
         self,
-        input: Union[moderngl.Texture, 'VideoFrame', 'np.ndarray']
+        input: Union[moderngl.Texture, np.ndarray]
     ) -> moderngl.Texture:
         """
         Apply the shader to the 'input', that
@@ -209,7 +209,7 @@ class OpenglNodeBase(_VideoNode):
         We use and return textures to maintain
         the process in GPU and optimize it.
         """
-        if PythonValidator.is_instance_of(input, ['VideoFrame', 'ndarray']):
+        if PythonValidator.is_instance_of(input, np.ndarray):
             # TODO: What about the numpy format (?)
             input = frame_to_texture(input, self.context)
 
@@ -293,7 +293,7 @@ class WavingNode(OpenglNodeBase):
     # processed by the code
     def process(
         self,
-        input: Union[moderngl.Texture, 'VideoFrame', 'np.ndarray'],
+        input: Union[moderngl.Texture, 'np.ndarray'],
         t: float = 0.0,
     ) -> moderngl.Texture:
         """

yta_video_opengl/nodes/video/opengl/experimental.py

@@ -65,7 +65,7 @@ class BreathingFrame(OpenglNodeBase):
     
     def process(
         self,
-        input: Union[moderngl.Texture, 'VideoFrame', 'np.ndarray'],
+        input: Union[moderngl.Texture, 'np.ndarray'],
         t: float = 0.0,
     ) -> moderngl.Texture:
         """
@@ -165,7 +165,7 @@ class HandheldFrame(OpenglNodeBase):
     
     def process(
         self,
-        input: Union[moderngl.Texture, 'VideoFrame', 'np.ndarray'],
+        input: Union[moderngl.Texture, np.ndarray],
         t: float = 0.0,
     ) -> moderngl.Texture:
         """
@@ -351,7 +351,7 @@ class OrbitingFrame(OpenglNodeBase):
     
     def process(
         self,
-        input: Union[moderngl.Texture, 'VideoFrame', 'np.ndarray'],
+        input: Union[moderngl.Texture, np.ndarray],
         t: float = 0.0,
     ) -> moderngl.Texture:
         """
@@ -446,7 +446,7 @@ class RotatingInCenterFrame(OpenglNodeBase):
 
     def process(
         self,
-        input: Union[moderngl.Texture, 'VideoFrame', 'np.ndarray'],
+        input: Union[moderngl.Texture, np.ndarray],
         t: float = 0.0,
     ) -> moderngl.Texture:
         """
@@ -636,7 +636,7 @@ class StrangeTvFrame(OpenglNodeBase):
 
     def process(
         self,
-        input: Union[moderngl.Texture, 'VideoFrame', 'np.ndarray'],
+        input: Union[moderngl.Texture, np.ndarray],
         t: float = 0.0,
     ) -> moderngl.Texture:
         """
@@ -744,7 +744,7 @@ class GlitchRgbFrame(OpenglNodeBase):
 
     def process(
         self,
-        input: Union[moderngl.Texture, 'VideoFrame', 'np.ndarray'],
+        input: Union[moderngl.Texture, np.ndarray],
         t: float = 0.0,
     ) -> moderngl.Texture:
         """

{yta_video_opengl-0.0.25.dist-info → yta_video_opengl-0.0.27.dist-info}/METADATA

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

yta_video_opengl-0.0.27.dist-info/RECORD

@@ -0,0 +1,13 @@
+yta_video_opengl/__init__.py,sha256=ycAx_XYMVDfkuObSvtW6irQ0Wo-fgxEz3fjIRMe8PpY,205
+yta_video_opengl/effects.py,sha256=292IfC1eGDXILkXlo5yUjFFyW7eYevM96V0Ncgnmk2o,11980
+yta_video_opengl/nodes/__init__.py,sha256=X5vmJChn9LJa-u5n6Ch1xS9lVL5mgn7Yw2Qm0x3rO_s,4443
+yta_video_opengl/nodes/audio/__init__.py,sha256=LnGes6u1K0pa4CXP0LrHftLwv0zi-JYvHmYEkJqw_J8,3302
+yta_video_opengl/nodes/video/__init__.py,sha256=I6F4JRNFKsj1jjy-nXoD9hj7rA47DtAIhAk6-m6vgjY,948
+yta_video_opengl/nodes/video/opengl/__init__.py,sha256=nqe803cLoxE0NVMadYU8fgdEXrocDjoD-NEZvs1lERw,8542
+yta_video_opengl/nodes/video/opengl/experimental.py,sha256=9MPudKhl_mDjOyVj89GGLJUVW2esc0PK15EsRpijtzI,22064
+yta_video_opengl/tests.py,sha256=OPD1Caxt-VYHOtgjIhSfG8pqu8YMREgNsEUBZ22kd3o,24256
+yta_video_opengl/utils.py,sha256=w6jYnZcBYPNAsTolkAlA6dxph0u_8-mcUzKvADlIlW8,3098
+yta_video_opengl-0.0.27.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+yta_video_opengl-0.0.27.dist-info/METADATA,sha256=MBxK-ZXJ1lbD0ot0SUGOvhVmmjmA4kQgnhDv5xcMVQo,589
+yta_video_opengl-0.0.27.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+yta_video_opengl-0.0.27.dist-info/RECORD,,

yta_video_opengl-0.0.25.dist-info/RECORD

@@ -1,13 +0,0 @@
-yta_video_opengl/__init__.py,sha256=ycAx_XYMVDfkuObSvtW6irQ0Wo-fgxEz3fjIRMe8PpY,205
-yta_video_opengl/effects.py,sha256=ySXlkUzFIAbnM8_j3ckqao4s0lvUib1e07e_p9HTjOs,10489
-yta_video_opengl/nodes/__init__.py,sha256=mDqQBfOjDKqPqp_CNY38ROM_5lhyzQ9AgT0pRswpYUY,4464
-yta_video_opengl/nodes/audio/__init__.py,sha256=7YQgWjX4sYy26mI03W1BEQZ7COKHSKZzcelPKvD7oJI,6097
-yta_video_opengl/nodes/video/__init__.py,sha256=I6F4JRNFKsj1jjy-nXoD9hj7rA47DtAIhAk6-m6vgjY,948
-yta_video_opengl/nodes/video/opengl/__init__.py,sha256=bVPdS_wpz4HNurmLRDEHUmNZU7Qz8LptKfJ9yN_2PJM,8587
-yta_video_opengl/nodes/video/opengl/experimental.py,sha256=XuriXcOuJU5P0FruKffudCpMuO-ht8weJud88Qn8GKk,22158
-yta_video_opengl/tests.py,sha256=OPD1Caxt-VYHOtgjIhSfG8pqu8YMREgNsEUBZ22kd3o,24256
-yta_video_opengl/utils.py,sha256=w6jYnZcBYPNAsTolkAlA6dxph0u_8-mcUzKvADlIlW8,3098
-yta_video_opengl-0.0.25.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-yta_video_opengl-0.0.25.dist-info/METADATA,sha256=B-rc8f1xDeLaJLsfFmQ6UOcerV3l5k3p-LtzCY4Dmss,589
-yta_video_opengl-0.0.25.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-yta_video_opengl-0.0.25.dist-info/RECORD,,