X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=0ea3569a5b3e689ba1f257b09f73b3eacf943ff3;hp=1df5fd6f68e2e17ce119324d24b371c0230005d8;hb=80e46ec589d14be2fa4b0704f613a04ecb1b64c4;hpb=70fd254ad455c84bec186ff6f7291b1405eed267 diff --git a/ogg_afh.c b/ogg_afh.c index 1df5fd6f..0ea3569a 100644 --- a/ogg_afh.c +++ b/ogg_afh.c @@ -1,19 +1,7 @@ /* - * Copyright (C) 2004-2007 Andre Noll + * Copyright (C) 2004-2008 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,27 +10,72 @@ #include #include -#include "server.cmdline.h" -#include "server.h" -#include "vss.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; +}; + static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource) { - FILE *f = datasource; - return fread(buf, size, nmemb, f); + struct ogg_datasource *ods = datasource; + size_t copy = PARA_MIN(ods->numbytes - ods->fpos, size * nmemb), + ret = copy / size; + if (!ret) + return 0; + memcpy(buf, ods->map + ods->fpos, copy); +// PARA_INFO_LOG("size: %zd, nmemb: %zd, ret: %zd\n", size, nmemb, ret); + ods->fpos += ret * size; + return ret; } -static int cb_seek(__a_unused void *datasource, ogg_int64_t offset, +static int cb_seek(void *datasource, ogg_int64_t offset, int whence) { - FILE *f = datasource; - return fseek(f, offset, whence); + struct ogg_datasource *ods = datasource; + switch (whence) { + case SEEK_SET: + if (offset >= 0 && offset <= ods->numbytes) { + ods->fpos = offset; + return 0; + } + errno = EINVAL; + return -1; + break; + case SEEK_END: + if (offset <= 0 && -offset <= ods->numbytes) { + ods->fpos = ods->numbytes + offset; + return 0; + } + errno = EINVAL; + return -1; + break; + case SEEK_CUR: + if ((offset >= 0 && offset + ods->fpos > ods->numbytes) || + (offset < 0 && offset + ods->fpos < 0)) { + errno = EINVAL; + return -1; + } + ods->fpos += offset; + return 0; + } + errno = EINVAL; + return -1; } /* don't do anything as vss still needs the open filehandle */ @@ -53,8 +86,8 @@ static int cb_close(__a_unused void *datasource) static long cb_tell(void *datasource) { - FILE *f = datasource; - return ftell(f); + struct ogg_datasource *ods = datasource; + return (unsigned long)ods->fpos; } static int ogg_open_callbacks(void *datasource, OggVorbis_File *vf, ov_callbacks c) @@ -64,39 +97,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 int ogg_save_header(FILE *file, struct audio_format_info *afi) +static int ogg_compute_header_len(char *map, size_t numbytes, + struct afh_info *afhi) { int ret; - - afi->header = para_malloc(afi->header_len); - rewind(file); - ret = read(fileno(file), afi->header, afi->header_len); - if (ret == afi->header_len) - return 1; - free(afi->header); - return -E_OGG_READ; -} - -static int ogg_compute_header_len(FILE *file, struct audio_format_info *afi) -{ - int ret, len, in = fileno(file); - unsigned int serial; + size_t len = PARA_MIN(numbytes, CHUNK_SIZE); + int serial; char *buf; + ogg_page page; ogg_packet packet; vorbis_comment vc; @@ -108,21 +130,21 @@ static int ogg_compute_header_len(FILE *file, struct audio_format_info *afi) ogg_sync_init(sync_in); vorbis_info_init(&vi); vorbis_comment_init(&vc); - buf = ogg_sync_buffer(sync_in, CHUNK_SIZE); - len = read(in, buf, CHUNK_SIZE); - ret = -E_OGG_READ; - if (len <= 0) - goto err1; - ogg_sync_wrote(sync_in, len); + buf = ogg_sync_buffer(sync_in, (long)len); + memcpy(buf, map, 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); @@ -133,7 +155,7 @@ static int ogg_compute_header_len(FILE *file, struct audio_format_info *afi) 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); @@ -154,11 +176,12 @@ static int ogg_compute_header_len(FILE *file, struct audio_format_info *afi) 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); - ret = ogg_save_header(file, afi); + 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); ogg_stream_destroy(stream_out); @@ -175,7 +198,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 afh_info *afhi, long unsigned time_total) { int i, ret, num; ssize_t max_chunk_len, pos = 0, min = 0, old_pos; @@ -186,10 +209,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[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 == 0; i++) { + for (i = 1; ret <= num; i++) { ogg_int64_t diff; ret = ov_time_seek(of, i * chunk_time); if (ret) @@ -198,7 +221,7 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of, 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, @@ -206,8 +229,8 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of, old_pos = pos; } num_chunks = i - 1; - afi->chunk_table[i] = pos; - PARA_INFO_LOG("%lu chunks (%fs), max chunk: %zd, min chunk: %zd\n", +//fi->chunk_table[i] = pos; + PARA_DEBUG_LOG("%lu chunks (%fs), max chunk: %zd, min chunk: %zd\n", num_chunks, chunk_time, max_chunk_len, min); return num_chunks; } @@ -215,58 +238,47 @@ 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(FILE *file, struct audio_format_info *afi) +static int ogg_get_file_info(char *map, size_t numbytes, + struct afh_info *afhi) { int ret; - double time_total; vorbis_info *vi; - ogg_int64_t raw_total; - long vi_sampling_rate, vi_bitrate; OggVorbis_File of; - static const ov_callbacks ovc = { + const ov_callbacks ovc = { .read_func = cb_read, .seek_func = cb_seek, .close_func = cb_close, .tell_func = cb_tell }; + struct ogg_datasource ods = {.map = map, .numbytes = numbytes, .fpos = 0}; - if (!file) - return -E_OGG_NO_FILE; - ret = ogg_compute_header_len(file, afi); + ret = ogg_compute_header_len(map, numbytes, afhi); if (ret < 0) return ret; - rewind(file); - ret = ogg_open_callbacks(file, &of, ovc); + ret = ogg_open_callbacks(&ods, &of, ovc); if (ret < 0) goto err; ret = -E_OGG_INFO; 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); - rewind(file); - afi->chunks_total = ogg_compute_chunk_table(&of, afi, time_total); - rewind(file); - sprintf(afi->info_string, "audio_file_info1:%lu x %lu, %ldkHz, " - "%d channels, %ldkbps\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 - ); - rewind(file); - 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 */ - if (ret < 0) - free(afi->header); return ret; }