From: Andre Noll Date: Sun, 22 Aug 2021 20:49:13 +0000 (+0200) Subject: mp4: Remove unused atoms. X-Git-Tag: v0.7.1~7^2~34 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=cb5cfd1ee950397d8393b57391755358179fc3f3 mp4: Remove unused atoms. The enum and atom_name_to_type() still knows about a lot of atoms we don't care about. These only clutter up the code and slow things down, so drop them. --- diff --git a/mp4.c b/mp4.c index 1f504fc3..b17c8171 100644 --- a/mp4.c +++ b/mp4.c @@ -147,7 +147,6 @@ enum atoms { /* atoms with subatoms */ ATOM_MOOV = 1, ATOM_TRAK = 2, - ATOM_EDTS = 3, ATOM_MDIA = 4, ATOM_MINF = 5, ATOM_STBL = 6, @@ -155,76 +154,25 @@ enum atoms { ATOM_ILST = 8, /* iTunes Metadata list */ ATOM_TITLE = 9, ATOM_ARTIST = 10, - ATOM_WRITER = 11, ATOM_ALBUM = 12, ATOM_DATE = 13, - ATOM_TOOL = 14, ATOM_COMMENT = 15, - ATOM_GENRE1 = 16, - ATOM_TRACK = 17, - ATOM_DISC = 18, - ATOM_COMPILATION = 19, - ATOM_GENRE2 = 20, - ATOM_TEMPO = 21, - ATOM_COVER = 22, - ATOM_DRMS = 23, - ATOM_SINF = 24, - ATOM_SCHI = 25, SUBATOMIC = 128, /* atoms without subatoms */ - ATOM_FTYP = 129, - ATOM_MDAT = 130, - ATOM_MVHD = 131, - ATOM_TKHD = 132, - ATOM_TREF = 133, ATOM_MDHD = 134, /* track header */ - ATOM_VMHD = 135, - ATOM_SMHD = 136, - ATOM_HMHD = 137, ATOM_STSD = 138, /* sample description box */ ATOM_STTS = 139, /* time to sample box */ ATOM_STSZ = 140, /* sample size box */ - ATOM_STZ2 = 141, ATOM_STCO = 142, /* chunk offset box */ ATOM_STSC = 143, /* sample to chunk box */ ATOM_MP4A = 144, - ATOM_MP4V = 145, - ATOM_MP4S = 146, - ATOM_ESDS = 147, ATOM_META = 148, /* iTunes Metadata box */ - ATOM_NAME = 149, /* iTunes Metadata name box */ ATOM_DATA = 150, /* iTunes Metadata data box */ - ATOM_CTTS = 151, - ATOM_FRMA = 152, - ATOM_IVIV = 153, - ATOM_PRIV = 154, - ATOM_USER = 155, - ATOM_KEY = 156, - ATOM_ALBUM_ARTIST = 157, - ATOM_CONTENTGROUP = 158, - ATOM_LYRICS = 159, - ATOM_DESCRIPTION = 160, - ATOM_NETWORK = 161, - ATOM_SHOW = 162, - ATOM_EPISODENAME = 163, - ATOM_SORTTITLE = 164, - ATOM_SORTALBUM = 165, - ATOM_SORTARTIST = 166, - ATOM_SORTALBUMARTIST = 167, - ATOM_SORTWRITER = 168, - ATOM_SORTSHOW = 169, - ATOM_SEASON = 170, - ATOM_EPISODE = 171, - ATOM_PODCAST = 172, - ATOM_UNKNOWN = 255 }; -#define ATOM_FREE ATOM_UNKNOWN -#define ATOM_SKIP ATOM_UNKNOWN - #define COPYRIGHT_SYMBOL ((int8_t)0xA9) static uint8_t atom_name_to_type(int8_t a, int8_t b, int8_t c, int8_t d) @@ -236,46 +184,18 @@ static uint8_t atom_name_to_type(int8_t a, int8_t b, int8_t c, int8_t d) return ATOM_MINF; else if (atom_compare(a, b, c, d, 'm', 'd', 'i', 'a')) return ATOM_MDIA; - else if (atom_compare(a, b, c, d, 'm', 'd', 'a', 't')) - return ATOM_MDAT; else if (atom_compare(a, b, c, d, 'm', 'd', 'h', 'd')) return ATOM_MDHD; - else if (atom_compare(a, b, c, d, 'm', 'v', 'h', 'd')) - return ATOM_MVHD; else if (atom_compare(a, b, c, d, 'm', 'p', '4', 'a')) return ATOM_MP4A; - else if (atom_compare(a, b, c, d, 'm', 'p', '4', 'v')) - return ATOM_MP4V; - else if (atom_compare(a, b, c, d, 'm', 'p', '4', 's')) - return ATOM_MP4S; else if (atom_compare(a, b, c, d, 'm', 'e', 't', 'a')) return ATOM_META; } else if (a == 't') { if (atom_compare(a, b, c, d, 't', 'r', 'a', 'k')) return ATOM_TRAK; - else if (atom_compare(a, b, c, d, 't', 'k', 'h', 'd')) - return ATOM_TKHD; - else if (atom_compare(a, b, c, d, 't', 'r', 'e', 'f')) - return ATOM_TREF; - else if (atom_compare(a, b, c, d, 't', 'r', 'k', 'n')) - return ATOM_TRACK; - else if (atom_compare(a, b, c, d, 't', 'm', 'p', 'o')) - return ATOM_TEMPO; - else if (atom_compare(a, b, c, d, 't', 'v', 'n', 'n')) - return ATOM_NETWORK; - else if (atom_compare(a, b, c, d, 't', 'v', 's', 'h')) - return ATOM_SHOW; - else if (atom_compare(a, b, c, d, 't', 'v', 'e', 'n')) - return ATOM_EPISODENAME; - else if (atom_compare(a, b, c, d, 't', 'v', 's', 'n')) - return ATOM_SEASON; - else if (atom_compare(a, b, c, d, 't', 'v', 'e', 's')) - return ATOM_EPISODE; } else if (a == 's') { if (atom_compare(a, b, c, d, 's', 't', 'b', 'l')) return ATOM_STBL; - else if (atom_compare(a, b, c, d, 's', 'm', 'h', 'd')) - return ATOM_SMHD; else if (atom_compare(a, b, c, d, 's', 't', 's', 'd')) return ATOM_STSD; else if (atom_compare(a, b, c, d, 's', 't', 't', 's')) @@ -286,97 +206,24 @@ static uint8_t atom_name_to_type(int8_t a, int8_t b, int8_t c, int8_t d) return ATOM_STSC; else if (atom_compare(a, b, c, d, 's', 't', 's', 'z')) return ATOM_STSZ; - else if (atom_compare(a, b, c, d, 's', 't', 'z', '2')) - return ATOM_STZ2; - else if (atom_compare(a, b, c, d, 's', 'k', 'i', 'p')) - return ATOM_SKIP; - else if (atom_compare(a, b, c, d, 's', 'i', 'n', 'f')) - return ATOM_SINF; - else if (atom_compare(a, b, c, d, 's', 'c', 'h', 'i')) - return ATOM_SCHI; - else if (atom_compare(a, b, c, d, 's', 'o', 'n', 'm')) - return ATOM_SORTTITLE; - else if (atom_compare(a, b, c, d, 's', 'o', 'a', 'l')) - return ATOM_SORTALBUM; - else if (atom_compare(a, b, c, d, 's', 'o', 'a', 'r')) - return ATOM_SORTARTIST; - else if (atom_compare(a, b, c, d, 's', 'o', 'a', 'a')) - return ATOM_SORTALBUMARTIST; - else if (atom_compare(a, b, c, d, 's', 'o', 'c', 'o')) - return ATOM_SORTWRITER; - else if (atom_compare(a, b, c, d, 's', 'o', 's', 'n')) - return ATOM_SORTSHOW; } else if (a == COPYRIGHT_SYMBOL) { if (atom_compare(a, b, c, d, COPYRIGHT_SYMBOL, 'n', 'a', 'm')) return ATOM_TITLE; else if (atom_compare(a, b, c, d, COPYRIGHT_SYMBOL, 'A', 'R', 'T')) return ATOM_ARTIST; - else if (atom_compare(a, b, c, d, COPYRIGHT_SYMBOL, 'w', 'r', 't')) - return ATOM_WRITER; else if (atom_compare(a, b, c, d, COPYRIGHT_SYMBOL, 'a', 'l', 'b')) return ATOM_ALBUM; else if (atom_compare(a, b, c, d, COPYRIGHT_SYMBOL, 'd', 'a', 'y')) return ATOM_DATE; - else if (atom_compare(a, b, c, d, COPYRIGHT_SYMBOL, 't', 'o', 'o')) - return ATOM_TOOL; else if (atom_compare(a, b, c, d, COPYRIGHT_SYMBOL, 'c', 'm', 't')) return ATOM_COMMENT; - else if (atom_compare(a, b, c, d, COPYRIGHT_SYMBOL, 'g', 'e', 'n')) - return ATOM_GENRE1; - else if (atom_compare(a, b, c, d, COPYRIGHT_SYMBOL, 'g', 'r', 'p')) - return ATOM_CONTENTGROUP; - else if (atom_compare(a, b, c, d, COPYRIGHT_SYMBOL, 'l', 'y', 'r')) - return ATOM_LYRICS; } - - if (atom_compare(a, b, c, d, 'e', 'd', 't', 's')) - return ATOM_EDTS; - else if (atom_compare(a, b, c, d, 'e', 's', 'd', 's')) - return ATOM_ESDS; - else if (atom_compare(a, b, c, d, 'f', 't', 'y', 'p')) - return ATOM_FTYP; - else if (atom_compare(a, b, c, d, 'f', 'r', 'e', 'e')) - return ATOM_FREE; - else if (atom_compare(a, b, c, d, 'h', 'm', 'h', 'd')) - return ATOM_HMHD; - else if (atom_compare(a, b, c, d, 'v', 'm', 'h', 'd')) - return ATOM_VMHD; - else if (atom_compare(a, b, c, d, 'u', 'd', 't', 'a')) + if (atom_compare(a, b, c, d, 'u', 'd', 't', 'a')) return ATOM_UDTA; else if (atom_compare(a, b, c, d, 'i', 'l', 's', 't')) return ATOM_ILST; - else if (atom_compare(a, b, c, d, 'n', 'a', 'm', 'e')) - return ATOM_NAME; else if (atom_compare(a, b, c, d, 'd', 'a', 't', 'a')) return ATOM_DATA; - else if (atom_compare(a, b, c, d, 'd', 'i', 's', 'k')) - return ATOM_DISC; - else if (atom_compare(a, b, c, d, 'g', 'n', 'r', 'e')) - return ATOM_GENRE2; - else if (atom_compare(a, b, c, d, 'c', 'o', 'v', 'r')) - return ATOM_COVER; - else if (atom_compare(a, b, c, d, 'c', 'p', 'i', 'l')) - return ATOM_COMPILATION; - else if (atom_compare(a, b, c, d, 'c', 't', 't', 's')) - return ATOM_CTTS; - else if (atom_compare(a, b, c, d, 'd', 'r', 'm', 's')) - return ATOM_DRMS; - else if (atom_compare(a, b, c, d, 'f', 'r', 'm', 'a')) - return ATOM_FRMA; - else if (atom_compare(a, b, c, d, 'p', 'r', 'i', 'v')) - return ATOM_PRIV; - else if (atom_compare(a, b, c, d, 'i', 'v', 'i', 'v')) - return ATOM_IVIV; - else if (atom_compare(a, b, c, d, 'u', 's', 'e', 'r')) - return ATOM_USER; - else if (atom_compare(a, b, c, d, 'k', 'e', 'y', ' ')) - return ATOM_KEY; - else if (atom_compare(a, b, c, d, 'a', 'A', 'R', 'T')) - return ATOM_ALBUM_ARTIST; - else if (atom_compare(a, b, c, d, 'd', 'e', 's', 'c')) - return ATOM_DESCRIPTION; - else if (atom_compare(a, b, c, d, 'p', 'c', 's', 't')) - return ATOM_PODCAST; else return ATOM_UNKNOWN; }