yta-video-opengl 0.0.23__py3-none-any.whl → 0.0.24__py3-none-any.whl

yta_video_opengl/tests.py

@@ -565,204 +565,208 @@ NUMPY_FORMAT = 'rgb24'
 #         print(f'Saved as "{self.output_filename}".')
 
 
-# def video_modified_stored():
-#     # This path below was trimmed in an online platform
-#     # and seems to be bad codified and generates error
-#     # when processing it, but it is readable in the
-#     # file explorer...
-#     #VIDEO_PATH = 'test_files/test_1_short_broken.mp4'
-#     # This is short but is working well
-#     VIDEO_PATH = "test_files/test_1_short_2.mp4"
-#     # Long version below, comment to test faster
-#     #VIDEO_PATH = "test_files/test_1.mp4"
-#     OUTPUT_PATH = "test_files/output.mp4"
-#     # TODO: This has to be dynamic, but
-#     # according to what (?)
-#     NUMPY_FORMAT = 'rgb24'
-#     # TODO: Where do we obtain this from (?)
-#     VIDEO_CODEC_NAME = 'libx264'
-#     # TODO: Where do we obtain this from (?)
-#     PIXEL_FORMAT = 'yuv420p'
-
-#     from yta_video_opengl.classes import WavingFrame, BreathingFrame, HandheldFrame, OrbitingFrame, RotatingInCenterFrame, StrangeTvFrame, GlitchRgbFrame, WavingNode
-#     from yta_video_opengl.utils import texture_to_frame, frame_to_texture
-
-#     video = VideoReader(VIDEO_PATH)
-#     video_writer = (
-#         VideoWriter(OUTPUT_PATH)
-#         #.set_video_stream(VIDEO_CODEC_NAME, video.fps, video.size, PIXEL_FORMAT)
-#         .set_video_stream_from_template(video.video_stream)
-#         .set_audio_stream_from_template(video.audio_stream)
-#     )
+def video_modified_stored():
+    # This path below was trimmed in an online platform
+    # and seems to be bad codified and generates error
+    # when processing it, but it is readable in the
+    # file explorer...
+    #VIDEO_PATH = 'test_files/test_1_short_broken.mp4'
+    # This is short but is working well
+    VIDEO_PATH = "test_files/test_1_short_2.mp4"
+    # Long version below, comment to test faster
+    #VIDEO_PATH = "test_files/test_1.mp4"
+    OUTPUT_PATH = "test_files/output.mp4"
+    # TODO: This has to be dynamic, but
+    # according to what (?)
+    NUMPY_FORMAT = 'rgb24'
+    # TODO: Where do we obtain this from (?)
+    VIDEO_CODEC_NAME = 'libx264'
+    # TODO: Where do we obtain this from (?)
+    PIXEL_FORMAT = 'yuv420p'
+
+    from yta_video_opengl.utils import texture_to_frame, frame_to_texture
+
+    #from yta_video_pyav.video import Video
+
+    #video = Video(VIDEO_PATH)
+
+    #effect = WavingFrame(size = video.size)
+    #effect = BreathingFrame(size = video.size)
+    #effect = HandheldFrame(size = video.size)
+    # effect = OrbitingFrame(
+    #     size = video.size,
+    #     first_frame = video.next_frame
+    # )
+    # effect = RotatingInCenterFrame(
+    #     size = video.size,
+    #     first_frame = video.next_frame
+    # )
+
+    # effect = GlitchRgbFrame(
+    #     size = video.size,
+    #     first_frame = video.next_frame
+    # )
+    from yta_video_opengl.editor import OpenglEditor
+
+    editor = OpenglEditor()
+    # waving_node_effect = editor.effects.video.waving_node(video.size, amplitude = 0.2, frequency = 9, speed = 3)
+    # chorus_effect = editor.effects.audio.chorus(audio.sample_rate)
+    # print(waving_node_effect)
     
