mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-07 11:13:41 +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>
133 lines
4.0 KiB
C
133 lines
4.0 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 audio frame information
|
|
*/
|
|
|
|
#include <inttypes.h>
|
|
#include <stddef.h>
|
|
|
|
#include "libavutil/adler32.h"
|
|
#include "libavutil/channel_layout.h"
|
|
#include "libavutil/common.h"
|
|
#include "libavutil/mem.h"
|
|
#include "libavutil/timestamp.h"
|
|
#include "libavutil/samplefmt.h"
|
|
|
|
#include "audio.h"
|
|
#include "avfilter.h"
|
|
#include "internal.h"
|
|
|
|
typedef struct AShowInfoContext {
|
|
/**
|
|
* Scratch space for individual plane checksums for planar audio
|
|
*/
|
|
uint32_t *plane_checksums;
|
|
|
|
/**
|
|
* Frame counter
|
|
*/
|
|
uint64_t frame;
|
|
} AShowInfoContext;
|
|
|
|
static void uninit(AVFilterContext *ctx)
|
|
{
|
|
AShowInfoContext *s = ctx->priv;
|
|
av_freep(&s->plane_checksums);
|
|
}
|
|
|
|
static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
|
|
{
|
|
AVFilterContext *ctx = inlink->dst;
|
|
AShowInfoContext *s = ctx->priv;
|
|
char chlayout_str[128];
|
|
uint32_t checksum = 0;
|
|
int channels = av_get_channel_layout_nb_channels(buf->channel_layout);
|
|
int planar = av_sample_fmt_is_planar(buf->format);
|
|
int block_align = av_get_bytes_per_sample(buf->format) * (planar ? 1 : channels);
|
|
int data_size = buf->nb_samples * block_align;
|
|
int planes = planar ? channels : 1;
|
|
int i;
|
|
void *tmp_ptr = av_realloc(s->plane_checksums, channels * sizeof(*s->plane_checksums));
|
|
|
|
if (!tmp_ptr)
|
|
return AVERROR(ENOMEM);
|
|
s->plane_checksums = tmp_ptr;
|
|
|
|
for (i = 0; i < planes; i++) {
|
|
uint8_t *data = buf->extended_data[i];
|
|
|
|
s->plane_checksums[i] = av_adler32_update(0, data, data_size);
|
|
checksum = i ? av_adler32_update(checksum, data, data_size) :
|
|
s->plane_checksums[0];
|
|
}
|
|
|
|
av_get_channel_layout_string(chlayout_str, sizeof(chlayout_str), -1,
|
|
buf->channel_layout);
|
|
|
|
av_log(ctx, AV_LOG_INFO,
|
|
"n:%"PRIu64" pts:%s pts_time:%s pos:%"PRId64" "
|
|
"fmt:%s channels:%d chlayout:%s rate:%d nb_samples:%d "
|
|
"checksum:%08X ",
|
|
s->frame,
|
|
av_ts2str(buf->pts), av_ts2timestr(buf->pts, &inlink->time_base),
|
|
av_frame_get_pkt_pos(buf),
|
|
av_get_sample_fmt_name(buf->format), av_frame_get_channels(buf), chlayout_str,
|
|
buf->sample_rate, buf->nb_samples,
|
|
checksum);
|
|
|
|
av_log(ctx, AV_LOG_INFO, "plane_checksums: [ ");
|
|
for (i = 0; i < planes; i++)
|
|
av_log(ctx, AV_LOG_INFO, "%08X ", s->plane_checksums[i]);
|
|
av_log(ctx, AV_LOG_INFO, "]\n");
|
|
|
|
s->frame++;
|
|
return ff_filter_frame(inlink->dst->outputs[0], buf);
|
|
}
|
|
|
|
static const AVFilterPad inputs[] = {
|
|
{
|
|
.name = "default",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
.get_audio_buffer = ff_null_get_audio_buffer,
|
|
.filter_frame = filter_frame,
|
|
},
|
|
{ NULL },
|
|
};
|
|
|
|
static const AVFilterPad outputs[] = {
|
|
{
|
|
.name = "default",
|
|
.type = AVMEDIA_TYPE_AUDIO,
|
|
},
|
|
{ NULL },
|
|
};
|
|
|
|
AVFilter avfilter_af_ashowinfo = {
|
|
.name = "ashowinfo",
|
|
.description = NULL_IF_CONFIG_SMALL("Show textual information for each audio frame."),
|
|
.priv_size = sizeof(AShowInfoContext),
|
|
.uninit = uninit,
|
|
.inputs = inputs,
|
|
.outputs = outputs,
|
|
};
|