X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=ef42c497062c228ddab10497c3388ffa2b8de90b;hp=f0c1e43586aecebb45f3fac3732fa274eac54690;hb=7e37a7cf49df279b9ab467fa4f62dd376c791a26;hpb=03d45daad787b8f2ced3070e80c4550bf4b02931 diff --git a/ogg_afh.c b/ogg_afh.c index f0c1e435..ef42c497 100644 --- a/ogg_afh.c +++ b/ogg_afh.c @@ -1,300 +1,79 @@ /* - * Copyright (C) 2004-2009 Andre Noll + * Copyright (C) 2004-2011 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ -/** \file ogg_afh.c para_server's ogg vorbis audio format handler */ -#include -#include +/** \file ogg_afh.c Audio format handler for ogg/vorbis files. */ + #include -#include -#include +#include #include "para.h" -#include "error.h" #include "afh.h" +#include "error.h" #include "string.h" +#include "ogg_afh_common.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; +struct private_vorbis_data { + vorbis_info vi; + vorbis_comment vc; }; -static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource) -{ - struct ogg_datasource *ods = datasource; - size_t copy, ret; - - if (!size) - return 0; - - assert(ods->numbytes >= ods->fpos); - ret = ods->numbytes - ods->fpos; - copy = PARA_MIN(ret, 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) +static int vorbis_packet_callback(ogg_packet *packet, int packet_num, + struct afh_info *afhi, void *private_data) { - 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; -} + struct private_vorbis_data *pvd = private_data; -/* 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) + if (vorbis_synthesis_headerin(&pvd->vi, &pvd->vc, packet) < 0) 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 afh_info *afhi) -{ - int ret; - size_t len = PARA_MIN(numbytes, (size_t)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_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) { - 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; - goto err2; + if (packet_num == 0) { + if (pvd->vi.rate == 0) + return -E_VORBIS; + afhi->channels = pvd->vi.channels; + afhi->frequency = pvd->vi.rate; + afhi->bitrate = pvd->vi.bitrate_nominal / 1000; + PARA_DEBUG_LOG("channels: %i, sampling rate: %i, bitrate: %i\n", + afhi->channels, afhi->frequency, afhi->bitrate); + return 1; } - 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_DEBUG_LOG("channels: %i, rate: %li\n", vi.channels, vi.rate); - ogg_stream_packetin(stream_out, &packet); - 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_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); - - afhi->header_len = 0; - while (ogg_stream_flush(stream_out, &page)) - 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); -err1: - ogg_sync_destroy(sync_in); - vorbis_info_clear(&vi); - vorbis_comment_clear(&vc); - 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 afh_info *afhi, long unsigned time_total) -{ - int i, ret, num; - long unsigned num_chunks; - ogg_int64_t max = 0, min = 0, old_pos = 0; - - num = time_total / chunk_time + 3; - PARA_DEBUG_LOG("chunk time: %g allocating %d chunk pointers\n", - chunk_time, num); - afhi->chunk_table = para_malloc((num + 1) * sizeof(size_t)); - afhi->chunk_table[0] = 0; - for (i = 1; i <= num; i++) { - ogg_int64_t diff, pos; - ret = ov_time_seek(of, i * chunk_time); - if (ret) - break; - pos = ov_raw_tell(of); - diff = pos - old_pos; - max = PARA_MAX(max, diff); - min = (i == 1)? diff : PARA_MIN(min, diff); - afhi->chunk_table[i] = pos; - old_pos = pos; - } - num_chunks = i - 1; - PARA_DEBUG_LOG("%lu chunks (%fs), max chunk: %lld, min chunk: %lld\n", - num_chunks, chunk_time, (long long)max, (long long)min); - return num_chunks; -} - -static void ogg_get_vorbis_comments(OggVorbis_File *vf, struct afh_info *afhi) -{ - vorbis_comment *vc = ov_comment(vf,-1); - - if (!vc) - return; - 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)); + if (packet_num == 1) + return 1; /* we also want to have packet #2 */ + afhi->tags.artist = para_strdup(vorbis_comment_query(&pvd->vc, "artist", 0)); + afhi->tags.title = para_strdup(vorbis_comment_query(&pvd->vc, "title", 0)); + afhi->tags.album = para_strdup(vorbis_comment_query(&pvd->vc, "album", 0)); + afhi->tags.year = para_strdup(vorbis_comment_query(&pvd->vc, "year", 0)); + afhi->tags.comment = para_strdup(vorbis_comment_query(&pvd->vc, "comment", 0)); + return 0; } -/* - * Init oggvorbis file and write some tech data to given pointers. - */ -static int ogg_get_file_info(char *map, size_t numbytes, __a_unused int fd, +static int ogg_vorbis_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 private_vorbis_data pvd; + struct ogg_afh_callback_info vorbis_callback_info = { + .packet_callback = vorbis_packet_callback, + .private_data = &pvd, }; - struct ogg_datasource ods = {.map = map, .numbytes = numbytes, .fpos = 0}; - ret = ogg_compute_header_len(map, numbytes, afhi); - if (ret < 0) - return ret; - 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; - 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->chunk_tv.tv_sec = 0; - afhi->chunk_tv.tv_usec = 250 * 1000; - ogg_get_vorbis_comments(&of, afhi); - ret = 1; -err: - ov_clear(&of); /* keeps the file open */ + vorbis_info_init(&pvd.vi); + vorbis_comment_init(&pvd.vc); + ret = ogg_get_file_info(map, numbytes, afhi, &vorbis_callback_info); + vorbis_info_clear(&pvd.vi); + vorbis_comment_clear(&pvd.vc); 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) { - afh->get_file_info = ogg_get_file_info, + afh->get_file_info = ogg_vorbis_get_file_info, afh->suffixes = ogg_suffixes; }