#include "error.h"
#include "string.h"
#include "aac.h"
+#include "fd.h"
/* must be big enough to hold header */
#define DEFAULT_INBUF_SIZE 65536
static FILE *infile;
static int inbuf_size;
static unsigned char *inbuf;
-static unsigned inbuf_len;
+static size_t inbuf_len;
struct audio_format *af;
-
-static unsigned num_chunks, entry;
+static size_t num_chunks;
+static size_t entry;
static size_t *chunk_table;
NeAACDecHandle handle;
-
static void aac_close_audio_file(void)
{
+ if (!infile)
+ return;
+ fclose(infile);
+ infile = NULL;
}
-static int aac_find_stsz(unsigned char *buf, unsigned buflen, unsigned *skip)
+static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip)
{
int i;
return -E_STSZ;
}
-static int read_chunk_table(unsigned skip)
+static int read_chunk_table(size_t skip)
{
int ret, i;
- long unsigned sum = 0;
+ size_t sum = 0;
for (;;) {
ret = aac_find_stsz(inbuf, inbuf_len, &skip);
PARA_INFO_LOG("next buffer: %d bytes\n", ret);
}
num_chunks = ret;
- PARA_INFO_LOG("sz table has %d entries\n", num_chunks);
+ PARA_INFO_LOG("sz table has %zu entries\n", num_chunks);
free(chunk_table);
chunk_table = para_malloc(num_chunks * sizeof(size_t));
for (i = 0; i < num_chunks; i++) {
return -E_AAC_READ;
inbuf_len = ret + skip;
skip = 0;
- PARA_INFO_LOG("next buffer: %d bytes\n", inbuf_len);
+ PARA_INFO_LOG("next buffer: %zu bytes\n", inbuf_len);
}
sum += aac_read_int32(inbuf + skip);
chunk_table[i] = sum;
skip += 4;
if (i < 10 || i > num_chunks - 10)
- PARA_DEBUG_LOG("offset #%d: %d\n", i, chunk_table[i]);
+ PARA_DEBUG_LOG("offset #%d: %zu\n", i, chunk_table[i]);
}
return 1;
static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames,
int *seconds)
{
- int ret, skip, decoder_len;
+ int ret, decoder_len;
+ size_t skip;
unsigned long rate = 0;
unsigned char channels = 0;
mp4AudioSpecificConfig mp4ASC;
PARA_INFO_LOG("next buffer: %d bytes\n", ret);
}
entry = ret;
- PARA_INFO_LOG("offset table has %d entries\, entry: %zd\n", num_chunks,
+ PARA_INFO_LOG("offset table has %zu entries, entry: %zu\n", num_chunks,
entry);
#if 1
- sprintf(info_str, "audio_file_info1:%d x %lums\n"
+ sprintf(info_str, "audio_file_info1:%zu x %lums\n"
"audio_file_info2:\n"
"audio_file_info3:\n",
num_chunks,
struct timeval total_tv;
tv_scale(num_chunks, &af->chunk_tv, &total_tv);
*seconds = tv2ms(&total_tv) / 1000;
- PARA_INFO_LOG("%d seconds, %d chunks\n", *seconds, num_chunks);
+ PARA_INFO_LOG("%d seconds, %zu chunks\n", *seconds, num_chunks);
}
#endif
return 1;
// return -E_AAC_REPOS;
}
-static __must_check int para_fread(void *ptr, size_t size, size_t nmemb, FILE *stream)
-{
- size_t res = fread(ptr, size, nmemb, stream);
- if (res == nmemb)
- return size * nmemb;
- if (feof(stream))
- return 0;
- return -E_FREAD;
-}
-
static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
{
int ret;
return (char *)inbuf;
}
+/** the init function of the aac audio format handler */
void aac_afh_init(void *p)
{
af = p;