mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
1cbf7fb434
* qatar/master: (26 commits) fate: use diff -b in oneline comparison Add missing version bumps and APIchanges/Changelog entries. lavfi: move buffer management function to a separate file. lavfi: move formats-related functions from default.c to formats.c lavfi: move video-related functions to a separate file. fate: make smjpeg a demux test fate: separate sierra-vmd audio and video tests fate: separate smacker audio and video tests libmp3lame: set supported channel layouts. avconv: automatically insert asyncts when -async is used. avconv: add support for audio filters. lavfi: add asyncts filter. lavfi: add aformat filter lavfi: add an audio buffer sink. lavfi: add an audio buffer source. buffersrc: add av_buffersrc_write_frame(). buffersrc: fix invalid read in uninit if the fifo hasn't been allocated lavfi: rename vsrc_buffer.c to buffersrc.c avfiltergraph: reindent lavfi: add channel layout/sample rate negotiation. ... Conflicts: Changelog doc/APIchanges doc/filters.texi ffmpeg.c ffprobe.c libavcodec/libmp3lame.c libavfilter/Makefile libavfilter/af_aformat.c libavfilter/allfilters.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffersrc.c libavfilter/defaults.c libavfilter/formats.c libavfilter/src_buffer.c libavfilter/version.h libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c libavfilter/vsrc_buffer.h libavutil/avutil.h tests/fate/audio.mak tests/fate/demux.mak tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
98 lines
3.6 KiB
C
98 lines
3.6 KiB
C
/*
|
|
* 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/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;
|
|
avfilter_copy_frame_props(picref, frame);
|
|
return picref;
|
|
}
|
|
|
|
AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_frame(const AVFrame *frame,
|
|
int perms)
|
|
{
|
|
AVFilterBufferRef *picref =
|
|
avfilter_get_audio_buffer_ref_from_arrays((uint8_t **)frame->data, frame->linesize[0], perms,
|
|
frame->nb_samples, frame->format,
|
|
av_frame_get_channel_layout(frame));
|
|
if (!picref)
|
|
return NULL;
|
|
avfilter_copy_frame_props(picref, frame);
|
|
return picref;
|
|
}
|
|
|
|
int avfilter_fill_frame_from_audio_buffer_ref(AVFrame *frame,
|
|
const AVFilterBufferRef *samplesref)
|
|
{
|
|
if (!samplesref || !samplesref->audio || !frame)
|
|
return AVERROR(EINVAL);
|
|
|
|
memcpy(frame->data, samplesref->data, sizeof(frame->data));
|
|
frame->pkt_pos = samplesref->pos;
|
|
frame->format = samplesref->format;
|
|
frame->nb_samples = samplesref->audio->nb_samples;
|
|
frame->pts = samplesref->pts;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int avfilter_fill_frame_from_video_buffer_ref(AVFrame *frame,
|
|
const AVFilterBufferRef *picref)
|
|
{
|
|
if (!picref || !picref->video || !frame)
|
|
return AVERROR(EINVAL);
|
|
|
|
memcpy(frame->data, picref->data, sizeof(frame->data));
|
|
memcpy(frame->linesize, picref->linesize, sizeof(frame->linesize));
|
|
frame->pkt_pos = picref->pos;
|
|
frame->interlaced_frame = picref->video->interlaced;
|
|
frame->top_field_first = picref->video->top_field_first;
|
|
frame->key_frame = picref->video->key_frame;
|
|
frame->pict_type = picref->video->pict_type;
|
|
frame->sample_aspect_ratio = picref->video->sample_aspect_ratio;
|
|
frame->width = picref->video->w;
|
|
frame->height = picref->video->h;
|
|
frame->format = picref->format;
|
|
frame->pts = picref->pts;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int avfilter_fill_frame_from_buffer_ref(AVFrame *frame,
|
|
const AVFilterBufferRef *ref)
|
|
{
|
|
if (!ref)
|
|
return AVERROR(EINVAL);
|
|
return ref->video ? avfilter_fill_frame_from_video_buffer_ref(frame, ref)
|
|
: avfilter_fill_frame_from_audio_buffer_ref(frame, ref);
|
|
}
|