Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Anton Khirnov <anton@khirnov.net>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 4/4] lavfi/vf_v360: implement output mask for barrelsplit
Date: Thu, 19 May 2022 15:47:28 +0200
Message-ID: <20220519134728.15354-4-anton@khirnov.net> (raw)
In-Reply-To: <20220519134728.15354-1-anton@khirnov.net>

The top/bottom of the barrel are each coded as two semicircles inside a
square block in the frame. Mask out the parts of the square that lie
outside of these semicircles, so they are made transparent when
alpha_mask=1.

Fixes the other part of #9725.
---
 libavfilter/vf_v360.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c
index 940e6fc5f6..42b1761333 100644
--- a/libavfilter/vf_v360.c
+++ b/libavfilter/vf_v360.c
@@ -3745,6 +3745,7 @@ static int barrelsplit_to_xyz(const V360Context *s,
     const float x = (i + 0.5f) / width;
     const float y = (j + 0.5f) / height;
     float l_x, l_y, l_z;
+    int ret;
 
     if (x < 2.f / 3.f) {
         const float scalew = s->fout_pad > 0 ? 1.f - s->fout_pad / (width * 2.f / 3.f) : 1.f - s->out_pad;
@@ -3763,6 +3764,8 @@ static int barrelsplit_to_xyz(const V360Context *s,
         l_x = cos_theta * sin_phi;
         l_y = sin_theta;
         l_z = cos_theta * cos_phi;
+
+        ret = 1;
     } else {
         const float scalew = s->fout_pad > 0 ? 1.f - s->fout_pad / (width  / 3.f) : 1.f - s->out_pad;
         const float scaleh = s->fout_pad > 0 ? 1.f - s->fout_pad / (height / 4.f) : 1.f - s->out_pad;
@@ -3788,13 +3791,14 @@ static int barrelsplit_to_xyz(const V360Context *s,
         l_x = (0.5f - uf) / scalew;
         l_y =  0.5f * dir_vert;
         l_z = (vf - 0.5f) * dir_vert / scaleh;
+        ret = (l_x * l_x * scalew * scalew + l_z * l_z * scaleh * scaleh) < 0.5f * 0.5f;
     }
 
     vec[0] = l_x;
     vec[1] = l_y;
     vec[2] = l_z;
 
-    return 1;
+    return ret;
 }
 
 /**
-- 
2.34.1

_______________________________________________
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".

  parent reply	other threads:[~2022-05-19 13:47 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-19 13:47 [FFmpeg-devel] [PATCH 1/4] lavfi/vf_v360: drop nonsense inline specifier Anton Khirnov
2022-05-19 13:47 ` [FFmpeg-devel] [PATCH 2/4] lavfi/vf_v360: factorize vector computation for barrelsplit Anton Khirnov
2022-05-19 13:47 ` [FFmpeg-devel] [PATCH 3/4] lavfi/vf_v360: fix barrelsplit transform with padding Anton Khirnov
2022-05-19 13:47 ` Anton Khirnov [this message]
2022-05-24 11:57 ` [FFmpeg-devel] [PATCH 1/4] lavfi/vf_v360: drop nonsense inline specifier Anton Khirnov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220519134728.15354-4-anton@khirnov.net \
    --to=anton@khirnov.net \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git