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

AAC codec: accept M4B files.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11681 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Magnus Holmgren 2006-12-07 09:24:31 +00:00
parent 7aab5302ac
commit de100c36cb
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -60,6 +60,7 @@ static void read_chunk_ftyp(qtmovie_t *qtmovie, size_t chunk_len)
type = stream_read_uint32(qtmovie->stream); type = stream_read_uint32(qtmovie->stream);
size_remaining-=4; size_remaining-=4;
if ((type != MAKEFOURCC('M','4','A',' ')) && if ((type != MAKEFOURCC('M','4','A',' ')) &&
(type != MAKEFOURCC('M','4','B',' ')) &&
(type != MAKEFOURCC('m','p','4','2')) && (type != MAKEFOURCC('m','p','4','2')) &&
(type != MAKEFOURCC('3','g','p','6')) && (type != MAKEFOURCC('3','g','p','6')) &&
(type != MAKEFOURCC('q','t',' ',' '))) (type != MAKEFOURCC('q','t',' ',' ')))

5
apps/metadata.c
View file

@ -55,6 +55,7 @@ enum tagtype { TAGTYPE_APE = 1, TAGTYPE_VORBIS };
#define MP4_hdlr MP4_ID('h', 'd', 'l', 'r') #define MP4_hdlr MP4_ID('h', 'd', 'l', 'r')
#define MP4_ilst MP4_ID('i', 'l', 's', 't') #define MP4_ilst MP4_ID('i', 'l', 's', 't')
#define MP4_M4A MP4_ID('M', '4', 'A', ' ') #define MP4_M4A MP4_ID('M', '4', 'A', ' ')
#define MP4_M4B MP4_ID('M', '4', 'B', ' ')
#define MP4_mdat MP4_ID('m', 'd', 'a', 't') #define MP4_mdat MP4_ID('m', 'd', 'a', 't')
#define MP4_mdia MP4_ID('m', 'd', 'i', 'a') #define MP4_mdia MP4_ID('m', 'd', 'i', 'a')
#define MP4_mdir MP4_ID('m', 'd', 'i', 'r') #define MP4_mdir MP4_ID('m', 'd', 'i', 'r')
@ -1318,8 +1319,8 @@ static bool read_mp4_container(int fd, struct mp3entry* id3,
read_uint32be(fd, &id); read_uint32be(fd, &id);
size -= 4; size -= 4;
if ((id != MP4_M4A) && (id != MP4_mp42) && (id != MP4_qt) if ((id != MP4_M4A) && (id != MP4_M4B) && (id != MP4_mp42)
&& (id != MP4_3gp6)) && (id != MP4_qt) && (id != MP4_3gp6))
{ {
DEBUGF("Unknown MP4 file type: '%c%c%c%c'\n", DEBUGF("Unknown MP4 file type: '%c%c%c%c'\n",
id >> 24 & 0xff, id >> 16 & 0xff, id >> 8 & 0xff, id >> 24 & 0xff, id >> 16 & 0xff, id >> 8 & 0xff,