* Johannes Overmann <overmann@iname.com>
*/
+#include <osl.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 */
return (char *)id3_ucs4_latin1duplicate(string);
}
-char *get_stringlist(union id3_field *field)
+static char *get_stringlist(union id3_field *field)
{
unsigned int k, nstrings = id3_field_getnstrings(field);
char *result = NULL;
return NULL;
}
-static char *mp3_get_id3(__a_unused unsigned char *map,
- __a_unused size_t numbytes, int fd)
+static void mp3_get_id3(__a_unused unsigned char *map,
+ __a_unused size_t numbytes, int fd, struct taginfo *tags)
{
int i;
struct id3_tag *id3_t;
- char *title = NULL, *artist = NULL, *album = NULL, *year = NULL,
- *comment = NULL, *result;
struct id3_file *id3_f = id3_file_fdopen(fd, ID3_FILE_MODE_READONLY);
if (!id3_f)
- goto no_tag;
+ return;
id3_t = id3_file_tag(id3_f);
- if (!id3_t)
- goto no_tag;
+ if (!id3_t) {
+ id3_file_close(id3_f);
+ return;
+ }
for (i = 0; i < id3_t->nframes; i++) {
struct id3_frame *fr = id3_t->frames[i];
if (!strcmp(fr->id, "TIT2")) {
- if (!title)
- title = get_strings(fr);
+ if (!tags->title)
+ tags->title = get_strings(fr);
continue;
}
if (!strcmp(fr->id, "TPE1")) {
- if (!artist)
- artist = get_strings(fr);
+ if (!tags->artist)
+ tags->artist = get_strings(fr);
continue;
}
if (!strcmp(fr->id, "TALB")) {
- if (!album)
- album = get_strings(fr);
+ if (!tags->album)
+ tags->album = get_strings(fr);
continue;
}
if (!strcmp(fr->id, "TDRC")) {
- if (!year)
- year = get_strings(fr);
+ if (!tags->year)
+ tags->year = get_strings(fr);
continue;
}
if (!strcmp(fr->id, "COMM")) {
- if (!comment)
- comment = get_strings(fr);
+ if (!tags->comment)
+ tags->comment = get_strings(fr);
continue;
}
}
id3_file_close(id3_f);
- result = make_taginfo(title, artist, album, year, comment);
- free(title);
- free(artist);
- free(album);
- free(year);
- free(comment);
- return result;
-no_tag:
- if (id3_f)
- id3_file_close(id3_f);
- return make_message("%s: (no id3 v1/v2 tag)\n%s:\n",
- status_item_list[SI_TAGINFO1],
- status_item_list[SI_TAGINFO2]);
}
#else /* HAVE_LIBID3TAG */
return string;
}
-static char *mp3_get_id3(unsigned char *map, size_t numbytes, __a_unused int fd)
+static void mp3_get_id3(unsigned char *map, size_t numbytes, __a_unused int fd,
+ struct taginfo *tags)
{
char title[31], artist[31], album[31], year[5], comment[31];
off_t fpos;
if (numbytes < 128 || strncmp("TAG", (char *)map + numbytes - 128, 3)) {
PARA_DEBUG_LOG("no id3 v1 tag\n");
- return make_message("%s: (no id3 v1 tag)\n%s:\n",
- status_item_list[SI_TAGINFO1],
- status_item_list[SI_TAGINFO2]);
+ return;
}
fpos = numbytes - 125;
memcpy(title, map + fpos, 30);
unpad(album);
unpad(year);
unpad(comment);
- return make_taginfo(title, artist, album, year, comment);
+ tags->artist = para_strdup(artist);
+ tags->title = para_strdup(title);
+ tags->year = para_strdup(year);
+ tags->album = para_strdup(album);
+ tags->comment = para_strdup(comment);
}
#endif /* HAVE_LIBID3TAG */
static int mp3_read_info(unsigned char *map, size_t numbytes, int fd,
struct afh_info *afhi)
{
- long freq_avg = 0, br_avg = 0;
- int ret, len = 0, old_br = -1, vbr = 0;
+ uint64_t freq_sum = 0, br_sum = 0;
+ int fl = 0, ret, len = 0, old_br = -1, vbr = 0;
struct timeval total_time = {0, 0};
unsigned chunk_table_size = 1000; /* gets increased on demand */
off_t fpos = 0;
struct mp3header header;
- char *taginfo;
afhi->chunks_total = 0;
- afhi->chunk_table = para_malloc(chunk_table_size * sizeof(size_t));
- taginfo = mp3_get_id3(map, numbytes, fd);
+ afhi->chunk_table = para_malloc(chunk_table_size * sizeof(uint32_t));
while (1) {
- unsigned long freq, br, fl;
+ int freq, br;
struct timeval tmp, cct; /* current chunk time */
fpos += len;
len = find_valid_start(map, numbytes, &fpos, &header);
- if (len <= 0)
+ if (len <= 0) {
+ size_t end;
+ ret = -E_MP3_INFO;
+ if (!afhi->chunks_total)
+ goto err_out;
+ end = afhi->chunk_table[afhi->chunks_total - 1] + fl;
+ afhi->chunk_table[afhi->chunks_total]
+ = PARA_MIN(end, numbytes);
break;
+ }
ret = header_frequency(&header);
if (ret < 0)
continue;
tv_divide(br * 125, &tmp, &cct);
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 (afhi->chunks_total >= chunk_table_size) {
chunk_table_size *= 2;
afhi->chunk_table = para_realloc(afhi->chunk_table,
- chunk_table_size * sizeof(size_t));
+ chunk_table_size * sizeof(uint32_t));
}
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;
- continue;
- }
- freq_avg += ((long)freq - freq_avg) / ((long)afhi->chunks_total + 1);
- br_avg += ((long)br - br_avg) / ((long)afhi->chunks_total + 1);
- if (old_br != br)
+ freq_sum += freq;
+ br_sum += br;
+ if (afhi->chunks_total != 1 && old_br != br)
vbr = 1;
old_br = br;
}
ret = -E_MP3_INFO;
- if (!afhi->chunks_total || !freq_avg || !br_avg)
+ if (!freq_sum || !br_sum)
goto err_out;
- afhi->chunk_table[afhi->chunks_total] = numbytes - 1;
- afhi->bitrate = br_avg;
- afhi->frequency = freq_avg;
+ afhi->bitrate = br_sum / afhi->chunks_total;
+ afhi->frequency = freq_sum / afhi->chunks_total;
afhi->channels = header_channels(&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));
- afhi->info_string = make_message("%s: %cbr, %s\n%s",
- status_item_list[SI_AUDIO_FILE_INFO], vbr? 'v' : 'c',
- header_mode(&header), taginfo);
- free(taginfo);
+ afhi->techinfo = make_message("%cbr, %s", vbr? 'v' : 'c',
+ header_mode(&header));
+ mp3_get_id3(map, numbytes, fd, &afhi->tags);
return 1;
err_out:
- free(taginfo);
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
free(afhi->chunk_table);
return ret;
projects / paraslash.git / blobdiff