* Johannes Overmann <overmann@iname.com>
*/
-#include "server.h"
+#include "para.h"
#include "error.h"
+#include "afh.h"
#include "string.h"
+#include "afs.h"
+#include "server.h"
/** \cond some defines and structs which are only used in this file */
+ header->padding;
}
-static void write_info_str(struct audio_format_info *afi)
+static void write_info_str(struct afh_info *afhi)
{
int v = mp3.id3_isvalid;
- snprintf(afi->info_string, MMD_INFO_SIZE,
- "audio_file_info1:%lu x %lums, %u kbit/s (%cbr) %i KHz %s\n"
- "audio_file_info2:%s, by %s\n"
- "audio_file_info3:A: %s, Y: %s, C: %s\n",
- afi->chunks_total,
- tv2ms(&afi->chunk_tv),
- afi->bitrate,
- mp3.vbr? 'v' : 'c',
- afi->frequency / 1000,
- header_mode(&mp3.header),
- v && *mp3.id3.title? mp3.id3.title : "(title tag not set)",
- v && *mp3.id3.artist? mp3.id3.artist : "(artist tag not set)",
- v && *mp3.id3.album? mp3.id3.album : "(album tag not set)",
- v && *mp3.id3.year? mp3.id3.year : "????",
- v && *mp3.id3.comment? mp3.id3.comment : "(comment tag not set)"
+ snprintf(afhi->info_string, MMD_INFO_SIZE,
+ "%s: %cbr, %s\n" /* audio file info*/
+ "%s: %s, by %s\n" /* taginfo1 */
+ "%s: A: %s, Y: %s, C: %s\n", /* taginfo 2*/
+ status_item_list[SI_AUDIO_FILE_INFO], mp3.vbr? 'v' : 'c',
+ header_mode(&mp3.header),
+ status_item_list[SI_TAG_INFO1], v && *mp3.id3.title?
+ mp3.id3.title : "(title tag not set)",
+ v && *mp3.id3.artist?
+ mp3.id3.artist : "(artist tag not set)",
+ status_item_list[SI_TAG_INFO2],
+ v && *mp3.id3.album?
+ mp3.id3.album : "(album tag not set)",
+ v && *mp3.id3.year? mp3.id3.year : "????",
+ v && *mp3.id3.comment?
+ mp3.id3.comment : "(comment tag not set)"
);
}
return;
*fpos = numbytes - 128;
if (strncmp("TAG", (char *) map + *fpos, 3)) {
- PARA_INFO_LOG("%s", "no id3 tag\n");
+ PARA_DEBUG_LOG("%s", "no id3 tag\n");
return;
}
*fpos = numbytes - 125;
}
static int mp3_read_info(unsigned char *map, size_t numbytes,
- struct audio_format_info *afi)
+ struct afh_info *afhi)
{
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 */
off_t fpos = 0;
- afi->chunks_total = 0;
- afi->chunk_table = para_malloc(chunk_table_size * sizeof(size_t));
+ afhi->chunks_total = 0;
+ afhi->chunk_table = para_malloc(chunk_table_size * sizeof(size_t));
mp3_get_id3(map, numbytes, &fpos);
fpos = 0;
mp3.vbr = 0;
tv_add(&cct, &total_time, &tmp);
total_time = tmp;
//PARA_DEBUG_LOG("%s: br: %d, freq: %d, fl: %d, cct: %lu\n", __func__, br, freq, fl, cct.tv_usec);
- if (afi->chunks_total >= chunk_table_size) {
+ if (afhi->chunks_total >= chunk_table_size) {
chunk_table_size *= 2;
- afi->chunk_table = para_realloc(afi->chunk_table,
+ afhi->chunk_table = para_realloc(afhi->chunk_table,
chunk_table_size * sizeof(size_t));
}
- afi->chunk_table[afi->chunks_total] = fpos;
-// if (afi->chunks_total < 10 || !(afi->chunks_total % 1000))
-// PARA_INFO_LOG("chunk #%lu: %zd\n", afi->chunks_total,
-// afi->chunk_table[afi->chunks_total]);
- afi->chunks_total++;
- if (afi->chunks_total == 1) {
+ afhi->chunk_table[afhi->chunks_total] = fpos;
+// if (afhi->chunks_total < 10 || !(afhi->chunks_total % 1000))
+// PARA_INFO_LOG("chunk #%lu: %zd\n", afhi->chunks_total,
+// afhi->chunk_table[afhi->chunks_total]);
+ afhi->chunks_total++;
+ if (afhi->chunks_total == 1) {
freq_avg = freq;
br_avg = br;
old_br = br;
fl_avg = fl;
continue;
}
- freq_avg += ((long)freq - freq_avg) / ((long)afi->chunks_total + 1);
- fl_avg += ((long)fl - fl_avg) / ((long)afi->chunks_total + 1);
- br_avg += ((long)br - br_avg) / ((long)afi->chunks_total + 1);
+ freq_avg += ((long)freq - freq_avg) / ((long)afhi->chunks_total + 1);
+ fl_avg += ((long)fl - fl_avg) / ((long)afhi->chunks_total + 1);
+ br_avg += ((long)br - br_avg) / ((long)afhi->chunks_total + 1);
if (old_br != br)
mp3.vbr = 1;
old_br = br;
}
ret = -E_MP3_INFO;
- if (!afi->chunks_total || !freq_avg || !br_avg)
+ if (!afhi->chunks_total || !freq_avg || !br_avg)
goto err_out;
- afi->chunk_table[afi->chunks_total] = numbytes - 1;
- afi->bitrate = br_avg;
- afi->frequency = freq_avg;
- afi->channels = header_channels(&mp3.header);
- afi->seconds_total = (tv2ms(&total_time) + 500) / 1000;
- tv_divide(afi->chunks_total, &total_time, &afi->chunk_tv);
- PARA_DEBUG_LOG("%lu chunks, each %lums\n", afi->chunks_total,
- tv2ms(&afi->chunk_tv));
- tv_scale(3, &afi->chunk_tv, &afi->eof_tv);
- PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&afi->eof_tv));
+ afhi->chunk_table[afhi->chunks_total] = numbytes - 1;
+ afhi->bitrate = br_avg;
+ afhi->frequency = freq_avg;
+ afhi->channels = header_channels(&mp3.header);
+ afhi->seconds_total = (tv2ms(&total_time) + 500) / 1000;
+ tv_divide(afhi->chunks_total, &total_time, &afhi->chunk_tv);
+ PARA_DEBUG_LOG("%lu chunks, each %lums\n", afhi->chunks_total,
+ tv2ms(&afhi->chunk_tv));
+ tv_scale(3, &afhi->chunk_tv, &afhi->eof_tv);
+ PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&afhi->eof_tv));
return 1;
err_out:
PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
- free(afi->chunk_table);
+ free(afhi->chunk_table);
return ret;
}
* Read mp3 information from audio file
*/
int mp3_get_file_info(char *map, size_t numbytes,
- struct audio_format_info *afi)
+ struct afh_info *afhi)
{
int ret;
- ret = mp3_read_info((unsigned char *)map, numbytes, afi);
+ ret = mp3_read_info((unsigned char *)map, numbytes, afhi);
if (ret < 0)
return ret;
- write_info_str(afi);
- if (afi->seconds_total < 2 || !afi->chunks_total)
+ write_info_str(afhi);
+ if (afhi->seconds_total < 2 || !afhi->chunks_total)
return -E_MP3_INFO;
return 1;
}
projects / paraslash.git / blobdiff