feat: text

anpawo · anpawo · commit de2a7d642c41 · 2025-03-03T03:32:31.000+01:00
New Input: Text.

Takes a string, a color, a size, a thickness.

Generate some text in the video.

Missing custom font.
diff --git a/Makefile b/Makefile
@@ -90,6 +90,7 @@ SRC_COMPILER	=	src/compiler/generateVideo.cpp	\
 SRC_INPUT		=	src/input/concrete/ABCConcreteInput.cpp		\
 					src/input/concrete/media/Image.cpp			\
 					src/input/concrete/media/Video.cpp			\
+					src/input/concrete/text/Text.cpp			\
 					src/input/composite/Slice.cpp				\
 
 
@@ -106,6 +107,7 @@ SRC_TSF_COLOR	=	src/transformation/color/fade.cpp				\
 
 
 SRC_TSF_OTHER	=	src/transformation/other/overlay.cpp			\
+					src/transformation/other/repeat.cpp			\
 
 
 OBJ				=	$(SRC:.cpp=.o)
diff --git a/README.md b/README.md
@@ -15,13 +15,26 @@ Below is an example of the last feature added (code) and the result (video).
 ```py
 from videocode.VideoCode import *
 
-
-v1 = video("video/v.mp4")
-
-
-v1[0:40].apply(move(200, 0))
-v1[0:20].apply(fadeIn()).add()
-v1[20:40].apply(fadeOut()).add()
+x = 700
+y = 100
+
+# text: Video-Code
+t = text("Video-Code", 3).apply(translate(x, y), repeat(40))
+t[:20].apply(fadeIn())
+t[20:].apply(fadeOut())
+t.add()
+
+# text: Made by:
+t = text("made by", 3).apply(translate(x, y), repeat(40))
+t[:20].apply(fadeIn())
+t[20:].apply(fadeOut())
+t.add()
+
+
+# Me
+v = video("video/v.mp4").apply(translate(x, y + 100))
+v[0:20].apply(fadeIn()).add()
+v[20:40].apply(fadeOut()).add()
 ```
 
 <img src="docs/readme/example.gif" style="width: 50%;">
@@ -31,25 +44,26 @@ To create a video with Video-Code, you need to write some simple code in Python.
 
 The flow of the Video comes from the __Inputs__ that you, first import or create, then modify with __Transformations__ and finally add to the __timeline__.
 
-To import or create an __Input__, you need to create a __video__ or __image__ instance (soon text and shapes).<br>
+To import or create an __Input__, you need to create a __video__, __image__ or a __text__ instance (soon shapes).<br>
 To modify it, you need to use __Transformations__ like __translate__ or __fade__.<br>
 To add the frames of the __Input__ to the timeline, use the __\<Input\>.add()__ function.
 
 ## Patch Notes
 
 
-<details open>
+<details>
     <summary><code>Inputs</code></summary>
 <br>
 
 - `image`
 - `video`
+- `text`
 
 </details>
 
 <br>
 
-<details open>
+<details>
     <summary><code>Transformations</code></summary>
 <br>
 
@@ -63,15 +77,18 @@ To add the frames of the __Input__ to the timeline, use the __\<Input\>.add()__
 <br>
 
 - `overlay`
+- `repeat`
 
 </details>
 
 <br>
 
-<details open>
+<details>
     <summary><code>Patchs</code></summary>
 <br>
 
+- `transformation`: repeat (03/03/25)
+- `input`: text (03/03/25)
 - `rework`: position of the frames (02/03/25)
 - `transformation`: move (02/03/25)
 
diff --git a/docs/readme/02_code.md b/docs/readme/02_code.md
@@ -2,11 +2,24 @@
 ```py
 from videocode.VideoCode import *
 
+x = 700
+y = 100
 
-v1 = video("video/v.mp4")
+# text: Video-Code
+t = text("Video-Code", 3).apply(translate(x, y), repeat(40))
+t[:20].apply(fadeIn())
+t[20:].apply(fadeOut())
+t.add()
 
+# text: Made by:
+t = text("made by", 3).apply(translate(x, y), repeat(40))
+t[:20].apply(fadeIn())
+t[20:].apply(fadeOut())
+t.add()
 
-v1[0:40].apply(move(200, 0))
-v1[0:20].apply(fadeIn()).add()
-v1[20:40].apply(fadeOut()).add()
+
+# Me
+v = video("video/v.mp4").apply(translate(x, y + 100))
+v[0:20].apply(fadeIn()).add()
+v[20:40].apply(fadeOut()).add()
 ```
diff --git a/docs/readme/04_getting_started.md b/docs/readme/04_getting_started.md
@@ -3,6 +3,6 @@ To create a video with Video-Code, you need to write some simple code in Python.
 
 The flow of the Video comes from the __Inputs__ that you, first import or create, then modify with __Transformations__ and finally add to the __timeline__.
 
