diff options
| author | roman.artiukhin <bahusdrive@gmail.com> | 2023-08-31 02:09:40 +0300 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2023-09-29 08:21:27 -0400 |
| commit | d05f6aac2d51b2c284b8185bc34383e62e2fb21f (patch) | |
| tree | e600bca6085e5a8270eca487be1af77326c1b5bb | |
| parent | fee50135149fbec0e5973caaa528826c256c66ac (diff) | |
| download | rockbox-d05f6aac2d.tar.gz rockbox-d05f6aac2d.zip | |
Codecs: mp4: Skip FOURCC filetype chunk check
Instead of FOURCC it needs ignore-case text match. Also value can contain \0 ('m4a\0' instead of expected 'm4a ').But let's simply skip it and let decoder handle it.
Change-Id: I87eefcabbc9010481286257c26cee09e61d1221c
| -rw-r--r-- | lib/rbcodec/codecs/libm4a/demux.c | 17 | ||||
| -rw-r--r-- | lib/rbcodec/metadata/mp4.c | 23 |
2 files changed, 8 insertions, 32 deletions
diff --git a/lib/rbcodec/codecs/libm4a/demux.c b/lib/rbcodec/codecs/libm4a/demux.c index 47cce9857f..2b56759b9c 100644 --- a/lib/rbcodec/codecs/libm4a/demux.c +++ b/lib/rbcodec/codecs/libm4a/demux.c @@ -56,22 +56,13 @@ typedef struct /* chunk handlers */ static void read_chunk_ftyp(qtmovie_t *qtmovie, size_t chunk_len) { - fourcc_t type; size_t size_remaining = chunk_len - 8; - type = stream_read_uint32(qtmovie->stream); + // filetype (supported ignore case values: m4a, m4b, mp42, 3gp6, qt, isom) + char filetype[4]; + stream_read(qtmovie->stream, 4, filetype); size_remaining-=4; - if ((type != MAKEFOURCC('M','4','A',' ')) && - (type != MAKEFOURCC('m','4','a',' ')) && - (type != MAKEFOURCC('M','4','B',' ')) && - (type != MAKEFOURCC('m','p','4','2')) && - (type != MAKEFOURCC('3','g','p','6')) && - (type != MAKEFOURCC('q','t',' ',' ')) && - (type != MAKEFOURCC('i','s','o','m'))) - { - DEBUGF("not M4A file\n"); - return; - } + /* minor_ver = */ stream_read_uint32(qtmovie->stream); size_remaining-=4; diff --git a/lib/rbcodec/metadata/mp4.c b/lib/rbcodec/metadata/mp4.c index 1540e93738..e05a588e7e 100644 --- a/lib/rbcodec/metadata/mp4.c +++ b/lib/rbcodec/metadata/mp4.c @@ -57,10 +57,6 @@ #define MP4_gnre FOURCC('g', 'n', 'r', 'e') #define MP4_hdlr FOURCC('h', 'd', 'l', 'r') #define MP4_ilst FOURCC('i', 'l', 's', 't') -#define MP4_isom FOURCC('i', 's', 'o', 'm') -#define MP4_M4A FOURCC('M', '4', 'A', ' ') -#define MP4_m4a FOURCC('m', '4', 'a', ' ') /*technically its "M4A "*/ -#define MP4_M4B FOURCC('M', '4', 'B', ' ') /*but files exist with lower case*/ #define MP4_mdat FOURCC('m', 'd', 'a', 't') #define MP4_mdia FOURCC('m', 'd', 'i', 'a') #define MP4_mdir FOURCC('m', 'd', 'i', 'r') @@ -68,8 +64,6 @@ #define MP4_minf FOURCC('m', 'i', 'n', 'f') #define MP4_moov FOURCC('m', 'o', 'o', 'v') #define MP4_mp4a FOURCC('m', 'p', '4', 'a') -#define MP4_mp42 FOURCC('m', 'p', '4', '2') -#define MP4_qt FOURCC('q', 't', ' ', ' ') #define MP4_soun FOURCC('s', 'o', 'u', 'n') #define MP4_stbl FOURCC('s', 't', 'b', 'l') #define MP4_stsd FOURCC('s', 't', 's', 'd') @@ -618,20 +612,11 @@ static bool read_mp4_container(int fd, struct mp3entry* id3, { case MP4_ftyp: { - uint32_t id; - - read_uint32be(fd, &id); + // filetype (supported ignore case values: m4a, m4b, mp42, 3gp6, qt, isom) + char filetype[4]; + read(fd, &filetype, 4); + DEBUGF("MP4 file type: '%.4s'\n", filetype); size -= 4; - - if ((id != MP4_M4A) && (id != MP4_M4B) && (id != MP4_mp42) - && (id != MP4_qt) && (id != MP4_3gp6) && (id != MP4_m4a) - && (id != MP4_isom)) - { - DEBUGF("Unknown MP4 file type: '%c%c%c%c'\n", - (int)(id >> 24 & 0xff), (int)(id >> 16 & 0xff), - (int)(id >> 8 & 0xff), (int)(id & 0xff)); - return false; - } } break; |