generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libavformat: add support for G726 audio decoder in RTP and RTSP streams

Browse Source 
Fixes Ticket611

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Miroslav Slugeň
2011-11-07 12:13:55 +01:00
committed by Michael Niedermayer
parent 159609512c
commit df9c1cfb48
4 changed files with 104 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/Makefile
View File

@@ -261,6 +261,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;

94
libavformat/rtpdec_g726.c Normal file
View File

@@ -0,0 +1,94 @@
/*
* 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"
static int g726_16_parse_sdp_line(AVFormatContext *s, int st_index,
PayloadContext *data, const char *line)
{
AVStream *stream = s->streams[st_index];
AVCodecContext *codec = stream->codec;
codec->bit_rate = 16000;
return 0;
}
static int g726_24_parse_sdp_line(AVFormatContext *s, int st_index,
PayloadContext *data, const char *line)
{
AVStream *stream = s->streams[st_index];
AVCodecContext *codec = stream->codec;
codec->bit_rate = 24000;
return 0;
}
static int g726_32_parse_sdp_line(AVFormatContext *s, int st_index,
PayloadContext *data, const char *line)
{
AVStream *stream = s->streams[st_index];
AVCodecContext *codec = stream->codec;
codec->bit_rate = 32000;
return 0;
}
static int g726_40_parse_sdp_line(AVFormatContext *s, int st_index,
PayloadContext *data, const char *line)
{
AVStream *stream = s->streams[st_index];
AVCodecContext *codec = stream->codec;
codec->bit_rate = 40000;
return 0;
}
RTPDynamicProtocolHandler ff_g726_16_dynamic_handler = {
.enc_name = "G726-16",
.codec_type = AVMEDIA_TYPE_AUDIO,
.codec_id = CODEC_ID_ADPCM_G726,
.parse_sdp_a_line = g726_16_parse_sdp_line,
};
RTPDynamicProtocolHandler ff_g726_24_dynamic_handler = {
.enc_name = "G726-24",
.codec_type = AVMEDIA_TYPE_AUDIO,
.codec_id = CODEC_ID_ADPCM_G726,
.parse_sdp_a_line = g726_24_parse_sdp_line,
};
RTPDynamicProtocolHandler ff_g726_32_dynamic_handler = {
.enc_name = "G726-32",
.codec_type = AVMEDIA_TYPE_AUDIO,
.codec_id = CODEC_ID_ADPCM_G726,
.parse_sdp_a_line = g726_32_parse_sdp_line,
};
RTPDynamicProtocolHandler ff_g726_40_dynamic_handler = {
.enc_name = "G726-40",
.codec_type = AVMEDIA_TYPE_AUDIO,
.codec_id = CODEC_ID_ADPCM_G726,
.parse_sdp_a_line = g726_40_parse_sdp_line,
};