Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2012-12-06 19:14:22 +0400
committerClément Bœsch <ubitux@gmail.com>2012-12-06 19:20:31 +0400
commite7b0e83e965e3881e0586d688c18741312f57256 (patch)
treec7d1e40a036c3111fed0e3520c15b0ae9a6a1223 /libavfilter/vf_deshake.c
parent71949ef715a29878424b2fb40c471cfb71c6bb98 (diff)
lavfi/deshake: switch to filter_frame.
Diffstat (limited to 'libavfilter/vf_deshake.c')
-rw-r--r--libavfilter/vf_deshake.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c
index 92fb1eabc1..5c562eb2b4 100644
--- a/libavfilter/vf_deshake.c
+++ b/libavfilter/vf_deshake.c
@@ -51,6 +51,7 @@
#include "avfilter.h"
#include "formats.h"
+#include "internal.h"
#include "video.h"
#include "libavutil/common.h"
#include "libavutil/mem.h"
@@ -425,16 +426,23 @@ static av_cold void uninit(AVFilterContext *ctx)
av_freep(&deshake->avctx);
}
-static int end_frame(AVFilterLink *link)
+static int filter_frame(AVFilterLink *link, AVFilterBufferRef *in)
{
DeshakeContext *deshake = link->dst->priv;
- AVFilterBufferRef *in = link->cur_buf;
- AVFilterBufferRef *out = link->dst->outputs[0]->out_buf;
+ AVFilterLink *outlink = link->dst->outputs[0];
+ AVFilterBufferRef *out;
Transform t = {{0},0}, orig = {{0},0};
float matrix[9];
float alpha = 2.0 / deshake->refcount;
char tmp[256];
+ out = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
+ if (!out) {
+ avfilter_unref_bufferp(&in);
+ return AVERROR(ENOMEM);
+ }
+ avfilter_copy_buffer_ref_props(out, in);
+
link->cur_buf = NULL; /* it is in 'in' now */
if (deshake->cx < 0 || deshake->cy < 0 || deshake->cw < 0 || deshake->ch < 0) {
// Find the most likely global motion for the current frame
@@ -528,22 +536,14 @@ static int end_frame(AVFilterLink *link)
// Cleanup the old reference frame
deshake->ref = in;
- // Draw the transformed frame information
- ff_draw_slice(link->dst->outputs[0], 0, link->h, 1);
- return ff_end_frame(link->dst->outputs[0]);
-}
-
-static int draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
-{
- return 0;
+ return ff_filter_frame(outlink, out);
}
static const AVFilterPad deshake_inputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
- .draw_slice = draw_slice,
- .end_frame = end_frame,
+ .filter_frame = filter_frame,
.config_props = config_props,
.min_perms = AV_PERM_READ | AV_PERM_PRESERVE,
},