X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=93ad14bbf9c0b5cbade554fbf22103ef460956fa;hp=6211deb3d0e27fe410854cd92ccfb60c8fc70f8a;hb=f932f45196a8a4480ad910c455abe8aae9824967;hpb=024e8b17ad91b3f36d826be3d68faec4e2100fa8 diff --git a/ogg_afh.c b/ogg_afh.c index 6211deb3..93ad14bb 100644 --- a/ogg_afh.c +++ b/ogg_afh.c @@ -1,291 +1,186 @@ -/* - * 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. - */ -/** \file ogg_afh.c para_server's ogg vorbis audio format handler */ +/* Copyright (C) 2004 Andre Noll , see file COPYING. */ + +/** \file ogg_afh.c Audio format handler for ogg/vorbis files. */ -#include -#include #include -#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 "ogg_afh_common.h" -/** must be big enough to hold header */ -#define CHUNK_SIZE 32768 -static double chunk_time = 0.25; - -static OggVorbis_File *oggvorbis_file; -static int header_len; -static char *header; -static ssize_t *chunk_table; -static struct audio_format_handler *af; - -static int ogg_compute_header_len(FILE *file) -{ - int ret, len, in = fileno(file); - unsigned int serial; - char *buf; - ogg_page page; - ogg_packet packet; - vorbis_comment vc; +struct private_vorbis_data { 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, CHUNK_SIZE); - len = read(in, buf, CHUNK_SIZE); - ret = -E_OGG_READ; - if (len <= 0) - goto err1; - ogg_sync_wrote(sync_in, 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); - - 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); + vorbis_comment vc; +}; - ret = ogg_sync_pageout(sync_in, &page); - if (ret <= 0) { - ret = -E_SYNC_PAGEOUT; - goto err2; +/* + * Vorbis uses three header packets, all of which are required: the + * identification header, the comments header, and the setup header. + * + * The identification header identifies the bitstream as Vorbis. It contains + * the Vorbis version and simple audio characteristics of the stream such as + * sample rate and number of channels. + * + * The comment header includes user text comments (tags) and a vendor string + * for the application/library that produced the bitstream. + * + * The setup header includes extensive CODEC setup information as well as the + * complete VQ and Huffman codebooks needed for decoding. + */ +static int vorbis_packet_callback(ogg_packet *packet, int packet_num, + __a_unused int serial, struct afh_info *afhi, void *private_data) +{ + struct private_vorbis_data *pvd = private_data; + + if (vorbis_synthesis_headerin(&pvd->vi, &pvd->vc, packet) < 0) + return -E_VORBIS; + 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; } - ogg_stream_pagein(stream_in, &page); - ogg_stream_packetout(stream_in, &packet); - ogg_stream_packetin(stream_out, &packet); - - header_len = 0; - while (ogg_stream_flush(stream_out, &page)) - header_len += page.body_len + page.header_len; - ret = len; - PARA_INFO_LOG("header_len = %d\n", header_len); -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; + 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; } -static void tunetable(long unsigned num_chunks) +static int ogg_vorbis_get_file_info(char *map, size_t numbytes, __a_unused int fd, + struct afh_info *afhi) { - int i = 1, j = -1, lp = 1; - while (i < num_chunks) { - if (chunk_table[i] == chunk_table[lp]) { - i++; - continue; - } - if (j < 0) - tv_scale(i, &af->chunk_tv, &af->eof_tv); - for (j = lp; j < i; j++) - chunk_table[j] = chunk_table[i]; - lp = i; - } -#if 1 - for (i = 2; i < num_chunks; i++) - if (chunk_table[i] != chunk_table[1]) - break; - lp = i; - for (i = 2; i < num_chunks - lp; i++) - chunk_table[i] = chunk_table[i + lp]; -#endif + int ret; + struct private_vorbis_data pvd; + struct oac_callback_info vorbis_callback_info = { + .packet_callback = vorbis_packet_callback, + .private_data = &pvd, + }; + + vorbis_info_init(&pvd.vi); + vorbis_comment_init(&pvd.vc); + ret = oac_get_file_info(map, numbytes, afhi, &vorbis_callback_info); + vorbis_info_clear(&pvd.vi); + vorbis_comment_clear(&pvd.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. - */ -static long unsigned ogg_compute_chunk_table(double time_total) +static int vorbis_get_header_callback(ogg_packet *packet, int packet_num, + int serial, __a_unused struct afh_info *afhi, void *private_data) { - int i, ret, num; - ssize_t max_chunk_len, pos = 0, min = 0, old_pos; - long unsigned 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); - chunk_table = para_malloc(num * sizeof(size_t)); - chunk_table[0] = 0; - max_chunk_len = 0; - for (i = 1; ret == 0; i++) { - ogg_int64_t diff; - ret = ov_time_seek(oggvorbis_file, i * chunk_time); - if (ret) - break; - pos = ov_raw_tell(oggvorbis_file); - diff = pos - old_pos; - max_chunk_len = PARA_MAX(max_chunk_len, diff); - min = (i == 1)? diff : PARA_MIN(min, diff); - 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; + int ret; + struct oac_custom_header *h = private_data; + static unsigned char dummy_packet[] = { + 0x03, + 'v', 'o', 'r', 'b', 'i', 's', + 0x06, 0x00, 0x00, 0x00, + 'd', 'u', 'm', 'm', 'y', '\0', + 0x00, 0x00, 0x00, 0x00, /* no comment :) */ + 0xff /* framing bit */ + }; + + PARA_DEBUG_LOG("processing ogg packet #%d\n", packet_num); + if (packet_num == 0) { + oac_custom_header_init(serial, h); + ret = oac_custom_header_append(packet, h); + if (ret < 0) + return ret; + oac_custom_header_flush(h); + return 1; + } + if (packet_num == 1) { + ogg_packet replacement = *packet; + PARA_INFO_LOG("replacing metadata packet\n"); + replacement.packet = dummy_packet; + replacement.bytes = sizeof(dummy_packet); + ret = oac_custom_header_append(&replacement, h); + return ret < 0? ret : 1; } - num_chunks = i - 1; - chunk_table[i] = pos; - tunetable(num_chunks); - PARA_INFO_LOG("%lu chunks (%fs), max chunk: %zd, min chunk: %zd\n", - num_chunks, chunk_time, max_chunk_len, min); - return num_chunks; + assert(packet_num == 2); + ret = oac_custom_header_append(packet, h); + if (ret < 0) + return ret; + oac_custom_header_flush(h); + return 0; } -static void ogg_close_audio_file(void) +static void vorbis_get_header(void *map, size_t mapsize, char **buf, + size_t *len) { - if (oggvorbis_file) { - PARA_DEBUG_LOG("%s", "ov_clear\n"); - ov_clear(oggvorbis_file); - free(oggvorbis_file); - oggvorbis_file = NULL; - } - free(header); - header = NULL; - header_len = 0; - free(chunk_table); - chunk_table = NULL; + int ret; + struct oac_custom_header *h = oac_custom_header_new(); + struct oac_callback_info cb = { + .packet_callback = vorbis_get_header_callback, + .private_data = h, + }; + + ret = oac_get_file_info(map, mapsize, NULL, &cb); + *len = oac_custom_header_get(buf, h); + if (ret < 0) { + PARA_ERROR_LOG("could not create ogg/vorbis header: %s\n", + para_strerror(-ret)); + free(*buf); + *buf = NULL; + *len = 0; + } else + PARA_INFO_LOG("created %zu byte ogg vorbis header\n", *len); } -static int ogg_save_header(FILE *file, int len) +static int vorbis_make_meta_packet(struct taginfo *tags, ogg_packet *result) { + vorbis_comment vc; int ret; - header = para_malloc(len); - rewind(file); - ret = read(fileno(file), header, len); - if (ret != len) - return -E_OGG_READ; + vorbis_comment_init(&vc); + vorbis_comment_add_tag(&vc, "artist", tags->artist); + vorbis_comment_add_tag(&vc, "title", tags->title); + vorbis_comment_add_tag(&vc, "album", tags->album); + vorbis_comment_add_tag(&vc, "year", tags->year); + vorbis_comment_add_tag(&vc, "comment", tags->comment); + ret = vorbis_commentheader_out(&vc, result); + vorbis_comment_clear(&vc); + if (ret != 0) + return -E_VORBIS_COMMENTHEADER; return 1; } -/* - * Init oggvorbis file and write some tech data to given pointers. - */ -static int ogg_get_file_info(FILE *file, char *info_str, long unsigned *frames, - int *seconds, size_t **vss_chunk_table) +static int vorbis_rewrite_tags(const char *map, size_t mapsize, + struct taginfo *tags, int output_fd, + __a_unused const char *filename) { int ret; - double time_total; - vorbis_info *vi; - ogg_int64_t raw_total; - long vi_sampling_rate, vi_bitrate; + ogg_packet packet; - if (!file) - return -E_OGG_NO_FILE; - ret = ogg_compute_header_len(file); - if (ret < 0) - return ret; - ret = ogg_save_header(file, header_len); + ret = vorbis_make_meta_packet(tags, &packet); if (ret < 0) return ret; - rewind(file); - oggvorbis_file = para_malloc(sizeof(OggVorbis_File)); - ret = ov_open(file, oggvorbis_file, NULL, 0); - if (ret < 0) { - free(oggvorbis_file); - free(header); - return -E_OGG_OPEN; - } - ret = -E_OGG_INFO; - vi = ov_info(oggvorbis_file, 0); - if (!vi) - goto err; - time_total = ov_time_total(oggvorbis_file, -1); - raw_total = ov_raw_total(oggvorbis_file, -1); - *seconds = time_total; - vi_sampling_rate = vi->rate; - vi_bitrate = ov_bitrate(oggvorbis_file, 0); - rewind(file); - *frames = ogg_compute_chunk_table(time_total); - rewind(file); - *vss_chunk_table = chunk_table; - sprintf(info_str, "audio_file_info1:%lu x %lu, %ldkHz, %d channels, %ldkbps\n" - "audio_file_info2: \n" - "audio_file_info3: \n", - *frames, (long unsigned) (chunk_time * 1000 * 1000), - vi_sampling_rate / 1000, vi->channels, vi_bitrate / 1000 - ); - rewind(file); - return 1; -err: - ogg_close_audio_file(); + ret = oac_rewrite_tags(map, mapsize, output_fd, (char *)packet.packet, + packet.bytes); + free(packet.packet); return ret; } -static char *ogg_get_header_info(int *len) -{ - *len = header_len; - return header; -} - -static const char* ogg_suffixes[] = {"ogg", NULL}; +static const char * const 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 p pointer to the struct to initialize + * \param afh Pointer to the struct to initialize. */ -void ogg_init(struct audio_format_handler *p) +void ogg_afh_init(struct audio_format_handler *afh) { - af = p; - af->get_file_info = ogg_get_file_info, - af->close_audio_file = ogg_close_audio_file; - af->get_header_info = ogg_get_header_info; - af->chunk_tv.tv_sec = 0; - af->chunk_tv.tv_usec = 250 * 1000; - tv_scale(3, &af->chunk_tv, &af->eof_tv); - af->suffixes = ogg_suffixes; + afh->get_file_info = ogg_vorbis_get_file_info; + afh->get_header = vorbis_get_header; + afh->suffixes = ogg_suffixes; + afh->rewrite_tags = vorbis_rewrite_tags; }