-To import or create an __Input__, you need to create a __video__ or __image__ instance (soon text and shapes).<br>
+To import or create an __Input__, you need to create a __video__, __image__ or a __text__ instance (soon shapes).<br>
 To modify it, you need to use __Transformations__ like __translate__ or __fade__.<br>
 To add the frames of the __Input__ to the timeline, use the __\<Input\>.add()__ function.
diff --git a/docs/readme/05_patch_notes.md b/docs/readme/05_patch_notes.md
@@ -1,18 +1,19 @@
 ## Patch Notes
 
 
-<details open>
+<details>
     <summary><code>Inputs</code></summary>
 <br>
 
 - `image`
 - `video`
+- `text`
 
 </details>
 
 <br>
 
-<details open>
+<details>
     <summary><code>Transformations</code></summary>
 <br>
 
@@ -26,15 +27,18 @@
 <br>
 
 - `overlay`
+- `repeat`
 
 </details>
 
 <br>
 
-<details open>
+<details>
     <summary><code>Patchs</code></summary>
 <br>
 
+- `transformation`: repeat (03/03/25)
+- `input`: text (03/03/25)
 - `rework`: position of the frames (02/03/25)
 - `transformation`: move (02/03/25)
 
diff --git a/docs/readme/example.gif b/docs/readme/example.gif
diff --git a/include/input/IInput.hpp b/include/input/IInput.hpp
@@ -25,6 +25,9 @@ class IInput
     virtual std::vector<Frame>::iterator begin() = 0;
     virtual std::vector<Frame>::iterator end() = 0;
 
+    ///< Repeat
+    virtual void repeat(size_t n) = 0;
+
     ///< Size
     virtual size_t size() = 0;
 };
diff --git a/include/input/composite/Slice.hpp b/include/input/composite/Slice.hpp
@@ -22,11 +22,14 @@ class Slice final : public ABCCompositeInput
     IInput* copy();
 
     ///< Iteration
-    virtual std::vector<Frame>::iterator begin();
-    virtual std::vector<Frame>::iterator end();
+    std::vector<Frame>::iterator begin();
+    std::vector<Frame>::iterator end();
+
+    ///< Repeat
+    void repeat(size_t n);
 
     ///< Size
-    virtual size_t size();
+    size_t size();
 
 private:
 
diff --git a/include/input/concrete/ABCConcreteInput.hpp b/include/input/concrete/ABCConcreteInput.hpp
@@ -27,6 +27,9 @@ class ABCConcreteInput : public IInput
     std::vector<Frame>::iterator begin() final;
     std::vector<Frame>::iterator end() final;
 
+    ///< Repeat
+    void repeat(size_t n) final;
+
     ///< Size
     size_t size() final;
 
diff --git a/include/input/concrete/text/Text.hpp b/include/input/concrete/text/Text.hpp
@@ -0,0 +1,21 @@
+/*
+** EPITECH PROJECT, 2025
+** video-code
+** File description:
+** Text
+*/
+
+#pragma once
+
+#include <string>
+
+#include "input/concrete/ABCConcreteInput.hpp"
+#include "opencv2/imgproc.hpp"
+
+class Text final : public ABCConcreteInput
+{
+public:
+
+    Text(const std::string &text, double fontSize, int fontThickness, const std::vector<int> &color, int font = cv::FONT_HERSHEY_SIMPLEX);
+    ~Text() = default;
+};
diff --git a/include/transformation/transformation.hpp b/include/transformation/transformation.hpp
@@ -30,17 +30,20 @@ namespace transformation
 
     // Other
     transformation(overlay);
+    transformation(repeat);
     /***
-        TODO: transformation(repeat);
-        TODO: transformation(wait);
         TODO: transformation(concat);
         TODO: transformation(merge);
     ***/
 
     static const std::map<std::string, std::function<void(std::shared_ptr<IInput>, Register &, const json::object_t &)>> map{
+        // Color
         {"fade", fade},
+        // Position
         {"translate", translate},
         {"move", move},
+        // Other
         {"overlay", overlay},
+        {"repeat", repeat},
     };
 };
diff --git a/include/vm/Register.hpp b/include/vm/Register.hpp
@@ -18,6 +18,7 @@
 #include "input/composite/Slice.hpp"
 #include "input/concrete/media/Image.hpp"
 #include "input/concrete/media/Video.hpp"
+#include "input/concrete/text/Text.hpp"
 
 using json = nlohmann::json;
 
@@ -51,8 +52,8 @@ class Register
         {"Video", [this](const json::object_t &args) { _inputs.push_back(std::make_shared<Video>(args.at("filepath"))); }},
         {"Copy", [this](const json::object_t &args) { _inputs.push_back(std::shared_ptr<IInput>(_inputs[args.at("input")]->copy())); }},
         {"Slice", [this](const json::object_t &args) { _inputs.push_back(std::make_shared<Slice>(_inputs[args.at("input")], args.at("start"), args.at("stop"))); }},
