mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-25 12:40:01 +00:00
7b0b10ce41
* qatar/master: (25 commits) rtpenc: Add support for G726 audio rtpdec: Interpret the different G726 names as bits_per_coded_sample rtpenc: Change rtp_send_samples to handle sample sizes other than even bytes rtpenc: Cast a rescaling parameter to int64_t h264: cap max has_b_frames at MAX_DELAYED_PIC_COUNT - 1. ARM: fix indentation in ff_dsputil_init_neon() ARM: NEON put/avg_pixels8/16 cosmetics ARM: add remaining NEON avg_pixels8/16 functions ARM: clean up NEON put/avg_pixels macros fate: split acodec-pcm into individual tests swscale: #include "libavutil/mathematics.h" pmpdec: don't use deprecated av_set_pts_info. rv34: align temporary block of "dct" coefs Add PlayStation Portable PMP format demuxer proto: Realign struct initializers proto: Use .priv_data_size to allocate the private context mmsh: Properly clean up if the second ffurl_alloc failed rtmp: Clean up properly if the handshake failed md5proto: Remove the get_file_handle function applehttpproto: Use the close function if the open function fails ... Conflicts: libavcodec/vble.c libavformat/mmsh.c libavformat/pmpdec.c libavformat/udp.c tests/ref/acodec/pcm Merged-by: Michael Niedermayer <michaelni@gmx.at>
47 lines
1.5 KiB
C
47 lines
1.5 KiB
C
/*
|
|
* Copyright (c) 2011 Miroslav Slugeň <Thunder.m@seznam.cz>
|
|
*
|
|
* 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 "avformat.h"
|
|
#include "rtpdec_formats.h"
|
|
|
|
#define RTP_G726_HANDLER(bitrate) \
|
|
static int g726_ ## bitrate ##_init(AVFormatContext *s, int st_index, PayloadContext *data) \
|
|
{ \
|
|
AVStream *stream = s->streams[st_index]; \
|
|
AVCodecContext *codec = stream->codec; \
|
|
\
|
|
codec->bits_per_coded_sample = bitrate/8; \
|
|
codec->bit_rate = codec->bits_per_coded_sample * codec->sample_rate; \
|
|
\
|
|
return 0; \
|
|
} \
|
|
\
|
|
RTPDynamicProtocolHandler ff_g726_ ## bitrate ## _dynamic_handler = { \
|
|
.enc_name = "G726-" #bitrate, \
|
|
.codec_type = AVMEDIA_TYPE_AUDIO, \
|
|
.codec_id = CODEC_ID_ADPCM_G726, \
|
|
.init = g726_ ## bitrate ## _init, \
|
|
}
|
|
|
|
RTP_G726_HANDLER(16);
|
|
RTP_G726_HANDLER(24);
|
|
RTP_G726_HANDLER(32);
|
|
RTP_G726_HANDLER(40);
|