devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Remove some unneeded code that caused problems for enhanced AAC files.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11648 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Magnus Holmgren 2006-12-03 13:51:30 +00:00
parent 53a93bea5b
commit 10a9b4ef53
1 changed files with 5 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

57
apps/codecs/libm4a/demux.c
View file

@ -79,50 +79,6 @@ static void read_chunk_ftyp(qtmovie_t *qtmovie, size_t chunk_len)
} }
} }
/* media handler inside mdia */
static void read_chunk_hdlr(qtmovie_t *qtmovie, size_t chunk_len)
{
fourcc_t comptype, compsubtype;
size_t size_remaining = chunk_len - 8;
int strlen;
char str[256] = {0};
/* version */
stream_read_uint8(qtmovie->stream);
size_remaining -= 1;
/* flags */
stream_read_uint8(qtmovie->stream);
stream_read_uint8(qtmovie->stream);
stream_read_uint8(qtmovie->stream);
size_remaining -= 3;
/* component type */
comptype = stream_read_uint32(qtmovie->stream);
compsubtype = stream_read_uint32(qtmovie->stream);
size_remaining -= 8;
/* component manufacturer */
stream_read_uint32(qtmovie->stream);
size_remaining -= 4;
/* flags */
stream_read_uint32(qtmovie->stream);
stream_read_uint32(qtmovie->stream);
size_remaining -= 8;
/* name */
strlen = stream_read_uint8(qtmovie->stream);
stream_read(qtmovie->stream, strlen, str);
size_remaining -= 1 + strlen;
if (size_remaining)
{
stream_skip(qtmovie->stream, size_remaining);
}
}
uint32_t mp4ff_read_mp4_descr_length(stream_t* stream) uint32_t mp4ff_read_mp4_descr_length(stream_t* stream)
{ {
uint8_t b; uint8_t b;
@ -300,7 +256,7 @@ static bool read_chunk_stsd(qtmovie_t *qtmovie, size_t chunk_len)
sub_chunk_len = stream_read_uint32(qtmovie->stream); sub_chunk_len = stream_read_uint32(qtmovie->stream);
if (sub_chunk_len <= 1 || sub_chunk_len > entry_remaining) if (sub_chunk_len <= 1 || sub_chunk_len > entry_remaining)
{ {
DEBUGF("strange size for chunk inside mp4a\n"); DEBUGF("strange size (%u) for chunk inside mp4a\n", sub_chunk_len);
return false; return false;
} }
@ -531,7 +487,7 @@ static bool read_chunk_stbl(qtmovie_t *qtmovie, size_t chunk_len)
sub_chunk_len = stream_read_uint32(qtmovie->stream); sub_chunk_len = stream_read_uint32(qtmovie->stream);
if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining) if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining)
{ {
DEBUGF("strange size for chunk inside stbl\n"); DEBUGF("strange size (%u) for chunk inside stbl\n", sub_chunk_len);
return false; return false;
} }
@ -648,7 +604,7 @@ static bool read_chunk_mdia(qtmovie_t *qtmovie, size_t chunk_len)
sub_chunk_len = stream_read_uint32(qtmovie->stream); sub_chunk_len = stream_read_uint32(qtmovie->stream);
if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining) if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining)
{ {
DEBUGF("strange size for chunk inside mdia\n"); DEBUGF("strange size (%u) for chunk inside mdia\n", sub_chunk_len);
return false; return false;
} }
@ -656,9 +612,6 @@ static bool read_chunk_mdia(qtmovie_t *qtmovie, size_t chunk_len)
switch (sub_chunk_id) switch (sub_chunk_id)
{ {
case MAKEFOURCC('h','d','l','r'):
read_chunk_hdlr(qtmovie, sub_chunk_len);
break;
case MAKEFOURCC('m','i','n','f'): case MAKEFOURCC('m','i','n','f'):
if (!read_chunk_minf(qtmovie, sub_chunk_len)) { if (!read_chunk_minf(qtmovie, sub_chunk_len)) {
return false; return false;
@ -689,7 +642,7 @@ static bool read_chunk_trak(qtmovie_t *qtmovie, size_t chunk_len)
sub_chunk_len = stream_read_uint32(qtmovie->stream); sub_chunk_len = stream_read_uint32(qtmovie->stream);
if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining) if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining)
{ {
DEBUGF("strange size for chunk inside trak\n"); DEBUGF("strange size (%u) for chunk inside trak\n", sub_chunk_len);
return false; return false;
} }
@ -727,7 +680,7 @@ static bool read_chunk_moov(qtmovie_t *qtmovie, size_t chunk_len)
sub_chunk_len = stream_read_uint32(qtmovie->stream); sub_chunk_len = stream_read_uint32(qtmovie->stream);
if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining) if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining)
{ {
DEBUGF("strange size for chunk inside moov\n"); DEBUGF("strange size (%u) for chunk inside moov\n", sub_chunk_len);
return false; return false;
} }