aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-16 02:06:37 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-25 16:35:23 +0200
commit98805cbac5a45538b5b3fe2473bfe74f22f2d08c (patch)
tree8ed5bf31aef46acec8acaadfd970a45b3e4e84ee
parent66ca450fcb073207391ce3ce79a9bbf74067f398 (diff)
downloadffmpeg-98805cbac5a45538b5b3fe2473bfe74f22f2d08c.tar.gz
avfilter/f_select: fix loss of precission in SAD calculation
Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5a8ef3c66b762f265b05aa096105555f1d26879c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavfilter/f_select.c2
-rw-r--r--tests/ref/fate/filter-metadata-scenedetect8
2 files changed, 5 insertions, 5 deletions
diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c
index 07a64f3139..4d32622754 100644
--- a/libavfilter/f_select.c
+++ b/libavfilter/f_select.c
@@ -279,7 +279,7 @@ static double get_scene_score(AVFilterContext *ctx, AVFrame *frame)
p2 += 8 * linesize;
}
emms_c();
- mafd = nb_sad ? sad / nb_sad : 0;
+ mafd = nb_sad ? (double)sad / nb_sad : 0;
diff = fabs(mafd - select->prev_mafd);
ret = av_clipf(FFMIN(mafd, diff) / 100., 0, 1);
select->prev_mafd = mafd;
diff --git a/tests/ref/fate/filter-metadata-scenedetect b/tests/ref/fate/filter-metadata-scenedetect
index 67251dfe60..495101352f 100644
--- a/tests/ref/fate/filter-metadata-scenedetect
+++ b/tests/ref/fate/filter-metadata-scenedetect
@@ -1,10 +1,10 @@
pkt_pts=1620|tag:lavfi.scene_score=1.000000
-pkt_pts=4140|tag:lavfi.scene_score=0.880000
+pkt_pts=4140|tag:lavfi.scene_score=0.876620
pkt_pts=5800|tag:lavfi.scene_score=1.000000
-pkt_pts=6720|tag:lavfi.scene_score=0.460000
+pkt_pts=6720|tag:lavfi.scene_score=0.463258
pkt_pts=8160|tag:lavfi.scene_score=1.000000
pkt_pts=9760|tag:lavfi.scene_score=1.000000
-pkt_pts=14080|tag:lavfi.scene_score=0.840000
+pkt_pts=14080|tag:lavfi.scene_score=0.842022
pkt_pts=15700|tag:lavfi.scene_score=1.000000
-pkt_pts=18500|tag:lavfi.scene_score=0.470000
+pkt_pts=18500|tag:lavfi.scene_score=0.471341
pkt_pts=21760|tag:lavfi.scene_score=1.000000