-#     #effect = WavingFrame(size = video.size)
-#     #effect = BreathingFrame(size = video.size)
-#     #effect = HandheldFrame(size = video.size)
-#     # effect = OrbitingFrame(
-#     #     size = video.size,
-#     #     first_frame = video.next_frame
-#     # )
-#     # effect = RotatingInCenterFrame(
-#     #     size = video.size,
-#     #     first_frame = video.next_frame
-#     # )
-#     effect = GlitchRgbFrame(
-#         size = video.size,
-#         first_frame = video.next_frame
-#     )
-#     context = moderngl.create_context(standalone = True)
+    # New way, with nodes
+    # context = moderngl.create_context(standalone = True)
+    # node = WavingNode(context, video.size, amplitude = 0.2, frequency = 9, speed = 3)
+    # print(node.process(video.get_frame_from_t(0)))
+    # We need to reset it to being again pointing
+    # to the first frame...
+    # TODO: Improve this by, maybe, storing the first
+    # frame in memory so we can append it later, or
+    # using the '.seek(0)' even when it could be not
+    # accurate
+    #video.reset()
+
+    # # TODO: By now this is applying an effect
+    # # by default
+    # VideoProcessor(
+    #     filename = VIDEO_PATH,
+    #     output_filename = OUTPUT_PATH
+    # ).process()
+
+    # return
+
+    return
     
-#     # New way, with nodes
-#     node = WavingNode(context, video.size, amplitude = 0.2, frequency = 9, speed = 3)
-#     # We need to reset it to being again pointing
-#     # to the first frame...
-#     # TODO: Improve this by, maybe, storing the first
-#     # frame in memory so we can append it later, or
-#     # using the '.seek(0)' even when it could be not
-#     # accurate
-#     video.reset()
-
-#     # # TODO: By now this is applying an effect
-#     # # by default
-#     # VideoProcessor(
-#     #     filename = VIDEO_PATH,
-#     #     output_filename = OUTPUT_PATH
-#     # ).process()
-
-#     # return
-
-    
-#     AMP = 0.05
-#     FREQ = 10.0
-#     SPEED = 2.0
-
-#     # Get the information about the video
-#     video = VideoReader(VIDEO_PATH)
-
-#     # ModernGL context without window
-#     context = moderngl.create_standalone_context()
-
-#     waving_frame_effect = WavingFrame(
-#         context = context,
-#         frame_size = video.size
-#     )
-
-#     vao = waving_frame_effect.vao
-
-#     # TODO: This has to be dynamic, but
-#     # according to what (?)
-#     NUMPY_FORMAT = 'rgb24'
-#     # TODO: Where do we obtain this from (?)
-#     VIDEO_CODEC_NAME = 'libx264'
-#     # TODO: Where do we obtain this from (?)
-#     PIXEL_FORMAT = 'yuv420p'
-
-#     # Framebuffer to render
-#     fbo = waving_frame_effect.fbo
-#     fbo.use()
-
-#     # Decode first frame and use as texture
-#     first_frame = video.next_frame
-#     # We need to reset it to being again pointing
-#     # to the first frame...
-#     # TODO: Improve this by, maybe, storing the first
-#     # frame in memory so we can append it later, or
-#     # using the '.seek(0)' even when it could be not
-#     # accurate
-#     video = VideoReader(VIDEO_PATH)
-
-#     # Most of OpenGL textures expect origin in lower
-#     # left corner
-#     # TODO: What if alpha (?)
-#     # TODO: Move this to the OpenglFrameEffect maybe (?)
+    AMP = 0.05
+    FREQ = 10.0
+    SPEED = 2.0
+
+    # Get the information about the video
+    video = VideoReader(VIDEO_PATH)
+
+    # ModernGL context without window
+    context = moderngl.create_standalone_context()
+
+    waving_frame_effect = WavingFrame(
+        context = context,
+        frame_size = video.size
+    )
+
+    vao = waving_frame_effect.vao
+
+    # TODO: This has to be dynamic, but
+    # according to what (?)
+    NUMPY_FORMAT = 'rgb24'
+    # TODO: Where do we obtain this from (?)
+    VIDEO_CODEC_NAME = 'libx264'
+    # TODO: Where do we obtain this from (?)
+    PIXEL_FORMAT = 'yuv420p'
+
+    # Framebuffer to render
+    fbo = waving_frame_effect.fbo
+    fbo.use()
+
+    # Decode first frame and use as texture
+    first_frame = video.next_frame
+    # We need to reset it to being again pointing
+    # to the first frame...
+    # TODO: Improve this by, maybe, storing the first
+    # frame in memory so we can append it later, or
+    # using the '.seek(0)' even when it could be not
+    # accurate
+    video = VideoReader(VIDEO_PATH)
+
+    # Most of OpenGL textures expect origin in lower
+    # left corner
+    # TODO: What if alpha (?)
+    # TODO: Move this to the OpenglFrameEffect maybe (?)
     
