summaryrefslogtreecommitdiff
path: root/libavfilter/vf_yadif.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavfilter/vf_yadif.c')
-rw-r--r--libavfilter/vf_yadif.c89
1 files changed, 53 insertions, 36 deletions
diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index f67e3b0249..74358e523f 100644
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@ -1,24 +1,23 @@
/*
- * Copyright (C) 2006-2010 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (C) 2006-2011 Michael Niedermayer <michaelni@gmx.at>
* 2010 James Darnley <james.darnley@gmail.com>
*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include "libavutil/avassert.h"
#include "libavutil/cpu.h"
#include "libavutil/common.h"
#include "libavutil/pixdesc.h"
@@ -116,6 +115,7 @@ static void filter(AVFilterContext *ctx, AVFilterBufferRef *dstpic,
int w = dstpic->video->w;
int h = dstpic->video->h;
int refs = yadif->cur->linesize[i];
+ int absrefs = FFABS(refs);
int df = (yadif->csp->comp[i].depth_minus1 + 8) / 8;
if (i == 1 || i == 2) {
@@ -124,6 +124,12 @@ static void filter(AVFilterContext *ctx, AVFilterBufferRef *dstpic,
h >>= yadif->csp->log2_chroma_h;
}
+ if(yadif->temp_line_size < absrefs) {
+ av_free(yadif->temp_line);
+ yadif->temp_line = av_mallocz(2*64 + 5*absrefs);
+ yadif->temp_line_size = absrefs;
+ }
+
for (y = 0; y < h; y++) {
if ((y ^ parity) & 1) {
uint8_t *prev = &yadif->prev->data[i][y * refs];
@@ -131,9 +137,25 @@ static void filter(AVFilterContext *ctx, AVFilterBufferRef *dstpic,
uint8_t *next = &yadif->next->data[i][y * refs];
uint8_t *dst = &dstpic->data[i][y * dstpic->linesize[i]];
int mode = y == 1 || y + 2 == h ? 2 : yadif->mode;
+ int prefs = y+1<h ? refs : -refs;
+ int mrefs = y ?-refs : refs;
+
+ if(y<=1 || y+2>=h) {
+ uint8_t *tmp = yadif->temp_line + 64 + 2*absrefs;
+ if(mode<2)
+ memcpy(tmp+2*mrefs, cur+2*mrefs, w*df);
+ memcpy(tmp+mrefs, cur+mrefs, w*df);
+ memcpy(tmp , cur , w*df);
+ if(prefs != mrefs) {
+ memcpy(tmp+prefs, cur+prefs, w*df);
+ if(mode<2)
+ memcpy(tmp+2*prefs, cur+2*prefs, w*df);
+ }
+ cur = tmp;
+ }
+
yadif->filter_line(dst, prev, cur, next, w,
- y + 1 < h ? refs : -refs,
- y ? -refs : refs,
+ prefs, mrefs,
parity ^ tff, mode);
} else {
memcpy(&dstpic->data[i][y * dstpic->linesize[i]],
@@ -145,25 +167,6 @@ static void filter(AVFilterContext *ctx, AVFilterBufferRef *dstpic,
emms_c();
}
-static AVFilterBufferRef *get_video_buffer(AVFilterLink *link, int perms,
- int w, int h)
-{
- AVFilterBufferRef *picref;
- int width = FFALIGN(w, 32);
- int height = FFALIGN(h + 2, 32);
- int i;
-
- picref = ff_default_get_video_buffer(link, perms, width, height);
-
- picref->video->w = w;
- picref->video->h = h;
-
- for (i = 0; i < 3; i++)
- picref->data[i] += picref->linesize[i];
-
- return picref;
-}
-
static int return_frame(AVFilterContext *ctx, int is_second)
{
YADIFContext *yadif = ctx->priv;
@@ -189,7 +192,7 @@ static int return_frame(AVFilterContext *ctx, int is_second)
if (!yadif->csp)
yadif->csp = &av_pix_fmt_descriptors[link->format];
if (yadif->csp->comp[0].depth_minus1 / 8 == 1)
- yadif->filter_line = filter_line_c_16bit;
+ yadif->filter_line = (void*)filter_line_c_16bit;
filter(ctx, yadif->out, tff ^ !is_second, tff);
@@ -219,6 +222,13 @@ static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
AVFilterContext *ctx = link->dst;
YADIFContext *yadif = ctx->priv;
+ av_assert0(picref);
+
+ if (picref->video->h < 3 || picref->video->w < 3) {
+ av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or lines is not supported\n");
+ return AVERROR(EINVAL);
+ }
+
if (yadif->frame_pending)
return_frame(ctx, 1);
@@ -233,7 +243,7 @@ static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
return 0;
if (yadif->auto_enable && !yadif->cur->video->interlaced) {
- yadif->out = avfilter_ref_buffer(yadif->cur, AV_PERM_READ);
+ yadif->out = avfilter_ref_buffer(yadif->cur, ~AV_PERM_WRITE);
if (!yadif->out)
return AVERROR(ENOMEM);
@@ -244,7 +254,7 @@ static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
}
if (!yadif->prev &&
- !(yadif->prev = avfilter_ref_buffer(yadif->cur, AV_PERM_READ)))
+ !(yadif->prev = avfilter_ref_buffer(yadif->cur, ~AV_PERM_WRITE)))
return AVERROR(ENOMEM);
yadif->out = ff_get_video_buffer(ctx->outputs[0], PERM_RWP,
@@ -298,9 +308,8 @@ static int request_frame(AVFilterLink *link)
ret = ff_request_frame(link->src->inputs[0]);
- if (ret == AVERROR_EOF && yadif->next) {
- AVFilterBufferRef *next =
- avfilter_ref_buffer(yadif->next, AV_PERM_READ);
+ if (ret == AVERROR_EOF && yadif->cur) {
+ AVFilterBufferRef *next = avfilter_ref_buffer(yadif->next, ~AV_PERM_WRITE);
if (!next)
return AVERROR(ENOMEM);
@@ -331,7 +340,7 @@ static int poll_frame(AVFilterLink *link)
return val;
//FIXME change API to not requre this red tape
- if (val == 1 && !yadif->next) {
+ if (val >= 1 && !yadif->next) {
if ((ret = ff_request_frame(link->src->inputs[0])) < 0)
return ret;
val = ff_poll_frame(link->src->inputs[0]);
@@ -353,6 +362,7 @@ static av_cold void uninit(AVFilterContext *ctx)
if (yadif->prev) avfilter_unref_bufferp(&yadif->prev);
if (yadif->cur ) avfilter_unref_bufferp(&yadif->cur );
if (yadif->next) avfilter_unref_bufferp(&yadif->next);
+ av_freep(&yadif->temp_line); yadif->temp_line_size = 0;
}
static int query_formats(AVFilterContext *ctx)
@@ -377,6 +387,8 @@ static int query_formats(AVFilterContext *ctx)
AV_NE( AV_PIX_FMT_YUV422P16BE, AV_PIX_FMT_YUV422P16LE ),
AV_NE( AV_PIX_FMT_YUV444P16BE, AV_PIX_FMT_YUV444P16LE ),
AV_PIX_FMT_YUVA420P,
+ AV_PIX_FMT_YUVA422P,
+ AV_PIX_FMT_YUVA444P,
AV_PIX_FMT_NONE
};
@@ -416,11 +428,16 @@ static int null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
static int config_props(AVFilterLink *link)
{
+ YADIFContext *yadif = link->src->priv;
+
link->time_base.num = link->src->inputs[0]->time_base.num;
link->time_base.den = link->src->inputs[0]->time_base.den * 2;
link->w = link->src->inputs[0]->w;
link->h = link->src->inputs[0]->h;
+ if(yadif->mode&1)
+ link->frame_rate = av_mul_q(link->src->inputs[0]->frame_rate, (AVRational){2,1});
+
return 0;
}
@@ -429,9 +446,9 @@ static const AVFilterPad avfilter_vf_yadif_inputs[] = {
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.start_frame = start_frame,
- .get_video_buffer = get_video_buffer,
.draw_slice = null_draw_slice,
.end_frame = end_frame,
+ .min_perms = AV_PERM_PRESERVE,
},
{ NULL }
};
@@ -449,7 +466,7 @@ static const AVFilterPad avfilter_vf_yadif_outputs[] = {
AVFilter avfilter_vf_yadif = {
.name = "yadif",
- .description = NULL_IF_CONFIG_SMALL("Deinterlace the input image"),
+ .description = NULL_IF_CONFIG_SMALL("Deinterlace the input image."),
.priv_size = sizeof(YADIFContext),
.init = init,
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 19:02:27 +0000