static OggVorbis_File *oggvorbis_file;
static FILE *infile;
-static int header_len, oggbuf_len, vi_channels;
-static char *header, *oggbuf;
+static int header_len, inbuf_size, vi_channels;
+static char *header, *inbuf;
static ssize_t *chunk_table, max_chunk_len;
static struct audio_format_handler *af;
static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal,
goto err2;
}
ret = -E_VORBIS;
- if (vorbis_synthesis_headerin(&vi, &vc, &packet) < 0) {
+ if (vorbis_synthesis_headerin(&vi, &vc, &packet) < 0)
goto err2;
- } else
- PARA_INFO_LOG("channels: %i, rate: %li\n", vi.channels,
- vi.rate);
+ PARA_INFO_LOG("channels: %i, rate: %li\n", vi.channels, vi.rate);
ogg_stream_packetin(stream_out, &packet);
ret = ogg_sync_pageout(sync_in, &page);
num = time_total / chunk_time + 3;
PARA_DEBUG_LOG("chunk time: %g allocating %d chunk pointers\n",
chunk_time, num);
- chunk_table = para_malloc(num * sizeof(ogg_int64_t));
+ chunk_table = para_malloc(num * sizeof(size_t));
chunk_table[0] = 0;
max_chunk_len = 0;
rewind(infile);
free(chunk_table);
chunk_table = NULL;
num_chunks = 0;
- free(oggbuf);
- oggbuf = NULL;
- oggbuf_len = 0;
+ free(inbuf);
+ inbuf = NULL;
+ inbuf_size = 0;
}
static int ogg_save_header(FILE *file, int len)
ogg_int64_t cs = get_chunk_size(current_chunk);
if (!cs) { /* nothing to send for this run */
*len = 0;
- return oggbuf;
+ return inbuf;
}
if (cs < 0) { /* eof */
*len = 0;
return NULL;
}
*len = cs;
- if (!oggbuf || oggbuf_len < *len) {
+ if (!inbuf || inbuf_size < *len) {
PARA_INFO_LOG("increasing ogg buffer size (%d -> %zu)\n",
- oggbuf_len, *len);
- oggbuf = para_realloc(oggbuf, *len);
- oggbuf_len = *len;
+ inbuf_size, *len);
+ inbuf = para_realloc(inbuf, *len);
+ inbuf_size = *len;
}
- ret = read(fileno(infile), oggbuf, *len);
+ ret = read(fileno(infile), inbuf, *len);
if (!ret) {
*len = 0;
return NULL;
if (ret != *len)
PARA_WARNING_LOG("short read (%d/%zd)\n", ret, *len);
*len = ret;
- return oggbuf;
+ return inbuf;
}
static char *ogg_get_header_info(int *len)