mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-10 01:30:21 +02:00
![Michael Niedermayer](/assets/img/avatar_default.png)
* 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>
83 lines
3.1 KiB
C
83 lines
3.1 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
|
|
*/
|
|
|
|
#ifndef AVFILTER_AUDIO_H
|
|
#define AVFILTER_AUDIO_H
|
|
|
|
#include "avfilter.h"
|
|
|
|
static const enum AVSampleFormat ff_packed_sample_fmts_array[] = {
|
|
AV_SAMPLE_FMT_U8,
|
|
AV_SAMPLE_FMT_S16,
|
|
AV_SAMPLE_FMT_S32,
|
|
AV_SAMPLE_FMT_FLT,
|
|
AV_SAMPLE_FMT_DBL,
|
|
AV_SAMPLE_FMT_NONE
|
|
};
|
|
|
|
static const enum AVSampleFormat ff_planar_sample_fmts_array[] = {
|
|
AV_SAMPLE_FMT_U8P,
|
|
AV_SAMPLE_FMT_S16P,
|
|
AV_SAMPLE_FMT_S32P,
|
|
AV_SAMPLE_FMT_FLTP,
|
|
AV_SAMPLE_FMT_DBLP,
|
|
AV_SAMPLE_FMT_NONE
|
|
};
|
|
|
|
/** default handler for get_audio_buffer() for audio inputs */
|
|
AVFilterBufferRef *ff_default_get_audio_buffer(AVFilterLink *link, int perms,
|
|
int nb_samples);
|
|
|
|
/** get_audio_buffer() handler for filters which simply pass audio along */
|
|
AVFilterBufferRef *ff_null_get_audio_buffer(AVFilterLink *link, int perms,
|
|
int nb_samples);
|
|
|
|
/**
|
|
* Request an audio samples buffer with a specific set of permissions.
|
|
*
|
|
* @param link the output link to the filter from which the buffer will
|
|
* be requested
|
|
* @param perms the required access permissions
|
|
* @param nb_samples the number of samples per channel
|
|
* @return A reference to the samples. This must be unreferenced with
|
|
* avfilter_unref_buffer when you are finished with it.
|
|
*/
|
|
AVFilterBufferRef *ff_get_audio_buffer(AVFilterLink *link, int perms,
|
|
int nb_samples);
|
|
|
|
/** default handler for filter_samples() for audio inputs */
|
|
void ff_default_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref);
|
|
|
|
/** filter_samples() handler for filters which simply pass audio along */
|
|
void ff_null_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref);
|
|
|
|
/**
|
|
* Send a buffer of audio samples to the next filter.
|
|
*
|
|
* @param link the output link over which the audio samples are being sent
|
|
* @param samplesref a reference to the buffer of audio samples being sent. The
|
|
* receiving filter will free this reference when it no longer
|
|
* needs it or pass it on to the next filter.
|
|
*/
|
|
void ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref);
|
|
|
|
#endif /* AVFILTER_AUDIO_H */
|