X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=4b44ea16664948da6cd52adca357b5cb037c3223;hp=94383c4564156cb7f608c9eaa9a7b6b5e8846614;hb=60ef885705932a682097ad2b9f2379282d814e79;hpb=df3c03e72911edb31e7f1e32ebe29dad063e3b70 diff --git a/ogg_afh.c b/ogg_afh.c index 94383c45..4b44ea16 100644 --- a/ogg_afh.c +++ b/ogg_afh.c @@ -1,300 +1,197 @@ /* - * Copyright (C) 2004-2007 Andre Noll + * Copyright (C) 2004-2010 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 */ + +/** \file ogg_afh.c Audio format handler for ogg vorbis files. */ #include #include #include -#include +#include -#include "server.h" +#include "para.h" +#include "afh.h" #include "error.h" #include "string.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) +/* Taken from decoder_example.c of libvorbis-1.2.3. */ +static int read_vorbis_comment(ogg_sync_state *oss, ogg_stream_state *stream, + vorbis_info *vi, vorbis_comment *vc) { - 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(void *datasource, ogg_int64_t offset, - int 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; + ogg_page page; + ogg_packet packet; + int i = 0; + + while (i < 2) { + while (i < 2) { + int ret = ogg_sync_pageout(oss, &page); + if (ret == 0) + break; /* Need more data */ + if (ret != 1) + continue; + /* + * We can ignore any errors here as they'll also become + * apparent at packetout. + */ + ogg_stream_pagein(stream, &page); + while (i < 2) { + ret = ogg_stream_packetout(stream, &packet); + if (ret == 0) + break; + if (ret < 0) + return -E_STREAM_PACKETOUT; + ret = vorbis_synthesis_headerin(vi, vc, + &packet); + if (ret < 0) + return -E_VORBIS; + i++; + } } - ods->fpos += offset; - return 0; } - errno = EINVAL; - return -1; -} - -/* don't do anything as vss still needs the open filehandle */ -static int cb_close(__a_unused void *datasource) -{ - return 0; -} - -static long cb_tell(void *datasource) -{ - struct ogg_datasource *ods = datasource; - return (unsigned long)ods->fpos; -} - -static int ogg_open_callbacks(void *datasource, OggVorbis_File *vf, ov_callbacks c) -{ - int ret = ov_open_callbacks(datasource, vf, - NULL, /* no initial buffer */ - 0, /* no initial bytes */ - c); /* the ov_open_callbacks */ - - if (ret == OV_EREAD) - return -E_OGG_READ; - if (ret == OV_ENOTVORBIS) - return -E_VORBIS; - if (ret == OV_EVERSION) - return -E_OGG_VERSION; - if (ret == OV_EBADHEADER) - return -E_OGG_BAD_HEADER; - if (ret < 0) - return -E_OGG_UNKNOWN_ERROR; return 1; - } -static int ogg_compute_header_len(char *map, size_t numbytes, - struct audio_format_info *afi) +static int read_vorbis_info(ogg_sync_state *oss, struct afh_info *afhi) { - int ret; - size_t len = PARA_MIN(numbytes, CHUNK_SIZE); - int serial; - char *buf; - - ogg_page page; - ogg_packet packet; vorbis_comment vc; vorbis_info vi; - ogg_stream_state *stream_in = para_malloc(sizeof(ogg_stream_state)); - ogg_stream_state *stream_out = para_malloc(sizeof(ogg_stream_state)); - ogg_sync_state *sync_in = para_malloc(sizeof(ogg_sync_state)); + ogg_packet packet; + ogg_stream_state stream; + ogg_page page; + int ret; - ogg_sync_init(sync_in); vorbis_info_init(&vi); vorbis_comment_init(&vc); - 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) - 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; - goto err2; - } - ret = ogg_stream_packetout(stream_in, &packet); - if (ret != 1) { - ret = -E_STREAM_PACKETOUT; - goto err2; - } - 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); - ogg_stream_packetin(stream_out, &packet); + if (ogg_sync_pageout(oss, &page) != 1) + goto out; - ret = ogg_sync_pageout(sync_in, &page); - if (ret <= 0) { - ret = -E_SYNC_PAGEOUT; - goto err2; - } - ogg_stream_pagein(stream_in, &page); - ogg_stream_packetout(stream_in, &packet); - ogg_stream_packetin(stream_out, &packet); + ret = ogg_page_serialno(&page); + ogg_stream_init(&stream, ret); - ret = ogg_sync_pageout(sync_in, &page); - if (ret <= 0) { - ret = -E_SYNC_PAGEOUT; - goto err2; - } - ogg_stream_pagein(stream_in, &page); - ogg_stream_packetout(stream_in, &packet); - ogg_stream_packetin(stream_out, &packet); + ret = -E_STREAM_PAGEIN; + if (ogg_stream_pagein(&stream, &page) < 0) + goto out; + + ret = -E_STREAM_PACKETOUT; + if (ogg_stream_packetout(&stream, &packet) != 1) + goto out; - afi->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; + ret = -E_VORBIS; + if (vorbis_synthesis_headerin(&vi, &vc, &packet) < 0) + goto out; + if (vi.rate == 0) + goto out; + afhi->channels = vi.channels; + afhi->frequency = vi.rate; + afhi->bitrate = vi.bitrate_nominal / 1000; + PARA_DEBUG_LOG("channels: %i, sampling rate: %i, bitrate: %i\n", + afhi->channels, afhi->frequency, afhi->bitrate); + ret = read_vorbis_comment(oss, &stream, &vi, &vc); + if (ret < 0) + goto out; + afhi->tags.artist = para_strdup(vorbis_comment_query(&vc, "artist", 0)); + afhi->tags.title = para_strdup(vorbis_comment_query(&vc, "title", 0)); + afhi->tags.album = para_strdup(vorbis_comment_query(&vc, "album", 0)); + afhi->tags.year = para_strdup(vorbis_comment_query(&vc, "year", 0)); + afhi->tags.comment = para_strdup(vorbis_comment_query(&vc, "comment", 0)); + + afhi->header_offset = 0; + afhi->header_len = oss->returned; ret = 1; -err2: - ogg_stream_destroy(stream_in); - ogg_stream_destroy(stream_out); -err1: - ogg_sync_destroy(sync_in); +out: vorbis_info_clear(&vi); vorbis_comment_clear(&vc); + //ogg_stream_clear(&stream); return ret; } -/* - * Alloc and fill array table of byte offsets. chunk_table[i] is the - * offset in the current input file at which the sample containing time i * - * CHUNK_TIME begins. Always successful. - */ -static long unsigned ogg_compute_chunk_table(OggVorbis_File *of, - struct audio_format_info *afi, long unsigned time_total) +static void set_chunk_tv(int num_frames, int num_chunks, int frequency, + struct timeval *result) { - int i, ret, num; - ssize_t max_chunk_len, pos = 0, min = 0, old_pos; - long unsigned num_chunks; + uint64_t x = (uint64_t)num_frames * 1000 * 1000 + / frequency / num_chunks; - old_pos = 0; - ret = 0; - 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; - max_chunk_len = 0; - for (i = 1; ret <= num; i++) { - ogg_int64_t diff; - ret = ov_time_seek(of, i * chunk_time); - if (ret) - break; - pos = ov_raw_tell(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; -// if (i < 11 || !((i - 1) % 1000)|| i > num - 11) -// PARA_DEBUG_LOG("chunk #%d: %g secs, pos: %zd, " -// "size: %zd\n", i - 1, -// i * chunk_time, pos, pos - old_pos); - old_pos = pos; - } - num_chunks = i - 1; -//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; + result->tv_sec = x / 1000 / 1000; + result->tv_usec = x % (1000 * 1000); + PARA_INFO_LOG("%d chunks, chunk time: %lums\n", num_chunks, + tv2ms(result)); } -/* - * Init oggvorbis file and write some tech data to given pointers. - */ -static int ogg_get_file_info(char *map, size_t numbytes, - struct audio_format_info *afi) +/* Write tech data to given audio format handler struct. */ +static int ogg_get_file_info(char *map, size_t numbytes, __a_unused int fd, + struct afh_info *afhi) { - int ret; - vorbis_info *vi; - OggVorbis_File of; - 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}; - - ret = ogg_compute_header_len(map, numbytes, afi); - if (ret < 0) - return ret; - ret = ogg_open_callbacks(&ods, &of, ovc); + ogg_sync_state oss; + ogg_page op; + long len = numbytes; + char *buf; + int ret, i, j, frames_per_chunk, ct_size; + long long unsigned num_frames = 0; + + ogg_sync_init(&oss); + ret = -E_OGG_SYNC; + buf = ogg_sync_buffer(&oss, len); + if (!buf) + goto out; + memcpy(buf, map, len); + ret = -E_OGG_SYNC; + if (ogg_sync_wrote(&oss, len) < 0) + goto out; + ret = read_vorbis_info(&oss, afhi); if (ret < 0) - goto err; - ret = -E_OGG_INFO; - 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); - ret = 1; -err: - ov_clear(&of); /* keeps the file open */ + goto out; + oss.returned = 0; + oss.fill = numbytes; + /* count ogg packages and get duration of the file */ + for (i = 0; ogg_sync_pageseek(&oss, &op) > 0; i++) + num_frames = ogg_page_granulepos(&op); + PARA_INFO_LOG("%d pages, %llu frames\n", i, num_frames); + ret = -E_OGG_EMPTY; + if (i == 0) + goto out; + afhi->seconds_total = num_frames / afhi->frequency; + /* use roughly one page per chunk */ + frames_per_chunk = num_frames / i; + PARA_INFO_LOG("%lu seconds, %d frames/chunk\n", + afhi->seconds_total, frames_per_chunk); + ct_size = 250; + afhi->chunk_table = para_malloc(ct_size * sizeof(uint32_t)); + afhi->chunk_table[0] = 0; + afhi->chunk_table[1] = afhi->header_len; + oss.returned = afhi->header_len; + oss.fill = numbytes; + for (i = 0, j = 1; ogg_sync_pageseek(&oss, &op) > 0; i++) { + int granule = ogg_page_granulepos(&op); + + while (granule > j * frames_per_chunk) { + j++; + if (j >= ct_size) { + ct_size *= 2; + afhi->chunk_table = para_realloc( + afhi->chunk_table, + ct_size * sizeof(uint32_t)); + } + afhi->chunk_table[j] = oss.returned; + } + } + afhi->chunks_total = j; + set_chunk_tv(num_frames, j, afhi->frequency, &afhi->chunk_tv); + ret = 0; +out: + ogg_sync_clear(&oss); return ret; } static const char* ogg_suffixes[] = {"ogg", NULL}; /** - * the init function of the ogg vorbis audio format handler + * The init function of the ogg vorbis audio format handler. * - * \param afh pointer to the struct to initialize + * \param afh Pointer to the struct to initialize. */ void ogg_init(struct audio_format_handler *afh) {