Changeset 4907:7ce748f993d8 in roaraudio

Timestamp:

05/06/11 14:05:07 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

assigned codec IDs for opus

Files:

• doc/new-cmds (modified) (1 diff)
• include/roaraudio/audio.h (modified) (1 diff)
• libroar/stream.c (modified) (2 diffs)

doc/new-cmds

@@ -277 +277 @@
 +MUUTLAW    = MUUTLAW_BE
 +BRR        = 0x3c
++OGG_OPUS   = 0x18
++ROAR_OPUS  = 0x19
 !SECTIONEND
 !SECTION: Network

include/roaraudio/audio.h

@@ -185 +185 @@
 #define ROAR_CODEC_OGG_CELT     0x16
 #define ROAR_CODEC_OGG          0x17
-
+#define ROAR_CODEC_OGG_OPUS     0x18
+
+#define ROAR_CODEC_ROAR_OPUS    0x19
 #define ROAR_CODEC_ROAR_CELT    0x1a
 #define ROAR_CODEC_ROAR_SPEEX   0x1b

libroar/stream.c

@@ -843 +843 @@
  {ROAR_CODEC_OGG_CELT,    "ogg_celt",    "audio/ogg; codecs=celt"},
  {ROAR_CODEC_OGG,         "ogg",         "application/ogg"},
+ {ROAR_CODEC_OGG_OPUS,    "ogg_opus",    NULL},
+ {ROAR_CODEC_ROAR_OPUS,   "roar_opus",   NULL},
  {ROAR_CODEC_ROAR_CELT,   "roar_celt",   NULL},
  {ROAR_CODEC_ROAR_SPEEX,  "roar_speex",  NULL},
@@ -1155 +1157 @@
  {"speex-wb",  {.rate =  16000, .bits = 16, .channels =  2, .codec = ROAR_CODEC_ROAR_SPEEX}},
  {"speex-uwb", {.rate =  32000, .bits = 16, .channels =  2, .codec = ROAR_CODEC_ROAR_SPEEX}},
+ {"opus",      {.rate =  48000, .bits = 16, .channels =  2, .codec = ROAR_CODEC_ROAR_OPUS}},
  {"gsm",       {.rate =   8000, .bits = 16, .channels =  1, .codec = ROAR_CODEC_GSM}},
  {"brr",       {.rate =   8000, .bits = 32, .channels =  1, .codec = ROAR_CODEC_BRR}},