Changeset 4583:3bd9da6e60fa in roaraudio

Timestamp:

11/05/10 00:47:14 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added mimetype lookup functions

Files:

• include/libroar/stream.h (modified) (1 diff)
• libroar/stream.c (modified) (2 diffs)

include/libroar/stream.h

@@ -102 +102 @@
 const char * roar_codec2str (const int    codec);
 
+int    roar_mime2codec (const char * mime);
+const char * roar_codec2mime (const int    codec);
+
 const char * roar_streamstate2str(int streamstate);
 

libroar/stream.c

@@ -809 +809 @@
  int    codec;
  const char * name;
+ const char * mime;
 } _libroar_codec[] = {
  // PCM:
- {ROAR_CODEC_PCM_S_LE,    "pcm_s_le"   },
- {ROAR_CODEC_PCM_S_BE,    "pcm_s_be"   },
- {ROAR_CODEC_PCM_S_PDP,   "pcm_s_pdp"  },
- {ROAR_CODEC_PCM_U_LE,    "pcm_u_le"   },
- {ROAR_CODEC_PCM_U_BE,    "pcm_u_be"   },
- {ROAR_CODEC_PCM_U_PDP,   "pcm_u_pdp"  },
- {ROAR_CODEC_DEFAULT,     "default"    }, // alias
- {ROAR_CODEC_DEFAULT,     "pcm"        }, // alias
- {ROAR_CODEC_DEFAULT,     "raw"        }, // alias
+ {ROAR_CODEC_PCM_S_LE,    "pcm_s_le",    NULL},
+ {ROAR_CODEC_PCM_S_BE,    "pcm_s_be",    NULL},
+ {ROAR_CODEC_PCM_S_PDP,   "pcm_s_pdp",   NULL},
+ {ROAR_CODEC_PCM_U_LE,    "pcm_u_le",    NULL},
+ {ROAR_CODEC_PCM_U_BE,    "pcm_u_be",    NULL},
+ {ROAR_CODEC_PCM_U_PDP,   "pcm_u_pdp",   NULL},
+ {ROAR_CODEC_DEFAULT,     "default",     NULL}, // alias
+ {ROAR_CODEC_DEFAULT,     "pcm",         NULL}, // alias
+ {ROAR_CODEC_DEFAULT,     "raw",         NULL}, // alias
 
  // MIDI:
- {ROAR_CODEC_MIDI_FILE,   "midi_file"  },
- {ROAR_CODEC_MIDI,        "midi"       },
- {ROAR_CODEC_ROARMIDI,    "roarmidi"   },
+ {ROAR_CODEC_MIDI_FILE,   "midi_file",   NULL},
+ {ROAR_CODEC_MIDI,        "midi",        NULL},
+ {ROAR_CODEC_ROARMIDI,    "roarmidi",    NULL},
 
  // XIPH:
- {ROAR_CODEC_OGG_VORBIS,  "ogg_vorbis" },
- {ROAR_CODEC_OGG_VORBIS,  "vorbis"     }, // alias
- {ROAR_CODEC_FLAC,        "flac"       },
- {ROAR_CODEC_OGG_SPEEX,   "ogg_speex"  },
- {ROAR_CODEC_OGG_SPEEX,   "speex"      }, // alias
- {ROAR_CODEC_OGG_FLAC,    "ogg_flac"   },
- {ROAR_CODEC_OGG_GENERAL, "ogg_general"},
- {ROAR_CODEC_OGG_CELT,    "ogg_celt"   },
- {ROAR_CODEC_OGG,         "ogg"        },
- {ROAR_CODEC_ROAR_CELT,   "roar_celt"  },
- {ROAR_CODEC_ROAR_SPEEX,  "roar_speex" },
+ {ROAR_CODEC_OGG_VORBIS,  "ogg_vorbis",  "application/ogg"},
+ {ROAR_CODEC_OGG_VORBIS,  "vorbis",      "application/ogg"}, // alias
+ {ROAR_CODEC_FLAC,        "flac",        "audio/x-flac"},
+ {ROAR_CODEC_OGG_SPEEX,   "ogg_speex",   "audio/ogg; codecs=speex"},
+ {ROAR_CODEC_OGG_SPEEX,   "speex",       "audio/ogg; codecs=speex"}, // alias
+ {ROAR_CODEC_OGG_FLAC,    "ogg_flac",    "audio/ogg; codecs=flac"},
+ {ROAR_CODEC_OGG_GENERAL, "ogg_general", "application/ogg"},
+ {ROAR_CODEC_OGG_CELT,    "ogg_celt",    "audio/ogg; codecs=celt"},
+ {ROAR_CODEC_OGG,         "ogg",         "application/ogg"},
+ {ROAR_CODEC_ROAR_CELT,   "roar_celt",   NULL},
+ {ROAR_CODEC_ROAR_SPEEX,  "roar_speex",  NULL},
 
  // RAUM:
- {ROAR_CODEC_RAUM,        "raum"       },
- {ROAR_CODEC_RAUM_VORBIS, "raum_vorbis"},
- {ROAR_CODEC_RAUM_FLAC,   "raum_flac"  },
+ {ROAR_CODEC_RAUM,        "raum",        NULL},
+ {ROAR_CODEC_RAUM_VORBIS, "raum_vorbis", NULL},
+ {ROAR_CODEC_RAUM_FLAC,   "raum_flac",   NULL},
 
  // RIFF/WAVE like:
- {ROAR_CODEC_RIFF_WAVE,   "riff_wave"  },
- {ROAR_CODEC_RIFF_WAVE,   "wave"       }, // alias
- {ROAR_CODEC_RIFF_WAVE,   "wav"        }, // alias
- {ROAR_CODEC_RIFX,        "rifx"       },
- {ROAR_CODEC_AU,          "au"         },
- {ROAR_CODEC_AIFF,        "aiff"       },
+ {ROAR_CODEC_RIFF_WAVE,   "riff_wave",   "audio/x-wav"},
+ {ROAR_CODEC_RIFF_WAVE,   "wave",        "audio/x-wav"}, // alias
+ {ROAR_CODEC_RIFF_WAVE,   "wav",         "audio/x-wav"}, // alias
+ {ROAR_CODEC_RIFX,        "rifx",        NULL},
+ {ROAR_CODEC_AU,          "au",          "audio/basic"},
+ {ROAR_CODEC_AIFF,        "aiff",        "audio/aiff"},
 
  //Log codecs:
- {ROAR_CODEC_ALAW,        "alaw"       },
- {ROAR_CODEC_MULAW,       "mulaw"      },
- {ROAR_CODEC_MULAW,       "ulaw"       }, // alias
+ {ROAR_CODEC_ALAW,        "alaw",        NULL},
+ {ROAR_CODEC_MULAW,       "mulaw",       NULL},
+ {ROAR_CODEC_MULAW,       "ulaw",        NULL}, // alias
 
  //GSM:
- {ROAR_CODEC_GSM,         "gsm"        },
- {ROAR_CODEC_GSM49,       "gsm49"      },
+ {ROAR_CODEC_GSM,         "gsm",         NULL},
+ {ROAR_CODEC_GSM49,       "gsm49",       NULL},
 
  // 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"},
+ {ROAR_CODEC_META_VCLT,     "meta_vclt",     NULL},
+ {ROAR_CODEC_META_RALT,     "meta_ralt",     NULL},
+ {ROAR_CODEC_META_RALB,     "meta_ralb",     NULL},
+ {ROAR_CODEC_META_RALB_LE,  "meta_ralb_le",  NULL},
+ {ROAR_CODEC_META_RALB_BE,  "meta_ralb_be",  NULL},
+ {ROAR_CODEC_META_RALB_PDP, "meta_ralb_pdp", NULL},
 
  // light control:
- {ROAR_CODEC_DMX512,      "dmx512"     },
- {ROAR_CODEC_ROARDMX,     "roardmx"    },
+ {ROAR_CODEC_DMX512,      "dmx512",      NULL},
+ {ROAR_CODEC_ROARDMX,     "roardmx",     NULL},
 
  // Radio Data and Transmitter Control System:
- {ROAR_CODEC_RDS,         "rds"        },
+ {ROAR_CODEC_RDS,         "rds",         NULL},
 
  // User specific:
- {ROAR_CODEC_USER0,       "user0"      },
- {ROAR_CODEC_USER1,       "user1"      },
- {ROAR_CODEC_USER2,       "user2"      },
- {ROAR_CODEC_USER3,       "user3"      },
- {ROAR_CODEC_USER4,       "user4"      },
- {ROAR_CODEC_USER5,       "user5"      },
- {ROAR_CODEC_USER6,       "user6"      },
- {ROAR_CODEC_USER7,       "user7"      },
- {ROAR_CODEC_USER8,       "user8"      },
- {ROAR_CODEC_USER9,       "user9"      },
- {ROAR_CODEC_USER10,      "user10"     },
- {ROAR_CODEC_USER11,      "user11"     },
- {ROAR_CODEC_USER12,      "user12"     },
- {ROAR_CODEC_USER13,      "user13"     },
- {ROAR_CODEC_USER14,      "user14"     },
- {ROAR_CODEC_USER15,      "user15"     },
- {-1, NULL}
+ {ROAR_CODEC_USER0,       "user0",       NULL},
+ {ROAR_CODEC_USER1,       "user1",       NULL},
+ {ROAR_CODEC_USER2,       "user2",       NULL},
+ {ROAR_CODEC_USER3,       "user3",       NULL},
+ {ROAR_CODEC_USER4,       "user4",       NULL},
+ {ROAR_CODEC_USER5,       "user5",       NULL},
+ {ROAR_CODEC_USER6,       "user6",       NULL},
+ {ROAR_CODEC_USER7,       "user7",       NULL},
+ {ROAR_CODEC_USER8,       "user8",       NULL},
+ {ROAR_CODEC_USER9,       "user9",       NULL},
+ {ROAR_CODEC_USER10,      "user10",      NULL},
+ {ROAR_CODEC_USER11,      "user11",      NULL},
+ {ROAR_CODEC_USER12,      "user12",      NULL},
+ {ROAR_CODEC_USER13,      "user13",      NULL},
+ {ROAR_CODEC_USER14,      "user14",      NULL},
+ {ROAR_CODEC_USER15,      "user15",      NULL},
+ {-1, NULL, NULL}
 };
 
@@ -925 +926 @@
 
  return "unknown";
+}
+
+int    roar_mime2codec (const char * mime) {
+ int i;
+
+ if ( mime == NULL || *mime == 0 )
+  return -1;
+
+ for (i = 0; _libroar_codec[i].codec != -1; i++)
+  if ( _libroar_codec[i].mime != NULL )
+   if ( strcasecmp(_libroar_codec[i].mime, mime) == 0 )
+    return _libroar_codec[i].codec;
+
+ return -1;
+}
+
+const char * roar_codec2mime (const int    codec) {
+ int i;
+
+ for (i = 0; _libroar_codec[i].codec != -1; i++)
+  if ( _libroar_codec[i].codec == codec )
+   return _libroar_codec[i].mime;
+
+ return NULL;
 }