X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_framerate.c;h=06e463e4d77d8d4bc00546cef93fb36b83ec029b;hb=233fdd84c2c77296624f8b4a88f4ce4739c3a653;hp=3e2615be5e6958f8a940bc04ef2acc72b1c62a5a;hpb=ce265b0bf5d0c77a092a1f5fbeb652c7cdea5fc7;p=ffmpeg diff --git a/libavfilter/vf_framerate.c b/libavfilter/vf_framerate.c index 3e2615be5e6..06e463e4d77 100644 --- a/libavfilter/vf_framerate.c +++ b/libavfilter/vf_framerate.c @@ -33,12 +33,13 @@ #include "libavutil/internal.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" -#include "libavutil/pixelutils.h" #include "avfilter.h" #include "internal.h" #include "video.h" +#include "filters.h" #include "framerate.h" +#include "scene_sad.h" #define OFFSET(x) offsetof(FrameRateContext, x) #define V AV_OPT_FLAG_VIDEO_PARAM @@ -61,52 +62,6 @@ static const AVOption framerate_options[] = { AVFILTER_DEFINE_CLASS(framerate); -static av_always_inline int64_t sad_8x8_16(const uint16_t *src1, ptrdiff_t stride1, - const uint16_t *src2, ptrdiff_t stride2) -{ - int sum = 0; - int x, y; - - for (y = 0; y < 8; y++) { - for (x = 0; x < 8; x++) - sum += FFABS(src1[x] - src2[x]); - src1 += stride1; - src2 += stride2; - } - return sum; -} - -static int64_t scene_sad16(FrameRateContext *s, const uint16_t *p1, int p1_linesize, const uint16_t* p2, int p2_linesize, const int width, const int height) -{ - int64_t sad; - int x, y; - for (sad = y = 0; y < height - 7; y += 8) { - for (x = 0; x < width - 7; x += 8) { - sad += sad_8x8_16(p1 + y * p1_linesize + x, - p1_linesize, - p2 + y * p2_linesize + x, - p2_linesize); - } - } - return sad; -} - -static int64_t scene_sad8(FrameRateContext *s, uint8_t *p1, int p1_linesize, uint8_t* p2, int p2_linesize, const int width, const int height) -{ - int64_t sad; - int x, y; - for (sad = y = 0; y < height - 7; y += 8) { - for (x = 0; x < width - 7; x += 8) { - sad += s->sad(p1 + y * p1_linesize + x, - p1_linesize, - p2 + y * p2_linesize + x, - p2_linesize); - } - } - emms_c(); - return sad; -} - static double get_scene_score(AVFilterContext *ctx, AVFrame *crnt, AVFrame *next) { FrameRateContext *s = ctx->priv; @@ -116,16 +71,13 @@ static double get_scene_score(AVFilterContext *ctx, AVFrame *crnt, AVFrame *next if (crnt->height == next->height && crnt->width == next->width) { - int64_t sad; + uint64_t sad; double mafd, diff; ff_dlog(ctx, "get_scene_score() process\n"); - if (s->bitdepth == 8) - sad = scene_sad8(s, crnt->data[0], crnt->linesize[0], next->data[0], next->linesize[0], crnt->width, crnt->height); - else - sad = scene_sad16(s, (const uint16_t*)crnt->data[0], crnt->linesize[0] / 2, (const uint16_t*)next->data[0], next->linesize[0] / 2, crnt->width, crnt->height); - - mafd = (double)sad * 100.0 / FFMAX(1, (crnt->height & ~7) * (crnt->width & ~7)) / (1 << s->bitdepth); + s->sad(crnt->data[0], crnt->linesize[0], next->data[0], next->linesize[0], crnt->width, crnt->height, &sad); + emms_c(); + mafd = (double)sad * 100.0 / (crnt->width * crnt->height) / (1 << s->bitdepth); diff = fabs(mafd - s->prev_mafd); ret = av_clipf(FFMIN(mafd, diff), 0, 100.0); s->prev_mafd = mafd; @@ -349,7 +301,7 @@ static int config_input(AVFilterLink *inlink) s->bitdepth = pix_desc->comp[0].depth; s->vsub = pix_desc->log2_chroma_h; - s->sad = av_pixelutils_get_sad_fn(3, 3, 2, s); // 8x8 both sources aligned + s->sad = ff_scene_sad_get_fn(s->bitdepth == 8 ? 8 : 16); if (!s->sad) return AVERROR(EINVAL); @@ -360,53 +312,81 @@ static int config_input(AVFilterLink *inlink) return 0; } -static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) +static int activate(AVFilterContext *ctx) { - int ret; - AVFilterContext *ctx = inlink->dst; + int ret, status; + AVFilterLink *inlink = ctx->inputs[0]; + AVFilterLink *outlink = ctx->outputs[0]; FrameRateContext *s = ctx->priv; + AVFrame *inpicref; int64_t pts; - if (inpicref->interlaced_frame) - av_log(ctx, AV_LOG_WARNING, "Interlaced frame found - the output will not be correct.\n"); + FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); - if (inpicref->pts == AV_NOPTS_VALUE) { - av_log(ctx, AV_LOG_WARNING, "Ignoring frame without PTS.\n"); - return 0; +retry: + ret = process_work_frame(ctx); + if (ret < 0) + return ret; + else if (ret == 1) + return ff_filter_frame(outlink, s->work); + + ret = ff_inlink_consume_frame(inlink, &inpicref); + if (ret < 0) + return ret; + + if (inpicref) { + if (inpicref->interlaced_frame) + av_log(ctx, AV_LOG_WARNING, "Interlaced frame found - the output will not be correct.\n"); + + if (inpicref->pts == AV_NOPTS_VALUE) { + av_log(ctx, AV_LOG_WARNING, "Ignoring frame without PTS.\n"); + av_frame_free(&inpicref); + } } - pts = av_rescale_q(inpicref->pts, s->srce_time_base, s->dest_time_base); - if (s->f1 && pts == s->pts1) { - av_log(ctx, AV_LOG_WARNING, "Ignoring frame with same PTS.\n"); - return 0; + if (inpicref) { + pts = av_rescale_q(inpicref->pts, s->srce_time_base, s->dest_time_base); + + if (s->f1 && pts == s->pts1) { + av_log(ctx, AV_LOG_WARNING, "Ignoring frame with same PTS.\n"); + av_frame_free(&inpicref); + } } - av_frame_free(&s->f0); - s->f0 = s->f1; - s->pts0 = s->pts1; - s->f1 = inpicref; - s->pts1 = pts; - s->delta = s->pts1 - s->pts0; - s->score = -1.0; - - if (s->delta < 0) { - av_log(ctx, AV_LOG_WARNING, "PTS discontinuity.\n"); - s->start_pts = s->pts1; - s->n = 0; + if (inpicref) { av_frame_free(&s->f0); + s->f0 = s->f1; + s->pts0 = s->pts1; + s->f1 = inpicref; + s->pts1 = pts; + s->delta = s->pts1 - s->pts0; + s->score = -1.0; + + if (s->delta < 0) { + av_log(ctx, AV_LOG_WARNING, "PTS discontinuity.\n"); + s->start_pts = s->pts1; + s->n = 0; + av_frame_free(&s->f0); + } + + if (s->start_pts == AV_NOPTS_VALUE) + s->start_pts = s->pts1; + + goto retry; } - if (s->start_pts == AV_NOPTS_VALUE) - s->start_pts = s->pts1; + if (ff_inlink_acknowledge_status(inlink, &status, &pts)) { + if (!s->flush) { + s->flush = 1; + goto retry; + } + ff_outlink_set_status(outlink, status, pts); + return 0; + } - do { - ret = process_work_frame(ctx); - if (ret <= 0) - return ret; - ret = ff_filter_frame(ctx->outputs[0], s->work); - } while (ret >= 0); + FF_FILTER_FORWARD_WANTED(outlink, inlink); - return ret; + return FFERROR_NOT_READY; } static int config_output(AVFilterLink *outlink) @@ -454,33 +434,11 @@ static int config_output(AVFilterLink *outlink) return 0; } -static int request_frame(AVFilterLink *outlink) -{ - AVFilterContext *ctx = outlink->src; - FrameRateContext *s = ctx->priv; - int ret; - - ff_dlog(ctx, "request_frame()\n"); - - ret = ff_request_frame(ctx->inputs[0]); - if (ret == AVERROR_EOF && s->f1 && !s->flush) { - s->flush = 1; - ret = process_work_frame(ctx); - if (ret < 0) - return ret; - ret = ret ? ff_filter_frame(ctx->outputs[0], s->work) : AVERROR_EOF; - } - - ff_dlog(ctx, "request_frame() source's request_frame() returned:%d\n", ret); - return ret; -} - static const AVFilterPad framerate_inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_input, - .filter_frame = filter_frame, }, { NULL } }; @@ -489,7 +447,6 @@ static const AVFilterPad framerate_outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .request_frame = request_frame, .config_props = config_output, }, { NULL } @@ -506,4 +463,5 @@ AVFilter ff_vf_framerate = { .inputs = framerate_inputs, .outputs = framerate_outputs, .flags = AVFILTER_FLAG_SLICE_THREADS, + .activate = activate, };