mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +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>
137 lines
3.8 KiB
C
137 lines
3.8 KiB
C
/*
|
|
* Copyright (c) 2009 Stefano Sabatini
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* pixdesc test filter
|
|
*/
|
|
|
|
#include "libavutil/common.h"
|
|
#include "libavutil/pixdesc.h"
|
|
#include "avfilter.h"
|
|
#include "internal.h"
|
|
#include "video.h"
|
|
|
|
typedef struct {
|
|
const AVPixFmtDescriptor *pix_desc;
|
|
uint16_t *line;
|
|
} PixdescTestContext;
|
|
|
|
static av_cold void uninit(AVFilterContext *ctx)
|
|
{
|
|
PixdescTestContext *priv = ctx->priv;
|
|
av_freep(&priv->line);
|
|
}
|
|
|
|
static int config_props(AVFilterLink *inlink)
|
|
{
|
|
PixdescTestContext *priv = inlink->dst->priv;
|
|
|
|
priv->pix_desc = av_pix_fmt_desc_get(inlink->format);
|
|
|
|
if (!(priv->line = av_malloc(sizeof(*priv->line) * inlink->w)))
|
|
return AVERROR(ENOMEM);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int filter_frame(AVFilterLink *inlink, AVFrame *in)
|
|
{
|
|
PixdescTestContext *priv = inlink->dst->priv;
|
|
AVFilterLink *outlink = inlink->dst->outputs[0];
|
|
AVFrame *out;
|
|
int i, c, w = inlink->w, h = inlink->h;
|
|
|
|
out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
|
|
if (!out) {
|
|
av_frame_free(&in);
|
|
return AVERROR(ENOMEM);
|
|
}
|
|
|
|
av_frame_copy_props(out, in);
|
|
|
|
for (i = 0; i < 4; i++) {
|
|
int h = outlink->h;
|
|
h = i == 1 || i == 2 ? h>>priv->pix_desc->log2_chroma_h : h;
|
|
if (out->data[i]) {
|
|
uint8_t *data = out->data[i] +
|
|
(out->linesize[i] > 0 ? 0 : out->linesize[i] * (h-1));
|
|
memset(data, 0, FFABS(out->linesize[i]) * h);
|
|
}
|
|
}
|
|
|
|
/* copy palette */
|
|
if (priv->pix_desc->flags & PIX_FMT_PAL ||
|
|
priv->pix_desc->flags & PIX_FMT_PSEUDOPAL)
|
|
memcpy(out->data[1], in->data[1], AVPALETTE_SIZE);
|
|
|
|
for (c = 0; c < priv->pix_desc->nb_components; c++) {
|
|
int w1 = c == 1 || c == 2 ? w>>priv->pix_desc->log2_chroma_w : w;
|
|
int h1 = c == 1 || c == 2 ? h>>priv->pix_desc->log2_chroma_h : h;
|
|
|
|
for (i = 0; i < h1; i++) {
|
|
av_read_image_line(priv->line,
|
|
(void*)in->data,
|
|
in->linesize,
|
|
priv->pix_desc,
|
|
0, i, c, w1, 0);
|
|
|
|
av_write_image_line(priv->line,
|
|
out->data,
|
|
out->linesize,
|
|
priv->pix_desc,
|
|
0, i, c, w1);
|
|
}
|
|
}
|
|
|
|
av_frame_free(&in);
|
|
return ff_filter_frame(outlink, out);
|
|
}
|
|
|
|
static const AVFilterPad avfilter_vf_pixdesctest_inputs[] = {
|
|
{
|
|
.name = "default",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.filter_frame = filter_frame,
|
|
.config_props = config_props,
|
|
},
|
|
{ NULL }
|
|
};
|
|
|
|
static const AVFilterPad avfilter_vf_pixdesctest_outputs[] = {
|
|
{
|
|
.name = "default",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
},
|
|
{ NULL }
|
|
};
|
|
|
|
AVFilter avfilter_vf_pixdesctest = {
|
|
.name = "pixdesctest",
|
|
.description = NULL_IF_CONFIG_SMALL("Test pixel format definitions."),
|
|
|
|
.priv_size = sizeof(PixdescTestContext),
|
|
.uninit = uninit,
|
|
|
|
.inputs = avfilter_vf_pixdesctest_inputs,
|
|
|
|
.outputs = avfilter_vf_pixdesctest_outputs,
|
|
};
|