2004-02-24 00:41:20 +01:00
|
|
|
/* the Music Player Daemon (MPD)
|
2007-04-05 05:22:33 +02:00
|
|
|
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
|
2004-02-24 00:41:20 +01:00
|
|
|
* This project's homepage is: http://www.musicpd.org
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program 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 General Public License for more details.
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*/
|
|
|
|
|
2006-03-16 07:52:46 +01:00
|
|
|
/* TODO 'ogg' should probably be replaced with 'oggvorbis' in all instances */
|
|
|
|
|
2004-05-31 03:21:17 +02:00
|
|
|
#include "../inputPlugin.h"
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2006-03-16 07:52:46 +01:00
|
|
|
#ifdef HAVE_OGGVORBIS
|
|
|
|
|
|
|
|
#include "_ogg_common.h"
|
2004-03-18 04:29:25 +01:00
|
|
|
|
2004-05-31 03:21:17 +02:00
|
|
|
#include "../utils.h"
|
|
|
|
#include "../audio.h"
|
|
|
|
#include "../log.h"
|
|
|
|
#include "../pcm_utils.h"
|
|
|
|
#include "../inputStream.h"
|
|
|
|
#include "../outputBuffer.h"
|
|
|
|
#include "../replayGain.h"
|
2008-01-03 08:29:49 +01:00
|
|
|
#include "../os_compat.h"
|
2005-08-25 10:07:28 +02:00
|
|
|
|
|
|
|
#ifndef HAVE_TREMOR
|
2004-02-24 00:41:20 +01:00
|
|
|
#include <vorbis/vorbisfile.h>
|
2005-08-25 10:07:28 +02:00
|
|
|
#else
|
|
|
|
#include <tremor/ivorbisfile.h>
|
|
|
|
/* Macros to make Tremor's API look like libogg. Tremor always
|
|
|
|
returns host-byte-order 16-bit signed data, and uses integer
|
|
|
|
milliseconds where libogg uses double seconds.
|
|
|
|
*/
|
|
|
|
#define ov_read(VF, BUFFER, LENGTH, BIGENDIANP, WORD, SGNED, BITSTREAM) \
|
|
|
|
ov_read(VF, BUFFER, LENGTH, BITSTREAM)
|
|
|
|
#define ov_time_total(VF, I) ((double)ov_time_total(VF, I)/1000)
|
|
|
|
#define ov_time_tell(VF) ((double)ov_time_tell(VF)/1000)
|
|
|
|
#define ov_time_seek_page(VF, S) (ov_time_seek_page(VF, (S)*1000))
|
2006-07-20 20:53:56 +02:00
|
|
|
#endif /* HAVE_TREMOR */
|
2005-08-25 10:07:28 +02:00
|
|
|
|
2004-03-09 22:42:08 +01:00
|
|
|
#ifdef WORDS_BIGENDIAN
|
|
|
|
#define OGG_DECODE_USE_BIGENDIAN 1
|
|
|
|
#else
|
|
|
|
#define OGG_DECODE_USE_BIGENDIAN 0
|
|
|
|
#endif
|
|
|
|
|
2004-05-20 05:44:33 +02:00
|
|
|
typedef struct _OggCallbackData {
|
2006-07-20 18:02:40 +02:00
|
|
|
InputStream *inStream;
|
|
|
|
DecoderControl *dc;
|
2004-05-20 05:44:33 +02:00
|
|
|
} OggCallbackData;
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static size_t ogg_read_cb(void *ptr, size_t size, size_t nmemb, void *vdata)
|
2004-05-04 21:49:29 +02:00
|
|
|
{
|
2008-03-26 11:37:36 +01:00
|
|
|
size_t ret;
|
2006-07-20 18:02:40 +02:00
|
|
|
OggCallbackData *data = (OggCallbackData *) vdata;
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
ret = readFromInputStream(data->inStream, ptr, size, nmemb);
|
|
|
|
if (ret == 0 && !inputStreamAtEOF(data->inStream) &&
|
|
|
|
!data->dc->stop) {
|
|
|
|
my_usleep(10000);
|
|
|
|
} else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
errno = 0;
|
|
|
|
/*if(ret<0) errno = ((InputStream *)inStream)->error; */
|
2004-05-04 21:49:29 +02:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static int ogg_seek_cb(void *vdata, ogg_int64_t offset, int whence)
|
|
|
|
{
|
2008-02-05 11:17:33 +01:00
|
|
|
const OggCallbackData *data = (const OggCallbackData *) vdata;
|
2007-11-28 15:06:03 +01:00
|
|
|
if(data->dc->stop)
|
|
|
|
return -1;
|
2006-07-20 18:02:40 +02:00
|
|
|
return seekInputStream(data->inStream, offset, whence);
|
2004-05-04 21:49:29 +02:00
|
|
|
}
|
|
|
|
|
2008-01-01 11:09:56 +01:00
|
|
|
/* TODO: check Ogg libraries API and see if we can just not have this func */
|
2006-07-20 18:02:40 +02:00
|
|
|
static int ogg_close_cb(void *vdata)
|
|
|
|
{
|
2008-01-01 11:09:56 +01:00
|
|
|
return 0;
|
2004-05-04 21:49:29 +02:00
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static long ogg_tell_cb(void *vdata)
|
|
|
|
{
|
2008-02-05 11:17:33 +01:00
|
|
|
const OggCallbackData *data = (const OggCallbackData *) vdata;
|
2004-05-20 05:44:33 +02:00
|
|
|
|
|
|
|
return (long)(data->inStream->offset);
|
2004-05-04 21:49:29 +02:00
|
|
|
}
|
|
|
|
|
2008-02-05 11:17:33 +01:00
|
|
|
static const char *ogg_parseComment(const char *comment, const char *needle)
|
2006-07-20 18:02:40 +02:00
|
|
|
{
|
|
|
|
int len = strlen(needle);
|
2004-05-08 14:00:30 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (strncasecmp(comment, needle, len) == 0 && *(comment + len) == '=') {
|
|
|
|
return comment + len + 1;
|
2004-05-31 04:21:06 +02:00
|
|
|
}
|
2004-05-08 14:00:30 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
return NULL;
|
2004-05-08 14:00:30 +02:00
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static void ogg_getReplayGainInfo(char **comments, ReplayGainInfo ** infoPtr)
|
|
|
|
{
|
2008-02-05 11:17:33 +01:00
|
|
|
const char *temp;
|
2004-11-02 20:56:59 +01:00
|
|
|
int found = 0;
|
2004-05-08 14:00:30 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (*infoPtr)
|
|
|
|
freeReplayGainInfo(*infoPtr);
|
2004-11-02 20:56:59 +01:00
|
|
|
*infoPtr = newReplayGainInfo();
|
2004-05-08 14:00:30 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
while (*comments) {
|
|
|
|
if ((temp =
|
|
|
|
ogg_parseComment(*comments, "replaygain_track_gain"))) {
|
|
|
|
(*infoPtr)->trackGain = atof(temp);
|
2004-11-02 20:56:59 +01:00
|
|
|
found = 1;
|
2006-07-20 18:02:40 +02:00
|
|
|
} else if ((temp = ogg_parseComment(*comments,
|
|
|
|
"replaygain_album_gain"))) {
|
|
|
|
(*infoPtr)->albumGain = atof(temp);
|
2004-11-02 20:56:59 +01:00
|
|
|
found = 1;
|
2006-07-20 18:02:40 +02:00
|
|
|
} else if ((temp = ogg_parseComment(*comments,
|
|
|
|
"replaygain_track_peak"))) {
|
|
|
|
(*infoPtr)->trackPeak = atof(temp);
|
2004-11-02 20:56:59 +01:00
|
|
|
found = 1;
|
2006-07-20 18:02:40 +02:00
|
|
|
} else if ((temp = ogg_parseComment(*comments,
|
|
|
|
"replaygain_album_peak"))) {
|
|
|
|
(*infoPtr)->albumPeak = atof(temp);
|
2004-11-02 20:56:59 +01:00
|
|
|
found = 1;
|
2006-07-20 18:02:40 +02:00
|
|
|
}
|
2004-05-08 14:00:30 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
comments++;
|
|
|
|
}
|
2004-05-08 14:00:30 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (!found) {
|
2004-11-02 20:56:59 +01:00
|
|
|
freeReplayGainInfo(*infoPtr);
|
|
|
|
*infoPtr = NULL;
|
|
|
|
}
|
2004-05-08 14:00:30 +02:00
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static const char *VORBIS_COMMENT_TRACK_KEY = "tracknumber";
|
|
|
|
static const char *VORBIS_COMMENT_DISC_KEY = "discnumber";
|
2006-03-16 07:52:46 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static unsigned int ogg_parseCommentAddToTag(char *comment,
|
|
|
|
unsigned int itemType,
|
|
|
|
MpdTag ** tag)
|
2006-03-16 07:52:46 +01:00
|
|
|
{
|
2006-07-20 18:02:40 +02:00
|
|
|
const char *needle;
|
2006-06-04 13:36:02 +02:00
|
|
|
unsigned int len;
|
2006-04-30 21:55:56 +02:00
|
|
|
switch (itemType) {
|
2006-07-20 18:02:40 +02:00
|
|
|
case TAG_ITEM_TRACK:
|
|
|
|
needle = VORBIS_COMMENT_TRACK_KEY;
|
|
|
|
break;
|
|
|
|
case TAG_ITEM_DISC:
|
|
|
|
needle = VORBIS_COMMENT_DISC_KEY;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
needle = mpdTagItemKeys[itemType];
|
2006-04-30 21:55:56 +02:00
|
|
|
}
|
2006-06-04 13:36:02 +02:00
|
|
|
len = strlen(needle);
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (strncasecmp(comment, needle, len) == 0 && *(comment + len) == '=') {
|
2006-03-16 07:52:46 +01:00
|
|
|
if (!*tag)
|
|
|
|
*tag = newMpdTag();
|
2006-07-20 18:02:40 +02:00
|
|
|
|
|
|
|
addItemToMpdTag(*tag, itemType, comment + len + 1);
|
|
|
|
|
2006-03-16 07:52:46 +01:00
|
|
|
return 1;
|
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
|
2006-03-16 07:52:46 +01:00
|
|
|
return 0;
|
|
|
|
}
|
2004-06-01 13:18:25 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static MpdTag *oggCommentsParse(char **comments)
|
|
|
|
{
|
|
|
|
MpdTag *tag = NULL;
|
|
|
|
|
|
|
|
while (*comments) {
|
2006-04-18 08:17:48 +02:00
|
|
|
int j;
|
2006-07-20 18:02:40 +02:00
|
|
|
for (j = TAG_NUM_OF_ITEM_TYPES; --j >= 0;) {
|
2006-03-16 07:52:46 +01:00
|
|
|
if (ogg_parseCommentAddToTag(*comments, j, &tag))
|
|
|
|
break;
|
2005-03-05 23:24:10 +01:00
|
|
|
}
|
2004-06-01 13:18:25 +02:00
|
|
|
comments++;
|
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
|
2006-03-16 07:52:46 +01:00
|
|
|
return tag;
|
2004-06-01 13:18:25 +02:00
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static void putOggCommentsIntoOutputBuffer(OutputBuffer * cb, char *streamName,
|
|
|
|
char **comments)
|
2004-06-01 13:18:25 +02:00
|
|
|
{
|
2006-07-20 18:02:40 +02:00
|
|
|
MpdTag *tag;
|
2004-06-01 13:18:25 +02:00
|
|
|
|
|
|
|
tag = oggCommentsParse(comments);
|
2006-07-20 18:02:40 +02:00
|
|
|
if (!tag && streamName) {
|
2004-06-09 18:58:33 +02:00
|
|
|
tag = newMpdTag();
|
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
if (!tag)
|
|
|
|
return;
|
2004-06-01 13:18:25 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (streamName) {
|
2004-11-10 22:58:27 +01:00
|
|
|
clearItemsFromMpdTag(tag, TAG_ITEM_NAME);
|
|
|
|
addItemToMpdTag(tag, TAG_ITEM_NAME, streamName);
|
2004-06-06 18:42:14 +02:00
|
|
|
}
|
|
|
|
|
2004-06-01 13:18:25 +02:00
|
|
|
freeMpdTag(tag);
|
|
|
|
}
|
|
|
|
|
2006-03-16 07:52:46 +01:00
|
|
|
/* public */
|
2006-07-17 03:47:32 +02:00
|
|
|
static int oggvorbis_decode(OutputBuffer * cb, DecoderControl * dc,
|
2006-07-20 18:02:40 +02:00
|
|
|
InputStream * inStream)
|
2004-02-24 00:41:20 +01:00
|
|
|
{
|
|
|
|
OggVorbis_File vf;
|
2004-05-04 21:49:29 +02:00
|
|
|
ov_callbacks callbacks;
|
2006-07-20 18:02:40 +02:00
|
|
|
OggCallbackData data;
|
2004-06-01 12:37:13 +02:00
|
|
|
int current_section;
|
2004-06-05 07:03:00 +02:00
|
|
|
int prev_section = -1;
|
2004-06-01 12:37:13 +02:00
|
|
|
long ret;
|
|
|
|
#define OGG_CHUNK_SIZE 4096
|
|
|
|
char chunk[OGG_CHUNK_SIZE];
|
|
|
|
int chunkpos = 0;
|
|
|
|
long bitRate = 0;
|
|
|
|
long test;
|
2006-07-20 18:02:40 +02:00
|
|
|
ReplayGainInfo *replayGainInfo = NULL;
|
|
|
|
char **comments;
|
2008-02-05 11:17:33 +01:00
|
|
|
const char *errorStr;
|
2004-05-20 05:44:33 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
data.inStream = inStream;
|
|
|
|
data.dc = dc;
|
2004-05-04 21:49:29 +02:00
|
|
|
|
|
|
|
callbacks.read_func = ogg_read_cb;
|
|
|
|
callbacks.seek_func = ogg_seek_cb;
|
|
|
|
callbacks.close_func = ogg_close_cb;
|
|
|
|
callbacks.tell_func = ogg_tell_cb;
|
2006-07-20 18:02:40 +02:00
|
|
|
if ((ret = ov_open_callbacks(&data, &vf, NULL, 0, callbacks)) < 0) {
|
|
|
|
if (!dc->stop) {
|
|
|
|
switch (ret) {
|
2004-11-05 06:12:58 +01:00
|
|
|
case OV_EREAD:
|
2006-07-19 17:58:11 +02:00
|
|
|
errorStr = "read error";
|
2004-11-05 06:12:58 +01:00
|
|
|
break;
|
|
|
|
case OV_ENOTVORBIS:
|
2006-07-19 17:58:11 +02:00
|
|
|
errorStr = "not vorbis stream";
|
2004-11-05 06:12:58 +01:00
|
|
|
break;
|
|
|
|
case OV_EVERSION:
|
2006-07-19 17:58:11 +02:00
|
|
|
errorStr = "vorbis version mismatch";
|
2004-11-05 06:12:58 +01:00
|
|
|
break;
|
|
|
|
case OV_EBADHEADER:
|
2006-07-19 17:58:11 +02:00
|
|
|
errorStr = "invalid vorbis header";
|
2004-11-05 06:12:58 +01:00
|
|
|
break;
|
|
|
|
case OV_EFAULT:
|
2006-07-19 17:58:11 +02:00
|
|
|
errorStr = "internal logic error";
|
2004-11-05 06:12:58 +01:00
|
|
|
break;
|
|
|
|
default:
|
2006-07-19 17:58:11 +02:00
|
|
|
errorStr = "unknown error";
|
2004-11-05 06:12:58 +01:00
|
|
|
break;
|
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
ERROR("Error decoding Ogg Vorbis stream: %s\n",
|
2006-07-19 17:58:11 +02:00
|
|
|
errorStr);
|
2006-07-20 18:02:40 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
dc->totalTime = ov_time_total(&vf, -1);
|
|
|
|
if (dc->totalTime < 0)
|
|
|
|
dc->totalTime = 0;
|
2004-06-05 18:01:44 +02:00
|
|
|
dc->audioFormat.bits = 16;
|
2004-06-01 12:37:13 +02:00
|
|
|
|
2008-03-26 11:37:49 +01:00
|
|
|
while (1) {
|
2006-07-20 18:02:40 +02:00
|
|
|
if (dc->seek) {
|
|
|
|
if (0 == ov_time_seek_page(&vf, dc->seekWhere)) {
|
|
|
|
clearOutputBuffer(cb);
|
|
|
|
chunkpos = 0;
|
|
|
|
} else
|
|
|
|
dc->seekError = 1;
|
2004-06-01 12:37:13 +02:00
|
|
|
dc->seek = 0;
|
Initial cut of fork() => pthreads() for decoder and player
I initially started to do a heavy rewrite that changed the way processes
communicated, but that was too much to do at once. So this change only
focuses on replacing the player and decode processes with threads and
using condition variables instead of polling in loops; so the changeset
itself is quiet small.
* The shared output buffer variables will still need locking
to guard against race conditions. So in this effect, we're probably
just as buggy as before. The reduced context-switching overhead of
using threads instead of processes may even make bugs show up more or
less often...
* Basic functionality appears to be working for playing local (and NFS)
audio, including:
play, pause, stop, seek, previous, next, and main playlist editing
* I haven't tested HTTP streams yet, they should work.
* I've only tested ALSA and Icecast. ALSA works fine, Icecast
metadata seems to get screwy at times and breaks song
advancement in the playlist at times.
* state file loading works, too (after some last-minute hacks with
non-blocking wakeup functions)
* The non-blocking (*_nb) variants of the task management functions are
probably overused. They're more lenient and easier to use because
much of our code is still based on our previous polling-based system.
* It currently segfaults on exit. I haven't paid much attention
to the exit/signal-handling routines other than ensuring it
compiles. At least the state file seems to work. We don't
do any cleanups of the threads on exit, yet.
* Update is still done in a child process and not in a thread.
To do this in a thread, we'll need to ensure it does proper
locking and communication with the main thread; but should
require less memory in the end because we'll be updating
the database "in-place" rather than updating a copy and
then bulk-loading when done.
* We're more sensitive to bugs in 3rd party libraries now.
My plan is to eventually use a master process which forks()
and restarts the child when it dies:
locking and communication with the main thread; but should
require less memory in the end because we'll be updating
the database "in-place" rather than updating a copy and
then bulk-loading when done.
* We're more sensitive to bugs in 3rd party libraries now.
My plan is to eventually use a master process which forks()
and restarts the child when it dies:
master - just does waitpid() + fork() in a loop
\- main thread
\- decoder thread
\- player thread
At the beginning of every song, the main thread will set
a dirty flag and update the state file. This way, if we
encounter a song that triggers a segfault killing the
main thread, the master will start the replacement main
on the next song.
* The main thread still wakes up every second on select()
to check for signals; which affects power management.
[merged r7138 from branches/ew]
git-svn-id: https://svn.musicpd.org/mpd/trunk@7240 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2008-04-12 06:08:00 +02:00
|
|
|
decoder_wakeup_player();
|
2004-06-01 12:37:13 +02:00
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
ret = ov_read(&vf, chunk + chunkpos,
|
|
|
|
OGG_CHUNK_SIZE - chunkpos,
|
|
|
|
OGG_DECODE_USE_BIGENDIAN, 2, 1, ¤t_section);
|
|
|
|
if (current_section != prev_section) {
|
|
|
|
/*printf("new song!\n"); */
|
|
|
|
vorbis_info *vi = ov_info(&vf, -1);
|
2004-06-05 18:01:44 +02:00
|
|
|
dc->audioFormat.channels = vi->channels;
|
|
|
|
dc->audioFormat.sampleRate = vi->rate;
|
2006-07-20 18:02:40 +02:00
|
|
|
if (dc->state == DECODE_STATE_START) {
|
|
|
|
getOutputAudioFormat(&(dc->audioFormat),
|
|
|
|
&(cb->audioFormat));
|
2004-06-06 18:42:14 +02:00
|
|
|
dc->state = DECODE_STATE_DECODE;
|
|
|
|
}
|
2004-06-05 18:01:44 +02:00
|
|
|
comments = ov_comment(&vf, -1)->user_comments;
|
2004-06-07 07:00:56 +02:00
|
|
|
putOggCommentsIntoOutputBuffer(cb, inStream->metaName,
|
2006-07-20 18:02:40 +02:00
|
|
|
comments);
|
|
|
|
ogg_getReplayGainInfo(comments, &replayGainInfo);
|
2004-06-05 18:01:44 +02:00
|
|
|
}
|
2004-06-05 07:03:00 +02:00
|
|
|
|
|
|
|
prev_section = current_section;
|
|
|
|
|
2008-03-26 11:37:49 +01:00
|
|
|
if (ret <= 0) {
|
|
|
|
if (ret == OV_HOLE) /* bad packet */
|
|
|
|
ret = 0;
|
|
|
|
else /* break on EOF or other error */
|
|
|
|
break;
|
2004-02-24 00:41:20 +01:00
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
chunkpos += ret;
|
2004-06-01 12:37:13 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (chunkpos >= OGG_CHUNK_SIZE) {
|
|
|
|
if ((test = ov_bitrate_instant(&vf)) > 0) {
|
|
|
|
bitRate = test / 1000;
|
2004-06-01 12:37:13 +02:00
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
sendDataToOutputBuffer(cb, inStream, dc,
|
|
|
|
inStream->seekable,
|
|
|
|
chunk, chunkpos,
|
|
|
|
ov_pcm_tell(&vf) /
|
|
|
|
dc->audioFormat.sampleRate,
|
|
|
|
bitRate, replayGainInfo);
|
2004-06-01 12:37:13 +02:00
|
|
|
chunkpos = 0;
|
2006-07-20 18:02:40 +02:00
|
|
|
if (dc->stop)
|
|
|
|
break;
|
2004-05-10 21:41:27 +02:00
|
|
|
}
|
2004-06-01 12:37:13 +02:00
|
|
|
}
|
2004-05-10 21:41:27 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (!dc->stop && chunkpos > 0) {
|
2004-06-01 12:37:13 +02:00
|
|
|
sendDataToOutputBuffer(cb, NULL, dc, inStream->seekable,
|
2006-07-20 18:02:40 +02:00
|
|
|
chunk, chunkpos,
|
|
|
|
ov_time_tell(&vf), bitRate,
|
|
|
|
replayGainInfo);
|
2004-06-01 12:37:13 +02:00
|
|
|
}
|
2004-02-24 00:41:20 +01:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (replayGainInfo)
|
|
|
|
freeReplayGainInfo(replayGainInfo);
|
2004-11-02 20:56:59 +01:00
|
|
|
|
2004-06-01 12:37:13 +02:00
|
|
|
ov_clear(&vf);
|
2004-05-07 21:11:43 +02:00
|
|
|
|
2004-06-01 12:37:13 +02:00
|
|
|
flushOutputBuffer(cb);
|
2004-02-24 00:41:20 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
static MpdTag *oggvorbis_TagDup(char *file)
|
|
|
|
{
|
2008-03-26 11:37:36 +01:00
|
|
|
MpdTag *ret;
|
2006-07-20 18:02:40 +02:00
|
|
|
FILE *fp;
|
2004-05-31 03:21:17 +02:00
|
|
|
OggVorbis_File vf;
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
fp = fopen(file, "r");
|
|
|
|
if (!fp) {
|
2006-08-20 12:13:59 +02:00
|
|
|
DEBUG("oggvorbis_TagDup: Failed to open file: '%s', %s\n",
|
|
|
|
file, strerror(errno));
|
2006-07-20 18:02:40 +02:00
|
|
|
return NULL;
|
2005-09-08 23:08:02 +02:00
|
|
|
}
|
2006-07-20 18:02:40 +02:00
|
|
|
if (ov_open(fp, &vf, NULL, 0) < 0) {
|
2004-05-31 03:21:17 +02:00
|
|
|
fclose(fp);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
ret = oggCommentsParse(ov_comment(&vf, -1)->user_comments);
|
2004-05-31 05:02:17 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
if (!ret)
|
|
|
|
ret = newMpdTag();
|
|
|
|
ret->time = (int)(ov_time_total(&vf, -1) + 0.5);
|
2004-05-31 03:21:17 +02:00
|
|
|
|
|
|
|
ov_clear(&vf);
|
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
return ret;
|
2004-05-31 03:21:17 +02:00
|
|
|
}
|
|
|
|
|
2006-03-16 07:52:46 +01:00
|
|
|
static unsigned int oggvorbis_try_decode(InputStream * inStream)
|
|
|
|
{
|
|
|
|
return (ogg_stream_type_detect(inStream) == VORBIS) ? 1 : 0;
|
|
|
|
}
|
|
|
|
|
2008-03-20 06:27:04 +01:00
|
|
|
static const char *oggvorbis_Suffixes[] = { "ogg","oga", NULL };
|
2008-02-05 11:17:33 +01:00
|
|
|
static const char *oggvorbis_MimeTypes[] = { "application/ogg",
|
|
|
|
"audio/x-vorbis+ogg",
|
|
|
|
"application/x-ogg",
|
|
|
|
NULL };
|
2004-05-31 03:21:17 +02:00
|
|
|
|
2006-07-20 18:02:40 +02:00
|
|
|
InputPlugin oggvorbisPlugin = {
|
2006-03-16 07:52:46 +01:00
|
|
|
"oggvorbis",
|
|
|
|
NULL,
|
2004-05-31 22:59:55 +02:00
|
|
|
NULL,
|
2006-03-16 07:52:46 +01:00
|
|
|
oggvorbis_try_decode,
|
|
|
|
oggvorbis_decode,
|
2004-05-31 22:59:55 +02:00
|
|
|
NULL,
|
2006-03-16 07:52:46 +01:00
|
|
|
oggvorbis_TagDup,
|
|
|
|
INPUT_PLUGIN_STREAM_URL | INPUT_PLUGIN_STREAM_FILE,
|
|
|
|
oggvorbis_Suffixes,
|
|
|
|
oggvorbis_MimeTypes
|
2004-05-31 03:21:17 +02:00
|
|
|
};
|
|
|
|
|
2006-07-20 20:53:56 +02:00
|
|
|
#else /* !HAVE_OGGVORBIS */
|
2004-05-31 03:21:17 +02:00
|
|
|
|
2007-01-14 04:07:53 +01:00
|
|
|
InputPlugin oggvorbisPlugin;
|
2004-05-31 03:21:17 +02:00
|
|
|
|
2006-07-20 20:53:56 +02:00
|
|
|
#endif /* HAVE_OGGVORBIS */
|