[svn-commits] file: branch group/media_formats r406154 - /team/group/media_formats/main/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Jan 22 08:09:57 CST 2014
Author: file
Date: Wed Jan 22 08:09:48 2014
New Revision: 406154
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=406154
Log:
Add bitfields to built-in codecs.
Modified:
team/group/media_formats/main/codec_builtin.c
Modified: team/group/media_formats/main/codec_builtin.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats/main/codec_builtin.c?view=diff&rev=406154&r1=406153&r2=406154
==============================================================================
--- team/group/media_formats/main/codec_builtin.c (original)
+++ team/group/media_formats/main/codec_builtin.c Wed Jan 22 08:09:48 2014
@@ -92,6 +92,7 @@
.name = "g723",
.description = "G.723.1",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 0),
.sample_rate = 8000,
.minimum_ms = 30,
.maximum_ms = 300,
@@ -115,6 +116,7 @@
.name = "ulaw",
.description = "G.711 u-law",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 2),
.sample_rate = 8000,
.minimum_ms = 10,
.maximum_ms = 150,
@@ -128,6 +130,7 @@
.name = "alaw",
.description = "G.711 a-law",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 3),
.sample_rate = 8000,
.minimum_ms = 10,
.maximum_ms = 150,
@@ -151,6 +154,7 @@
.name = "gsm",
.description = "GSM",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 1),
.sample_rate = 8000,
.minimum_ms = 20,
.maximum_ms = 300,
@@ -174,6 +178,7 @@
.name = "g726",
.description = "G.726 RFC3551",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 11),
.sample_rate = 8000,
.minimum_ms = 10,
.maximum_ms = 300,
@@ -187,6 +192,7 @@
.name = "g726aal2",
.description = "G.726 AAL2",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 4),
.sample_rate = 8000,
.minimum_ms = 10,
.maximum_ms = 300,
@@ -200,6 +206,7 @@
.name = "adpcm",
.description = "ADPCM",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 5),
.sample_rate = 8000,
.minimum_ms = 10,
.maximum_ms = 300,
@@ -223,6 +230,7 @@
.name = "slin",
.description = "16 bit Signed Linear PCM",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 6),
.sample_rate = 8000,
.minimum_ms = 10,
.maximum_ms = 70,
@@ -249,6 +257,7 @@
.name = "slin",
.description = "16 bit Signed Linear PCM (16kHz)",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 15),
.sample_rate = 16000,
.minimum_ms = 10,
.maximum_ms = 70,
@@ -350,6 +359,7 @@
.name = "lpc10",
.description = "LPC10",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 7),
.sample_rate = 8000,
.minimum_ms = 20,
.maximum_ms = 20,
@@ -372,6 +382,7 @@
.name = "g729",
.description = "G.729A",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 8),
.sample_rate = 8000,
.minimum_ms = 10,
.maximum_ms = 230,
@@ -499,6 +510,7 @@
.name = "speex",
.description = "SpeeX",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 9),
.sample_rate = 8000,
.minimum_ms = 10,
.maximum_ms = 60,
@@ -516,6 +528,7 @@
.name = "speex",
.description = "SpeeX 16khz",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 33),
.sample_rate = 16000,
.minimum_ms = 10,
.maximum_ms = 60,
@@ -550,6 +563,7 @@
.name = "ilbc",
.description = "iLBC",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 10),
.sample_rate = 8000,
.minimum_ms = 30,
.maximum_ms = 30,
@@ -562,6 +576,7 @@
.name = "g722",
.description = "G722",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 12),
.sample_rate = 16000,
.minimum_ms = 10,
.maximum_ms = 150,
@@ -585,6 +600,7 @@
.name = "siren7",
.description = "ITU G.722.1 (Siren7, licensed from Polycom)",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 13),
.sample_rate = 16000,
.minimum_ms = 20,
.maximum_ms = 80,
@@ -608,6 +624,7 @@
.name = "siren14",
.description = "ITU G.722.1 Annex C, (Siren14, licensed from Polycom)",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 14),
.sample_rate = 32000,
.minimum_ms = 20,
.maximum_ms = 80,
@@ -621,6 +638,7 @@
.name = "testlaw",
.description = "G.711 test-law",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 47),
.sample_rate = 8000,
.minimum_ms = 10,
.maximum_ms = 150,
@@ -644,6 +662,7 @@
.name = "g719",
.description = "ITU G.719",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 32),
.sample_rate = 48000,
.minimum_ms = 20,
.maximum_ms = 80,
@@ -657,6 +676,7 @@
.name = "opus",
.description = "Opus Codec",
.type = AST_MEDIA_TYPE_AUDIO,
+ .original_id = (1ULL << 34),
.sample_rate = 48000,
.minimum_ms = 20,
.maximum_ms = 60,
@@ -668,60 +688,70 @@
.name = "jpeg",
.description = "JPEG image",
.type = AST_MEDIA_TYPE_IMAGE,
+ .original_id = (1ULL << 16),
};
static struct ast_codec png = {
.name = "png",
.description = "PNG Image",
.type = AST_MEDIA_TYPE_IMAGE,
+ .original_id = (1ULL << 17),
};
static struct ast_codec h261 = {
.name = "h261",
.description = "H.261 video",
.type = AST_MEDIA_TYPE_VIDEO,
+ .original_id = (1ULL << 18),
};
static struct ast_codec h263 = {
.name = "h263",
.description = "H.263 video",
.type = AST_MEDIA_TYPE_VIDEO,
+ .original_id = (1ULL << 19),
};
static struct ast_codec h263p = {
.name = "h263p",
.description = "H.263+ video",
.type = AST_MEDIA_TYPE_VIDEO,
+ .original_id = (1ULL << 20),
};
static struct ast_codec h264 = {
.name = "h264",
.description = "H.264 video",
.type = AST_MEDIA_TYPE_VIDEO,
+ .original_id = (1ULL << 21),
};
static struct ast_codec mpeg4 = {
.name = "mpeg4",
.description = "MPEG4 video",
.type = AST_MEDIA_TYPE_VIDEO,
+ .original_id = (1ULL << 22),
};
static struct ast_codec vp8 = {
.name = "vp8",
.description = "VP8 video",
.type = AST_MEDIA_TYPE_VIDEO,
+ .original_id = (1ULL << 23),
};
static struct ast_codec t140red = {
.name = "red",
.description = "T.140 Realtime Text with redundancy",
.type = AST_MEDIA_TYPE_TEXT,
+ .original_id = (1ULL << 26),
};
static struct ast_codec t140 = {
.name = "t140",
.description = "Passthrough T.140 Realtime Text",
.type = AST_MEDIA_TYPE_TEXT,
+ .original_id = (1ULL << 27),
};
int ast_codec_builtin_init(void)
More information about the svn-commits
mailing list