virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

rtpdec: Add support for G726 audio

Browse Source 
This requires using a separate init function, since there
isn't necessarily any fmtp lines for this codec, so
parse_sdp_a_line won't be called. Incorporating it with the
alloc function wouldn't do either, since it is called before
the full rtpmap line is parsed (where the sample rate is
extracted).

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Miroslav Slugeň 2011-11-07 12:13:55 +01:00 committed by Martin Storsjö
parent 2583660664
commit 06d7325ab1
4 changed files with 112 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/Makefile
View File

@ -247,6 +247,7 @@ OBJS-$(CONFIG_RTPDEC) += rdt.o \
rtpdec.o \
rtpdec_amr.o \
rtpdec_asf.o \
rtpdec_g726.o \
rtpdec_h263.o \
rtpdec_h264.o \
rtpdec_latm.o \

5
libavformat/rtpdec.c
View File

@ -83,6 +83,11 @@ void av_register_rtp_dynamic_payload_handlers(void)
ff_register_dynamic_payload_handler(&ff_qt_rtp_vid_handler);
ff_register_dynamic_payload_handler(&ff_quicktime_rtp_aud_handler);
ff_register_dynamic_payload_handler(&ff_quicktime_rtp_vid_handler);
ff_register_dynamic_payload_handler(&ff_g726_16_dynamic_handler);
ff_register_dynamic_payload_handler(&ff_g726_24_dynamic_handler);
ff_register_dynamic_payload_handler(&ff_g726_32_dynamic_handler);
ff_register_dynamic_payload_handler(&ff_g726_40_dynamic_handler);
}
RTPDynamicProtocolHandler *ff_rtp_handler_find_by_name(const char *name,

4
libavformat/rtpdec_formats.h
View File

@ -33,6 +33,10 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p);
extern RTPDynamicProtocolHandler ff_amr_nb_dynamic_handler;
extern RTPDynamicProtocolHandler ff_amr_wb_dynamic_handler;
extern RTPDynamicProtocolHandler ff_g726_16_dynamic_handler;
extern RTPDynamicProtocolHandler ff_g726_24_dynamic_handler;
extern RTPDynamicProtocolHandler ff_g726_32_dynamic_handler;
extern RTPDynamicProtocolHandler ff_g726_40_dynamic_handler;
extern RTPDynamicProtocolHandler ff_h263_1998_dynamic_handler;
extern RTPDynamicProtocolHandler ff_h263_2000_dynamic_handler;
extern RTPDynamicProtocolHandler ff_h264_dynamic_handler;

102
libavformat/rtpdec_g726.c Normal file
View File

@ -0,0 +1,102 @@
/*
* Copyright (c) 2011 Miroslav Slugeň <Thunder.m@seznam.cz>
*
* This file is part of Libav.
*
* Libav 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.
*
* Libav 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 Libav; 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"
static int g726_16_init(AVFormatContext *s, int st_index, PayloadContext *data)
{
AVStream *stream = s->streams[st_index];
AVCodecContext *codec = stream->codec;
codec->bit_rate = 16000;
if (codec->sample_rate)
codec->bits_per_coded_sample =
av_clip((codec->bit_rate + codec->sample_rate/2) / codec->sample_rate, 2, 5);
return 0;
}
static int g726_24_init(AVFormatContext *s, int st_index, PayloadContext *data)
{
AVStream *stream = s->streams[st_index];
AVCodecContext *codec = stream->codec;
codec->bit_rate = 24000;
if (codec->sample_rate)
codec->bits_per_coded_sample =
av_clip((codec->bit_rate + codec->sample_rate/2) / codec->sample_rate, 2, 5);
return 0;
}
static int g726_32_init(AVFormatContext *s, int st_index, PayloadContext *data)
{
AVStream *stream = s->streams[st_index];
AVCodecContext *codec = stream->codec;
codec->bit_rate = 32000;
if (codec->sample_rate)
codec->bits_per_coded_sample =
av_clip((codec->bit_rate + codec->sample_rate/2) / codec->sample_rate, 2, 5);
return 0;
}
static int g726_40_init(AVFormatContext *s, int st_index, PayloadContext *data)
{
AVStream *stream = s->streams[st_index];
AVCodecContext *codec = stream->codec;
codec->bit_rate = 40000;
if (codec->sample_rate)
codec->bits_per_coded_sample =
av_clip((codec->bit_rate + codec->sample_rate/2) / codec->sample_rate, 2, 5);
return 0;
}
RTPDynamicProtocolHandler ff_g726_16_dynamic_handler = {
.enc_name = "G726-16",
.codec_type = AVMEDIA_TYPE_AUDIO,
.codec_id = CODEC_ID_ADPCM_G726,
.init = g726_16_init,
};
RTPDynamicProtocolHandler ff_g726_24_dynamic_handler = {
.enc_name = "G726-24",
.codec_type = AVMEDIA_TYPE_AUDIO,
.codec_id = CODEC_ID_ADPCM_G726,
.init = g726_24_init,
};
RTPDynamicProtocolHandler ff_g726_32_dynamic_handler = {
.enc_name = "G726-32",
.codec_type = AVMEDIA_TYPE_AUDIO,
.codec_id = CODEC_ID_ADPCM_G726,
.init = g726_32_init,
};
RTPDynamicProtocolHandler ff_g726_40_dynamic_handler = {
.enc_name = "G726-40",
.codec_type = AVMEDIA_TYPE_AUDIO,
.codec_id = CODEC_ID_ADPCM_G726,
.init = g726_40_init,
};