mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-12 19:18: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>
120 lines
3.9 KiB
C
120 lines
3.9 KiB
C
/*
|
|
* Copyright (c) 2011 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
|
|
* filter for showing textual video frame information
|
|
*/
|
|
|
|
#include "libavutil/adler32.h"
|
|
#include "libavutil/imgutils.h"
|
|
#include "libavutil/internal.h"
|
|
#include "libavutil/pixdesc.h"
|
|
#include "libavutil/timestamp.h"
|
|
#include "avfilter.h"
|
|
#include "internal.h"
|
|
#include "video.h"
|
|
|
|
typedef struct {
|
|
unsigned int frame;
|
|
} ShowInfoContext;
|
|
|
|
static av_cold int init(AVFilterContext *ctx, const char *args)
|
|
{
|
|
ShowInfoContext *showinfo = ctx->priv;
|
|
showinfo->frame = 0;
|
|
return 0;
|
|
}
|
|
|
|
static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
|
|
{
|
|
AVFilterContext *ctx = inlink->dst;
|
|
ShowInfoContext *showinfo = ctx->priv;
|
|
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
|
|
uint32_t plane_checksum[4] = {0}, checksum = 0;
|
|
int i, plane, vsub = desc->log2_chroma_h;
|
|
|
|
for (plane = 0; plane < 4 && frame->data[plane]; plane++) {
|
|
int64_t linesize = av_image_get_linesize(frame->format, frame->width, plane);
|
|
uint8_t *data = frame->data[plane];
|
|
int h = plane == 1 || plane == 2 ? inlink->h >> vsub : inlink->h;
|
|
|
|
if (linesize < 0)
|
|
return linesize;
|
|
|
|
for (i = 0; i < h; i++) {
|
|
plane_checksum[plane] = av_adler32_update(plane_checksum[plane], data, linesize);
|
|
checksum = av_adler32_update(checksum, data, linesize);
|
|
data += frame->linesize[plane];
|
|
}
|
|
}
|
|
|
|
av_log(ctx, AV_LOG_INFO,
|
|
"n:%d pts:%s pts_time:%s pos:%"PRId64" "
|
|
"fmt:%s sar:%d/%d s:%dx%d i:%c iskey:%d type:%c "
|
|
"checksum:%08X plane_checksum:[%08X",
|
|
showinfo->frame,
|
|
av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base), av_frame_get_pkt_pos(frame),
|
|
desc->name,
|
|
frame->sample_aspect_ratio.num, frame->sample_aspect_ratio.den,
|
|
frame->width, frame->height,
|
|
!frame->interlaced_frame ? 'P' : /* Progressive */
|
|
frame->top_field_first ? 'T' : 'B', /* Top / Bottom */
|
|
frame->key_frame,
|
|
av_get_picture_type_char(frame->pict_type),
|
|
checksum, plane_checksum[0]);
|
|
|
|
for (plane = 1; plane < 4 && frame->data[plane]; plane++)
|
|
av_log(ctx, AV_LOG_INFO, " %08X", plane_checksum[plane]);
|
|
av_log(ctx, AV_LOG_INFO, "]\n");
|
|
|
|
showinfo->frame++;
|
|
return ff_filter_frame(inlink->dst->outputs[0], frame);
|
|
}
|
|
|
|
static const AVFilterPad avfilter_vf_showinfo_inputs[] = {
|
|
{
|
|
.name = "default",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.get_video_buffer = ff_null_get_video_buffer,
|
|
.filter_frame = filter_frame,
|
|
},
|
|
{ NULL }
|
|
};
|
|
|
|
static const AVFilterPad avfilter_vf_showinfo_outputs[] = {
|
|
{
|
|
.name = "default",
|
|
.type = AVMEDIA_TYPE_VIDEO
|
|
},
|
|
{ NULL }
|
|
};
|
|
|
|
AVFilter avfilter_vf_showinfo = {
|
|
.name = "showinfo",
|
|
.description = NULL_IF_CONFIG_SMALL("Show textual information for each video frame."),
|
|
|
|
.priv_size = sizeof(ShowInfoContext),
|
|
.init = init,
|
|
|
|
.inputs = avfilter_vf_showinfo_inputs,
|
|
|
|
.outputs = avfilter_vf_showinfo_outputs,
|
|
};
|