-/*
- * Copyright (C) 2004-2007 Andre Noll <maan@systemlinux.org>
- *
- * 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 <maan@tuebingen.mpg.de>, see file COPYING. */
+
+/** \file ogg_afh.c Audio format handler for ogg/vorbis files. */
-#include <inttypes.h>
-#include <ogg/ogg.h>
#include <vorbis/codec.h>
-#include <vorbis/vorbisfile.h>
+#include <regex.h>
-#include "server.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;
-
-struct ogg_datasource {
- char *map;
- off_t numbytes;
- 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 = 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)
+/*
+ * 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 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;
+ 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;
}
- errno = EINVAL;
- return -1;
-}
-
-/* don't do anything as vss still needs the open filehandle */
-static int cb_close(__a_unused void *datasource)
-{
+ 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 long cb_tell(void *datasource)
+static int ogg_vorbis_get_file_info(char *map, size_t numbytes, __a_unused int fd,
+ struct afh_info *afhi)
{
- struct ogg_datasource *ods = datasource;
- return (unsigned long)ods->fpos;
+ 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;
}
-static int ogg_open_callbacks(void *datasource, OggVorbis_File *vf, ov_callbacks c)
+static int vorbis_get_header_callback(ogg_packet *packet, int packet_num,
+ int serial, __a_unused struct afh_info *afhi, void *private_data)
{
- int ret = ov_open_callbacks(datasource, vf,
- NULL, /* no initial buffer */
- 0, /* no initial bytes */
- c); /* the ov_open_callbacks */
+ 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 */
+ };
- /* FIXME: provide better error codes */
- if (ret == OV_EREAD)
- return -E_OGG_READ;
- if (ret == OV_ENOTVORBIS)
- return -E_OGG_READ;
- if (ret == OV_EVERSION)
- return -E_OGG_READ;
- if (ret == OV_EBADHEADER)
- return -E_OGG_READ;
+ 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;
+ }
+ assert(packet_num == 2);
+ ret = oac_custom_header_append(packet, h);
if (ret < 0)
- return -E_OGG_READ;
- return 1;
-
+ return ret;
+ oac_custom_header_flush(h);
+ return 0;
}
-static void ogg_save_header(char *map, struct audio_format_info *afi)
+static void vorbis_get_header(void *map, size_t mapsize, char **buf,
+ size_t *len)
{
- afi->header = para_malloc(afi->header_len);
- memcpy(afi->header, map, afi->header_len);
+ 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_compute_header_len(char *map, off_t numbytes,
- struct audio_format_info *afi)
+static int vorbis_make_meta_packet(struct taginfo *tags, ogg_packet *result)
{
- int ret, len = PARA_MIN(numbytes, CHUNK_SIZE);
- unsigned 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));
+ int ret;
- ogg_sync_init(sync_in);
- vorbis_info_init(&vi);
vorbis_comment_init(&vc);
- buf = ogg_sync_buffer(sync_in, len);
- memcpy(buf, map, len);
- 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);
-
- 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);
-
- 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);
- ogg_save_header(map, afi);
- 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_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);
- 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, double time_total)
-{
- 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);
- 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;
+ 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(char *map, off_t numbytes,
- struct audio_format_info *afi)
+static int vorbis_rewrite_tags(const char *map, size_t mapsize,
+ struct taginfo *tags, int output_fd,
+ __a_unused const char *filename)
{
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};
+ ogg_packet packet;
- ret = ogg_compute_header_len(map, numbytes, afi);
+ ret = vorbis_make_meta_packet(tags, &packet);
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;
- 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 */
- if (ret < 0)
- free(afi->header);
+ ret = oac_rewrite_tags(map, mapsize, output_fd, (char *)packet.packet,
+ packet.bytes);
+ free(packet.packet);
return ret;
}
-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 afh pointer to the struct to initialize
+ * \param afh Pointer to the struct to initialize.
*/
-void ogg_init(struct audio_format_handler *afh)
+void ogg_afh_init(struct audio_format_handler *afh)
{
- afh->get_file_info = ogg_get_file_info,
+ 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;
}
projects / paraslash.git / blobdiff