-#     texture: moderngl.Texture = frame_to_texture(first_frame, waving_frame_effect.context)
-#     texture.build_mipmaps()
-
-#     # These properties can be set before 
-#     # iterating the frames or maybe for 
-#     # each iteration... depending on the
-#     # effect.
-#     # Uniforms (properties)
-#     (
-#         waving_frame_effect
-#         .set_value('amp', AMP)
-#         .set_value('freq', FREQ)
-#         .set_value('speed', SPEED)
-#     )
-
-#     # Writer with H.264 codec
-#     video_writer = (
-#         VideoWriter(OUTPUT_PATH)
-#         .set_video_stream(VIDEO_CODEC_NAME, video.fps, video.size, PIXEL_FORMAT)
-#         .set_audio_stream_from_template(video.audio_stream)
-#     )
-
-#     frame_index = 0
-#     for frame_or_packet in video.iterate_with_audio(
-#         do_decode_video = True,
-#         do_decode_audio = False
-#     ):
-#         # This below is because of the parameters we
-#         # passed to the method
-#         is_video_frame = PythonValidator.is_instance_of(frame_or_packet, 'VideoReaderFrame')
-#         is_audio_packet = PythonValidator.is_instance_of(frame_or_packet, 'VideoReaderPacket')
-
-#         # To simplify the process
-#         if frame_or_packet is not None:
-#             frame_or_packet = frame_or_packet.data
-
-#         if is_audio_packet:
-#             video_writer.mux(frame_or_packet)
-#         elif is_video_frame:
-#             with Timer(is_silent_as_context = True) as timer:
-
-#                 def process_frame(
-#                     frame: 'VideoFrame'
-#                 ):
-#                     # Add some variables if we need, for the
-#                     # opengl change we are applying (check the
-#                     # program code)
-#                     waving_frame_effect.set_value('time', T.video_frame_index_to_video_frame_time(frame_index, float(video.fps)))
+    texture: moderngl.Texture = frame_to_texture(first_frame, waving_frame_effect.context)
+    texture.build_mipmaps()
+
+    # These properties can be set before 
+    # iterating the frames or maybe for 
+    # each iteration... depending on the
+    # effect.
+    # Uniforms (properties)
+    (
+        waving_frame_effect
+        .set_value('amp', AMP)
+        .set_value('freq', FREQ)
+        .set_value('speed', SPEED)
+    )
+
+    # Writer with H.264 codec
+    video_writer = (
+        VideoWriter(OUTPUT_PATH)
+        .set_video_stream(VIDEO_CODEC_NAME, video.fps, video.size, PIXEL_FORMAT)
+        .set_audio_stream_from_template(video.audio_stream)
+    )
+
+    frame_index = 0
+    for frame_or_packet in video.iterate_with_audio(
+        do_decode_video = True,
+        do_decode_audio = False
+    ):
+        # This below is because of the parameters we
+        # passed to the method
+        is_video_frame = PythonValidator.is_instance_of(frame_or_packet, 'VideoReaderFrame')
+        is_audio_packet = PythonValidator.is_instance_of(frame_or_packet, 'VideoReaderPacket')
+
+        # To simplify the process
+        if frame_or_packet is not None:
+            frame_or_packet = frame_or_packet.data
+
+        if is_audio_packet:
+            video_writer.mux(frame_or_packet)
+        elif is_video_frame:
+            with Timer(is_silent_as_context = True) as timer:
+
+                def process_frame(
+                    frame: 'VideoFrame'
+                ):
+                    # Add some variables if we need, for the
+                    # opengl change we are applying (check the
+                    # program code)
+                    waving_frame_effect.set_value('time', T.video_frame_index_to_video_frame_time(frame_index, float(video.fps)))
                     
