X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=60af9922f45b836065d66be73e130e653705ef6b;hp=eaed16210678d7c9ba6082f733b54264db7e325f;hb=d6dcce32b8e844b7a2ffeb5ff2e519e89fb7be3f;hpb=2c6032259d6536daabd4132a3737cac08ebdd018 diff --git a/ogg_afh.c b/ogg_afh.c index eaed1621..60af9922 100644 --- a/ogg_afh.c +++ b/ogg_afh.c @@ -1,19 +1,7 @@ /* * Copyright (C) 2004-2007 Andre Noll * - * 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 */ @@ -22,9 +10,7 @@ #include #include -#include "server.cmdline.h" #include "server.h" -#include "vss.h" #include "error.h" #include "string.h" @@ -32,9 +18,13 @@ #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; }; @@ -104,33 +94,28 @@ static int ogg_open_callbacks(void *datasource, OggVorbis_File *vf, ov_callbacks 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 void ogg_save_header(char *map, struct audio_format_info *afi) -{ - afi->header = para_malloc(afi->header_len); - memcpy(afi->header, map, afi->header_len); -} - -static int ogg_compute_header_len(char *map, off_t numbytes, +static int ogg_compute_header_len(char *map, size_t numbytes, struct audio_format_info *afi) { - 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; @@ -142,18 +127,21 @@ static int ogg_compute_header_len(char *map, off_t numbytes, 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); @@ -189,7 +177,7 @@ static int ogg_compute_header_len(char *map, off_t numbytes, 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); - ogg_save_header(map, afi); + afi->header_offset = 0; ret = 1; err2: ogg_stream_destroy(stream_in); @@ -207,7 +195,7 @@ err1: * CHUNK_TIME begins. Always successful. */ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of, - struct audio_format_info *afi, double time_total) + struct audio_format_info *afi, long unsigned time_total) { int i, ret, num; ssize_t max_chunk_len, pos = 0, min = 0, old_pos; @@ -218,10 +206,10 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of, 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 * sizeof(size_t)); + afi->chunk_table = para_malloc((num + 1) * sizeof(size_t)); afi->chunk_table[0] = 0; max_chunk_len = 0; - for (i = 1; ret == 0; i++) { + for (i = 1; ret <= num; i++) { ogg_int64_t diff; ret = ov_time_seek(of, i * chunk_time); if (ret) @@ -238,7 +226,7 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of, old_pos = pos; } num_chunks = i - 1; - afi->chunk_table[i] = pos; +//fi->chunk_table[i] = pos; PARA_INFO_LOG("%lu chunks (%fs), max chunk: %zd, min chunk: %zd\n", num_chunks, chunk_time, max_chunk_len, min); return num_chunks; @@ -247,14 +235,11 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of, /* * Init oggvorbis file and write some tech data to given pointers. */ -static int ogg_get_file_info(char *map, off_t numbytes, +static int ogg_get_file_info(char *map, size_t numbytes, struct audio_format_info *afi) { int ret; - double time_total; vorbis_info *vi; - ogg_int64_t raw_total; - long vi_sampling_rate, vi_bitrate; OggVorbis_File of; const ov_callbacks ovc = { .read_func = cb_read, @@ -274,18 +259,17 @@ static int ogg_get_file_info(char *map, off_t numbytes, vi = ov_info(&of, 0); if (!vi) goto err; - time_total = ov_time_total(&of, -1); - raw_total = ov_raw_total(&of, -1); - afi->seconds_total = time_total; - vi_sampling_rate = vi->rate; - vi_bitrate = ov_bitrate(&of, 0); - afi->chunks_total = ogg_compute_chunk_table(&of, afi, time_total); - sprintf(afi->info_string, "audio_file_info1:%lu x %lu, %ldkHz, " - "%d channels, %ldkbps\n" + 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), - vi_sampling_rate / 1000, vi->channels, vi_bitrate / 1000 + afi->frequency / 1000, vi->channels, afi->bitrate / 1000 ); afi->chunk_tv.tv_sec = 0; afi->chunk_tv.tv_usec = 250 * 1000; @@ -293,8 +277,6 @@ static int ogg_get_file_info(char *map, off_t numbytes, ret = 1; err: ov_clear(&of); /* keeps the file open */ - if (ret < 0) - free(afi->header); return ret; }