mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-01 12:22:09 +00: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 759001c534287a96dc96d1e274665feb7059145d 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>
155 lines
5.4 KiB
C
155 lines
5.4 KiB
C
/*
|
|
* Copyright 2011 Stefano Sabatini | stefasab at gmail.com
|
|
*
|
|
* 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
|
|
* libavcodec/libavfilter gluing utilities
|
|
*/
|
|
|
|
#include "avcodec.h"
|
|
#include "libavutil/avassert.h"
|
|
#include "libavutil/opt.h"
|
|
|
|
AVFilterBufferRef *avfilter_get_video_buffer_ref_from_frame(const AVFrame *frame,
|
|
int perms)
|
|
{
|
|
AVFilterBufferRef *picref =
|
|
avfilter_get_video_buffer_ref_from_arrays(frame->data, frame->linesize, perms,
|
|
frame->width, frame->height,
|
|
frame->format);
|
|
if (!picref)
|
|
return NULL;
|
|
if (avfilter_copy_frame_props(picref, frame) < 0) {
|
|
picref->buf->data[0] = NULL;
|
|
avfilter_unref_bufferp(&picref);
|
|
}
|
|
return picref;
|
|
}
|
|
|
|
AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_frame(const AVFrame *frame,
|
|
int perms)
|
|
{
|
|
AVFilterBufferRef *samplesref;
|
|
int channels = av_frame_get_channels(frame);
|
|
int64_t layout = av_frame_get_channel_layout(frame);
|
|
|
|
if (layout && av_get_channel_layout_nb_channels(layout) != av_frame_get_channels(frame)) {
|
|
av_log(0, AV_LOG_ERROR, "Layout indicates a different number of channels than actually present\n");
|
|
return NULL;
|
|
}
|
|
|
|
samplesref = avfilter_get_audio_buffer_ref_from_arrays_channels(
|
|
(uint8_t **)frame->extended_data, frame->linesize[0], perms,
|
|
frame->nb_samples, frame->format, channels, layout);
|
|
if (!samplesref)
|
|
return NULL;
|
|
if (avfilter_copy_frame_props(samplesref, frame) < 0) {
|
|
samplesref->buf->data[0] = NULL;
|
|
avfilter_unref_bufferp(&samplesref);
|
|
}
|
|
return samplesref;
|
|
}
|
|
|
|
AVFilterBufferRef *avfilter_get_buffer_ref_from_frame(enum AVMediaType type,
|
|
const AVFrame *frame,
|
|
int perms)
|
|
{
|
|
switch (type) {
|
|
case AVMEDIA_TYPE_VIDEO:
|
|
return avfilter_get_video_buffer_ref_from_frame(frame, perms);
|
|
case AVMEDIA_TYPE_AUDIO:
|
|
return avfilter_get_audio_buffer_ref_from_frame(frame, perms);
|
|
default:
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src)
|
|
{
|
|
int planes, nb_channels;
|
|
|
|
if (!dst)
|
|
return AVERROR(EINVAL);
|
|
/* abort in case the src is NULL and dst is not, avoid inconsistent state in dst */
|
|
av_assert0(src);
|
|
|
|
memcpy(dst->data, src->data, sizeof(dst->data));
|
|
memcpy(dst->linesize, src->linesize, sizeof(dst->linesize));
|
|
|
|
dst->pts = src->pts;
|
|
dst->format = src->format;
|
|
av_frame_set_pkt_pos(dst, src->pos);
|
|
|
|
switch (src->type) {
|
|
case AVMEDIA_TYPE_VIDEO:
|
|
av_assert0(src->video);
|
|
dst->width = src->video->w;
|
|
dst->height = src->video->h;
|
|
dst->sample_aspect_ratio = src->video->sample_aspect_ratio;
|
|
dst->interlaced_frame = src->video->interlaced;
|
|
dst->top_field_first = src->video->top_field_first;
|
|
dst->key_frame = src->video->key_frame;
|
|
dst->pict_type = src->video->pict_type;
|
|
break;
|
|
case AVMEDIA_TYPE_AUDIO:
|
|
av_assert0(src->audio);
|
|
nb_channels = av_get_channel_layout_nb_channels(src->audio->channel_layout);
|
|
planes = av_sample_fmt_is_planar(src->format) ? nb_channels : 1;
|
|
|
|
if (planes > FF_ARRAY_ELEMS(dst->data)) {
|
|
dst->extended_data = av_mallocz(planes * sizeof(*dst->extended_data));
|
|
if (!dst->extended_data)
|
|
return AVERROR(ENOMEM);
|
|
memcpy(dst->extended_data, src->extended_data,
|
|
planes * sizeof(*dst->extended_data));
|
|
} else
|
|
dst->extended_data = dst->data;
|
|
dst->nb_samples = src->audio->nb_samples;
|
|
av_frame_set_sample_rate (dst, src->audio->sample_rate);
|
|
av_frame_set_channel_layout(dst, src->audio->channel_layout);
|
|
av_frame_set_channels (dst, src->audio->channels);
|
|
break;
|
|
default:
|
|
return AVERROR(EINVAL);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef FF_API_FILL_FRAME
|
|
int avfilter_fill_frame_from_audio_buffer_ref(AVFrame *frame,
|
|
const AVFilterBufferRef *samplesref)
|
|
{
|
|
return avfilter_copy_buf_props(frame, samplesref);
|
|
}
|
|
|
|
int avfilter_fill_frame_from_video_buffer_ref(AVFrame *frame,
|
|
const AVFilterBufferRef *picref)
|
|
{
|
|
return avfilter_copy_buf_props(frame, picref);
|
|
}
|
|
|
|
int avfilter_fill_frame_from_buffer_ref(AVFrame *frame,
|
|
const AVFilterBufferRef *ref)
|
|
{
|
|
return avfilter_copy_buf_props(frame, ref);
|
|
}
|
|
#endif
|