Changeset 1211:cd16786b451f in roaraudio

Timestamp:

02/05/09 03:44:16 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added codec IDs for meta data streams

Files:

• include/roaraudio/audio.h (modified) (4 diffs)
• libroar/stream.c (modified) (1 diff)

include/roaraudio/audio.h

@@ -36 +36 @@
  Bits:
  76543210
-   |||||\---\ byte-
-   ||||\----/ order
-   |||\-----> unsigned?
-   ||\------> PCM(0) or MIDI(1)?
-   |\-------> PCM/MIDI(0) or hi-level codecs(1)
-   \--------> MISC(0) or RIFF/WAVE like(1)
+ |||||||\---\ byte-
+ ||||||\----/ order
+ |||||\-----> unsigned?
+ ||||\------> PCM(0) or MIDI(1)?
+ |||\-------> PCM/MIDI(0) or hi-level codecs(1)
+ ||\--------> MISC(0) or RIFF/WAVE like(1)
+ |\---------> first set(0) or second set(1)
+ \----------> (0)
 
  BB = Byte order / MSB/LSB
+
+ -- First Set:
 
  MIDI 0x08:
@@ -50 +54 @@
 
  hi-level 0x10:
- 76543210
-     0000 0x10 -> Ogg Vorbis
-     0001 0x11 -> Native FLAC
-     0010 0x12 -> Ogg Speex
-     0011 0x13 -> Reserved for CELT
-     0100 0x14 -> Ogg FLAC
-     0101 0x15 -> Ogg General
-     0110 0x16 -> Ogg CELT
-     [...]
-     **** 0x1a -> ROAR CELT
-     **** 0x1b -> ROAR SPEEX
+  76543210
+      0000 0x10 -> Ogg Vorbis
+      0001 0x11 -> Native FLAC
+      0010 0x12 -> Ogg Speex
+      0011 0x13 -> Reserved for CELT
+      0100 0x14 -> Ogg FLAC
+      0101 0x15 -> Ogg General
+      0110 0x16 -> Ogg CELT
+      [...]
+      **** 0x1a -> ROAR CELT
+      **** 0x1b -> ROAR SPEEX
+      **** 0x1c -> RAUM
+      **** 0x1d -> RAUM Vorbis
 
  RIFF/WAVE like 0x20:
@@ -70 +76 @@
       00BB 0x30 -> A-Law (base)
       01BB 0x34 -> mu-Law (base)
+
+ -- Second Set:
+
+ Bits:
+ 76543210
+ |||||||\---\ byte-
+ ||||||\----/ order
+ |||||\-----> unsigned? (or other flags)
+ ||||\------> META: text(0) or binary(1)
+ |||\-------> META(0)
+ ||\--------> (0)
+ |\---------> second set(1)
+ \----------> (0)
+
+ Meta Codecs 0x40:
+  76543210
+      0000 0x40 -> Meta Text: Vorbis Comment Like
+      [...]
+      0100 0x44 -> Meta Text: RoarAudio Like
+      [...]
+      11BB 0x4c -> Meta Binary: RoarAudio Like
+
 */
 
@@ -112 +140 @@
 #define ROAR_CODEC_MULAW        0x34
 
+// Meta Codecs:
+#define ROAR_CODEC_META_VCLT    0x40 /* VCLT = Vorbis Comment Like Text */
+#define ROAR_CODEC_META_RALT    0x44 /* RALT = RoarAudio Like Text      */
+#define ROAR_CODEC_META_RALB    0x4c /* RALB = RoarAudio Like Binary    */
+                                     /* if no byte order is given then you
+                                        should assume BE as it is network
+                                        byte order                     */
+#define ROAR_CODEC_META_RALB_LE (ROAR_CODEC_META_RALB | ROAR_CODEC_LE)
+#define ROAR_CODEC_META_RALB_BE (ROAR_CODEC_META_RALB | ROAR_CODEC_BE)
+#define ROAR_CODEC_META_RALB_PDP (ROAR_CODEC_META_RALB | ROAR_CODEC_PDP)
 
 #if BYTE_ORDER == BIG_ENDIAN

libroar/stream.c

@@ -484 +484 @@
  {ROAR_CODEC_MULAW,       "ulaw"       }, // alias
 
+ // Meta Codecs:
+ {ROAR_CODEC_META_VCLT,     "meta_vclt"    },
+ {ROAR_CODEC_META_RALT,     "meta_ralt"    },
+ {ROAR_CODEC_META_RALB,     "meta_ralb"    },
+ {ROAR_CODEC_META_RALB_LE,  "meta_ralb_le" },
+ {ROAR_CODEC_META_RALB_BE,  "meta_ralb_be" },
+ {ROAR_CODEC_META_RALB_PDP, "meta_ralb_pdp"},
+
  {-1, NULL}
 };