From: Andre Noll Date: Mon, 21 Sep 2009 07:36:57 +0000 (+0200) Subject: Merge commit 'meins/next' into next X-Git-Tag: v0.4.0~25 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=305ea292b101b906e738d7bf756d4921497198d6;hp=7205bdd68b0ad3c50bbe7b5e01eb62be97aab5c8 Merge commit 'meins/next' into next --- diff --git a/NEWS b/NEWS index dd9d2d12..bf45722a 100644 --- a/NEWS +++ b/NEWS @@ -25,15 +25,21 @@ provided for conversion of the 0.3 database to the new 0.4 format. 0.3.5 (to be announced) "symplectic separability" ------------------------------------------------- -Full client support for *BSD Unixes, various improvements and the -usual mix of bugfixes. This release marks the end of the 0.3 series -if no serious problems show up. +Full client support for *BSD Unixes, complete re-write of the ogg +vorbis audio format handler, various improvements all over the place +and the usual mix of bugfixes. This release marks the end of the 0.3 +series if no serious problems show up. - the new oss writer (supported on *BSD and Linux) + - rewrite of the ogg vorbis audio format handler. It's + recommended to replace the chunk tables of existing ogg + vorbis files in the afs database by re-adding these files + with "add -f". - support for netmask subsets (Gerrit Renker) - the new prebuffer filter - improved signal handling - variable fec output buffer size + - improved FEC timing fixes audible buffer underruns in UDP mode - --log_color actually works - new ls option: -d (print dates as seconds after the epoch) - update to gengetopt 2.22.2 diff --git a/configure.ac b/configure.ac index ea8d531a..a1cba833 100644 --- a/configure.ac +++ b/configure.ac @@ -172,10 +172,10 @@ fi AC_CHECK_HEADER(osl.h, [], have_osl=no) AC_CHECK_LIB([osl], [osl_open_table], [], have_osl=no) if test "$have_osl" = "no"; then - AC_MSG_ERROR([libosl not found, type the following to download: + AC_MSG_ERROR([libosl not found, download it at + http://systemlinux.org/~maan/osl +or execute git clone git://git.tuebingen.mpg.de/osl -Install the library with - (cd osl && make && sudo make install) ]) fi AC_SUBST(osl_cppflags) diff --git a/error.h b/error.h index 6a1d0071..512dcc9f 100644 --- a/error.h +++ b/error.h @@ -300,15 +300,12 @@ extern const char **para_errlist[]; #define OGG_AFH_ERRORS \ - PARA_ERROR(OGG_READ, "ogg read error"), \ PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \ PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error (first page)"), \ PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error (first packet)"), \ PARA_ERROR(VORBIS, "vorbis synthesis header-in error (not vorbis?)"), \ - PARA_ERROR(OGG_INFO, "ov_info error"), \ - PARA_ERROR(OGG_VERSION, "unsupported ogg version"), \ - PARA_ERROR(OGG_BAD_HEADER, "invalid ogg vorbis header"), \ - PARA_ERROR(OGG_UNKNOWN_ERROR, "unknown ogg vorbis error"), \ + PARA_ERROR(OGG_SYNC, "internal ogg storage overflow"), \ + PARA_ERROR(OGG_EMPTY, "no ogg pages found"), \ #define VSS_ERRORS \ diff --git a/fecdec_filter.c b/fecdec_filter.c index 7fe87437..ca9dcd73 100644 --- a/fecdec_filter.c +++ b/fecdec_filter.c @@ -4,7 +4,7 @@ * Licensed under the GPL v2. For licencing details see COPYING. */ -/** \file fecdec_filter.c A filter fec-decodes an audio stream. */ +/** \file fecdec_filter.c A filter that fec-decodes an audio stream. */ #include @@ -72,6 +72,20 @@ struct fecdec_group { unsigned char **data; }; +/** + * The fecdec filter defers decoding of the first group until the first slice + * of the next group was received. This avoids buffer underruns in subsequent + * filters of the filter chain. + */ +enum group_completion_status { + /** No complete group received so far. */ + GCS_NO_COMPLETE_GROUP, + /** First group received, but not yet decoded. */ + GCS_FIRST_GROUP_COMPLETE, + /** At least one complete group decoded. */ + GCS_FIRST_GROUP_DECODED, +}; + /** * Data private to the fecdec filter. */ @@ -82,6 +96,10 @@ struct private_fecdec_data { struct fecdec_group groups[NUM_FEC_GROUPS]; /** Whether an audio file header was already received. */ int have_header; + /** See \ref group_completion_status. */ + unsigned completion_status; + /** Points to the first received group. */ + struct fecdec_group *first_complete_group; }; /** Iterate over all fecdec groups. */ @@ -155,6 +173,13 @@ static struct fecdec_group *try_to_free_group(struct private_fecdec_data *pfd) FOR_EACH_FECDEC_GROUP(fg, pfd) { if (!group_complete(fg)) continue; + /* + * Don't clear the first complete group if it has not yet been + * decoded. + */ + if (pfd->completion_status == GCS_FIRST_GROUP_COMPLETE + && pfd->first_complete_group == fg) + continue; clear_group(fg); return fg; } @@ -173,6 +198,8 @@ static struct fecdec_group *free_oldest_group(struct private_fecdec_data *pfd) PARA_WARNING_LOG("Clearing incomplete group %d " "(contains %d slices)\n", oldest->h.group_num, oldest->num_received_slices); + assert(pfd->completion_status != GCS_FIRST_GROUP_COMPLETE + || oldest != pfd->first_complete_group); clear_group(oldest); return oldest; } @@ -213,8 +240,8 @@ static int add_slice(char *buf, struct fecdec_group *fg) int r, slice_num; if (group_complete(fg)) { - PARA_DEBUG_LOG("group complete, ignoring slice %d\n", - fg->h.slice_num); + PARA_DEBUG_LOG("group %d complete, ignoring slice %d\n", + fg->h.group_num, fg->h.slice_num); fg->num_received_slices++; return 0; } @@ -269,7 +296,7 @@ static int decode_group(struct fecdec_group *fg, struct filter_node *fn) PARA_INFO_LOG("dropping unusable group %d\n", fg->h.group_num); return 0; } - PARA_DEBUG_LOG("decoding group %d %d slices\n", fg->h.group_num, + PARA_DEBUG_LOG("decoding group %d (%d slices)\n", fg->h.group_num, fg->h.data_slices_per_group); ret = fec_decode(pfd->fec, fg->data, fg->idx, sb); if (ret < 0) @@ -341,7 +368,7 @@ static int dispatch_slice(char *buf, size_t len, struct fec_header *h, struct filter_node *fn) { struct fecdec_group *fg; - int ret; + int ret, k, n; struct private_fecdec_data *pfd = fn->private_data; if (h->slice_bytes > len) /* can not use the thing, try to read more */ @@ -352,17 +379,34 @@ static int dispatch_slice(char *buf, size_t len, struct fec_header *h, if (!add_slice(buf, fg)) return 1; if (group_complete(fg)) { - if (!pfd->fec) { - int k = h->data_slices_per_group, n = h->slices_per_group; - PARA_NOTICE_LOG("init fec (%d, %d)\n", k, n); - ret = fec_new(k, n, &pfd->fec); - if (ret < 0) - return ret; + if (pfd->completion_status == GCS_NO_COMPLETE_GROUP) { + pfd->completion_status = GCS_FIRST_GROUP_COMPLETE; + pfd->first_complete_group = fg; + return 1; } + assert(pfd->fec); ret = decode_group(fg, fn); if (ret < 0) return ret; + return 1; } + if (pfd->completion_status == GCS_NO_COMPLETE_GROUP) + return 1; + if (pfd->completion_status == GCS_FIRST_GROUP_DECODED) + return 1; + if (fg == pfd->first_complete_group) + return 1; + assert(!pfd->fec); + k = h->data_slices_per_group; + n = h->slices_per_group; + PARA_NOTICE_LOG("init fec (%d, %d)\n", k, n); + ret = fec_new(k, n, &pfd->fec); + if (ret < 0) + return ret; + ret = decode_group(pfd->first_complete_group, fn); + if (ret < 0) + return ret; + pfd->completion_status = GCS_FIRST_GROUP_DECODED; return 1; } @@ -402,9 +446,12 @@ static void fecdec_close(struct filter_node *fn) static void fecdec_open(struct filter_node *fn) { + struct private_fecdec_data *pfd; fn->bufsize = FECDEC_DEFAULT_OUTBUF_SIZE; fn->buf = para_malloc(fn->bufsize); - fn->private_data = para_calloc(sizeof(struct private_fecdec_data)); + pfd = para_calloc(sizeof(*pfd)); + pfd->completion_status = GCS_NO_COMPLETE_GROUP; + fn->private_data = pfd; fn->loaded = 0; } diff --git a/gui_theme.c b/gui_theme.c index a33df3d2..baa64247 100644 --- a/gui_theme.c +++ b/gui_theme.c @@ -318,19 +318,19 @@ static void init_theme_colorful_blackness(struct gui_theme *t) d[SI_YEAR].len = 10; d[SI_ALBUM].prefix = "A: "; - d[SI_ALBUM].postfix = ""; + d[SI_ALBUM].postfix = ","; d[SI_ALBUM].fg = COLOR_GREEN; d[SI_ALBUM].bg = COLOR_BLACK; - d[SI_ALBUM].align = CENTER; + d[SI_ALBUM].align = RIGHT; d[SI_ALBUM].x = 0; d[SI_ALBUM].y = 63; d[SI_ALBUM].len = 50; - d[SI_COMMENT].prefix = "C: "; + d[SI_COMMENT].prefix = " C: "; d[SI_COMMENT].postfix = ""; d[SI_COMMENT].fg = COLOR_GREEN; d[SI_COMMENT].bg = COLOR_BLACK; - d[SI_COMMENT].align = CENTER; + d[SI_COMMENT].align = LEFT; d[SI_COMMENT].x = 50; d[SI_COMMENT].y = 63; d[SI_COMMENT].len = 50; diff --git a/ogg_afh.c b/ogg_afh.c index 4e64f062..4583caab 100644 --- a/ogg_afh.c +++ b/ogg_afh.c @@ -3,295 +3,195 @@ * * Licensed under the GPL v2. For licencing details see COPYING. */ -/** \file ogg_afh.c para_server's ogg vorbis audio format handler */ -#include +/** \file ogg_afh.c Audio format handler for ogg vorbis files. */ + #include #include #include -#include +#include #include "para.h" -#include "error.h" #include "afh.h" +#include "error.h" #include "string.h" -/** must be big enough to hold header */ -#define CHUNK_SIZE 32768 -static double chunk_time = 0.25; - -/** describes a memory-mapped ogg vorbis file */ -struct ogg_datasource { - /** the memory mapping */ - char *map; - /** this size of the mapping */ - off_t numbytes; - /** the current position in the mapping */ - off_t fpos; -}; - -static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource) -{ - struct ogg_datasource *ods = datasource; - size_t copy, ret; - - if (!size) - return 0; - - assert(ods->numbytes >= ods->fpos); - ret = ods->numbytes - ods->fpos; - copy = PARA_MIN(ret, size * nmemb); - ret = copy / size; - if (!ret) - return 0; - memcpy(buf, ods->map + ods->fpos, copy); -// PARA_INFO_LOG("size: %zd, nmemb: %zd, ret: %zd\n", size, nmemb, ret); - ods->fpos += ret * size; - return ret; -} - -static int cb_seek(void *datasource, ogg_int64_t offset, - int whence) +/* Taken from decoder_example.c of libvorbis-1.2.3. */ +static int read_vorbis_comment(ogg_sync_state *oss, ogg_stream_state *stream, + vorbis_info *vi, vorbis_comment *vc) { - struct ogg_datasource *ods = datasource; - switch (whence) { - case SEEK_SET: - if (offset >= 0 && offset <= ods->numbytes) { - ods->fpos = offset; - return 0; - } - errno = EINVAL; - return -1; - break; - case SEEK_END: - if (offset <= 0 && -offset <= ods->numbytes) { - ods->fpos = ods->numbytes + offset; - return 0; - } - errno = EINVAL; - return -1; - break; - case SEEK_CUR: - if ((offset >= 0 && offset + ods->fpos > ods->numbytes) || - (offset < 0 && offset + ods->fpos < 0)) { - errno = EINVAL; - return -1; + ogg_page page; + ogg_packet packet; + int i = 0; + + while (i < 2) { + while (i < 2) { + int ret = ogg_sync_pageout(oss, &page); + if (ret == 0) + break; /* Need more data */ + if (ret != 1) + continue; + /* + * We can ignore any errors here as they'll also become + * apparent at packetout. + */ + ogg_stream_pagein(stream, &page); + while (i < 2) { + ret = ogg_stream_packetout(stream, &packet); + if (ret == 0) + break; + if (ret < 0) + return -E_STREAM_PACKETOUT; + ret = vorbis_synthesis_headerin(vi, vc, + &packet); + if (ret < 0) + return -E_VORBIS; + i++; + } } - ods->fpos += offset; - return 0; } - errno = EINVAL; - return -1; -} - -/* don't do anything as vss still needs the open filehandle */ -static int cb_close(__a_unused void *datasource) -{ - return 0; -} - -static long cb_tell(void *datasource) -{ - struct ogg_datasource *ods = datasource; - return (unsigned long)ods->fpos; -} - -static int ogg_open_callbacks(void *datasource, OggVorbis_File *vf, ov_callbacks c) -{ - int ret = ov_open_callbacks(datasource, vf, - NULL, /* no initial buffer */ - 0, /* no initial bytes */ - c); /* the ov_open_callbacks */ - - if (ret == OV_EREAD) - return -E_OGG_READ; - if (ret == OV_ENOTVORBIS) - return -E_VORBIS; - if (ret == OV_EVERSION) - return -E_OGG_VERSION; - if (ret == OV_EBADHEADER) - return -E_OGG_BAD_HEADER; - if (ret < 0) - return -E_OGG_UNKNOWN_ERROR; return 1; - } -static int ogg_compute_header_len(char *map, size_t numbytes, - struct afh_info *afhi) +static int read_vorbis_info(ogg_sync_state *oss, struct afh_info *afhi) { - int ret; - size_t len = PARA_MIN(numbytes, (size_t)CHUNK_SIZE); - int serial; - char *buf; - - ogg_page page; - ogg_packet packet; vorbis_comment vc; vorbis_info vi; - ogg_stream_state *stream_in = para_malloc(sizeof(ogg_stream_state)); - ogg_stream_state *stream_out = para_malloc(sizeof(ogg_stream_state)); - ogg_sync_state *sync_in = para_malloc(sizeof(ogg_sync_state)); + ogg_packet packet; + ogg_stream_state stream; + ogg_page page; + int ret; - ogg_sync_init(sync_in); vorbis_info_init(&vi); vorbis_comment_init(&vc); - buf = ogg_sync_buffer(sync_in, (long)len); - memcpy(buf, map, len); - ogg_sync_wrote(sync_in, (long)len); + ret = -E_SYNC_PAGEOUT; - if (ogg_sync_pageout(sync_in, &page) <= 0) { - free(stream_in); - free(stream_out); - goto err1; - } - serial = ogg_page_serialno(&page); - ogg_stream_init(stream_in, serial); - ogg_stream_init(stream_out, serial); - ret = ogg_stream_pagein(stream_in, &page); - if (ret < 0) { - ret = -E_STREAM_PAGEIN; - goto err2; - } - ret = ogg_stream_packetout(stream_in, &packet); - if (ret != 1) { - ret = -E_STREAM_PACKETOUT; - goto err2; - } + if (ogg_sync_pageout(oss, &page) != 1) + goto out; + + ret = ogg_page_serialno(&page); + ogg_stream_init(&stream, ret); + + ret = -E_STREAM_PAGEIN; + if (ogg_stream_pagein(&stream, &page) < 0) + goto out; + + ret = -E_STREAM_PACKETOUT; + if (ogg_stream_packetout(&stream, &packet) != 1) + goto out; + ret = -E_VORBIS; if (vorbis_synthesis_headerin(&vi, &vc, &packet) < 0) - goto err2; - PARA_DEBUG_LOG("channels: %i, rate: %li\n", vi.channels, vi.rate); - ogg_stream_packetin(stream_out, &packet); - ret = ogg_sync_pageout(sync_in, &page); - if (ret <= 0) { - ret = -E_SYNC_PAGEOUT; - goto err2; - } - ogg_stream_pagein(stream_in, &page); - ogg_stream_packetout(stream_in, &packet); - ogg_stream_packetin(stream_out, &packet); - - ret = ogg_sync_pageout(sync_in, &page); - if (ret <= 0) { - ret = -E_SYNC_PAGEOUT; - goto err2; - } - ogg_stream_pagein(stream_in, &page); - ogg_stream_packetout(stream_in, &packet); - ogg_stream_packetin(stream_out, &packet); + goto out; + if (vi.rate == 0) + goto out; + afhi->channels = vi.channels; + afhi->frequency = vi.rate; + afhi->bitrate = vi.bitrate_nominal / 1000; + PARA_DEBUG_LOG("channels: %i, sampling rate: %i, bitrate: %i\n", + afhi->channels, afhi->frequency, afhi->bitrate); + ret = read_vorbis_comment(oss, &stream, &vi, &vc); + if (ret < 0) + goto out; + afhi->tags.artist = para_strdup(vorbis_comment_query(&vc, "artist", 0)); + afhi->tags.title = para_strdup(vorbis_comment_query(&vc, "title", 0)); + afhi->tags.album = para_strdup(vorbis_comment_query(&vc, "album", 0)); + afhi->tags.year = para_strdup(vorbis_comment_query(&vc, "year", 0)); + afhi->tags.comment = para_strdup(vorbis_comment_query(&vc, "comment", 0)); - afhi->header_len = 0; - while (ogg_stream_flush(stream_out, &page)) - afhi->header_len += page.body_len + page.header_len; - PARA_DEBUG_LOG("header_len = %d\n", afhi->header_len); afhi->header_offset = 0; + afhi->header_len = oss->returned; ret = 1; -err2: - ogg_stream_destroy(stream_in); - ogg_stream_destroy(stream_out); -err1: - ogg_sync_destroy(sync_in); +out: vorbis_info_clear(&vi); vorbis_comment_clear(&vc); + ogg_stream_clear(&stream); return ret; } -/* - * Alloc and fill array table of byte offsets. chunk_table[i] is the - * offset in the current input file at which the sample containing time i * - * CHUNK_TIME begins. Always successful. - */ -static long unsigned ogg_compute_chunk_table(OggVorbis_File *of, - struct afh_info *afhi, long unsigned time_total) +static void set_chunk_tv(int num_frames, int num_chunks, int frequency, + struct timeval *result) { - int i, ret, num; - long unsigned num_chunks; - ogg_int64_t max = 0, min = 0, old_pos = 0; + uint64_t x = (uint64_t)num_frames * 1000 * 1000 + / frequency / num_chunks; - num = time_total / chunk_time + 3; - PARA_DEBUG_LOG("chunk time: %g allocating %d chunk pointers\n", - chunk_time, num); - afhi->chunk_table = para_malloc((num + 1) * sizeof(size_t)); - afhi->chunk_table[0] = 0; - for (i = 1; i <= num; i++) { - ogg_int64_t diff, pos; - ret = ov_time_seek(of, i * chunk_time); - if (ret) - break; - pos = ov_raw_tell(of); - diff = pos - old_pos; - max = PARA_MAX(max, diff); - min = (i == 1)? diff : PARA_MIN(min, diff); - afhi->chunk_table[i] = pos; - old_pos = pos; - } - num_chunks = i - 1; - PARA_DEBUG_LOG("%lu chunks (%fs), max chunk: %lld, min chunk: %lld\n", - num_chunks, chunk_time, (long long)max, (long long)min); - return num_chunks; + result->tv_sec = x / 1000 / 1000; + result->tv_usec = x % (1000 * 1000); + PARA_INFO_LOG("%d chunks, chunk time: %lums\n", num_chunks, + tv2ms(result)); } -static void ogg_get_vorbis_comments(OggVorbis_File *vf, struct afh_info *afhi) -{ - vorbis_comment *vc = ov_comment(vf,-1); - - if (!vc) - return; - afhi->tags.artist = para_strdup(vorbis_comment_query(vc, "artist", 0)); - afhi->tags.title = para_strdup(vorbis_comment_query(vc, "title", 0)); - afhi->tags.album = para_strdup(vorbis_comment_query(vc, "album", 0)); - afhi->tags.year = para_strdup(vorbis_comment_query(vc, "year", 0)); - afhi->tags.comment = para_strdup(vorbis_comment_query(vc, "comment", 0)); -} - -/* - * Init oggvorbis file and write some tech data to given pointers. - */ +/* Write tech data to given audio format handler struct. */ static int ogg_get_file_info(char *map, size_t numbytes, __a_unused int fd, struct afh_info *afhi) { - int ret; - vorbis_info *vi; - OggVorbis_File of; - const ov_callbacks ovc = { - .read_func = cb_read, - .seek_func = cb_seek, - .close_func = cb_close, - .tell_func = cb_tell - }; - struct ogg_datasource ods = {.map = map, .numbytes = numbytes, .fpos = 0}; - - ret = ogg_compute_header_len(map, numbytes, afhi); - if (ret < 0) - return ret; - ret = ogg_open_callbacks(&ods, &of, ovc); + ogg_sync_state oss; + ogg_page op; + long len = numbytes; + char *buf; + int ret, i, j, frames_per_chunk, ct_size; + long long unsigned num_frames = 0; + + ogg_sync_init(&oss); + ret = -E_OGG_SYNC; + buf = ogg_sync_buffer(&oss, len); + if (!buf) + goto out; + memcpy(buf, map, len); + ret = -E_OGG_SYNC; + if (ogg_sync_wrote(&oss, len) < 0) + goto out; + ret = read_vorbis_info(&oss, afhi); if (ret < 0) - goto err; - ret = -E_OGG_INFO; - vi = ov_info(&of, 0); - if (!vi) - goto err; - afhi->seconds_total = ov_time_total(&of, -1); - afhi->frequency = vi->rate; - afhi->bitrate = ov_bitrate(&of, 0) / 1000; - afhi->channels = vi->channels; - afhi->chunks_total = ogg_compute_chunk_table(&of, afhi, afhi->seconds_total); - afhi->chunk_tv.tv_sec = 0; - afhi->chunk_tv.tv_usec = 250 * 1000; - ogg_get_vorbis_comments(&of, afhi); - ret = 1; -err: - ov_clear(&of); /* keeps the file open */ + goto out; + oss.returned = 0; + oss.fill = numbytes; + /* count ogg packages and get duration of the file */ + for (i = 0; ogg_sync_pageseek(&oss, &op) > 0; i++) + num_frames = ogg_page_granulepos(&op); + PARA_INFO_LOG("%d pages, %llu frames\n", i, num_frames); + ret = -E_OGG_EMPTY; + if (i == 0) + goto out; + afhi->seconds_total = num_frames / afhi->frequency; + /* use roughly one page per chunk */ + frames_per_chunk = num_frames / i; + PARA_INFO_LOG("%lu seconds, %d frames/chunk\n", + afhi->seconds_total, frames_per_chunk); + ct_size = 250; + afhi->chunk_table = para_malloc(ct_size * sizeof(uint32_t)); + afhi->chunk_table[0] = 0; + afhi->chunk_table[1] = afhi->header_len; + oss.returned = afhi->header_len; + oss.fill = numbytes; + for (i = 0, j = 1; ogg_sync_pageseek(&oss, &op) > 0; i++) { + int granule = ogg_page_granulepos(&op); + + while (granule > j * frames_per_chunk) { + j++; + if (j >= ct_size) { + ct_size *= 2; + afhi->chunk_table = para_realloc( + afhi->chunk_table, + ct_size * sizeof(uint32_t)); + } + afhi->chunk_table[j] = oss.returned; + } + } + afhi->chunks_total = j; + set_chunk_tv(num_frames, j, afhi->frequency, &afhi->chunk_tv); + ret = 0; +out: + ogg_sync_clear(&oss); return ret; } static const char* ogg_suffixes[] = {"ogg", NULL}; /** - * the init function of the ogg vorbis audio format handler + * The init function of the ogg vorbis audio format handler. * - * \param afh pointer to the struct to initialize + * \param afh Pointer to the struct to initialize. */ void ogg_init(struct audio_format_handler *afh) { diff --git a/oggdec_filter.c b/oggdec_filter.c index 02f04b48..6a97d6c6 100644 --- a/oggdec_filter.c +++ b/oggdec_filter.c @@ -35,6 +35,8 @@ struct private_oggdec_data { size_t inbuf_len; /** The number of bytes consumed from the input buffer. */ size_t converted; + /** When to start producing output. */ + struct timeval stream_start; }; static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource) @@ -124,24 +126,30 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn) pod->converted = 0; if (!pod->vf) { - int ib = 1024 * conf->initial_buffer_arg; /* initial buffer */ if (*fn->fc->input_error < 0) return *fn->fc->input_error; - if (len < ib) { - PARA_DEBUG_LOG("initial input buffer %zd/%d, " - "waiting for more data\n", len, ib); + if (!len) return 0; - } pod->vf = para_malloc(sizeof(struct OggVorbis_File)); PARA_NOTICE_LOG("input buffer: %zd, opening ov callbacks\n", len); ret = ov_open_callbacks(fn, pod->vf, NULL, /* no initial buffer */ 0, /* no initial bytes */ ovc); /* the ov_open_callbacks */ + if (ret == OV_ENOTVORBIS) { + /* this might be due to the input buffer being too small */ + int ib = 1024 * conf->initial_buffer_arg; /* initial buffer */ + if (len < ib) { + PARA_INFO_LOG("initial input buffer %zd/%d, " + "waiting for more data\n", len, ib); + free(pod->vf); + pod->vf = NULL; + return 0; + } + return -E_OGGDEC_NOTVORBIS; + } if (ret == OV_EREAD) return -E_OGGDEC_READ; - if (ret == OV_ENOTVORBIS) - return -E_OGGDEC_NOTVORBIS; if (ret == OV_EVERSION) return -E_OGGDEC_VERSION; if (ret == OV_EBADHEADER) @@ -152,13 +160,27 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn) fn->fc->samplerate = ov_info(pod->vf, 0)->rate; PARA_NOTICE_LOG("%d channels, %d Hz\n", fn->fc->channels, fn->fc->samplerate); + /* wait a bit to avoid buffer underruns */ + tv_add(now, &(struct timeval){0, 500 * 1000}, &pod->stream_start); + return pod->converted; + } + if (tv_diff(now, &pod->stream_start, NULL) < 0) { + PARA_DEBUG_LOG("initial delay..\n"); + return 0; } while (fn->loaded < fn->bufsize) { int length = fn->bufsize - fn->loaded; long read_ret = ov_read(pod->vf, fn->buf + fn->loaded, length, ENDIAN, 2 /* 16 bit */, 1 /* signed */, NULL); - if (read_ret == OV_HOLE || !read_ret) + if (read_ret == 0) + return pod->converted; + if (read_ret == OV_HOLE) { + if (!fn->loaded) { + PARA_INFO_LOG("hole, delaying playback\n"); + tv_add(now, &(struct timeval){0, 500 * 1000}, &pod->stream_start); + } return pod->converted; + } if (read_ret < 0) return -E_OGGDEC_BADLINK; fn->loaded += read_ret; diff --git a/stdin.c b/stdin.c index 8eb86dee..f66d1bba 100644 --- a/stdin.c +++ b/stdin.c @@ -89,7 +89,7 @@ void stdin_set_defaults(struct stdin_task *sit) { int ret; - sit->bufsize = 16 * 1024, + sit->bufsize = 32 * 1024, sit->task.pre_select = stdin_pre_select; sit->task.post_select = stdin_post_select; sprintf(sit->task.status, "stdin reader"); diff --git a/time.c b/time.c index 6e1d603d..0cb9babe 100644 --- a/time.c +++ b/time.c @@ -106,9 +106,10 @@ void tv_add(const struct timeval *a, const struct timeval *b, void tv_scale(const unsigned long mult, const struct timeval *tv, struct timeval *result) { - result->tv_sec = mult * tv->tv_sec; - result->tv_sec += tv->tv_usec * mult / 1000 / 1000; - result->tv_usec = tv->tv_usec * mult % (1000 * 1000); + uint64_t x = ((uint64_t)tv->tv_sec * 1000 * 1000 + tv->tv_usec) * mult; + + result->tv_sec = x / 1000 / 1000; + result->tv_usec = x % (1000 * 1000); } /** diff --git a/vss.c b/vss.c index 85e7da85..40a18e5c 100644 --- a/vss.c +++ b/vss.c @@ -356,7 +356,12 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst) g->num_header_slices, data_slices ); /* set group start */ - tv_scale(g->first_chunk - fc->first_stream_chunk, chunk_tv, &tmp); + if (g->num != 0 && vsst->header_len != 0 && fc->first_stream_chunk == 0) + /* chunk #0 is the audio file header */ + tv_scale(g->first_chunk - 1, chunk_tv, &tmp); + else + tv_scale(g->first_chunk - fc->first_stream_chunk, + chunk_tv, &tmp); tv_add(&fc->stream_start, &tmp, &g->start); return 1; }