Add new mime types AAL2-G726 for g726 as suggested in rfc 3551. This patch will break interaction with applications that incorrectly use big-endian G.726 with mime type G726 but we know of at least one device (DVTel camera) that correctly implements the rfc, so do the same. Fixes ticket #5890.
		
			
				
	
	
		
			55 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			55 lines
		
	
	
		
			1.9 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 "libavutil/attributes.h"
 | |
| #include "avformat.h"
 | |
| #include "rtpdec_formats.h"
 | |
| 
 | |
| #define RTP_G726_HANDLER(bitrate) \
 | |
| static av_cold int g726_ ## bitrate ##_init(AVFormatContext *s, int st_index, \
 | |
|                                             PayloadContext *data) \
 | |
| { \
 | |
|     AVStream *stream = s->streams[st_index]; \
 | |
|     AVCodecParameters *par = stream->codecpar; \
 | |
| \
 | |
|     par->bits_per_coded_sample = bitrate/8; \
 | |
|     par->bit_rate = par->bits_per_coded_sample * par->sample_rate; \
 | |
| \
 | |
|     return 0; \
 | |
| } \
 | |
| \
 | |
| RTPDynamicProtocolHandler ff_g726_ ## bitrate ## _dynamic_handler = { \
 | |
|     .enc_name   = "AAL2-G726-" #bitrate, \
 | |
|     .codec_type = AVMEDIA_TYPE_AUDIO, \
 | |
|     .codec_id   = AV_CODEC_ID_ADPCM_G726, \
 | |
|     .init       = g726_ ## bitrate ## _init, \
 | |
| }; \
 | |
| RTPDynamicProtocolHandler ff_g726le_ ## bitrate ## _dynamic_handler = { \
 | |
|     .enc_name   = "G726-" #bitrate, \
 | |
|     .codec_type = AVMEDIA_TYPE_AUDIO, \
 | |
|     .codec_id   = AV_CODEC_ID_ADPCM_G726LE, \
 | |
|     .init       = g726_ ## bitrate ## _init, \
 | |
| }
 | |
| 
 | |
| RTP_G726_HANDLER(16);
 | |
| RTP_G726_HANDLER(24);
 | |
| RTP_G726_HANDLER(32);
 | |
| RTP_G726_HANDLER(40);
 |