[FFmpeg-devel] [PATCH 2/3] avfilter/delogo: added circular delogo algorithm description

[FFmpeg-devel] [PATCH 2/3] avfilter/delogo: added circular delogo algorithm description

[Jörg Habenicht via ffmpeg-devel]

Added a description of the elliptic formed delogo algorithm. Placed it
outside the doxygen function comment.

Signed-off-by: Jörg Habenicht <j.habenicht@gmx.de>
---
  libavfilter/vf_delogo.c | 24 ++++++++++++++++++++++++
  1 file changed, 24 insertions(+)

diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c
index 7641c3b483..ea741e2700 100644
--- a/libavfilter/vf_delogo.c
+++ b/libavfilter/vf_delogo.c
@@ -100,6 +100,30 @@ static void apply_delogo(uint8_t *dst, int
dst_linesize,
                           int logo_x, int logo_y, int logo_w, int logo_h,
                           unsigned int band, int show, int direct)
  {
+    /* Round area algorithm description:
+     *
+     * logo_x, logo_y, logo_w and logo_h define the boundaries of the
+     * ellipse. In the ellipse formula x^2 / a^2 + y^2 / b^2 = 1 let
+     * a = logo_w/2, b = logo_h/2 and the center of the ellipse
+     * (0,0) = (logo_x + a, logo_y + b).
+     * Let the picture dimensions (px,py,pw,ph) := function API(x,y,w,h).
+     * A point of the picture is transformed into the ellipse coordinates
+     * by using x = px - (logo_x + a), y = py - (logo_y +b).
+     *
+     * A point is inside the ellipse if x^2 / a^2 + y^2 / b^2 <= 1
+     * <=> (x + logo_x)^2 / (logo_w / 2)^2
+     *     + (y + logo_y)^2 / (logo_h / 2)^2 <= 1
+     * <=> (px - logo_x - a + logo_x)^2 / (logo_w / 2)^2
+     *     + (py - logo_y - b + logo_y)^2 / (logo_h / 2)^2 <= 1
+     * <=> (px - a)^2 / (logo_w / 2)^2
+     *     + (py - b)^2 / (logo_h / 2)^2 <= 1
+     * <=> ((px - a) / (logo_w / 2))^2
+     *     + ((py - b) / (logo_h / 2))^2 <= 1
+     *
+     * px is later defined x, py defined y.
+     * logo_w is later defined logo_w2, logo_h defined logo_h2.
+     */
+
      int x, y;
      uint64_t interp, weightl, weightr, weightt, weightb, weight;
      uint8_t *xdst, *xsrc;
--
2.45.3

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 0/3] Patch to create a circular delogo area

[Jörg Habenicht via ffmpeg-devel]

Dear list,

sorry for the previous posting. I noticed the lines got mangled. So here
is a new try to get the patches right.


Old text:
I made a patch for the delogo filter. With this I can create a circular or
elliptic zone to apply the delogo algorithm. The borders are defined with
x,y,w,h parameter just like the rectangular area definition. To become
circular I added an additional parameter 'r'=0/1 defaulting to '0' i.e.
rectangular area definition.

I added a large comment to the function body describing the calculation
of the ellipse. Hope you don't mind.
The patch has been tested with 'make fate-rsync fate' and applies
clean to the master branch, commit 957eb2323a924aa0b148927889eae581185c367b .

Please have a look.

best regards
Jörg


Jörg Habenicht (3):
  avfilter/delogo: add parameter to switch on circular delogo
  avfilter/delogo: added circular delogo algorithm description
  avfilter/delogo: added the circular delogo algorithm

 libavfilter/vf_delogo.c | 59 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 54 insertions(+), 5 deletions(-)

--
2.45.3

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/3] avfilter/delogo: added circular delogo algorithm description

[Jörg Habenicht via ffmpeg-devel]

Added a description of the elliptic formed delogo algorithm. Placed it
outside the doxygen function comment.

Signed-off-by: Jörg Habenicht <j.habenicht@gmx.de>
---
 libavfilter/vf_delogo.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c
index 7641c3b483..ea741e2700 100644
--- a/libavfilter/vf_delogo.c
+++ b/libavfilter/vf_delogo.c
@@ -100,6 +100,30 @@ static void apply_delogo(uint8_t *dst, int dst_linesize,
                          int logo_x, int logo_y, int logo_w, int logo_h,
                          unsigned int band, int show, int direct)
 {
+    /* Round area algorithm description:
+     *
+     * logo_x, logo_y, logo_w and logo_h define the boundaries of the
+     * ellipse. In the ellipse formula x^2 / a^2 + y^2 / b^2 = 1 let
+     * a = logo_w/2, b = logo_h/2 and the center of the ellipse
+     * (0,0) = (logo_x + a, logo_y + b).
+     * Let the picture dimensions (px,py,pw,ph) := function API(x,y,w,h).
+     * A point of the picture is transformed into the ellipse coordinates
+     * by using x = px - (logo_x + a), y = py - (logo_y +b).
+     *
+     * A point is inside the ellipse if x^2 / a^2 + y^2 / b^2 <= 1
+     * <=> (x + logo_x)^2 / (logo_w / 2)^2
+     *     + (y + logo_y)^2 / (logo_h / 2)^2 <= 1
+     * <=> (px - logo_x - a + logo_x)^2 / (logo_w / 2)^2
+     *     + (py - logo_y - b + logo_y)^2 / (logo_h / 2)^2 <= 1
+     * <=> (px - a)^2 / (logo_w / 2)^2
+     *     + (py - b)^2 / (logo_h / 2)^2 <= 1
+     * <=> ((px - a) / (logo_w / 2))^2
+     *     + ((py - b) / (logo_h / 2))^2 <= 1
+     *
+     * px is later defined x, py defined y.
+     * logo_w is later defined logo_w2, logo_h defined logo_h2.
+     */
+
     int x, y;
     uint64_t interp, weightl, weightr, weightt, weightb, weight;
     uint8_t *xdst, *xsrc;
--
2.45.3

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".