X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=dd0a54051c4196e6cebac887ec183f317bbe5cf4;hp=f57e2ec4d0ab8266b5d1339f5a17d747d6557256;hb=3d075bb43197cf3c5dbe23bb78e3b43a5f4bcca1;hpb=d61d4f3dc0d2e0a59e221add150bf971c0f03c65 diff --git a/ogg_afh.c b/ogg_afh.c index f57e2ec4..dd0a5405 100644 --- a/ogg_afh.c +++ b/ogg_afh.c @@ -28,18 +28,63 @@ #include "afh.h" #include "error.h" #include "string.h" -#include "fd.h" /** must be big enough to hold header */ #define CHUNK_SIZE 32768 static double chunk_time = 0.25; -static OggVorbis_File *oggvorbis_file; +FILE *audio_file; static int header_len; static char *header; -static ssize_t *chunk_table, num_chunks; +static ssize_t *chunk_table; static struct audio_format_handler *af; -static long vi_sampling_rate, vi_bitrate; + +static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource) +{ + FILE *f = datasource; + return fread(buf, size, nmemb, f); +} + +static int cb_seek(__a_unused void *datasource, ogg_int64_t offset, + int whence) +{ + FILE *f = datasource; + return fseek(f, offset, whence); +} + +/* don't do anything as vss still needs the open filehandle */ +static int cb_close(__a_unused void *datasource) +{ + return 0; +} + +long cb_tell(void *datasource) +{ + FILE *f = datasource; + return ftell(f); +} + +int ogg_open_callbacks(void *datasource, OggVorbis_File *vf, ov_callbacks c) +{ + int ret = ov_open_callbacks(datasource, vf, + NULL, /* no initial buffer */ + 0, /* no initial bytes */ + c); /* the ov_open_callbacks */ + + /* 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; + if (ret < 0) + return -E_OGG_READ; + return 1; + +} static int ogg_compute_header_len(FILE *file) { @@ -118,40 +163,17 @@ err1: 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 input file at which the sample containing time i * - * CHUNK_TIME begins. + * CHUNK_TIME begins. Always successful. */ -static void ogg_compute_chunk_table(double time_total) +static long unsigned ogg_compute_chunk_table(OggVorbis_File *of, + 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; @@ -163,10 +185,10 @@ static void ogg_compute_chunk_table(double time_total) max_chunk_len = 0; for (i = 1; ret == 0; i++) { ogg_int64_t diff; - ret = ov_time_seek(oggvorbis_file, i * chunk_time); + ret = ov_time_seek(of, i * chunk_time); if (ret) break; - pos = ov_raw_tell(oggvorbis_file); + 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); @@ -179,25 +201,16 @@ static void ogg_compute_chunk_table(double time_total) } num_chunks = i - 1; chunk_table[i] = pos; - tunetable(); - PARA_INFO_LOG("%zu chunks (%fs), max chunk: %zd, min chunk: %zd\n", + PARA_INFO_LOG("%lu chunks (%fs), max chunk: %zd, min chunk: %zd\n", num_chunks, chunk_time, max_chunk_len, min); + return num_chunks; } static void ogg_close_audio_file(void) { - 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; + fclose(audio_file); } static int ogg_save_header(FILE *file, int len) @@ -207,9 +220,10 @@ static int ogg_save_header(FILE *file, int len) header = para_malloc(len); rewind(file); ret = read(fileno(file), header, len); - if (ret != len) - return -E_OGG_READ; - return 1; + if (ret == len) + return 1; + free(header); + return -E_OGG_READ; } /* @@ -222,6 +236,14 @@ static int ogg_get_file_info(FILE *file, char *info_str, long unsigned *frames, 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 = { + .read_func = cb_read, + .seek_func = cb_seek, + .close_func = cb_close, + .tell_func = cb_tell + }; if (!file) return -E_OGG_NO_FILE; @@ -232,37 +254,35 @@ static int ogg_get_file_info(FILE *file, char *info_str, long unsigned *frames, 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 = ogg_open_callbacks(file, &of, ovc); + if (ret < 0) + goto err; ret = -E_OGG_INFO; - vi = ov_info(oggvorbis_file, 0); + vi = ov_info(&of, 0); if (!vi) goto err; - time_total = ov_time_total(oggvorbis_file, -1); - raw_total = ov_raw_total(oggvorbis_file, -1); + time_total = ov_time_total(&of, -1); + raw_total = ov_raw_total(&of, -1); *seconds = time_total; vi_sampling_rate = vi->rate; - vi_bitrate = ov_bitrate(oggvorbis_file, 0); + vi_bitrate = ov_bitrate(&of, 0); rewind(file); - ogg_compute_chunk_table(time_total); + *frames = ogg_compute_chunk_table(&of, time_total); rewind(file); - *frames = num_chunks; *vss_chunk_table = chunk_table; - sprintf(info_str, "audio_file_info1:%zu x %lu, %ldkHz, %d channels, %ldkbps\n" + 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), + *frames, (long unsigned) (chunk_time * 1000 * 1000), vi_sampling_rate / 1000, vi->channels, vi_bitrate / 1000 ); rewind(file); - return 1; + audio_file = file; + ret = 1; err: - ogg_close_audio_file(); + ov_clear(&of); /* keeps the file open */ + if (ret < 0) + free(header); return ret; }