#include "server.cmdline.h"
#include "server.h"
#include "vss.h"
-#include "afh.h"
#include "error.h"
#include "fd.h"
#include "string.h"
static FILE *infile;
static struct mp3info mp3;
static struct audio_format_handler *af;
-static ssize_t *chunk_table, num_chunks;
+static ssize_t num_chunks;
static int header_frequency(struct mp3header *h)
{
+ header->padding;
}
-static void write_info_str(char *info_str)
+static void write_info_str(struct audio_format_info *afi)
{
int v = mp3.id3_isvalid;
- snprintf(info_str, MMD_INFO_SIZE,
+ snprintf(afi->info_string, MMD_INFO_SIZE,
"audio_file_info1:%d x %lums, %lu kbit/s (%cbr) %i KHz %s\n"
"audio_file_info2:%s, by %s\n"
"audio_file_info3:A: %s, Y: %s, C: %s\n",
num_chunks,
- tv2ms(&af->chunk_tv),
+ tv2ms(&afi->chunk_tv),
mp3.br_average,
mp3.vbr? 'v' : 'c',
mp3.freq / 1000,
return frame_len;
}
-static int mp3_read_info(void)
+static int mp3_read_info(struct audio_format_info *afi)
{
long fl_avg = 0, freq_avg = 0, br_avg = 0;
int ret, len = 0, old_br = -1;
unsigned chunk_table_size = 1000; /* gets increased on demand */
num_chunks = 0;
- chunk_table = para_malloc(chunk_table_size * sizeof(size_t));
+ afi->chunk_table = para_malloc(chunk_table_size * sizeof(size_t));
ret = mp3_get_id3();
if (ret < 0)
goto err_out;
//PARA_DEBUG_LOG("%s: br: %d, freq: %d, fl: %d, cct: %lu\n", __func__, br, freq, fl, cct.tv_usec);
if (num_chunks >= chunk_table_size) {
chunk_table_size *= 2;
- chunk_table = para_realloc(chunk_table,
+ afi->chunk_table = para_realloc(afi->chunk_table,
chunk_table_size * sizeof(size_t));
}
- chunk_table[num_chunks] = ftell(infile);
+ afi->chunk_table[num_chunks] = ftell(infile);
if (num_chunks < 10 || !(num_chunks % 1000))
PARA_INFO_LOG("chunk #%d: %zd\n", num_chunks,
- chunk_table[num_chunks]);
+ afi->chunk_table[num_chunks]);
num_chunks++;
if (num_chunks == 1) {
// entry = ftell(infile);
ret= para_fseek(infile, 0, SEEK_END);
if (ret < 0)
goto err_out;
- chunk_table[num_chunks] = ftell(infile);
+ afi->chunk_table[num_chunks] = ftell(infile);
mp3.br_average = br_avg;
mp3.freq = freq_avg;
mp3.seconds = (tv2ms(&total_time) + 500) / 1000;
- tv_divide(num_chunks, &total_time, &af->chunk_tv);
+ tv_divide(num_chunks, &total_time, &afi->chunk_tv);
rewind(infile);
- PARA_DEBUG_LOG("%zu chunks, each %lums\n", num_chunks, tv2ms(&af->chunk_tv));
- tv_scale(3, &af->chunk_tv, &af->eof_tv);
- PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&af->eof_tv));
+ PARA_DEBUG_LOG("%zu chunks, each %lums\n", num_chunks, tv2ms(&afi->chunk_tv));
+ tv_scale(3, &afi->chunk_tv, &afi->eof_tv);
+ PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&afi->eof_tv));
return 1;
err_out:
PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
- free(chunk_table);
+ free(afi->chunk_table);
return ret;
}
/*
* Read mp3 information from audio file
*/
-static int mp3_get_file_info(FILE *audio_file, char *info_str,
- long unsigned *frames, int *seconds, size_t **vss_chunk_table)
+static int mp3_get_file_info(FILE *audio_file, struct audio_format_info *afi)
{
int ret;
if (!audio_file)
return -E_MP3_NO_FILE;
infile = audio_file;
- ret = mp3_read_info();
+ ret = mp3_read_info(afi);
if (ret < 0) {
infile = NULL;
return ret;
}
- write_info_str(info_str);
- *frames = num_chunks;
- *seconds = mp3.seconds;
- *vss_chunk_table = chunk_table;
- if (*seconds < 2 || !*frames)
+ write_info_str(afi);
+ afi->chunks_total = num_chunks;
+ afi->seconds_total = mp3.seconds;
+ if (afi->seconds_total < 2 || !afi->chunks_total)
return -E_MP3_INFO;
return 1;
}
return;
fclose(infile);
infile = NULL;
- free(chunk_table);
}
static const char* mp3_suffixes[] = {"mp3", NULL};
af = p;
af->get_file_info = mp3_get_file_info;
af->close_audio_file = mp3_close_audio_file;
- af->get_header_info = NULL;
- /* eof_tv gets overwritten in mp3_get_file_info() */
- af->eof_tv.tv_sec = 0;
- af->eof_tv.tv_usec = 100 * 1000;
af->suffixes = mp3_suffixes;
}