mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
a05a44e205
* commit '7e350379f87e7f74420b4813170fe808e2313911':
lavfi: switch to AVFrame.
Conflicts:
doc/filters.texi
libavfilter/af_ashowinfo.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersink.c
libavfilter/buffersrc.c
libavfilter/buffersrc.h
libavfilter/f_select.c
libavfilter/f_setpts.c
libavfilter/fifo.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/version.h
libavfilter/vf_aspect.c
libavfilter/vf_bbox.c
libavfilter/vf_blackframe.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_fps.c
libavfilter/vf_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_showinfo.c
libavfilter/vf_transpose.c
libavfilter/vf_vflip.c
libavfilter/vf_yadif.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavfilter/yadif.h
Following are notes about the merge authorship and various technical details.
Michael Niedermayer:
* Main merge operation, notably avfilter.c and video.c
* Switch to AVFrame:
- afade
- anullsrc
- apad
- aresample
- blackframe
- deshake
- idet
- il
- mandelbrot
- mptestsrc
- noise
- setfield
- smartblur
- tinterlace
* various merge changes and fixes in:
- ashowinfo
- blackdetect
- field
- fps
- select
- testsrc
- yadif
Nicolas George:
* Switch to AVFrame:
- make rawdec work with refcounted frames. Adapted from commit
759001c534
by Anton Khirnov.
Also, fix the use of || instead of | in a flags check.
- make buffer sink and src, audio and video work all together
Clément Bœsch:
* Switch to AVFrame:
- aevalsrc
- alphaextract
- blend
- cellauto
- colormatrix
- concat
- earwax
- ebur128
- edgedetect
- geq
- histeq
- histogram
- hue
- kerndeint
- life
- movie
- mp (with the help of Michael)
- overlay
- pad
- pan
- pp
- pp
- removelogo
- sendcmd
- showspectrum
- showwaves
- silencedetect
- stereo3d
- subtitles
- super2xsai
- swapuv
- thumbnail
- tile
Hendrik Leppkes:
* Switch to AVFrame:
- aconvert
- amerge
- asetnsamples
- atempo
- biquads
Matthieu Bouron:
* Switch to AVFrame
- alphamerge
- decimate
- volumedetect
Stefano Sabatini:
* Switch to AVFrame:
- astreamsync
- flite
- framestep
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
172 lines
4.7 KiB
C
172 lines
4.7 KiB
C
/*
|
|
* Copyright (c) 2002 A'rpi
|
|
* Copyright (C) 2012 Clément Bœsch
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* 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.
|
|
*
|
|
* 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 FFmpeg; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* libpostproc filter, ported from MPlayer.
|
|
*/
|
|
|
|
#include "libavutil/avassert.h"
|
|
#include "libavutil/opt.h"
|
|
#include "internal.h"
|
|
|
|
#include "libpostproc/postprocess.h"
|
|
|
|
typedef struct {
|
|
int mode_id;
|
|
pp_mode *modes[PP_QUALITY_MAX + 1];
|
|
void *pp_ctx;
|
|
} PPFilterContext;
|
|
|
|
static av_cold int pp_init(AVFilterContext *ctx, const char *args)
|
|
{
|
|
int i;
|
|
PPFilterContext *pp = ctx->priv;
|
|
|
|
if (!args || !*args)
|
|
args = "de";
|
|
|
|
for (i = 0; i <= PP_QUALITY_MAX; i++) {
|
|
pp->modes[i] = pp_get_mode_by_name_and_quality(args, i);
|
|
if (!pp->modes[i])
|
|
return AVERROR_EXTERNAL;
|
|
}
|
|
pp->mode_id = PP_QUALITY_MAX;
|
|
return 0;
|
|
}
|
|
|
|
static int pp_process_command(AVFilterContext *ctx, const char *cmd, const char *args,
|
|
char *res, int res_len, int flags)
|
|
{
|
|
PPFilterContext *pp = ctx->priv;
|
|
|
|
if (!strcmp(cmd, "quality")) {
|
|
pp->mode_id = av_clip(strtol(args, NULL, 10), 0, PP_QUALITY_MAX);
|
|
return 0;
|
|
}
|
|
return AVERROR(ENOSYS);
|
|
}
|
|
|
|
static int pp_query_formats(AVFilterContext *ctx)
|
|
{
|
|
static const enum PixelFormat pix_fmts[] = {
|
|
AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVJ420P,
|
|
AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVJ422P,
|
|
AV_PIX_FMT_YUV411P,
|
|
AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P,
|
|
AV_PIX_FMT_NONE
|
|
};
|
|
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
|
|
return 0;
|
|
}
|
|
|
|
static int pp_config_props(AVFilterLink *inlink)
|
|
{
|
|
int flags = PP_CPU_CAPS_AUTO;
|
|
PPFilterContext *pp = inlink->dst->priv;
|
|
|
|
switch (inlink->format) {
|
|
case AV_PIX_FMT_YUVJ420P:
|
|
case AV_PIX_FMT_YUV420P: flags |= PP_FORMAT_420; break;
|
|
case AV_PIX_FMT_YUVJ422P:
|
|
case AV_PIX_FMT_YUV422P: flags |= PP_FORMAT_422; break;
|
|
case AV_PIX_FMT_YUV411P: flags |= PP_FORMAT_411; break;
|
|
case AV_PIX_FMT_YUVJ444P:
|
|
case AV_PIX_FMT_YUV444P: flags |= PP_FORMAT_444; break;
|
|
default: av_assert0(0);
|
|
}
|
|
|
|
pp->pp_ctx = pp_get_context(inlink->w, inlink->h, flags);
|
|
if (!pp->pp_ctx)
|
|
return AVERROR(ENOMEM);
|
|
return 0;
|
|
}
|
|
|
|
static int pp_filter_frame(AVFilterLink *inlink, AVFrame *inbuf)
|
|
{
|
|
AVFilterContext *ctx = inlink->dst;
|
|
PPFilterContext *pp = ctx->priv;
|
|
AVFilterLink *outlink = ctx->outputs[0];
|
|
const int aligned_w = FFALIGN(outlink->w, 8);
|
|
const int aligned_h = FFALIGN(outlink->h, 8);
|
|
AVFrame *outbuf;
|
|
|
|
outbuf = ff_get_video_buffer(outlink, aligned_w, aligned_h);
|
|
if (!outbuf) {
|
|
av_frame_free(&inbuf);
|
|
return AVERROR(ENOMEM);
|
|
}
|
|
av_frame_copy_props(outbuf, inbuf);
|
|
|
|
pp_postprocess((const uint8_t **)inbuf->data, inbuf->linesize,
|
|
outbuf->data, outbuf->linesize,
|
|
aligned_w, outlink->h,
|
|
outbuf->qscale_table,
|
|
outbuf->qstride,
|
|
pp->modes[pp->mode_id],
|
|
pp->pp_ctx,
|
|
outbuf->pict_type);
|
|
|
|
av_frame_free(&inbuf);
|
|
return ff_filter_frame(outlink, outbuf);
|
|
}
|
|
|
|
static av_cold void pp_uninit(AVFilterContext *ctx)
|
|
{
|
|
int i;
|
|
PPFilterContext *pp = ctx->priv;
|
|
|
|
for (i = 0; i <= PP_QUALITY_MAX; i++)
|
|
pp_free_mode(pp->modes[i]);
|
|
if (pp->pp_ctx)
|
|
pp_free_context(pp->pp_ctx);
|
|
}
|
|
|
|
static const AVFilterPad pp_inputs[] = {
|
|
{
|
|
.name = "default",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.config_props = pp_config_props,
|
|
.filter_frame = pp_filter_frame,
|
|
},
|
|
{ NULL }
|
|
};
|
|
|
|
static const AVFilterPad pp_outputs[] = {
|
|
{
|
|
.name = "default",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
},
|
|
{ NULL }
|
|
};
|
|
|
|
AVFilter avfilter_vf_pp = {
|
|
.name = "pp",
|
|
.description = NULL_IF_CONFIG_SMALL("Filter video using libpostproc."),
|
|
.priv_size = sizeof(PPFilterContext),
|
|
.init = pp_init,
|
|
.uninit = pp_uninit,
|
|
.query_formats = pp_query_formats,
|
|
.inputs = pp_inputs,
|
|
.outputs = pp_outputs,
|
|
.process_command = pp_process_command,
|
|
};
|