-#                     # Create texture
-#                     texture = frame_to_texture(frame, waving_frame_effect.context)
-#                     texture.use()
-
-#                     # Render with shader to frame buffer
-#                     fbo.use()
-#                     vao.render(moderngl.TRIANGLE_STRIP)
-
-#                     # Processed GPU result to numpy
-#                     processed_data = np.frombuffer(
-#                         fbo.read(components = 3, alignment = 1), dtype = np.uint8
-#                     )
-
-#                     # Invert numpy to normal frame
-#                     # TODO: Can I use the texture.size to fill
-#                     # these 'img_array.shape[0]' (?)
-#                     processed_data = np.flipud(
-#                         processed_data.reshape((texture.size[1], texture.size[0], 3))
-#                     )
-
-#                     # To VideoFrame and to buffer
-#                     frame = av.VideoFrame.from_ndarray(processed_data, format = NUMPY_FORMAT)
-#                     # TODO: What is this for (?)
-#                     #out_frame.pict_type = 'NONE'
-#                     return frame
-
-#                 video_writer.mux_video_frame(process_frame(frame_or_packet))
-
-#             print(f'Frame {str(frame_index)}: {timer.time_elapsed_str}s')
-#             frame_index += 1
-
-#     # While this code can be finished, the work in
-#     # the muxer could be not finished and have some
-#     # packets waiting to be written. Here we tell
-#     # the muxer to process all those packets.
-#     video_writer.mux_video_frame(None)
-
-#     # TODO: Maybe move this to the '__del__' (?)
-#     video_writer.output.close()
-#     video.container.close()
-#     print(f'Saved as "{OUTPUT_PATH}".')
+                    # Create texture
+                    texture = frame_to_texture(frame, waving_frame_effect.context)
+                    texture.use()
+
+                    # Render with shader to frame buffer
+                    fbo.use()
+                    vao.render(moderngl.TRIANGLE_STRIP)
+
+                    # Processed GPU result to numpy
+                    processed_data = np.frombuffer(
+                        fbo.read(components = 3, alignment = 1), dtype = np.uint8
+                    )
+
+                    # Invert numpy to normal frame
+                    # TODO: Can I use the texture.size to fill
+                    # these 'img_array.shape[0]' (?)
+                    processed_data = np.flipud(
+                        processed_data.reshape((texture.size[1], texture.size[0], 3))
+                    )
+
+                    # To VideoFrame and to buffer
+                    frame = av.VideoFrame.from_ndarray(processed_data, format = NUMPY_FORMAT)
+                    # TODO: What is this for (?)
+                    #out_frame.pict_type = 'NONE'
+                    return frame
+
+                video_writer.mux_video_frame(process_frame(frame_or_packet))
+
+            print(f'Frame {str(frame_index)}: {timer.time_elapsed_str}s')
+            frame_index += 1
+
+    # While this code can be finished, the work in
+    # the muxer could be not finished and have some
+    # packets waiting to be written. Here we tell
+    # the muxer to process all those packets.
+    video_writer.mux_video_frame(None)
+
+    # TODO: Maybe move this to the '__del__' (?)
+    video_writer.output.close()
+    video.container.close()
+    print(f'Saved as "{OUTPUT_PATH}".')

{yta_video_opengl-0.0.23.dist-info → yta_video_opengl-0.0.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: yta-video-opengl
-Version: 0.0.23
+Version: 0.0.24
 Summary: Youtube Autonomous Video OpenGL Module
 Author: danialcala94
 Author-email: danielalcalavalera@gmail.com
@@ -9,6 +9,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Requires-Dist: moderngl (>=0.0.1,<9.0.0)
 Requires-Dist: numpy (>=0.0.1,<9.0.0)
+Requires-Dist: yta_programming (>=0.0.1,<1.0.0)
 Requires-Dist: yta_validation (>=0.0.1,<1.0.0)
 Description-Content-Type: text/markdown
 

yta_video_opengl-0.0.24.dist-info/RECORD

@@ -0,0 +1,13 @@
+yta_video_opengl/__init__.py,sha256=ycAx_XYMVDfkuObSvtW6irQ0Wo-fgxEz3fjIRMe8PpY,205
+yta_video_opengl/editor.py,sha256=ILzeGAe6uO5IptwrplbvnFu8e0j8v9AOaAmuvFH4YjI,9218
+yta_video_opengl/nodes/__init__.py,sha256=Rbh6HxWpKrdF_qlcGVKYBGW6i10NodoExa5qGEMcmIM,3738
+yta_video_opengl/nodes/audio/__init__.py,sha256=upKsYZrrNW2DxP77RyMCw2I16Lj9JsHbXGALw5grxbQ,6143
+yta_video_opengl/nodes/video/__init__.py,sha256=Nf1CnUaz6m7mOvVsuoTKMsq5QIVqEqZaiGseNOre8_k,859
+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=uvTU1_cvz5r7fETd4X8hvsYw4jViMDA0x-LsDNplFPM,24265
+yta_video_opengl/utils.py,sha256=w6jYnZcBYPNAsTolkAlA6dxph0u_8-mcUzKvADlIlW8,3098
+yta_video_opengl-0.0.24.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+yta_video_opengl-0.0.24.dist-info/METADATA,sha256=WKcDQFnZS0TvesGJM9N-bbPjOx0DdTNZb6yU-4nzUqY,589
+yta_video_opengl-0.0.24.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+yta_video_opengl-0.0.24.dist-info/RECORD,,