/*
- * Copyright (C) 2004-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2008 Andre Noll <maan@systemlinux.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, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file ogg_afh.c para_server's ogg vorbis audio format handler */
#include <vorbis/codec.h>
#include <vorbis/vorbisfile.h>
-#include "server.h"
+#include "para.h"
+#include "afh.h"
#include "error.h"
#include "string.h"
+#include "afs.h"
+#include "server.h"
/** must be big enough to hold header */
#define CHUNK_SIZE 32768
static double chunk_time = 0.25;
+/** describes a memory-mapped ogg vorbis file */
struct ogg_datasource {
+ /** the memory mapping */
char *map;
+ /** this size of the mapping */
off_t numbytes;
+ /** the current position in the mapping */
off_t fpos;
};
0, /* no initial bytes */
c); /* the ov_open_callbacks */
- /* FIXME: provide better error codes */
if (ret == OV_EREAD)
return -E_OGG_READ;
if (ret == OV_ENOTVORBIS)
- return -E_OGG_READ;
+ return -E_VORBIS;
if (ret == OV_EVERSION)
- return -E_OGG_READ;
+ return -E_OGG_VERSION;
if (ret == OV_EBADHEADER)
- return -E_OGG_READ;
+ return -E_OGG_BAD_HEADER;
if (ret < 0)
- return -E_OGG_READ;
+ return -E_OGG_UNKNOWN_ERROR;
return 1;
}
-static int ogg_compute_header_len(char *map, off_t numbytes,
- struct audio_format_info *afi)
+static int ogg_compute_header_len(char *map, size_t numbytes,
+ struct afh_info *afhi)
{
- int ret, len = PARA_MIN(numbytes, CHUNK_SIZE);
- unsigned int serial;
+ int ret;
+ size_t len = PARA_MIN(numbytes, CHUNK_SIZE);
+ int serial;
char *buf;
+
ogg_page page;
ogg_packet packet;
vorbis_comment vc;
ogg_sync_init(sync_in);
vorbis_info_init(&vi);
vorbis_comment_init(&vc);
- buf = ogg_sync_buffer(sync_in, len);
+ buf = ogg_sync_buffer(sync_in, (long)len);
memcpy(buf, map, len);
- ogg_sync_wrote(sync_in, len);
+ ogg_sync_wrote(sync_in, (long)len);
ret = -E_SYNC_PAGEOUT;
- if (ogg_sync_pageout(sync_in, &page) <= 0)
+ if (ogg_sync_pageout(sync_in, &page) <= 0) {
+ free(stream_in);
+ free(stream_out);
goto err1;
+ }
serial = ogg_page_serialno(&page);
ogg_stream_init(stream_in, serial);
ogg_stream_init(stream_out, serial);
ret = ogg_stream_pagein(stream_in, &page);
if (ret < 0) {
- ret = E_STREAM_PAGEIN;
+ ret = -E_STREAM_PAGEIN;
goto err2;
}
ret = ogg_stream_packetout(stream_in, &packet);
ret = -E_VORBIS;
if (vorbis_synthesis_headerin(&vi, &vc, &packet) < 0)
goto err2;
- PARA_INFO_LOG("channels: %i, rate: %li\n", vi.channels, vi.rate);
+ PARA_DEBUG_LOG("channels: %i, rate: %li\n", vi.channels, vi.rate);
ogg_stream_packetin(stream_out, &packet);
ret = ogg_sync_pageout(sync_in, &page);
ogg_stream_packetout(stream_in, &packet);
ogg_stream_packetin(stream_out, &packet);
- afi->header_len = 0;
+ afhi->header_len = 0;
while (ogg_stream_flush(stream_out, &page))
- afi->header_len += page.body_len + page.header_len;
- PARA_INFO_LOG("header_len = %d\n", afi->header_len);
- afi->header_offset = 0;
+ afhi->header_len += page.body_len + page.header_len;
+ PARA_DEBUG_LOG("header_len = %d\n", afhi->header_len);
+ afhi->header_offset = 0;
ret = 1;
err2:
ogg_stream_destroy(stream_in);
* CHUNK_TIME begins. Always successful.
*/
static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
- struct audio_format_info *afi, double time_total)
+ struct afh_info *afhi, long unsigned time_total)
{
int i, ret, num;
ssize_t max_chunk_len, pos = 0, min = 0, old_pos;
num = time_total / chunk_time + 3;
PARA_DEBUG_LOG("chunk time: %g allocating %d chunk pointers\n",
chunk_time, num);
- afi->chunk_table = para_malloc((num + 1) * sizeof(size_t));
- afi->chunk_table[0] = 0;
+ afhi->chunk_table = para_malloc((num + 1) * sizeof(size_t));
+ afhi->chunk_table[0] = 0;
max_chunk_len = 0;
for (i = 1; ret <= num; i++) {
ogg_int64_t diff;
diff = pos - old_pos;
max_chunk_len = PARA_MAX(max_chunk_len, diff);
min = (i == 1)? diff : PARA_MIN(min, diff);
- afi->chunk_table[i] = pos;
+ afhi->chunk_table[i] = pos;
// if (i < 11 || !((i - 1) % 1000)|| i > num - 11)
// PARA_DEBUG_LOG("chunk #%d: %g secs, pos: %zd, "
// "size: %zd\n", i - 1,
}
num_chunks = i - 1;
//fi->chunk_table[i] = pos;
- PARA_INFO_LOG("%lu chunks (%fs), max chunk: %zd, min chunk: %zd\n",
+ PARA_DEBUG_LOG("%lu chunks (%fs), max chunk: %zd, min chunk: %zd\n",
num_chunks, chunk_time, max_chunk_len, min);
return num_chunks;
}
/*
* Init oggvorbis file and write some tech data to given pointers.
*/
-static int ogg_get_file_info(char *map, off_t numbytes,
- struct audio_format_info *afi)
+static int ogg_get_file_info(char *map, size_t numbytes,
+ struct afh_info *afhi)
{
int ret;
vorbis_info *vi;
};
struct ogg_datasource ods = {.map = map, .numbytes = numbytes, .fpos = 0};
- ret = ogg_compute_header_len(map, numbytes, afi);
+ ret = ogg_compute_header_len(map, numbytes, afhi);
if (ret < 0)
return ret;
ret = ogg_open_callbacks(&ods, &of, ovc);
vi = ov_info(&of, 0);
if (!vi)
goto err;
- afi->seconds_total = ov_time_total(&of, -1);
- afi->frequency = vi->rate;
- afi->bitrate = ov_bitrate(&of, 0);
- afi->channels = vi->channels;
- afi->chunks_total = ogg_compute_chunk_table(&of, afi, afi->seconds_total);
- sprintf(afi->info_string, "audio_file_info1:%lu x %lu, %ukHz, "
- "%d channels, %ukbps\n"
- "audio_file_info2: \n"
- "audio_file_info3: \n",
- afi->chunks_total, (long unsigned) (chunk_time * 1000 * 1000),
- afi->frequency / 1000, vi->channels, afi->bitrate / 1000
- );
- afi->chunk_tv.tv_sec = 0;
- afi->chunk_tv.tv_usec = 250 * 1000;
- tv_scale(3, &afi->chunk_tv, &afi->eof_tv);
+ afhi->seconds_total = ov_time_total(&of, -1);
+ afhi->frequency = vi->rate;
+ afhi->bitrate = ov_bitrate(&of, 0) / 1000;
+ afhi->channels = vi->channels;
+ afhi->chunks_total = ogg_compute_chunk_table(&of, afhi, afhi->seconds_total);
+ afhi->info_string[0] = '\0';
+ sprintf(afhi->info_string, "%s:\n%s:\n%s:\n",
+ status_item_list[SI_AUDIO_FILE_INFO],
+ status_item_list[SI_TAGINFO1],
+ status_item_list[SI_TAGINFO2]
+ );
+ afhi->chunk_tv.tv_sec = 0;
+ afhi->chunk_tv.tv_usec = 250 * 1000;
+ tv_scale(10 / afhi->channels, &afhi->chunk_tv, &afhi->eof_tv);
ret = 1;
err:
ov_clear(&of); /* keeps the file open */
projects / paraslash.git / blobdiff