To make naming consistent with the aac and mp3 audio format handler.
static OggVorbis_File *oggvorbis_file;
static FILE *infile;
static int header_len, oggbuf_len, vi_channels;
static OggVorbis_File *oggvorbis_file;
static FILE *infile;
static int header_len, oggbuf_len, vi_channels;
-static char *header, *oggbuf;
+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,
static ssize_t *chunk_table, max_chunk_len;
static struct audio_format_handler *af;
static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal,
free(chunk_table);
chunk_table = NULL;
num_chunks = 0;
free(chunk_table);
chunk_table = NULL;
num_chunks = 0;
- free(oggbuf);
- oggbuf = NULL;
+ free(inbuf);
+ inbuf = NULL;
ogg_int64_t cs = get_chunk_size(current_chunk);
if (!cs) { /* nothing to send for this run */
*len = 0;
ogg_int64_t cs = get_chunk_size(current_chunk);
if (!cs) { /* nothing to send for this run */
*len = 0;
}
if (cs < 0) { /* eof */
*len = 0;
return NULL;
}
*len = cs;
}
if (cs < 0) { /* eof */
*len = 0;
return NULL;
}
*len = cs;
- if (!oggbuf || oggbuf_len < *len) {
+ if (!inbuf || oggbuf_len < *len) {
PARA_INFO_LOG("increasing ogg buffer size (%d -> %zu)\n",
oggbuf_len, *len);
PARA_INFO_LOG("increasing ogg buffer size (%d -> %zu)\n",
oggbuf_len, *len);
- oggbuf = para_realloc(oggbuf, *len);
+ inbuf = para_realloc(inbuf, *len);
- ret = read(fileno(infile), oggbuf, *len);
+ ret = read(fileno(infile), inbuf, *len);
if (!ret) {
*len = 0;
return NULL;
if (!ret) {
*len = 0;
return NULL;
if (ret != *len)
PARA_WARNING_LOG("short read (%d/%zd)\n", ret, *len);
*len = ret;
if (ret != *len)
PARA_WARNING_LOG("short read (%d/%zd)\n", ret, *len);
*len = ret;
}
static char *ogg_get_header_info(int *len)
}
static char *ogg_get_header_info(int *len)