Merge pull request #42 from anpawo/slice

feat: Slices

Author: anpawo

Makefile

@@ -72,7 +72,7 @@ LFLAGS			=	-O1 -Wl,-rpath-link,/usr/lib64
 SRC				=	$(SRC_MAIN)				\
 					$(SRC_VM)				\
 					$(SRC_INPUT)			\
-					$(SRC_TRANSFORM)		\
+					$(SRC_TSF)				\
 					$(SRC_COMPILER)			\
 
 
@@ -87,12 +87,13 @@ SRC_VM			=	src/vm/VideoCode.cpp	\
 SRC_COMPILER	=	src/compiler/generateVideo.cpp	\
 
 
-SRC_INPUT		=	src/input/ABCInput.cpp	\
-					src/input/Image.cpp		\
-					src/input/Video.cpp		\
+SRC_INPUT		=	src/input/concrete/ABCConcreteInput.cpp		\
+					src/input/concrete/media/Image.cpp			\
+					src/input/concrete/media/Video.cpp			\
+					src/input/composite/Slice.cpp				\
 
 
-SRC_TRANSFORM	=	$(SRC_TSF_POS)		\
+SRC_TSF			=	$(SRC_TSF_POS)		\
 					$(SRC_TSF_COLOR)	\
 					$(SRC_TSF_OTHER)	\
 

README.md

@@ -7,7 +7,12 @@ Below is an example of the last feature added (code) and the result (video).
 from frontend.VideoCode import *
 
 
-v1 = video("video/v.mp4").apply(fade()).add()
+v1 = video("video/v.mp4")
+
+v1[:20].apply(fadeIn())
+v1[-20:].apply(fadeOut())
+
+v1.add()
 ```
 
 <img src="docs/readme/example.gif" style="width: 50%;">

docs/readme/02_code.md

@@ -3,5 +3,10 @@
 from frontend.VideoCode import *
 
 
-v1 = video("video/v.mp4").apply(fade()).add()
+v1 = video("video/v.mp4")
+
+v1[:20].apply(fadeIn())
+v1[-20:].apply(fadeOut())
+
+v1.add()
 ```

docs/readme/example.gif

@@ -24,7 +24,6 @@
 DL = DOWN + LEFT
 DR = DOWN + RIGHT
 
-
 # index
 START = 0
 END = -1

frontend/Constant.py

@@ -93,7 +93,7 @@ def __getitem__(self, i: int | slice[int | None, int | None, None]) -> Slice:
 
         """
         if isinstance(i, int):
-            s = slice(i, i)
+            s = slice(i, i + 1)  # stop is excluded
         else:
             s = slice(i.start or 0, i.stop or -1)
 

frontend/input/Input.py

@@ -8,7 +8,7 @@
 class fade(Transformation):
     def __init__(self, sides: list[side] = ALL, startOpacity: uint = 0, endOpacity: uint = 255) -> None:
         """
-        `Fade` from `side`.
+        `Fade` from `sides`.
 
         Modify `opacity` for a `Fade in` or a `Fade out`.
 
@@ -17,3 +17,22 @@ def __init__(self, sides: list[side] = ALL, startOpacity: uint = 0, endOpacity:
         self.sides = sides
         self.startOpacity = startOpacity
         self.endOpacity = endOpacity
+
+
+class fadeIn:
+    def __new__(cls, sides: list[side] = ALL) -> fade:
+        """
+        `Fade in` from `sides`.
+        """
+        return fade(sides, startOpacity=0, endOpacity=255)
+
+
+class fadeOut:
+    def __new__(cls, sides: list[side] = ALL) -> fade:
+        """
+        `Fade out` from `sides`.
+        """
+        return fade(sides, startOpacity=255, endOpacity=0)
+
+
+# fadeFromLeft etc...

frontend/transformation/color/Fade.py

@@ -21,6 +21,10 @@ class IInput
     ///< Deep copy of `_frames`
     virtual IInput* copy() = 0;
 
-    ///< Get the frames
-    virtual std::vector<cv::Mat>& getFrames() = 0;
+    ///< Iteration
+    virtual std::vector<cv::Mat>::iterator begin() = 0;
+    virtual std::vector<cv::Mat>::iterator end() = 0;
+
+    ///< Size
+    virtual size_t size() = 0;
 };

include/input/IInput.hpp

@@ -2,18 +2,13 @@
 ** EPITECH PROJECT, 2025
 ** video-code
 ** File description:
-** Slice
+** Input
 */
 
 #pragma once
 
-class Slice
-{
-public:
-
-    Slice();
-    ~Slice();
+#include "input/IInput.hpp"
 
-protected:
-private:
+class ABCCompositeInput : public IInput
+{
 };

include/input/slice/Slice.hpp …de/input/composite/ABCCompositeInput.hppinclude/input/slice/Slice.hpp renamed to include/input/composite/ABCCompositeInput.hpp include/input/slice/Slice.hpp renamed to include/input/composite/ABCCompositeInput.hpp

@@ -0,0 +1,29 @@
+/*
+** EPITECH PROJECT, 2025
+** video-code
+** File description:
+** Slice
+*/
+
+#pragma once
+
+class Slice
+{
+public:
+
+    Slice() = default;
+    virtual ~Slice() = 0;
+
+    ///< Deep copy of `this`
+    IInput* copy() = 0;
+
+    ///< Iteration
+    virtual std::vector<cv::Mat>::iterator begin() = 0;
+    virtual std::vector<cv::Mat>::iterator end() = 0;
+
+    ///< Size
+    virtual size_t size() = 0;
+
+protected:
+private:
+};