X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.c;h=c5d7aec296a7a44b2fedfd2532ad838f89654e6c;hp=24c2bc67dcd81addb013f2f00a87a64494f5933a;hb=a22e734cd89015a71d0dd7cf895799c440805847;hpb=4d92160ca359a986e1bbb056a9cc3ed0589b1816 diff --git a/afh.c b/afh.c index 24c2bc67..c5d7aec2 100644 --- a/afh.c +++ b/afh.c @@ -1,11 +1,12 @@ /* - * Copyright (C) 2008 Andre Noll + * Copyright (C) 2008-2011 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file afh.c Paraslash's standalone audio format handler tool. */ +#include #include #include @@ -21,7 +22,9 @@ static struct afh_args_info conf; const char *status_item_list[] = {STATUS_ITEM_ARRAY}; INIT_AFH_ERRLISTS; -INIT_STDERR_LOGGING(conf.loglevel_arg) + +static int loglevel; +INIT_STDERR_LOGGING(loglevel) static void print_info(int audio_format_num, struct afh_info *afhi) { @@ -30,18 +33,28 @@ static void print_info(int audio_format_num, struct afh_info *afhi) "%s: %dHz\n" /* frequency */ "%s: %d\n" /* channels */ "%s: %lu\n" /* seconds total */ - "%s" /* tag info */ "%s: %lu: %lu\n" /* chunk time */ - "%s: %lu\n", /* num chunks */ + "%s: %lu\n" /* num chunks */ + "%s: %s\n" /* techinfo */ + "%s: %s\n" /* artist */ + "%s: %s\n" /* title */ + "%s: %s\n" /* year */ + "%s: %s\n" /* album */ + "%s: %s\n", /* comment */ status_item_list[SI_BITRATE], afhi->bitrate, status_item_list[SI_FORMAT], audio_format_name(audio_format_num), status_item_list[SI_FREQUENCY], afhi->frequency, status_item_list[SI_CHANNELS], afhi->channels, status_item_list[SI_SECONDS_TOTAL], afhi->seconds_total, - afhi->info_string, status_item_list[SI_CHUNK_TIME], (long unsigned)afhi->chunk_tv.tv_sec, (long unsigned)afhi->chunk_tv.tv_usec, - status_item_list[SI_NUM_CHUNKS], afhi->chunks_total + status_item_list[SI_NUM_CHUNKS], afhi->chunks_total, + status_item_list[SI_TECHINFO], afhi->techinfo? afhi->techinfo : "", + status_item_list[SI_ARTIST], afhi->tags.artist? afhi->tags.artist : "", + status_item_list[SI_TITLE], afhi->tags.title? afhi->tags.title : "", + status_item_list[SI_YEAR], afhi->tags.year? afhi->tags.year : "", + status_item_list[SI_ALBUM], afhi->tags.album? afhi->tags.album : "", + status_item_list[SI_COMMENT], afhi->tags.comment? afhi->tags.comment : "" ); } @@ -49,21 +62,37 @@ static void print_chunk_table(struct afh_info *afhi) { int i; - printf("chunk_table: "); - for (i = 0; i <= afhi->chunks_total; i++) - printf("%u ", afhi->chunk_table[i]); - printf("\n"); + if (!conf.human_given) { + printf("chunk_table: "); + for (i = 0; i <= afhi->chunks_total; i++) + printf("%u ", afhi->chunk_table[i]); + printf("\n"); + return; + } + for (i = 1; i <= afhi->chunks_total; i++) { + struct timeval tv; + long unsigned from, to; + tv_scale(i - 1, &afhi->chunk_tv, &tv); + from = tv2ms(&tv); + tv_scale(i, &afhi->chunk_tv, &tv); + to = tv2ms(&tv); + printf("%d [%lu.%03lu - %lu.%03lu] %u - %u (%u)\n", i - 1, + from / 1000, from % 1000, to / 1000, to % 1000, + afhi->chunk_table[i - 1], afhi->chunk_table[i], + afhi->chunk_table[i] - afhi->chunk_table[i - 1]); + } } -static int cat_file(void *audio_file_data, struct afh_info *afhi) +static int cat_file(struct afh_info *afhi, int audio_format_id, + void *audio_file_data, size_t audio_file_size) { int ret; struct timeval stream_start; long unsigned i, first_chunk, last_chunk; const char *buf; + char *header; size_t size; - if (conf.begin_chunk_arg < 0) { if (-conf.begin_chunk_arg > afhi->chunks_total) return -ERRNO_TO_PARA_ERROR(EINVAL); @@ -86,14 +115,18 @@ static int cat_file(void *audio_file_data, struct afh_info *afhi) return -ERRNO_TO_PARA_ERROR(EINVAL); if (!afhi->chunks_total) return 1; - afh_get_header(afhi, audio_file_data, &buf, &size); - if (size && first_chunk && !conf.no_header_given) { - PARA_INFO_LOG("writing audio file header (%zu bytes)\n", size); - ret = write(STDOUT_FILENO, buf, size); - if (ret < 0) - return ret; - if (ret != size) - return -E_AFH_SHORT_WRITE; + if (first_chunk > 0 && !conf.no_header_given) { + afh_get_header(afhi, audio_format_id, audio_file_data, audio_file_size, + &header, &size); + if (size > 0) { + PARA_INFO_LOG("writing header (%zu bytes)\n", size); + ret = write(STDOUT_FILENO, header, size); /* FIXME */ + afh_free_header(header, audio_format_id); + if (ret < 0) + return ret; + if (ret != size) + return -E_AFH_SHORT_WRITE; + } } PARA_NOTICE_LOG("writing chunks %lu - %lu\n", first_chunk, last_chunk); gettimeofday(&stream_start, NULL); @@ -139,6 +172,7 @@ int main(int argc, char **argv) afh_cmdline_parser(argc, argv, &conf); HANDLE_VERSION_FLAG("afh", conf); + loglevel = get_loglevel_by_name(conf.loglevel_arg); ret = -E_AFH_SYNTAX; if (conf.inputs_num == 0) goto out; @@ -155,9 +189,11 @@ int main(int argc, char **argv) fd, &afhi); if (ret < 0) goto out; + audio_format_num = ret; if (conf.stream_given) - ret = cat_file(audio_file_data, &afhi); + ret = cat_file(&afhi, audio_format_num, + audio_file_data, audio_file_size); else { printf("File %d: %s\n", i + 1, conf.inputs[i]); print_info(audio_format_num, &afhi); @@ -165,6 +201,13 @@ int main(int argc, char **argv) print_chunk_table(&afhi); printf("\n"); } + free(afhi.techinfo); + free(afhi.tags.artist); + free(afhi.tags.title); + free(afhi.tags.year); + free(afhi.tags.album); + free(afhi.tags.comment); + free(afhi.chunk_table); ret2 = para_munmap(audio_file_data, audio_file_size); if (ret2 < 0 && ret >= 0) ret = ret2;