diff options
| author | Clément Bœsch <u@pkh.me> | 2016-01-07 22:27:54 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-01-07 22:27:54 +0100 |
| commit | 90cd02059b6f1a3776ca1581e8c94a59f6c70ec6 (patch) | |
| tree | 6ff2a90ee7fdd0f5d34d19e1a4e8a014000225e3 /libavfilter | |
| parent | 84a967df034baa85500972bb874f7d0dedb3b993 (diff) | |
lavfi/deshake: use FF_CEIL_RSHIFT()
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_deshake.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c index 79fcc200e1..e7ece443c3 100644 --- a/libavfilter/vf_deshake.c +++ b/libavfilter/vf_deshake.c @@ -62,9 +62,6 @@ #include "deshake.h" #include "deshake_opencl.h" -#define CHROMA_WIDTH(link) (-((-(link)->w) >> av_pix_fmt_desc_get((link)->format)->log2_chroma_w)) -#define CHROMA_HEIGHT(link) (-((-(link)->h) >> av_pix_fmt_desc_get((link)->format)->log2_chroma_h)) - #define OFFSET(x) offsetof(DeshakeContext, x) #define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM @@ -439,6 +436,9 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) float alpha = 2.0 / deshake->refcount; char tmp[256]; int ret = 0; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format); + const int chroma_width = FF_CEIL_RSHIFT(link->w, desc->log2_chroma_w); + const int chroma_height = FF_CEIL_RSHIFT(link->h, desc->log2_chroma_h); out = ff_get_video_buffer(outlink, outlink->w, outlink->h); if (!out) { @@ -527,9 +527,9 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) // Generate a luma transformation matrix avfilter_get_matrix(t.vec.x, t.vec.y, t.angle, 1.0 + t.zoom / 100.0, matrix_y); // Generate a chroma transformation matrix - avfilter_get_matrix(t.vec.x / (link->w / CHROMA_WIDTH(link)), t.vec.y / (link->h / CHROMA_HEIGHT(link)), t.angle, 1.0 + t.zoom / 100.0, matrix_uv); + avfilter_get_matrix(t.vec.x / (link->w / chroma_width), t.vec.y / (link->h / chroma_height), t.angle, 1.0 + t.zoom / 100.0, matrix_uv); // Transform the luma and chroma planes - ret = deshake->transform(link->dst, link->w, link->h, CHROMA_WIDTH(link), CHROMA_HEIGHT(link), + ret = deshake->transform(link->dst, link->w, link->h, chroma_width, chroma_height, matrix_y, matrix_uv, INTERPOLATE_BILINEAR, deshake->edge, in, out); // Cleanup the old reference frame |