X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=65573cfccf08c4e853231ade26509d8c3ee5c278;hp=2b4c100a9f32c7f1091b568680aee97598a6d7e0;hb=c9c96581d5a29830f555079e861dcac8d48722d5;hpb=4a262fc2d915538dd5ebaa58fa5ec7403de650cd diff --git a/ogg_afh.c b/ogg_afh.c index 2b4c100a..65573cfc 100644 --- a/ogg_afh.c +++ b/ogg_afh.c @@ -1,19 +1,20 @@ /* - * Copyright (C) 2004-2007 Andre Noll + * Copyright (C) 2004-2009 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 #include #include #include +#include #include "para.h" -#include "afh.h" -#include "server.h" #include "error.h" +#include "afh.h" #include "string.h" /** must be big enough to hold header */ @@ -33,8 +34,15 @@ struct ogg_datasource { static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource) { struct ogg_datasource *ods = datasource; - size_t copy = PARA_MIN(ods->numbytes - ods->fpos, size * nmemb), - ret = copy / size; + 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); @@ -111,10 +119,10 @@ static int ogg_open_callbacks(void *datasource, OggVorbis_File *vf, ov_callbacks } static int ogg_compute_header_len(char *map, size_t numbytes, - struct audio_format_info *afi) + struct afh_info *afhi) { int ret; - size_t len = PARA_MIN(numbytes, CHUNK_SIZE); + size_t len = PARA_MIN(numbytes, (size_t)CHUNK_SIZE); int serial; char *buf; @@ -156,7 +164,6 @@ static int ogg_compute_header_len(char *map, size_t numbytes, 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; @@ -175,11 +182,11 @@ static int ogg_compute_header_len(char *map, size_t numbytes, 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_DEBUG_LOG("header_len = %d\n", afi->header_len); - afi->header_offset = 0; + 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); @@ -197,48 +204,53 @@ err1: * CHUNK_TIME begins. Always successful. */ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of, - struct audio_format_info *afi, long unsigned 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; long unsigned num_chunks; + ogg_int64_t max = 0, min = 0, old_pos = 0; - 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; + 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_chunk_len = PARA_MAX(max_chunk_len, diff); + max = PARA_MAX(max, 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); + afhi->chunk_table[i] = pos; old_pos = pos; } num_chunks = i - 1; -//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); + 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)); +} + /* * 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) +static int ogg_get_file_info(char *map, size_t numbytes, __a_unused int fd, + struct afh_info *afhi) { int ret; vorbis_info *vi; @@ -251,7 +263,7 @@ static int ogg_get_file_info(char *map, size_t numbytes, }; struct ogg_datasource ods = {.map = map, .numbytes = numbytes, .fpos = 0}; - ret = ogg_compute_header_len(map, numbytes, afi); + ret = ogg_compute_header_len(map, numbytes, afhi); if (ret < 0) return ret; ret = ogg_open_callbacks(&ods, &of, ovc); @@ -261,21 +273,14 @@ static int ogg_get_file_info(char *map, size_t numbytes, 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); + 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 */