aac: fix some signedness warnings
[paraslash.git] / ogg_afh.c
index 3447f54..5adcc25 100644 (file)
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -22,9 +22,7 @@
 #include <vorbis/codec.h>
 #include <vorbis/vorbisfile.h>
 
-#include "server.cmdline.h"
 #include "server.h"
-#include "vss.h"
 #include "error.h"
 #include "string.h"
 
 #define CHUNK_SIZE 32768
 static double chunk_time = 0.25;
 
+struct ogg_datasource {
+       char *map;
+       off_t numbytes;
+       off_t fpos;
+};
+
 static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
 {
-       FILE *f = datasource;
-       return fread(buf, size, nmemb, f);
+       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(__a_unused void *datasource, ogg_int64_t offset,
+static int cb_seek(void *datasource, ogg_int64_t offset,
                int whence)
 {
-       FILE *f = datasource;
-       return fseek(f, offset, whence);
+       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;
 }
 
 /* don't do anything as vss still needs the open filehandle */
@@ -53,8 +91,8 @@ static int cb_close(__a_unused void *datasource)
 
 static long cb_tell(void *datasource)
 {
-       FILE *f = datasource;
-       return ftell(f);
+       struct ogg_datasource *ods = datasource;
+       return (unsigned long)ods->fpos;
 }
 
 static int ogg_open_callbacks(void *datasource, OggVorbis_File *vf, ov_callbacks c)
@@ -79,22 +117,10 @@ static int ogg_open_callbacks(void *datasource, OggVorbis_File *vf, ov_callbacks
 
 }
 
-static int ogg_save_header(FILE *file, struct audio_format_info *afi)
+static int ogg_compute_header_len(char *map, off_t numbytes,
+               struct audio_format_info *afi)
 {
-       int ret;
-
-       afi->header = para_malloc(afi->header_len);
-       rewind(file);
-       ret = read(fileno(file), afi->header, afi->header_len);
-       if (ret == afi->header_len)
-               return 1;
-       free(afi->header);
-       return -E_OGG_READ;
-}
-
-static int ogg_compute_header_len(FILE *file, struct audio_format_info *afi)
-{
-       int ret, len, in = fileno(file);
+       int ret, len = PARA_MIN(numbytes, CHUNK_SIZE);
        unsigned int serial;
        char *buf;
        ogg_page page;
@@ -108,11 +134,8 @@ static int ogg_compute_header_len(FILE *file, struct audio_format_info *afi)
        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;
+       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)
@@ -158,7 +181,8 @@ static int ogg_compute_header_len(FILE *file, struct audio_format_info *afi)
        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);
-       ret = ogg_save_header(file, afi);
+       afi->header_offset = 0;
+       ret = 1;
 err2:
        ogg_stream_destroy(stream_in);
        ogg_stream_destroy(stream_out);
@@ -186,10 +210,10 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
        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 * sizeof(size_t));
+       afi->chunk_table = para_malloc((num + 1) * sizeof(size_t));
        afi->chunk_table[0] = 0;
        max_chunk_len = 0;
-       for (i = 1; ret == 0; i++) {
+       for (i = 1; ret <= num; i++) {
                ogg_int64_t diff;
                ret = ov_time_seek(of, i * chunk_time);
                if (ret)
@@ -199,14 +223,14 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
                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);
+//             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;
-       afi->chunk_table[i] = pos;
+//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;
@@ -215,58 +239,48 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
 /*
  * Init oggvorbis file and write some tech data to given pointers.
  */
-static int ogg_get_file_info(FILE *file, struct audio_format_info *afi)
+static int ogg_get_file_info(char *map, off_t numbytes,
+               struct audio_format_info *afi)
 {
        int ret;
-       double time_total;
        vorbis_info *vi;
-       ogg_int64_t raw_total;
-       long vi_sampling_rate, vi_bitrate;
        OggVorbis_File of;
-       static const ov_callbacks ovc = {
+       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};
 
-       if (!file)
-               return -E_OGG_NO_FILE;
-       ret = ogg_compute_header_len(file, afi);
+       ret = ogg_compute_header_len(map, numbytes, afi);
        if (ret < 0)
                return ret;
-       rewind(file);
-       ret = ogg_open_callbacks(file, &of, ovc);
+       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;
-       time_total = ov_time_total(&of, -1);
-       raw_total = ov_raw_total(&of, -1);
-       afi->seconds_total = time_total;
-       vi_sampling_rate = vi->rate;
-       vi_bitrate = ov_bitrate(&of, 0);
-       rewind(file);
-       afi->chunks_total = ogg_compute_chunk_table(&of, afi, time_total);
-       rewind(file);
-       sprintf(afi->info_string, "audio_file_info1:%lu x %lu, %ldkHz, "
-               "%d channels, %ldkbps\n"
+       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),
-               vi_sampling_rate / 1000, vi->channels, vi_bitrate / 1000
+               afi->frequency / 1000, vi->channels, afi->bitrate / 1000
                );
-       rewind(file);
        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);
        return ret;
 }