From 2187e113d02a2257cbbb02902a942946ffdc2e7e Mon Sep 17 00:00:00 2001 From: Andre Date: Sat, 13 May 2006 06:20:17 +0200 Subject: [PATCH] aac: move aac_find_stsz from aac_common.c to to aac_afh.c It is only used there. --- aac.h | 1 - aac_afh.c | 26 ++++++++++++++++++++++++++ aac_common.c | 25 ------------------------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/aac.h b/aac.h index 373872e7..015bff8c 100644 --- a/aac.h +++ b/aac.h @@ -4,5 +4,4 @@ NeAACDecHandle aac_open(void); int aac_find_esds(unsigned char *buf, unsigned buflen, int *skip); int aac_find_entry(unsigned char *buf, unsigned buflen, int *skip); -int aac_find_stsz(unsigned char *buf, unsigned buflen, unsigned *skip); unsigned aac_read_int32(unsigned char *buf); diff --git a/aac_afh.c b/aac_afh.c index 93bcd427..b7e828f4 100644 --- a/aac_afh.c +++ b/aac_afh.c @@ -44,6 +44,32 @@ static void aac_close_audio_file(void) { } +static int aac_find_stsz(unsigned char *buf, unsigned buflen, unsigned *skip) +{ + int i; + + for (i = 0; i + 16 < buflen; i++) { + unsigned char *p = buf + i; + unsigned sample_count, sample_size; + + if (p[0] != 's' || p[1] != 't' || p[2] != 's' || p[3] != 'z') + continue; + PARA_INFO_LOG("found stsz@%d\n", i); + i += 8; + sample_size = aac_read_int32(buf + i); + PARA_INFO_LOG("sample size: %d\n", sample_size); + i += 4; + sample_count = aac_read_int32(buf + i); + i += 4; + PARA_INFO_LOG("sample count: %d\n", sample_count); + *skip = i; + return sample_count; + } + PARA_WARNING_LOG("stsz not found, buflen: %d\n", buflen); + return -E_STCO; +} + + static int read_stsz(unsigned skip) { int ret, i; diff --git a/aac_common.c b/aac_common.c index 9edeb1c5..148fefc3 100644 --- a/aac_common.c +++ b/aac_common.c @@ -95,28 +95,3 @@ int aac_find_entry(unsigned char *buf, unsigned buflen, int *skip) return -E_STCO; } -int aac_find_stsz(unsigned char *buf, unsigned buflen, unsigned *skip) -{ - int i; - - for (i = 0; i + 16 < buflen; i++) { - unsigned char *p = buf + i; - unsigned sample_count, sample_size; - - if (p[0] != 's' || p[1] != 't' || p[2] != 's' || p[3] != 'z') - continue; - PARA_INFO_LOG("found stsz@%d\n", i); - i += 8; - sample_size = aac_read_int32(buf + i); - PARA_INFO_LOG("sample size: %d\n", sample_size); - i += 4; - sample_count = aac_read_int32(buf + i); - i += 4; - PARA_INFO_LOG("sample count: %d\n", sample_count); - *skip = i; - return sample_count; - } - PARA_WARNING_LOG("stsz not found, buflen: %d\n", buflen); - return -E_STCO; -} - -- 2.39.5