mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
c7b9eab2be
* qatar/master: rtmp: Add a new option 'rtmp_buffer', for setting the client buffer time rtmp: Set the client buffer time to 3s instead of 0.26s rtmp: Handle server bandwidth packets rtmp: Display a verbose message when an unknown packet type is received lavfi/audio: use av_samples_copy() instead of custom code. configure: add all filters hardcoded into avconv to avconv_deps avfiltergraph: remove a redundant call to avfilter_get_by_name(). lavfi: allow building without swscale. build: Do not delete tests/vsynth2 directory, which is no longer created. lavfi: replace AVFilterContext.input/output_count with nb_inputs/outputs lavfi: make AVFilterPad opaque after two major bumps. lavfi: add avfilter_pad_get_type() and avfilter_pad_get_name(). lavfi: make avfilter_get_video_buffer() private on next bump. jack: update to new latency range API as the old one has been deprecated rtmp: Tokenize the AMF connection parameters manually instead of using strtok_r ppc: Rename H.264 optimization template file for consistency. lavfi: add channelsplit audio filter. golomb: check remaining bits during unary decoding in get_ur_golomb_jpegls() sws: fix planar RGB input conversions for 9/10/16 bpp. Conflicts: Changelog configure doc/APIchanges ffmpeg.c libavcodec/golomb.h libavcodec/v210dec.h libavfilter/Makefile libavfilter/allfilters.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffersrc.c libavfilter/formats.c libavfilter/version.h libavfilter/vf_frei0r.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/video.h libavfilter/vsrc_color.c libavformat/rtmpproto.c libswscale/input.c tests/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
217 lines
7.7 KiB
C
217 lines
7.7 KiB
C
/*
|
|
* Copyright (c) Stefano Sabatini | stefasab at gmail.com
|
|
* Copyright (c) S.N. Hemanth Meenakshisundaram | smeenaks at ucsd.edu
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
#include "libavutil/avassert.h"
|
|
#include "libavutil/audioconvert.h"
|
|
|
|
#include "audio.h"
|
|
#include "avfilter.h"
|
|
#include "internal.h"
|
|
|
|
AVFilterBufferRef *ff_null_get_audio_buffer(AVFilterLink *link, int perms,
|
|
int nb_samples)
|
|
{
|
|
return ff_get_audio_buffer(link->dst->outputs[0], perms, nb_samples);
|
|
}
|
|
|
|
AVFilterBufferRef *ff_default_get_audio_buffer(AVFilterLink *link, int perms,
|
|
int nb_samples)
|
|
{
|
|
AVFilterBufferRef *samplesref = NULL;
|
|
uint8_t **data;
|
|
int planar = av_sample_fmt_is_planar(link->format);
|
|
int nb_channels = av_get_channel_layout_nb_channels(link->channel_layout);
|
|
int planes = planar ? nb_channels : 1;
|
|
int linesize;
|
|
|
|
if (!(data = av_mallocz(sizeof(*data) * planes)))
|
|
goto fail;
|
|
|
|
if (av_samples_alloc(data, &linesize, nb_channels, nb_samples, link->format, 0) < 0)
|
|
goto fail;
|
|
|
|
samplesref = avfilter_get_audio_buffer_ref_from_arrays(data, linesize, perms,
|
|
nb_samples, link->format,
|
|
link->channel_layout);
|
|
if (!samplesref)
|
|
goto fail;
|
|
|
|
av_freep(&data);
|
|
|
|
fail:
|
|
if (data)
|
|
av_freep(&data[0]);
|
|
av_freep(&data);
|
|
return samplesref;
|
|
}
|
|
|
|
AVFilterBufferRef *ff_get_audio_buffer(AVFilterLink *link, int perms,
|
|
int nb_samples)
|
|
{
|
|
AVFilterBufferRef *ret = NULL;
|
|
|
|
if (link->dstpad->get_audio_buffer)
|
|
ret = link->dstpad->get_audio_buffer(link, perms, nb_samples);
|
|
|
|
if (!ret)
|
|
ret = ff_default_get_audio_buffer(link, perms, nb_samples);
|
|
|
|
if (ret)
|
|
ret->type = AVMEDIA_TYPE_AUDIO;
|
|
|
|
return ret;
|
|
}
|
|
|
|
AVFilterBufferRef* avfilter_get_audio_buffer_ref_from_arrays(uint8_t **data,
|
|
int linesize,int perms,
|
|
int nb_samples,
|
|
enum AVSampleFormat sample_fmt,
|
|
uint64_t channel_layout)
|
|
{
|
|
int planes;
|
|
AVFilterBuffer *samples = av_mallocz(sizeof(*samples));
|
|
AVFilterBufferRef *samplesref = av_mallocz(sizeof(*samplesref));
|
|
|
|
if (!samples || !samplesref)
|
|
goto fail;
|
|
|
|
samplesref->buf = samples;
|
|
samplesref->buf->free = ff_avfilter_default_free_buffer;
|
|
if (!(samplesref->audio = av_mallocz(sizeof(*samplesref->audio))))
|
|
goto fail;
|
|
|
|
samplesref->audio->nb_samples = nb_samples;
|
|
samplesref->audio->channel_layout = channel_layout;
|
|
|
|
planes = av_sample_fmt_is_planar(sample_fmt) ?
|
|
av_get_channel_layout_nb_channels(channel_layout) : 1;
|
|
|
|
/* make sure the buffer gets read permission or it's useless for output */
|
|
samplesref->perms = perms | AV_PERM_READ;
|
|
|
|
samples->refcount = 1;
|
|
samplesref->type = AVMEDIA_TYPE_AUDIO;
|
|
samplesref->format = sample_fmt;
|
|
|
|
memcpy(samples->data, data,
|
|
FFMIN(FF_ARRAY_ELEMS(samples->data), planes)*sizeof(samples->data[0]));
|
|
memcpy(samplesref->data, samples->data, sizeof(samples->data));
|
|
|
|
samples->linesize[0] = samplesref->linesize[0] = linesize;
|
|
|
|
if (planes > FF_ARRAY_ELEMS(samples->data)) {
|
|
samples-> extended_data = av_mallocz(sizeof(*samples->extended_data) *
|
|
planes);
|
|
samplesref->extended_data = av_mallocz(sizeof(*samplesref->extended_data) *
|
|
planes);
|
|
|
|
if (!samples->extended_data || !samplesref->extended_data)
|
|
goto fail;
|
|
|
|
memcpy(samples-> extended_data, data, sizeof(*data)*planes);
|
|
memcpy(samplesref->extended_data, data, sizeof(*data)*planes);
|
|
} else {
|
|
samples->extended_data = samples->data;
|
|
samplesref->extended_data = samplesref->data;
|
|
}
|
|
|
|
samplesref->pts = AV_NOPTS_VALUE;
|
|
|
|
return samplesref;
|
|
|
|
fail:
|
|
if (samples && samples->extended_data != samples->data)
|
|
av_freep(&samples->extended_data);
|
|
if (samplesref) {
|
|
av_freep(&samplesref->audio);
|
|
if (samplesref->extended_data != samplesref->data)
|
|
av_freep(&samplesref->extended_data);
|
|
}
|
|
av_freep(&samplesref);
|
|
av_freep(&samples);
|
|
return NULL;
|
|
}
|
|
|
|
void ff_null_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref)
|
|
{
|
|
ff_filter_samples(link->dst->outputs[0], samplesref);
|
|
}
|
|
|
|
/* FIXME: samplesref is same as link->cur_buf. Need to consider removing the redundant parameter. */
|
|
void ff_default_filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref)
|
|
{
|
|
AVFilterLink *outlink = NULL;
|
|
|
|
if (inlink->dst->nb_outputs)
|
|
outlink = inlink->dst->outputs[0];
|
|
|
|
if (outlink) {
|
|
outlink->out_buf = ff_default_get_audio_buffer(inlink, AV_PERM_WRITE,
|
|
samplesref->audio->nb_samples);
|
|
outlink->out_buf->pts = samplesref->pts;
|
|
outlink->out_buf->audio->sample_rate = samplesref->audio->sample_rate;
|
|
ff_filter_samples(outlink, avfilter_ref_buffer(outlink->out_buf, ~0));
|
|
avfilter_unref_buffer(outlink->out_buf);
|
|
outlink->out_buf = NULL;
|
|
}
|
|
avfilter_unref_buffer(samplesref);
|
|
inlink->cur_buf = NULL;
|
|
}
|
|
|
|
void ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref)
|
|
{
|
|
void (*filter_samples)(AVFilterLink *, AVFilterBufferRef *);
|
|
AVFilterPad *dst = link->dstpad;
|
|
int64_t pts;
|
|
|
|
FF_TPRINTF_START(NULL, filter_samples); ff_tlog_link(NULL, link, 1);
|
|
|
|
if (!(filter_samples = dst->filter_samples))
|
|
filter_samples = ff_default_filter_samples;
|
|
|
|
/* prepare to copy the samples if the buffer has insufficient permissions */
|
|
if ((dst->min_perms & samplesref->perms) != dst->min_perms ||
|
|
dst->rej_perms & samplesref->perms) {
|
|
int size;
|
|
av_log(link->dst, AV_LOG_DEBUG,
|
|
"Copying audio data in avfilter (have perms %x, need %x, reject %x)\n",
|
|
samplesref->perms, link->dstpad->min_perms, link->dstpad->rej_perms);
|
|
|
|
link->cur_buf = ff_default_get_audio_buffer(link, dst->min_perms,
|
|
samplesref->audio->nb_samples);
|
|
link->cur_buf->pts = samplesref->pts;
|
|
link->cur_buf->audio->sample_rate = samplesref->audio->sample_rate;
|
|
|
|
/* Copy actual data into new samples buffer */
|
|
av_samples_copy(link->cur_buf->extended_data, samplesref->extended_data,
|
|
0, 0, samplesref->audio->nb_samples,
|
|
av_get_channel_layout_nb_channels(link->channel_layout),
|
|
link->format);
|
|
|
|
avfilter_unref_buffer(samplesref);
|
|
} else
|
|
link->cur_buf = samplesref;
|
|
|
|
pts = link->cur_buf->pts;
|
|
filter_samples(link, link->cur_buf);
|
|
ff_update_link_current_pts(link, pts);
|
|
}
|