X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=ogg_afh.c;h=3c7a143121897d045658195713bcb47170c6324f;hb=0b814bdbb7a3fe018cffee0162dc6c916cfa6879;hp=dd0a54051c4196e6cebac887ec183f317bbe5cf4;hpb=3d075bb43197cf3c5dbe23bb78e3b43a5f4bcca1;p=paraslash.git diff --git a/ogg_afh.c b/ogg_afh.c index dd0a5405..3c7a1431 100644 --- a/ogg_afh.c +++ b/ogg_afh.c @@ -25,7 +25,6 @@ #include "server.cmdline.h" #include "server.h" #include "vss.h" -#include "afh.h" #include "error.h" #include "string.h" @@ -33,12 +32,6 @@ #define CHUNK_SIZE 32768 static double chunk_time = 0.25; -FILE *audio_file; -static int header_len; -static char *header; -static ssize_t *chunk_table; -static struct audio_format_handler *af; - static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource) { FILE *f = datasource; @@ -86,7 +79,20 @@ int ogg_open_callbacks(void *datasource, OggVorbis_File *vf, ov_callbacks c) } -static int ogg_compute_header_len(FILE *file) +static int ogg_save_header(FILE *file, 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); unsigned int serial; @@ -148,11 +154,11 @@ static int ogg_compute_header_len(FILE *file) ogg_stream_packetout(stream_in, &packet); ogg_stream_packetin(stream_out, &packet); - header_len = 0; + afi->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); + 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); err2: ogg_stream_destroy(stream_in); ogg_stream_destroy(stream_out); @@ -169,7 +175,7 @@ err1: * CHUNK_TIME begins. Always successful. */ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of, - double time_total) + struct audio_format_info *afi, double time_total) { int i, ret, num; ssize_t max_chunk_len, pos = 0, min = 0, old_pos; @@ -180,8 +186,8 @@ 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); - chunk_table = para_malloc(num * sizeof(size_t)); - chunk_table[0] = 0; + afi->chunk_table = para_malloc(num * sizeof(size_t)); + afi->chunk_table[0] = 0; max_chunk_len = 0; for (i = 1; ret == 0; i++) { ogg_int64_t diff; @@ -192,7 +198,7 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of, 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; + 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, @@ -200,37 +206,16 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of, old_pos = pos; } num_chunks = i - 1; - chunk_table[i] = pos; + afi->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; } -static void ogg_close_audio_file(void) -{ - free(header); - free(chunk_table); - fclose(audio_file); -} - -static int ogg_save_header(FILE *file, int len) -{ - int ret; - - header = para_malloc(len); - rewind(file); - ret = read(fileno(file), header, len); - if (ret == len) - return 1; - free(header); - return -E_OGG_READ; -} - /* * 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 ogg_get_file_info(FILE *file, struct audio_format_info *afi) { int ret; double time_total; @@ -247,10 +232,7 @@ static int ogg_get_file_info(FILE *file, char *info_str, long unsigned *frames, 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 = ogg_compute_header_len(file, afi); if (ret < 0) return ret; rewind(file); @@ -263,35 +245,31 @@ static int ogg_get_file_info(FILE *file, char *info_str, long unsigned *frames, goto err; time_total = ov_time_total(&of, -1); raw_total = ov_raw_total(&of, -1); - *seconds = time_total; + afi->seconds_total = time_total; vi_sampling_rate = vi->rate; vi_bitrate = ov_bitrate(&of, 0); rewind(file); - *frames = ogg_compute_chunk_table(&of, time_total); + afi->chunks_total = ogg_compute_chunk_table(&of, afi, time_total); rewind(file); - *vss_chunk_table = chunk_table; - sprintf(info_str, "audio_file_info1:%lu x %lu, %ldkHz, %d channels, %ldkbps\n" + sprintf(afi->info_string, "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), + afi->chunks_total, (long unsigned) (chunk_time * 1000 * 1000), vi_sampling_rate / 1000, vi->channels, vi_bitrate / 1000 ); rewind(file); - audio_file = 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(header); + free(afi->header); return ret; } -static char *ogg_get_header_info(int *len) -{ - *len = header_len; - return header; -} - static const char* ogg_suffixes[] = {"ogg", NULL}; /** @@ -299,14 +277,8 @@ static const char* ogg_suffixes[] = {"ogg", NULL}; * * \param p 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->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_get_file_info, + afh->suffixes = ogg_suffixes; }