+        {"Text", [this](const json::object_t &args) { _inputs.push_back(std::make_shared<Text>(args.at("text"), args.at("fontSize"), args.at("fontThickness"), args.at("color"))); }},
         /// TODO: Shapes (Circle, Square)
-        /// TODO: Text (List of char)
         /// TODO: Formula (not important)
     };
 
diff --git a/src/input/composite/Slice.cpp b/src/input/composite/Slice.cpp
@@ -38,6 +38,11 @@ std::vector<Frame>::iterator Slice::end()
     return _endIt;
 }
 
+void Slice::repeat([[maybe_unused]] size_t n)
+{
+    /// TODO: maybe add std::vector<Frame&> instead of iterators so we can duplicate the ref
+}
+
 ///< Size
 size_t Slice::size()
 {
diff --git a/src/input/concrete/ABCConcreteInput.cpp b/src/input/concrete/ABCConcreteInput.cpp
@@ -42,6 +42,19 @@ std::vector<Frame>::iterator ABCConcreteInput::end()
     return _frames.end();
 }
 
+void ABCConcreteInput::repeat(size_t n)
+{
+    const size_t initialSize = size();
+
+    while (n--)
+    {
+        for (size_t i = 0; i < initialSize; i++)
+        {
+            _frames.push_back(_frames[i].clone());
+        }
+    }
+}
+
 size_t ABCConcreteInput::size()
 {
     return _frames.size();
diff --git a/src/input/concrete/media/Image.cpp b/src/input/concrete/media/Image.cpp
@@ -28,7 +28,7 @@ Image::Image(const std::string& inputName)
         cv::cvtColor(image, image, cv::COLOR_BGR2BGRA);
     }
 
-    _frames = {Frame(std::move(image))};
+    _frames.push_back(Frame(std::move(image)));
 }
 
 ///< After lots of tests, I feel like opencv crashs with the handling of RGBA.
diff --git a/src/input/concrete/text/Text.cpp b/src/input/concrete/text/Text.cpp
@@ -0,0 +1,27 @@
+/*
+** EPITECH PROJECT, 2025
+** video-code
+** File description:
+** Text
+*/
+
+#include "input/concrete/text/Text.hpp"
+
+#include <vector>
+
+#include "input/Frame.hpp"
+#include "opencv2/core/types.hpp"
+
+Text::Text(const std::string &text, double fontSize, int fontThickness, const std::vector<int> &color, int font)
+{
+    int baseLine = 0;
+
+    // get the size of the text and the baseline (line where letters sit)
+    cv::Size size = cv::getTextSize(text, font, fontSize, fontThickness, &baseLine);
+
+    cv::Mat bg = cv::Mat(size.height + baseLine, size.width, CV_8UC4).setTo(cv::Scalar(0, 0, 0, 0));
+
+    cv::putText(bg, text, cv::Point(0, size.height), font, fontSize, cv::Scalar(color[0], color[1], color[2], color[3]), fontThickness, cv::LINE_AA);
+
+    _frames.push_back(Frame(std::move(bg)));
+}
diff --git a/src/transformation/other/repeat.cpp b/src/transformation/other/repeat.cpp
@@ -0,0 +1,16 @@
+/*
+** EPITECH PROJECT, 2025
+** video-code
+** File description:
+** translate
+*/
+
+#include <memory>
+
+#include "transformation/transformation.hpp"
+#include "vm/Register.hpp"
+
+void transformation::repeat(std::shared_ptr<IInput> input, [[maybe_unused]] Register &reg, const json::object_t &args)
+{
+    input->repeat(args.at("n"));
+}
diff --git a/src/vm/VideoCode.cpp b/src/vm/VideoCode.cpp
@@ -106,6 +106,20 @@ void VideoCode::executeStack()
             ///< Example: {"action": 'Apply', "input": 0, "transformation": 'overlay', "fg": 1}
             transformation::map.at(i["transformation"])(_register[i["input"]], _register, i["args"]);
         }
+        else if (i["action"] == "Wait")
+        {
+            for (size_t n = 0; n < i["n"]; n++)
+            {
+                if (_frames.empty())
+                {
+                    _frames.push_back(_defaultBlackFrame.clone());
+                }
+                else
+                {
+                    _frames.push_back(_frames.back().clone());
+                }
+            }
+        }
     }
 }
 
diff --git a/video.py b/video.py
diff --git a/videocode/Constant.py b/videocode/Constant.py
diff --git a/videocode/Global.py b/videocode/Global.py
diff --git a/videocode/input/text/Text.py b/videocode/input/text/Text.py
diff --git a/videocode/transformation/other/Repeat.py b/videocode/transformation/other/Repeat.py
