From: Gerion Entrup <gerion.entrup@flump.de>
To: ffmpeg-devel@ffmpeg.org
Cc: Sachin Tilloo <sachin.tilloo@gmail.com>
Subject: [FFmpeg-devel] [PATCH 2/2] libavfilter/signature_lookup: fix jaccard distance
Date: Mon, 6 May 2024 00:30:40 +0200
Message-ID: <20240505223040.521838-2-gerion.entrup@flump.de> (raw)
In-Reply-To: <20240505223040.521838-1-gerion.entrup@flump.de>
Actually, the jaccard distance is defined as D = 1 - intersect / union.
Additionally, the distance value is compared against a constant that
must be between 0 and 1, which is not the case here. Both facts together
has led to the fact, that the function always returned a matching course
signature. To leave the constant intact and to avoid floating point
computation, this commit multiplies with 1 << 16 making the constant
effectively 9000 / (1<<16) =~ 0.14.
Reported-by: Sachin Tilloo <sachin.tilloo@gmail.com>
Reviewed-by: Sachin Tilloo <sachin.tilloo@gmail.com>
Tested-by: Sachin Tilloo <sachin.tilloo@gmail.com>
---
libavfilter/signature_lookup.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavfilter/signature_lookup.c b/libavfilter/signature_lookup.c
index b39a3e225b..b90b63f3f2 100644
--- a/libavfilter/signature_lookup.c
+++ b/libavfilter/signature_lookup.c
@@ -127,9 +127,10 @@ static int get_jaccarddist(SignatureContext *sc, CoarseSignature *first, CoarseS
{
int jaccarddist, i, composdist = 0, cwthcount = 0;
for (i = 0; i < 5; i++) {
- if ((jaccarddist = intersection_word(first->data[i], second->data[i])) > 0) {
+ if ((jaccarddist = (1 << 16) * intersection_word(first->data[i], second->data[i])) > 0) {
jaccarddist /= FFMAX(union_word(first->data[i], second->data[i]), 1);
}
+ jaccarddist = (1 << 16) - jaccarddist;
if (jaccarddist >= sc->thworddist) {
if (++cwthcount > 2) {
/* more than half (5/2) of distances are too wide */
--
2.43.2
_______________________________________________
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".
next prev parent reply other threads:[~2024-05-05 22:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-05 22:30 [FFmpeg-devel] [PATCH 1/2] libavfilter/signature_lookup: fix possible division by zero Gerion Entrup
2024-05-05 22:30 ` Gerion Entrup [this message]
2024-05-07 17:46 ` Michael Niedermayer
2024-05-24 10:33 ` Gerion Entrup
2024-05-24 21:03 ` Michael Niedermayer
2024-05-26 15:08 ` Gerion Entrup
2024-05-26 17:26 ` Michael Niedermayer
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=20240505223040.521838-2-gerion.entrup@flump.de \
--to=gerion.entrup@flump.de \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=sachin.tilloo@gmail.com \
/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