Add btr support to the oggdec filter.

[paraslash.git] / ogg_afh.c

diff --git a/ogg_afh.c b/ogg_afh.c
index d295f2d31ba1a482f7c67a0d0663a1efc5c82867..6a17f05655297e0393a590d352b35035f6f4ea64 100644 (file)
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -1,369 +1,200 @@
 /*
 /*

- * Copyright (C) 2004-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2009 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.
+ * 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 <inttypes.h>
 #include <ogg/ogg.h>
 #include <vorbis/codec.h>
 
 #include <inttypes.h>
 #include <ogg/ogg.h>
 #include <vorbis/codec.h>

-#include <vorbis/vorbisfile.h>
+#include <regex.h>

 
 

-#include "server.cmdline.h"
-#include "server.h"
-#include "vss.h"
+#include "para.h"

 #include "afh.h"
 #include "error.h"
 #include "string.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;
-
-static OggVorbis_File *oggvorbis_file;
-static FILE *infile;
-static int header_len, oggbuf_len, vi_channels;
-static char *header, *oggbuf;
-static ssize_t *chunk_table, max_chunk_len;
-static struct audio_format_handler *af;
-static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal,
-       num_chunks;
-
-static int ogg_compute_header_len(void)
+/* 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)

 {
 {

-       int ret, len, in = fileno(infile);
-       unsigned int serial;
-       char *buf;

        ogg_page page;
        ogg_packet packet;
        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++;
+                       }
+               }
+       }
+       return 1;
+}
+
+static int read_vorbis_info(ogg_sync_state *oss, struct afh_info *afhi)
+{

        vorbis_comment vc;
        vorbis_info vi;
        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);
        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;
        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;
-       } else
-               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;

 
 

-       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);
+       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;
+out:

        vorbis_info_clear(&vi);
        vorbis_comment_clear(&vc);
        vorbis_info_clear(&vi);
        vorbis_comment_clear(&vc);

+       //ogg_stream_clear(&stream);

        return ret;
 }
 
        return ret;
 }
 

-static void tunetable(void)
-{
-       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
-}
-
-
-/*
- * Alloc and fill array table of byte offsets. chunk_table[i] is the
- * offset in the current infile at which the sample containing time i *
- * CHUNK_TIME begins.
- */
-static void ogg_compute_chunk_table(double time_total)
-{
-       int i, ret, num;
-       ssize_t pos = 0, min = 0, old_pos;
-
-       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(ogg_int64_t));
-       chunk_table[0] = 0;
-       max_chunk_len = 0;
-       rewind(infile);
-       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;
-       }
-       num_chunks = i - 1;
-       chunk_table[i] = pos;
-       tunetable();
-       PARA_INFO_LOG("%li chunks (%fs), max chunk: %zd, min chunk: %zd\n",
-               num_chunks, chunk_time, max_chunk_len, min);
-       rewind(infile);
-}
-
-static void ogg_close_audio_file(void)
+static void set_chunk_tv(int num_frames, int num_chunks, int frequency,
+               struct timeval *result)

 {
 {

-       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;
-       num_chunks = 0;
-       free(oggbuf);
-       oggbuf = NULL;
-       oggbuf_len = 0;
-}
-
-static int ogg_save_header(FILE *file, int len)
-{
-       int ret;
+       uint64_t x = (uint64_t)num_frames * 1000 * 1000
+               / frequency / num_chunks;

 
 

-       header = para_malloc(len);
-       rewind(file);
-       ret = read(fileno(file), header, len);
-       if (ret != len)
-               return -E_OGG_READ;
-       return 1;
+       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(FILE *file, char *info_str, long unsigned *frames,
-       int *seconds)
+/* 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;
-       double time_total;
-       vorbis_info *vi;
-       ogg_int64_t raw_total;
-
-       infile = file;
-       if (!file)
-               return -E_OGG_NO_FILE;
-       ret = ogg_compute_header_len();
-       if (ret < 0)
-               return ret;
-       ret = ogg_save_header(file, header_len);
+       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)
        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;
+               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;
+               }

        }
        }

-       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);
-       vi_bitrate_nominal = vi->bitrate_nominal;
-       vi_channels = vi->channels;
-       ogg_compute_chunk_table(time_total);
-       *frames = num_chunks;
-       sprintf(info_str, "audio_file_info1:%lu x %lu, %ldkHz, %d channels, %ldkbps\n"
-               "audio_file_info2: \n"
-               "audio_file_info3: \n",
-               num_chunks, (long unsigned) (chunk_time * 1000 * 1000),
-               vi_sampling_rate / 1000, vi_channels, vi_bitrate / 1000
-               );
-       rewind(file);
-       return 1;
-err:
-       ogg_close_audio_file();
-       return ret;
-}
-
-/*
- * Simple stream reposition routine
- */
-static int ogg_reposition_stream(long unsigned request)
-{
-       int ret;
-       long seek;
-
-       seek = chunk_table[request];
-       ret = fseek(infile, seek, SEEK_SET);
-       PARA_DEBUG_LOG("seek to %li returned %d. offset:%li\n", seek,
-               ret, ftell(infile));
-       return ret < 0? -E_OGG_REPOS : 1;
-}
-
-static ogg_int64_t get_chunk_size(long unsigned chunk_num)
-{
-       ogg_int64_t ret;
-       if (chunk_num >= num_chunks)
-               return -1;
-       ret = chunk_table[chunk_num + 1] - chunk_table[chunk_num];
-       if (!ret)
-               return ret;
-#if 0
-       PARA_DEBUG_LOG("chunk %d: %lli-%lli (%lli bytes)\n",
-               chunk_num,
-               chunk_table[chunk_num],
-               chunk_table[chunk_num + 1] - 1,
-               ret);
-#endif
+       afhi->chunks_total = j;
+       set_chunk_tv(num_frames, j, afhi->frequency, &afhi->chunk_tv);
+       ret = 0;
+out:
+       ogg_sync_clear(&oss);

        return ret;
 }
 
        return ret;
 }
 

-static char *ogg_read_chunk(long unsigned current_chunk, ssize_t *len)
-{
-       int ret;
-       ogg_int64_t cs = get_chunk_size(current_chunk);
-       if (!cs) { /* nothing to send for this run */
-               *len = 0;
-               return oggbuf;
-       }
-       if (cs < 0) { /* eof */
-               *len = 0;
-               return NULL;
-       }
-       *len = cs;
-       if (!oggbuf || oggbuf_len < *len) {
-               PARA_INFO_LOG("increasing ogg buffer size (%d -> %zu)\n",
-                       oggbuf_len, *len);
-               oggbuf = para_realloc(oggbuf, *len);
-               oggbuf_len = *len;
-       }
-       ret = read(fileno(infile), oggbuf, *len);
-       if (!ret) {
-               *len = 0;
-               return NULL;
-       }
-       if (ret < 0) {
-               *len = -E_OGG_READ;
-               return NULL;
-       }
-       if (ret != *len)
-               PARA_WARNING_LOG("short read (%d/%zd)\n", ret, *len);
-       *len = ret;
-       return oggbuf;
-}
-
-static char *ogg_get_header_info(int *len)
-{
-       *len = header_len;
-       return header;
-}
-

 static const char* ogg_suffixes[] = {"ogg", NULL};
 
 /**
 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 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_init(struct audio_format_handler *afh)

 {
 {

-       af = p;
-       af->reposition_stream = ogg_reposition_stream;
-       af->get_file_info = ogg_get_file_info,
-       af->read_chunk = ogg_read_chunk;
-       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_get_file_info,
+       afh->suffixes = ogg_suffixes;

 }
 }