[FFmpeg-devel] [PATCH v4 3/4] avfilter/vf_minterpolate: if metadata lavfi.scd.mafd exists, we'll use it first

2019-10-08 Thread lance . lmwang 
From: Limin Wang 

Reviewed-by: Paul B Mahol 
Signed-off-by: Limin Wang 
---
 libavfilter/vf_minterpolate.c | 16 
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/libavfilter/vf_minterpolate.c b/libavfilter/vf_minterpolate.c
index b0bb238..db3d7d4 100644
--- a/libavfilter/vf_minterpolate.c
+++ b/libavfilter/vf_minterpolate.c
@@ -832,11 +832,19 @@ static int detect_scene_change(MIContext *mi_ctx)
 ptrdiff_t linesize2 = mi_ctx->frames[2].avf->linesize[0];
 
 if (mi_ctx->scd_method == SCD_METHOD_FDIFF) {
-double ret = 0, mafd, diff;
+double ret = 0, mafd = HUGE_VAL, diff;
 uint64_t sad;
-mi_ctx->sad(p1, linesize1, p2, linesize2, me_ctx->width, 
me_ctx->height, );
-emms_c();
-mafd = (double) sad / (me_ctx->height * me_ctx->width * 3);
+AVDictionaryEntry *e_mafd = NULL;
+char *tail = NULL;
+
+e_mafd = av_dict_get(mi_ctx->frames[2].avf->metadata, 
"lavfi.scd.mafd", NULL, AV_DICT_MATCH_CASE);
+if (e_mafd)
+mafd = strtod(e_mafd->value, );
+if (*tail || mafd == HUGE_VAL) {
+mi_ctx->sad(p1, linesize1, p2, linesize2, me_ctx->width, 
me_ctx->height, );
+emms_c();
+mafd = (double) sad / (me_ctx->height * me_ctx->width * 3);
+}
 diff = fabs(mafd - mi_ctx->prev_mafd);
 ret  = av_clipf(FFMIN(mafd, diff), 0, 100.0);
 mi_ctx->prev_mafd = mafd;
-- 
2.6.4

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

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

[FFmpeg-devel] [PATCH v4 3/4] avfilter/vf_minterpolate: if metadata lavfi.scd.mafd exists, we'll use it first

2019-10-08 Thread lance . lmwang 
From: Limin Wang 

Reviewed-by: Paul B Mahol 
Signed-off-by: Limin Wang 
---
 libavfilter/vf_minterpolate.c | 16 
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/libavfilter/vf_minterpolate.c b/libavfilter/vf_minterpolate.c
index b0bb238ade..db3d7d4ca3 100644
--- a/libavfilter/vf_minterpolate.c
+++ b/libavfilter/vf_minterpolate.c
@@ -832,11 +832,19 @@ static int detect_scene_change(MIContext *mi_ctx)
 ptrdiff_t linesize2 = mi_ctx->frames[2].avf->linesize[0];
 
 if (mi_ctx->scd_method == SCD_METHOD_FDIFF) {
-double ret = 0, mafd, diff;
+double ret = 0, mafd = HUGE_VAL, diff;
 uint64_t sad;
-mi_ctx->sad(p1, linesize1, p2, linesize2, me_ctx->width, 
me_ctx->height, );
-emms_c();
-mafd = (double) sad / (me_ctx->height * me_ctx->width * 3);
+AVDictionaryEntry *e_mafd = NULL;
+char *tail = NULL;
+
+e_mafd = av_dict_get(mi_ctx->frames[2].avf->metadata, 
"lavfi.scd.mafd", NULL, AV_DICT_MATCH_CASE);
+if (e_mafd)
+mafd = strtod(e_mafd->value, );
+if (*tail || mafd == HUGE_VAL) {
+mi_ctx->sad(p1, linesize1, p2, linesize2, me_ctx->width, 
me_ctx->height, );
+emms_c();
+mafd = (double) sad / (me_ctx->height * me_ctx->width * 3);
+}
 diff = fabs(mafd - mi_ctx->prev_mafd);
 ret  = av_clipf(FFMIN(mafd, diff), 0, 100.0);
 mi_ctx->prev_mafd = mafd;
-- 
2.21.0

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

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