/*
- * Copyright (C) 2004-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2007 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
#include "server.cmdline.h"
#include "server.h"
-#include "afs.h"
+#include "vss.h"
#include "afh.h"
#include "error.h"
#include "string.h"
+#include "fd.h"
-/* must be big enough to hold header */
+/** must be big enough to hold header */
#define CHUNK_SIZE 32768
static double chunk_time = 0.25;
static OggVorbis_File *oggvorbis_file;
static FILE *infile;
-static int header_len, oggbuf_len, vi_channels;
-static char *header, *oggbuf;
-static ssize_t *chunk_table, max_chunk_len;
+static int header_len, inbuf_size, vi_channels;
+static char *header, *inbuf;
+static ssize_t *chunk_table, max_chunk_len, num_chunks;
static struct audio_format_handler *af;
-static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal,
- num_chunks;
+static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal;
static int ogg_compute_header_len(void)
{
goto err2;
}
ret = -E_VORBIS;
- if (vorbis_synthesis_headerin(&vi, &vc, &packet) < 0) {
+ if (vorbis_synthesis_headerin(&vi, &vc, &packet) < 0)
goto err2;
- } else
- PARA_INFO_LOG("channels: %i, rate: %li\n", vi.channels,
- vi.rate);
+ PARA_INFO_LOG("channels: %i, rate: %li\n", vi.channels, vi.rate);
ogg_stream_packetin(stream_out, &packet);
ret = ogg_sync_pageout(sync_in, &page);
err1:
ogg_sync_destroy(sync_in);
vorbis_info_clear(&vi);
- vorbis_comment_clear(&vc);
+ vorbis_comment_clear(&vc);
return ret;
}
lp = i;
for (i = 2; i < num_chunks - lp; i++)
chunk_table[i] = chunk_table[i + lp];
-#endif
+#endif
}
num = time_total / chunk_time + 3;
PARA_DEBUG_LOG("chunk time: %g allocating %d chunk pointers\n",
chunk_time, num);
- chunk_table = para_malloc(num * sizeof(ogg_int64_t));
+ chunk_table = para_malloc(num * sizeof(size_t));
chunk_table[0] = 0;
max_chunk_len = 0;
rewind(infile);
num_chunks = i - 1;
chunk_table[i] = pos;
tunetable();
- PARA_INFO_LOG("%li chunks (%fs), max chunk: %zd, min chunk: %zd\n",
+ PARA_INFO_LOG("%zu chunks (%fs), max chunk: %zd, min chunk: %zd\n",
num_chunks, chunk_time, max_chunk_len, min);
rewind(infile);
}
free(chunk_table);
chunk_table = NULL;
num_chunks = 0;
- free(oggbuf);
- oggbuf = NULL;
- oggbuf_len = 0;
+ free(inbuf);
+ inbuf = NULL;
+ inbuf_size = 0;
}
static int ogg_save_header(FILE *file, int len)
* Init oggvorbis file and write some tech data to given pointers.
*/
static int ogg_get_file_info(FILE *file, char *info_str, long unsigned *frames,
- int *seconds)
+ int *seconds, size_t **vss_chunk_table)
{
int ret;
double time_total;
vi_channels = vi->channels;
ogg_compute_chunk_table(time_total);
*frames = num_chunks;
- sprintf(info_str, "audio_file_info1:%lu x %lu, %ldkHz, %d channels, %ldkbps\n"
+ *vss_chunk_table = chunk_table;
+ sprintf(info_str, "audio_file_info1:%zu x %lu, %ldkHz, %d channels, %ldkbps\n"
"audio_file_info2: \n"
"audio_file_info3: \n",
num_chunks, (long unsigned) (chunk_time * 1000 * 1000),
return ret;
}
-/*
- * Simple stream reposition routine
- */
-static int ogg_reposition_stream(long unsigned request)
-{
- int ret;
- long seek;
-
- seek = chunk_table[request];
- ret = fseek(infile, seek, SEEK_SET);
- PARA_DEBUG_LOG("seek to %li returned %d. offset:%li\n", seek,
- ret, ftell(infile));
- return ret < 0? -E_OGG_REPOS : 1;
-}
-
-static ogg_int64_t get_chunk_size(long unsigned chunk_num)
-{
- ogg_int64_t ret;
- if (chunk_num >= num_chunks)
- return -1;
- ret = chunk_table[chunk_num + 1] - chunk_table[chunk_num];
- if (!ret)
- return ret;
-#if 0
- PARA_DEBUG_LOG("chunk %d: %lli-%lli (%lli bytes)\n",
- chunk_num,
- chunk_table[chunk_num],
- chunk_table[chunk_num + 1] - 1,
- ret);
-#endif
- return ret;
-}
-
-char *ogg_read_chunk(long unsigned current_chunk, ssize_t *len)
-{
- int ret;
- ogg_int64_t cs = get_chunk_size(current_chunk);
- if (!cs) { /* nothing to send for this run */
- *len = 0;
- return oggbuf;
- }
- if (cs < 0) { /* eof */
- *len = 0;
- return NULL;
- }
- *len = cs;
- if (!oggbuf || oggbuf_len < *len) {
- PARA_INFO_LOG("increasing ogg buffer size (%d -> %zu)\n",
- oggbuf_len, *len);
- oggbuf = para_realloc(oggbuf, *len);
- oggbuf_len = *len;
- }
- ret = read(fileno(infile), oggbuf, *len);
- if (!ret) {
- *len = 0;
- return NULL;
- }
- if (ret < 0) {
- *len = -E_OGG_READ;
- return NULL;
- }
- if (ret != *len)
- PARA_WARNING_LOG("short read (%d/%zd)\n", ret, *len);
- *len = ret;
- return oggbuf;
-}
-
static char *ogg_get_header_info(int *len)
{
*len = header_len;
}
static const char* ogg_suffixes[] = {"ogg", NULL};
+
+/**
+ * the init function of the ogg vorbis audio format handler
+ *
+ * \param p pointer to the struct to initialize
+ */
void ogg_init(struct audio_format_handler *p)
{
af = p;
- af->reposition_stream = ogg_reposition_stream;
af->get_file_info = ogg_get_file_info,
- af->read_chunk = ogg_read_chunk;
af->close_audio_file = ogg_close_audio_file;
af->get_header_info = ogg_get_header_info;
af->chunk_tv.tv_sec = 0;
projects / paraslash.git / blobdiff