On 1/28/15, Robert Krueger <krue...@lesspain.de> wrote:
> On Tue, Jan 27, 2015 at 12:14 PM, Paul B Mahol <one...@gmail.com> wrote:
>
>> Signed-off-by: Paul B Mahol <one...@gmail.com>
>> ---
>> Not-bitexact, dunno why. Do not have actual samples to test.
>> ---
>> LICENSE.md | 1 +
>> configure | 1 +
>> libavfilter/Makefile | 1 +
>> libavfilter/allfilters.c | 1 +
>> libavfilter/vf_softpulldown.c | 177
>> ++++++++++++++++++++++++++++++++++++++++++
>> 5 files changed, 181 insertions(+)
>> create mode 100644 libavfilter/vf_softpulldown.c
>>
>> diff --git a/LICENSE.md b/LICENSE.md
>> index fb52cad..7add63c 100644
>> --- a/LICENSE.md
>> +++ b/LICENSE.md
>> @@ -48,6 +48,7 @@ Specifically, the GPL parts of FFmpeg are:
>> - vf_pullup.c
>> - vf_sab.c
>> - vf_smartblur.c
>> + - vf_softpulldown.c
>> - vf_spp.c
>> - vf_stereo3d.c
>> - vf_super2xsai.c
>> diff --git a/configure b/configure
>> index 9fcdaee..01fc0cb 100755
>> --- a/configure
>> +++ b/configure
>> @@ -2615,6 +2615,7 @@ select_filter_select="pixelutils"
>> smartblur_filter_deps="gpl swscale"
>> showspectrum_filter_deps="avcodec"
>> showspectrum_filter_select="rdft"
>> +softpulldown_filter_deps="gpl"
>> spp_filter_deps="gpl avcodec"
>> spp_filter_select="fft idctdsp fdctdsp me_cmp pixblockdsp"
>> stereo3d_filter_deps="gpl"
>> diff --git a/libavfilter/Makefile b/libavfilter/Makefile
>> index 7e0d456..1c1ea6d 100644
>> --- a/libavfilter/Makefile
>> +++ b/libavfilter/Makefile
>> @@ -186,6 +186,7 @@ OBJS-$(CONFIG_SHOWPALETTE_FILTER) +=
>> vf_showpalette.o
>> OBJS-$(CONFIG_SHUFFLEPLANES_FILTER) += vf_shuffleplanes.o
>> OBJS-$(CONFIG_SIGNALSTATS_FILTER) += vf_signalstats.o
>> OBJS-$(CONFIG_SMARTBLUR_FILTER) += vf_smartblur.o
>> +OBJS-$(CONFIG_SOFTPULLDOWN_FILTER) += vf_softpulldown.o
>> OBJS-$(CONFIG_SPLIT_FILTER) += split.o
>> OBJS-$(CONFIG_SPP_FILTER) += vf_spp.o
>> OBJS-$(CONFIG_STEREO3D_FILTER) += vf_stereo3d.o
>> diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
>> index f4af8ec..6a336fa 100644
>> --- a/libavfilter/allfilters.c
>> +++ b/libavfilter/allfilters.c
>> @@ -201,6 +201,7 @@ void avfilter_register_all(void)
>> REGISTER_FILTER(SHUFFLEPLANES, shuffleplanes, vf);
>> REGISTER_FILTER(SIGNALSTATS, signalstats, vf);
>> REGISTER_FILTER(SMARTBLUR, smartblur, vf);
>> + REGISTER_FILTER(SOFTPULLDOWN, softpulldown, vf);
>> REGISTER_FILTER(SPLIT, split, vf);
>> REGISTER_FILTER(SPP, spp, vf);
>> REGISTER_FILTER(STEREO3D, stereo3d, vf);
>> diff --git a/libavfilter/vf_softpulldown.c
>> b/libavfilter/vf_softpulldown.c
>> new file mode 100644
>> index 0000000..7115119
>> --- /dev/null
>> +++ b/libavfilter/vf_softpulldown.c
>> @@ -0,0 +1,177 @@
>> +/*
>> + * Copyright (c) 2003 Tobias Diedrich
>> + *
>> + * This file is part of FFmpeg.
>> + *
>> + * FFmpeg is free software; you can redistribute it and/or
>> + * modify it under the terms of the GNU Lesser General Public
>> + * License as published by the Free Software Foundation; either
>> + * version 2.1 of the License, or (at your option) any later version.
>> + *
>> + * 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
>> + * Lesser General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU Lesser General Public
>> + * License along with FFmpeg; if not, write to the Free Software
>> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
>> 02110-1301 USA
>> + */
>> +
>> +#include "libavutil/imgutils.h"
>> +#include "avfilter.h"
>> +#include "internal.h"
>> +
>> +typedef struct SoftpulldownContext {
>> + const AVClass *class;
>> + int state;
>> + int nb_planes;
>> + int linesize[4];
>> + int planeheight[4];
>> + AVFrame *frame;
>> +} SoftpulldownContext;
>> +
>> +static av_cold void uninit(AVFilterContext *ctx)
>> +{
>> + SoftpulldownContext *s = ctx->priv;
>> +
>> + av_frame_free(&s->frame);
>> +}
>> +
>> +static int query_formats(AVFilterContext *ctx)
>> +{
>> + static const enum AVPixelFormat pixel_fmts_eq[] = {
>> + AV_PIX_FMT_GRAY8,
>> + AV_PIX_FMT_YUV410P,
>> + AV_PIX_FMT_YUV411P,
>> + AV_PIX_FMT_YUV420P,
>> + AV_PIX_FMT_YUV422P,
>> + AV_PIX_FMT_YUV444P,
>> + AV_PIX_FMT_NONE
>> + };
>> +
>> + ff_set_common_formats(ctx, ff_make_format_list(pixel_fmts_eq));
>> +
>> + return 0;
>> +}
>> +
>> +static int config_input(AVFilterLink *inlink)
>> +{
>> + SoftpulldownContext *s = inlink->dst->priv;
>> + const AVPixFmtDescriptor *desc =
>> av_pix_fmt_desc_get(inlink->format);
>> + int ret;
>> +
>> + if ((ret = av_image_fill_linesizes(s->linesize, inlink->format,
>> inlink->w)) < 0)
>> + return ret;
>> +
>> + s->planeheight[1] = s->planeheight[2] = FF_CEIL_RSHIFT(inlink->h,
>> desc->log2_chroma_h);
>> + s->planeheight[0] = s->planeheight[3] = inlink->h;
>> +
>> + s->nb_planes = av_pix_fmt_count_planes(inlink->format);
>> +
>> + return 0;
>> +}
>> +
>> +static int filter_frame(AVFilterLink *inlink, AVFrame *in)
>> +{
>> + AVFilterContext *ctx = inlink->dst;
>> + AVFilterLink *outlink = inlink->dst->outputs[0];
>> + SoftpulldownContext *s = ctx->priv;
>> + AVFrame *out;
>> + int ret, i;
>> + int state = s->state;
>> +
>> + if (!s->frame) {
>> + s->frame = av_frame_clone(in);
>> + if (!s->frame)
>> + return AVERROR(ENOMEM);
>> + }
>> +
>> + out = s->frame;
>> + av_frame_copy_props(out, in);
>> +
>> + if ((state == 0 && !in->top_field_first) ||
>> + (state == 1 && in->top_field_first)) {
>> + av_log(ctx, AV_LOG_WARNING, "Unexpected field flags: "
>> + "state=%d top_field_first=%d
>> repeat_first_field=%d\n",
>> + state, in->top_field_first,
>> in->repeat_pict);
>> + state ^= 1;
>> + }
>> +
>> + if (state == 0) {
>> + AVFrame *new;
>> +
>> + new = av_frame_clone(in);
>> + if (!new)
>> + return AVERROR(ENOMEM);
>> +
>> + ret = ff_filter_frame(outlink, new);
>> +
>> + if (in->repeat_pict) {
>> + for (i = 0; i < s->nb_planes; i++) {
>> + av_image_copy_plane(out->data[i], out->linesize[i] * 2,
>> + in->data[i], in->linesize[i] * 2,
>> + s->linesize[i], s->planeheight[i] /
>> 2);
>> + }
>> + state = 1;
>> + }
>> + } else {
>> + for (i = 0; i < s->nb_planes; i++) {
>> + av_image_copy_plane(out->data[i] + out->linesize[i],
>> out->linesize[i] * 2,
>> + in->data[i] + in->linesize[i],
>> in->linesize[i] * 2,
>> + s->linesize[i], s->planeheight[i] / 2);
>> + }
>> +
>> + ret = ff_filter_frame(outlink, av_frame_clone(out));
>> +
>> + if (in->repeat_pict) {
>> + AVFrame *new;
>> +
>> + new = av_frame_clone(in);
>> + if (!new)
>> + return AVERROR(ENOMEM);
>> +
>> + ret = ff_filter_frame(outlink, new);
>> + state = 0;
>> + } else {
>> + for (i = 0; i < s->nb_planes; i++) {
>> + av_image_copy_plane(out->data[i], out->linesize[i] * 2,
>> + in->data[i], in->linesize[i] * 2,
>> + s->linesize[i], s->planeheight[i] /
>> 2);
>> + }
>> + }
>> + }
>> +
>> + s->state = state;
>> +
>> + av_frame_free(&in);
>> + return 0;
>> +}
>> +
>> +static const AVFilterPad softpulldown_inputs[] = {
>> + {
>> + .name = "default",
>> + .type = AVMEDIA_TYPE_VIDEO,
>> + .filter_frame = filter_frame,
>> + .config_props = config_input,
>> + },
>> + { NULL }
>> +};
>> +
>> +static const AVFilterPad softpulldown_outputs[] = {
>> + {
>> + .name = "default",
>> + .type = AVMEDIA_TYPE_VIDEO,
>> + },
>> + { NULL }
>> +};
>> +
>> +AVFilter ff_vf_softpulldown = {
>> + .name = "softpulldown",
>> + .description = NULL_IF_CONFIG_SMALL("Mpeg2 soft 3:2 pulldown"),
>> + .priv_size = sizeof(SoftpulldownContext),
>> + .uninit = uninit,
>> + .inputs = softpulldown_inputs,
>> + .outputs = softpulldown_outputs,
>> + .query_formats = query_formats,
>> +};
>> --
>> 1.7.11.2
>>
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel@ffmpeg.org
>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>
>
> License header in the file is LGPL but all other things in the patch look
> like it's meant to be GPL.
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
Fixed locally.
Thanks.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
