qt

5 files changed, 338 insertions, 295 deletions

diff --git a/src/include/extractor.h b/src/include/extractor.h
index 47eb197..960c13a 100644
--- a/src/include/extractor.h
+++ b/src/include/extractor.h
@@ -207,7 +207,7 @@ enum EXTRACTOR_MetaType
     EXTRACTOR_METATYPE_PACKAGE_PRE_DEPENDENCY = 84,
     EXTRACTOR_METATYPE_LICENSE = 85,
     EXTRACTOR_METATYPE_PACKAGE_DISTRIBUTION = 86,
-    EXTRACTOR_METATYPE_PACKAGE_BUILDHOST = 87,
+    EXTRACTOR_METATYPE_BUILDHOST = 87,
     EXTRACTOR_METATYPE_VENDOR = 88,
     EXTRACTOR_METATYPE_TARGET_OS = 89,
     EXTRACTOR_METATYPE_SOFTWARE_VERSION = 90,
@@ -276,6 +276,13 @@ enum EXTRACTOR_MetaType
     EXTRACTOR_METATYPE_DISCLAIMER = 144,
     EXTRACTOR_METATYPE_WARNING = 145,
     EXTRACTOR_METATYPE_PAGE_ORDER = 146,
+    EXTRACTOR_METATYPE_WRITER = 147,
+    EXTRACTOR_METATYPE_PRODUCT_VERSION = 148,
+    EXTRACTOR_METATYPE_CONTRIBUTOR_NAME = 149,
+    EXTRACTOR_METATYPE_MOVIE_DIRECTOR = 150,
+    EXTRACTOR_METATYPE_TV_NETWORK_NAME = 151,
+    EXTRACTOR_METATYPE_TV_SHOW_NAME = 152,
+    EXTRACTOR_METATYPE_CHAPTER_NAME = 153,
 
     /* fixme: used up to here! */
 
@@ -283,7 +290,6 @@ enum EXTRACTOR_MetaType
     EXTRACTOR_METATYPE_CONDUCTOR = 64,
     EXTRACTOR_METATYPE_INTERPRET = 65,
     EXTRACTOR_METATYPE_MUSIC_CD_IDENTIFIER = 117,
-    EXTRACTOR_METATYPE_MOVIE_DIRECTOR = 110,
     EXTRACTOR_METATYPE_SONG_COUNT = 127,
     EXTRACTOR_METATYPE_STARTING_SONG = 128,
     EXTRACTOR_METATYPE_MUSICIAN_CREDITS_LIST = 123,
@@ -311,12 +317,10 @@ enum EXTRACTOR_MetaType
 
     EXTRACTOR_METATYPE_GENERATOR = 103,
     EXTRACTOR_METATYPE_ENCODED_BY = 121,
-    EXTRACTOR_METATYPE_PROUCUCTVERSION = 90,
 
     EXTRACTOR_METATYPE_FULL_DATA = 137,
 
     EXTRACTOR_METATYPE_ORGANIZATION = 15,
-    EXTRACTOR_METATYPE_CONTRIBUTOR = 19,
     EXTRACTOR_METATYPE_RELATION = 24,
     EXTRACTOR_METATYPE_COVERAGE = 25,
     EXTRACTOR_METATYPE_SOFTWARE = 26,
@@ -328,7 +332,6 @@ enum EXTRACTOR_MetaType
     EXTRACTOR_METATYPE_OWNER = 66,
     EXTRACTOR_METATYPE_MEDIA_TYPE = 68,
     EXTRACTOR_METATYPE_SECURITY = 97,
-    EXTRACTOR_METATYPE_INFORMATION = 112,
     EXTRACTOR_METATYPE_FULL_NAME = 113,
     EXTRACTOR_METATYPE_LINK = 116,
     EXTRACTOR_METATYPE_TIME = 122,
diff --git a/src/main/extractor_metatypes.c b/src/main/extractor_metatypes.c
index f59172a..2864488 100644
--- a/src/main/extractor_metatypes.c
+++ b/src/main/extractor_metatypes.c
@@ -360,8 +360,21 @@ static const struct MetaTypeDescription meta_type_descriptions[] = {
     gettext_noop ("warning about the nature of the content") }, 
   { gettext_noop ("page order"),
     gettext_noop ("order of the pages") }, 
-  { gettext_noop (""),
+  { gettext_noop ("writer"),
+    gettext_noop ("contributing writer") }, 
+  { gettext_noop ("product version"),
     gettext_noop ("") }, 
+  { gettext_noop ("contributor"),
+    gettext_noop ("name of a contributor") }, 
+  /* 150 */
+  { gettext_noop ("movie director"),
+    gettext_noop ("name of the director") }, 
+  { gettext_noop ("TV network"),
+    gettext_noop ("name of the broadcasting TV network") }, 
+  { gettext_noop ("TV show"),
+    gettext_noop ("name of the TV show") }, 
+  { gettext_noop ("chapter name"),
+    gettext_noop ("name of the chapter") }, 
   { gettext_noop (""),
     gettext_noop ("") }, 
   { gettext_noop (""),
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index ee0184d..91f8d6b 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -89,6 +89,7 @@ plugin_LTLIBRARIES = \
   $(pdf) \
   libextractor_png.la \
   libextractor_ps.la \
+  libextractor_qt.la \
   libextractor_real.la \
   $(rpm) \
   libextractor_tar.la \
@@ -249,6 +250,13 @@ libextractor_ps_la_SOURCES = \
 libextractor_ps_la_LDFLAGS = \
   $(PLUGINFLAGS)
 
+libextractor_qt_la_SOURCES = \
+  qt_extractor.c 
+libextractor_qt_la_LDFLAGS = \
+  $(PLUGINFLAGS)
+libextractor_qt_la_LIBADD = \
+  -lz -lm
+
 libextractor_real_la_SOURCES = \
   real_extractor.c 
 libextractor_real_la_LDFLAGS = \
@@ -303,7 +311,6 @@ OLD_LIBS = \
   $(extrampeg) \
   libextractor_nsf.la \
   libextractor_nsfe.la \
-  $(extraqt) \
   libextractor_riff.la \
   libextractor_s3m.la \
   libextractor_sid.la \
@@ -313,15 +320,6 @@ OLD_LIBS = \
   libextractor_xm.la \
   libextractor_zip.la 
 
-if HAVE_ZLIB
-libextractor_qt_la_SOURCES = \
-  qtextractor.c 
-libextractor_qt_la_LDFLAGS = \
-  $(PLUGINFLAGS)
-libextractor_qt_la_LIBADD = \
-  -lz
-endif
-
 
 libextractor_id3v2_la_SOURCES = \
   id3v2extractor.c 
diff --git a/src/plugins/qtextractor.c b/src/plugins/qt_extractor.c
index 0f89a1f..3abd543 100644
--- a/src/plugins/qtextractor.c
+++ b/src/plugins/qt_extractor.c
@@ -181,6 +181,227 @@ static const char *const genre_names[] = {
     ((unsigned int)(sizeof genre_names / sizeof (const char *const)))
 
 
+static const char *languages[] = {
+  "English",
+  "French",
+  "German",
+  "Italian",
+  "Dutch",
+  "Swedish",
+  "Spanish",
+  "Danish",
+  "Portuguese",
+  "Norwegian",
+  "Hebrew",
+  "Japanese",
+  "Arabic",
+  "Finnish",
+  "Greek",
+  "Icelandic",
+  "Maltese",
+  "Turkish",
+  "Croatian",
+  "Traditional Chinese",
+  "Urdu",
+  "Hindi",
+  "Thai",
+  "Korean",
+  "Lithuanian",
+  "Polish",
+  "Hungarian",
+  "Estonian",
+  "Lettish",
+  "Saamisk",
+  "Lappish",
+  "Faeroese",
+  "Farsi",
+  "Russian",
+  "Simplified Chinese",
+  "Flemish",
+  "Irish",
+  "Albanian",
+  "Romanian",
+  "Czech",
+  "Slovak",
+  "Slovenian",
+  "Yiddish",
+  "Serbian",
+  "Macedonian",
+  "Bulgarian",
+  "Ukrainian",
+  "Byelorussian",
+  "Uzbek",
+  "Kazakh",
+  "Azerbaijani",
+  "AzerbaijanAr",
+  "Armenian",
+  "Georgian",
+  "Moldavian",
+  "Kirghiz",
+  "Tajiki",
+  "Turkmen",
+  "Mongolian",
+  "MongolianCyr",
+  "Pashto",
+  "Kurdish",
+  "Kashmiri",
+  "Sindhi",
+  "Tibetan",
+  "Nepali",
+  "Sanskrit",
+  "Marathi",
+  "Bengali",
+  "Assamese",
+  "Gujarati",
+  "Punjabi",
+  "Oriya",
+  "Malayalam",
+  "Kannada",
+  "Tamil",
+  "Telugu",
+  "Sinhalese",
+  "Burmese",
+  "Khmer",
+  "Lao",
+  "Vietnamese",
+  "Indonesian",
+  "Tagalog",
+  "MalayRoman",
+  "MalayArabic",
+  "Amharic",
+  "Tigrinya",
+  "Galla",
+  "Oromo",
+  "Somali",
+  "Swahili",
+  "Ruanda",
+  "Rundi",
+  "Chewa",
+  "Malagasy",
+  "Esperanto",
+  "Welsh",
+  "Basque",
+  "Catalan",
+  "Latin",
+  "Quechua",
+  "Guarani",
+  "Aymara",
+  "Tatar",
+  "Uighur",
+  "Dzongkha",
+  "JavaneseRom",
+};
+
+
+typedef struct
+{
+  const char *ext;
+  const char *mime;
+} C2M;
+
+/* see http://www.mp4ra.org/filetype.html 
+ *     http://www.ftyps.com/ */
+static C2M ftMap[] = {
+  {"qt  ", "video/quicktime"},
+  {"isom", "video/mp4"},        /* ISO Base Media files */
+  {"iso2", "video/mp4"},
+  {"mp41", "video/mp4"},        /* MPEG-4 (ISO/IEC 14491-1) version 1 */
+  {"mp42", "video/mp4"},        /* MPEG-4 (ISO/IEC 14491-1) version 2 */
+  {"3gp1", "video/3gpp"},
+  {"3gp2", "video/3gpp"},
+  {"3gp3", "video/3gpp"},
+  {"3gp4", "video/3gpp"},
+  {"3gp5", "video/3gpp"},
+  {"3g2a", "video/3gpp2"},
+  {"mmp4", "video/mp4"},        /* Mobile MPEG-4 */
+  {"M4A ", "audio/mp4"},
+  {"M4B ", "audio/mp4"},
+  {"M4P ", "audio/mp4"},
+  {"M4V ", "video/mp4"},
+  {"mj2s", "video/mj2"},        /* Motion JPEG 2000 */
+  {"mjp2", "video/mj2"},
+  {NULL, NULL},
+};
+
+typedef struct CHE
+{
+  const char *pfx;
+  enum EXTRACTOR_MetaType type;
+} CHE;
+
+static CHE cHm[] = {
+  {"aut", EXTRACTOR_METATYPE_AUTHOR_NAME},
+  {"cpy", EXTRACTOR_METATYPE_COPYRIGHT},
+  {"day", EXTRACTOR_METATYPE_CREATION_DATE},
+  {"ed1", EXTRACTOR_METATYPE_MODIFICATION_DATE},
+  {"ed2", EXTRACTOR_METATYPE_MODIFICATION_DATE},
+  {"ed3", EXTRACTOR_METATYPE_MODIFICATION_DATE},
+  {"ed4", EXTRACTOR_METATYPE_MODIFICATION_DATE},
+  {"ed5", EXTRACTOR_METATYPE_MODIFICATION_DATE},
+  {"ed6", EXTRACTOR_METATYPE_MODIFICATION_DATE},
+  {"ed7", EXTRACTOR_METATYPE_MODIFICATION_DATE},
+  {"ed8", EXTRACTOR_METATYPE_MODIFICATION_DATE},
+  {"ed9", EXTRACTOR_METATYPE_MODIFICATION_DATE},
+  {"cmt", EXTRACTOR_METATYPE_COMMENT},
+  {"url", EXTRACTOR_METATYPE_URL},
+  {"enc", EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE},
+  {"hst", EXTRACTOR_METATYPE_BUILDHOST},
+  {"nam", EXTRACTOR_METATYPE_TITLE},
+  {"gen", EXTRACTOR_METATYPE_GENRE},
+  {"mak", EXTRACTOR_METATYPE_CAMERA_MAKE},
+  {"mod", EXTRACTOR_METATYPE_CAMERA_MODEL},
+  {"des", EXTRACTOR_METATYPE_DESCRIPTION},
+  {"dis", EXTRACTOR_METATYPE_DISCLAIMER},
+  {"dir", EXTRACTOR_METATYPE_MOVIE_DIRECTOR},
+  {"src", EXTRACTOR_METATYPE_CONTRIBUTOR_NAME},
+  {"prf", EXTRACTOR_METATYPE_PERFORMER },
+  {"prd", EXTRACTOR_METATYPE_PRODUCER},
+  {"PRD", EXTRACTOR_METATYPE_PRODUCT_VERSION}, 
+  {"swr", EXTRACTOR_METATYPE_PRODUCED_BY_SOFTWARE},
+  {"isr", EXTRACTOR_METATYPE_ISRC},
+  {"wrt", EXTRACTOR_METATYPE_WRITER},
+  {"wrn", EXTRACTOR_METATYPE_WARNING},
+  {"chp", EXTRACTOR_METATYPE_CHAPTER_NAME},
+  {"inf", EXTRACTOR_METATYPE_DESCRIPTION},
+  {"req", EXTRACTOR_METATYPE_TARGET_PLATFORM},      /* hardware requirements */
+  {"fmt", EXTRACTOR_METATYPE_FORMAT},
+  {NULL, EXTRACTOR_METATYPE_RESERVED },
+};
+
+
+typedef struct
+{
+  const char *atom_type;
+  enum EXTRACTOR_MetaType type;
+} ITTagConversionEntry;
+
+/* iTunes Tags:
+ * see http://atomicparsley.sourceforge.net/mpeg-4files.html */
+static ITTagConversionEntry it_to_extr_table[] = {
+  {"\xa9" "alb", EXTRACTOR_METATYPE_ALBUM},
+  {"\xa9" "ART", EXTRACTOR_METATYPE_ARTIST},
+  {"aART", EXTRACTOR_METATYPE_ARTIST},
+  {"\xa9" "cmt", EXTRACTOR_METATYPE_COMMENT},
+  {"\xa9" "day", EXTRACTOR_METATYPE_UNKNOWN_DATE},
+  {"\xa9" "nam", EXTRACTOR_METATYPE_TITLE},
+  {"trkn", EXTRACTOR_METATYPE_TRACK_NUMBER},
+  {"disk", EXTRACTOR_METATYPE_DISC_NUMBER},
+  {"\xa9" "gen", EXTRACTOR_METATYPE_GENRE},
+  {"gnre", EXTRACTOR_METATYPE_GENRE},
+  {"\xa9" "wrt", EXTRACTOR_METATYPE_WRITER},
+  {"\xa9" "too", EXTRACTOR_METATYPE_CREATED_BY_SOFTWARE},
+  {"cprt", EXTRACTOR_METATYPE_COPYRIGHT},
+  {"\xa9" "grp", EXTRACTOR_METATYPE_GROUP},
+  {"catg", EXTRACTOR_METATYPE_SECTION},
+  {"keyw", EXTRACTOR_METATYPE_KEYWORDS},
+  {"desc", EXTRACTOR_METATYPE_DESCRIPTION},
+  {"tvnn", EXTRACTOR_METATYPE_TV_NETWORK_NAME},
+  {"tvsh", EXTRACTOR_METATYPE_TV_SHOW_NAME}, 
+  {"tven", EXTRACTOR_METATYPE_TV_NETWORK_NAME},
+  {NULL, EXTRACTOR_METATYPE_RESERVED}
+};
+
+
 typedef struct
 {
   unsigned int size;
@@ -204,21 +425,6 @@ ntohll (unsigned long long n)
 #endif
 }
 
-static void
-addKeyword (EXTRACTOR_KeywordType type,
-            const char *keyword, struct EXTRACTOR_Keywords **list)
-{
-  EXTRACTOR_KeywordList *result;
-
-  if (keyword == NULL)
-    return;
-  result = malloc (sizeof (EXTRACTOR_KeywordList));
-  result->next = *list;
-  result->keyword = strdup (keyword);
-  result->keywordType = type;
-  *list = result;
-}
-
 
 /**
  * Check if at position pos there is a valid atom.
@@ -285,12 +491,37 @@ getAtomHeaderSize (const char *buf)
   return sizeof (Atom);
 }
 
+struct ExtractContext
+{
+  EXTRACTOR_MetaDataProcessor proc;
+  void *proc_cls;
+  int ret;
+};
+
+static void
+addKeyword (enum EXTRACTOR_MetaType type,
+            const char *str,
+            struct ExtractContext *ec)
+{
+  if (ec->ret != 0)
+    return;
+  ec->ret = ec->proc (ec->proc_cls,
+                      "qt",
+                      type,
+                      EXTRACTOR_METAFORMAT_UTF8,
+                      "text/plain",
+                      str,
+                      strlen(str)+1);
+}
+
+
+
 /**
  * Assumes that checkAtomValid has already been called.
  */
 typedef int (*AtomHandler) (const char *input,
                             size_t size,
-                            size_t pos, struct EXTRACTOR_Keywords ** list);
+                            size_t pos, struct ExtractContext *ec);
 
 typedef struct
 {
@@ -307,7 +538,8 @@ typedef struct
 static int handleAtom (HandlerEntry *handlers,
                        const char *input,
                        size_t size,
-                       size_t pos, struct EXTRACTOR_Keywords **list);
+                       size_t pos, 
+                       struct ExtractContext *ec);
 
 static HandlerEntry all_handlers[];
 static HandlerEntry ilst_handlers[];
@@ -318,7 +550,7 @@ static HandlerEntry ilst_handlers[];
  */
 static int
 processAtoms (HandlerEntry *handlers, const char *input,
-                 size_t size, struct EXTRACTOR_Keywords **list)
+                 size_t size, struct ExtractContext *ec)
 {
   size_t pos;
 
@@ -327,7 +559,7 @@ processAtoms (HandlerEntry *handlers, const char *input,
   pos = 0;
   while (pos < size - sizeof (Atom))
     {
-      if (0 == handleAtom (handlers, input, size, pos, list))
+      if (0 == handleAtom (handlers, input, size, pos, ec))
         return 0;
       pos += getAtomSize (&input[pos]);
     }
@@ -340,9 +572,9 @@ processAtoms (HandlerEntry *handlers, const char *input,
  */
 static int
 processAllAtoms (const char *input,
-                 size_t size, struct EXTRACTOR_Keywords **list)
+                 size_t size, struct ExtractContext *ec)
 {
-  return processAtoms(all_handlers, input, size, list);
+  return processAtoms(all_handlers, input, size, ec);
 }
 
 /**
@@ -351,11 +583,11 @@ processAllAtoms (const char *input,
  */
 static int
 moovHandler (const char *input,
-             size_t size, size_t pos, struct EXTRACTOR_Keywords **list)
+             size_t size, size_t pos, struct ExtractContext *ec)
 {
   unsigned int hdr = getAtomHeaderSize (&input[pos]);
   return processAllAtoms (&input[pos + hdr],
-                          getAtomSize (&input[pos]) - hdr, list);
+                          getAtomSize (&input[pos]) - hdr, ec);
 }
 
 /* see http://developer.apple.com/documentation/QuickTime/QTFF/QTFFChap1/chapter_2_section_5.html */
@@ -370,39 +602,9 @@ typedef struct
   char compatibility[4];
 } FileType;
 
-typedef struct
-{
-  const char *ext;
-  const char *mime;
-} C2M;
-
-/* see http://www.mp4ra.org/filetype.html 
- *     http://www.ftyps.com/ */
-static C2M ftMap[] = {
-  {"qt  ", "video/quicktime"},
-  {"isom", "video/mp4"},        /* ISO Base Media files */
-  {"iso2", "video/mp4"},
-  {"mp41", "video/mp4"},        /* MPEG-4 (ISO/IEC 14491-1) version 1 */
-  {"mp42", "video/mp4"},        /* MPEG-4 (ISO/IEC 14491-1) version 2 */
-  {"3gp1", "video/3gpp"},
-  {"3gp2", "video/3gpp"},
-  {"3gp3", "video/3gpp"},
-  {"3gp4", "video/3gpp"},
-  {"3gp5", "video/3gpp"},
-  {"3g2a", "video/3gpp2"},
-  {"mmp4", "video/mp4"},        /* Mobile MPEG-4 */
-  {"M4A ", "audio/mp4"},
-  {"M4B ", "audio/mp4"},
-  {"M4P ", "audio/mp4"},
-  {"M4V ", "video/mp4"},
-  {"mj2s", "video/mj2"},        /* Motion JPEG 2000 */
-  {"mjp2", "video/mj2"},
-  {NULL, NULL},
-};
-
 static int
 ftypHandler (const char *input,
-             size_t size, size_t pos, struct EXTRACTOR_Keywords **list)
+             size_t size, size_t pos, struct ExtractContext *ec)
 {
   const FileType *ft;
   int i;
@@ -416,7 +618,7 @@ ftypHandler (const char *input,
   while ((ftMap[i].ext != NULL) && (0 != memcmp (ft->type, ftMap[i].ext, 4)))
     i++;
   if (ftMap[i].ext != NULL)
-    addKeyword (EXTRACTOR_MIMETYPE, ftMap[i].mime, list);
+    addKeyword (EXTRACTOR_METATYPE_MIMETYPE, ftMap[i].mime, ec);
   return 1;
 }
 
@@ -452,15 +654,18 @@ typedef struct
 
 static int
 mvhdHandler (const char *input,
-             size_t size, size_t pos, struct EXTRACTOR_Keywords **list)
+             size_t size, size_t pos, struct ExtractContext *ec)
 {
   const MovieHeaderAtom *m;
   char duration[16];
   if (getAtomSize (&input[pos]) != sizeof (MovieHeaderAtom))
     return 0;
   m = (const MovieHeaderAtom *) &input[pos];
-  snprintf (duration, 16, "%us", ntohl (m->duration) / ntohl (m->timeScale));
-  addKeyword (EXTRACTOR_DURATION, duration, list);
+  snprintf (duration,
+            sizeof(duration),
+            "%us",
+            ntohl (m->duration) / ntohl (m->timeScale));
+  addKeyword (EXTRACTOR_METATYPE_DURATION, duration, ec);
   return 1;
 }
 
@@ -475,7 +680,7 @@ typedef struct
 
 static int
 cmovHandler (const char *input,
-             size_t size, size_t pos, struct EXTRACTOR_Keywords **list)
+             size_t size, size_t pos, struct ExtractContext *ec)
 {
   const CompressedMovieHeaderAtom *c;
   unsigned int s;
@@ -529,7 +734,7 @@ cmovHandler (const char *input,
       free (buf);
       return 0;                 /* decode error? */
     }
-  ret = handleAtom (all_handlers, buf, s, 0, list);
+  ret = handleAtom (all_handlers, buf, s, 0, ec);
   free (buf);
   return ret;
 }
@@ -566,7 +771,7 @@ typedef struct
 
 static int
 tkhdHandler (const char *input,
-             size_t size, size_t pos, struct EXTRACTOR_Keywords **list)
+             size_t size, size_t pos, struct ExtractContext *ec)
 {
   const TrackAtom *m;
   char dimensions[40];
@@ -578,33 +783,33 @@ tkhdHandler (const char *input,
     {
       /* if actually a/the video track */
       snprintf (dimensions,
-                40,
+                sizeof(dimensions),
                 "%dx%d",
                 ntohs (m->track_width.integer),
                 ntohs (m->track_height.integer));
-      addKeyword (EXTRACTOR_FORMAT, dimensions, list);
+      addKeyword (EXTRACTOR_METATYPE_IMAGE_DIMENSIONS, dimensions, ec);
     }
   return 1;
 }
 
 static int
 trakHandler (const char *input,
-             size_t size, size_t pos, struct EXTRACTOR_Keywords **list)
+             size_t size, size_t pos, struct ExtractContext *ec)
 {
   unsigned int hdr = getAtomHeaderSize (&input[pos]);
   return processAllAtoms (&input[pos + hdr],
-                          getAtomSize (&input[pos]) - hdr, list);
+                          getAtomSize (&input[pos]) - hdr, ec);
 }
 
 static int
 metaHandler (const char *input,
-             size_t size, size_t pos, struct EXTRACTOR_Keywords **list)
+             size_t size, size_t pos, struct ExtractContext *ec)
 {
   unsigned int hdr = getAtomHeaderSize (&input[pos]);
   if (getAtomSize (&input[pos]) < hdr + 4)
     return 0;
   return processAllAtoms (&input[pos + hdr + 4],
-                          getAtomSize (&input[pos]) - hdr - 4, list);
+                          getAtomSize (&input[pos]) - hdr - 4, ec);
 }
 
 typedef struct
@@ -614,117 +819,6 @@ typedef struct
   unsigned short language;
 } InternationalText;
 
-static const char *languages[] = {
-  "English",
-  "French",
-  "German",
-  "Italian",
-  "Dutch",
-  "Swedish",
-  "Spanish",
-  "Danish",
-  "Portuguese",
-  "Norwegian",
-  "Hebrew",
-  "Japanese",
-  "Arabic",
-  "Finnish",
-  "Greek",
-  "Icelandic",
-  "Maltese",
-  "Turkish",
-  "Croatian",
-  "Traditional Chinese",
-  "Urdu",
-  "Hindi",
-  "Thai",
-  "Korean",
-  "Lithuanian",
-  "Polish",
-  "Hungarian",
-  "Estonian",
-  "Lettish",
-  "Saamisk",
-  "Lappish",
-  "Faeroese",
-  "Farsi",
-  "Russian",
-  "Simplified Chinese",
-  "Flemish",
-  "Irish",
-  "Albanian",
-  "Romanian",
-  "Czech",
-  "Slovak",
-  "Slovenian",
-  "Yiddish",
-  "Serbian",
-  "Macedonian",
-  "Bulgarian",
-  "Ukrainian",
-  "Byelorussian",
-  "Uzbek",
-  "Kazakh",
-  "Azerbaijani",
-  "AzerbaijanAr",
-  "Armenian",
-  "Georgian",
-  "Moldavian",
-  "Kirghiz",
-  "Tajiki",
-  "Turkmen",
-  "Mongolian",
-  "MongolianCyr",
-  "Pashto",
-  "Kurdish",
-  "Kashmiri",
-  "Sindhi",
-  "Tibetan",
-  "Nepali",
-  "Sanskrit",
-  "Marathi",
-  "Bengali",
-  "Assamese",
-  "Gujarati",
-  "Punjabi",
-  "Oriya",
-  "Malayalam",
-  "Kannada",
-  "Tamil",
-  "Telugu",
-  "Sinhalese",
-  "Burmese",
-  "Khmer",
-  "Lao",
-  "Vietnamese",
-  "Indonesian",
-  "Tagalog",
-  "MalayRoman",
-  "MalayArabic",
-  "Amharic",
-  "Tigrinya",
-  "Galla",
-  "Oromo",
-  "Somali",
-  "Swahili",
-  "Ruanda",
-  "Rundi",
-  "Chewa",
-  "Malagasy",
-  "Esperanto",
-  "Welsh",
-  "Basque",
-  "Catalan",
-  "Latin",
-  "Quechua",
-  "Guarani",
-  "Aymara",
-  "Tatar",
-  "Uighur",
-  "Dzongkha",
-  "JavaneseRom",
-};
-
 /*
  * see http://developer.apple.com/documentation/QuickTime/QTFF/QTFFChap2/chapter
 _3_section_2.html
@@ -735,7 +829,7 @@ static int
 processTextTag (const char *input,
                 size_t size,
                 size_t pos,
-                EXTRACTOR_KeywordType type, struct EXTRACTOR_Keywords **list)
+                enum EXTRACTOR_MetaType type, struct ExtractContext *ec)
 {
   unsigned long long as;
   unsigned short len;
@@ -756,7 +850,7 @@ processTextTag (const char *input,
   lang = ntohs (txt->language);
   if (lang >= sizeof (languages) / sizeof (char *))
     return 0;                   /* invalid */
-  addKeyword (EXTRACTOR_LANGUAGE, languages[lang], list);
+  addKeyword (EXTRACTOR_METATYPE_DOCUMENT_LANGUAGE, languages[lang], ec);
 
   meta = malloc (len + 1);
   memcpy (meta, &txt[1], len);
@@ -764,55 +858,15 @@ processTextTag (const char *input,
   for (i = 0; i < len; i++)
     if (meta[i] == '\r')
       meta[i] = '\n';
-  addKeyword (type, meta, list);
+  addKeyword (type, meta, ec);
   free (meta);
   return 1;
 }
 
-typedef struct CHE
-{
-  const char *pfx;
-  EXTRACTOR_KeywordType type;
-} CHE;
-
-static CHE cHm[] = {
-  {"aut", EXTRACTOR_AUTHOR,},
-  {"cpy", EXTRACTOR_COPYRIGHT,},
-  {"day", EXTRACTOR_CREATION_DATE,},
-  {"cmt", EXTRACTOR_COMMENT,},
-  {"hst", EXTRACTOR_BUILDHOST,},
-  {"inf", EXTRACTOR_INFORMATION,},
-  {"nam", EXTRACTOR_FULL_NAME,},
-  {"mak", EXTRACTOR_CAMERA_MAKE,},
-  {"mod", EXTRACTOR_CAMERA_MODEL,},
-  {"des", EXTRACTOR_DESCRIPTION,},
-  {"dis", EXTRACTOR_DISCLAIMER,},
-  {"dir", EXTRACTOR_MOVIE_DIRECTOR,},
-  {"src", EXTRACTOR_CONTRIBUTOR,},
-  {"prf", EXTRACTOR_ARTIST,},   /* performer */
-  {"req", EXTRACTOR_CREATED_FOR,},      /* hardware requirements */
-  {"fmt", EXTRACTOR_FORMAT,},
-  {"prd", EXTRACTOR_PRODUCER,},
-  {"PRD", EXTRACTOR_PRODUCTVERSION,},   /* just product */
-  {"swr", EXTRACTOR_SOFTWARE,},
-  {"wrt", EXTRACTOR_AUTHOR,},   /* writer */
-  {"wrn", EXTRACTOR_WARNING,},
-  {"ed1", EXTRACTOR_REVISION_HISTORY,},
-  {"ed2", EXTRACTOR_REVISION_HISTORY,},
-  {"ed3", EXTRACTOR_REVISION_HISTORY,},
-  {"ed4", EXTRACTOR_REVISION_HISTORY,},
-  {"ed5", EXTRACTOR_REVISION_HISTORY,},
-  {"ed6", EXTRACTOR_REVISION_HISTORY,},
-  {"ed7", EXTRACTOR_REVISION_HISTORY,},
-  {"ed8", EXTRACTOR_REVISION_HISTORY,},
-  {"ed9", EXTRACTOR_REVISION_HISTORY,},
-  {"chp", EXTRACTOR_CHAPTER,},
-  {NULL, EXTRACTOR_UNKNOWN},
-};
 
 static int
 c_Handler (const char *input,
-           size_t size, size_t pos, struct EXTRACTOR_Keywords **list)
+           size_t size, size_t pos, struct ExtractContext *ec)
 {
   int i;
 
@@ -820,26 +874,26 @@ c_Handler (const char *input,
   while ((cHm[i].pfx != NULL) && (0 != memcmp (&input[pos+5], cHm[i].pfx, 3)))
     i++;
   if (cHm[i].pfx != NULL)
-    return processTextTag (input, size, pos, cHm[i].type, list);
+    return processTextTag (input, size, pos, cHm[i].type, ec);
   return -1;                    /* not found */
 }
 
 static int
 udtaHandler (const char *input,
-             size_t size, size_t pos, struct EXTRACTOR_Keywords **list)
+             size_t size, size_t pos, struct ExtractContext *ec)
 {
   unsigned int hdr = getAtomHeaderSize (&input[pos]);
   return processAllAtoms (&input[pos + hdr],
-                          getAtomSize (&input[pos]) - hdr, list);
+                          getAtomSize (&input[pos]) - hdr, ec);
 }
 
 static int
 processDataAtom (const char *input,
-                size_t size, /* parent atom size */
-                size_t pos,
-                const char *patom,
-                EXTRACTOR_KeywordType type,
-                struct EXTRACTOR_Keywords **list)
+                 size_t size, /* parent atom size */
+                 size_t pos,
+                 const char *patom,
+                 enum EXTRACTOR_MetaType type,
+                 struct ExtractContext *ec)
 {
   char *meta;
   unsigned char version;
@@ -877,7 +931,7 @@ processDataAtom (const char *input,
         unsigned short genre = ((unsigned char)input[pos+16] << 8) |
                                 (unsigned char)input[pos+17];
         if (genre > 0 && genre < GENRE_NAME_COUNT)
-          addKeyword(type, genre_names[genre-1], list);
+          addKeyword(type, genre_names[genre-1], ec);
       }
       return 1;
     }
@@ -888,7 +942,7 @@ processDataAtom (const char *input,
                             (unsigned char)input[pos+19];
         char s[8];
         snprintf(s, 8, "%d", n);
-        addKeyword(type, s, list);
+        addKeyword(type, s, ec);
       }
     }
     else {
@@ -902,7 +956,7 @@ processDataAtom (const char *input,
     for (i = 0; i < len; i++)
       if (meta[i] == '\r')
         meta[i] = '\n';
-    addKeyword (type, meta, list);
+    addKeyword (type, meta, ec);
     free (meta);
     return 1;
   }
@@ -910,44 +964,12 @@ processDataAtom (const char *input,
   return -1;
 }
 
-typedef struct
-{
-  const char *atom_type;
-  EXTRACTOR_KeywordType type;
-} ITTagConversionEntry;
-
-/* iTunes Tags:
- * see http://atomicparsley.sourceforge.net/mpeg-4files.html */
-static ITTagConversionEntry it_to_extr_table[] = {
-  {"\xa9" "alb", EXTRACTOR_ALBUM,},
-  {"\xa9" "ART", EXTRACTOR_ARTIST,},
-  {"aART", EXTRACTOR_ARTIST,},
-  {"\xa9" "cmt", EXTRACTOR_COMMENT,},
-  {"\xa9" "day", EXTRACTOR_YEAR,},
-  {"\xa9" "nam", EXTRACTOR_TITLE,},
-  {"trkn", EXTRACTOR_TRACK_NUMBER,},
-  {"disk", EXTRACTOR_DISC_NUMBER,},
-  {"\xa9" "gen", EXTRACTOR_GENRE,},
-  {"gnre", EXTRACTOR_GENRE,},
-  {"\xa9" "wrt", EXTRACTOR_AUTHOR,},
-  {"\xa9" "too", EXTRACTOR_ENCODED_BY,},
-  {"cprt", EXTRACTOR_COPYRIGHT,},
-  {"\xa9" "grp", EXTRACTOR_GROUP,},
-  {"catg", EXTRACTOR_CATEGORY,},
-  {"keyw", EXTRACTOR_KEYWORDS,},
-  {"desc", EXTRACTOR_DESCRIPTION,},
-  {"tvnn", EXTRACTOR_PUBLISHER,}, /* TV Network Name */
-  {"tvsh", EXTRACTOR_TITLE,}, /* TV Show Name */
-/*  {"tven", EXTRACTOR_i,},*/ /* TV Network Name */
-  {NULL, EXTRACTOR_UNKNOWN},
-};
-
 /* NOTE: iTunes tag processing should, in theory, be limited to iTunes
  * file types (from ftyp), but, in reality, it seems that there are other
  * files, like 3gpp, out in the wild with iTunes tags. */
 static int
 iTunesTagHandler (const char *input,
-           size_t size, size_t pos, struct EXTRACTOR_Keywords **list)
+           size_t size, size_t pos, struct ExtractContext *ec)
 {
   unsigned long long asize;
   unsigned int hdr;
@@ -965,7 +987,7 @@ iTunesTagHandler (const char *input,
     i++;
   if (it_to_extr_table[i].atom_type != NULL)
     return processDataAtom(input, asize, pos+hdr, &input[pos],  
-                           it_to_extr_table[i].type, list);
+                           it_to_extr_table[i].type, ec);
 
   return -1;
 }
@@ -973,11 +995,11 @@ iTunesTagHandler (const char *input,
 
 static int 
 ilstHandler (const char *input,
-             size_t size, size_t pos, struct EXTRACTOR_Keywords **list)
+             size_t size, size_t pos, struct ExtractContext *ec)
 {
   unsigned int hdr = getAtomHeaderSize (&input[pos]);
   return processAtoms(ilst_handlers, &input[pos + hdr],
-                      getAtomSize(&input[pos]) - hdr, list);
+                      getAtomSize(&input[pos]) - hdr, ec);
 }
 
 
@@ -1069,7 +1091,7 @@ static HandlerEntry ilst_handlers[] = {
  */
 static int
 handleAtom (HandlerEntry *handlers, const char *input,
-            size_t size, size_t pos, struct EXTRACTOR_Keywords **list)
+            size_t size, size_t pos, struct ExtractContext *ec)
 {
   int i;
   if (0 == checkAtomValid (input, size, pos))
@@ -1090,7 +1112,7 @@ handleAtom (HandlerEntry *handlers, const char *input,
 #endif
       return -1;
     }
-  i = handlers[i].handler (input, size, pos, list);
+  i = handlers[i].handler (input, size, pos, ec);
 #if DEBUG
   printf ("Running handler for `%4s' at %u completed with result %d\n",
           &input[pos + 4], pos, i);
@@ -1103,13 +1125,20 @@ handleAtom (HandlerEntry *handlers, const char *input,
    video/x-quicktime: mov,qt: Quicktime animation;
    application/x-quicktimeplayer: qtl: Quicktime list;
  */
-struct EXTRACTOR_Keywords *
-libextractor_qt_extract (const char *filename,
-                         const char *data,
-                         size_t size, struct EXTRACTOR_Keywords *prev)
+
+int 
+EXTRACTOR_qt_extract (const char *data,
+                      size_t size,
+                      EXTRACTOR_MetaDataProcessor proc,
+                      void *proc_cls,
+                      const char *options)
 {
-  processAllAtoms (data, size, &prev);
-  return prev;
+  struct ExtractContext ec;
+  ec.proc = proc;
+  ec.proc_cls = proc_cls;
+  ec.ret = 0;
+  processAllAtoms (data, size, &ec);
+  return ec.ret;
 }
 
-/*  end of qtextractor.c */
+/*  end of qt_extractor.c */
diff --git a/src/plugins/rpm_extractor.c b/src/plugins/rpm_extractor.c
index d77da7a..f8ed431 100644
--- a/src/plugins/rpm_extractor.c
+++ b/src/plugins/rpm_extractor.c
@@ -81,7 +81,7 @@ static Matches tests[] = {
 #endif
   {RPMTAG_LICENSE, EXTRACTOR_METATYPE_LICENSE},
   {RPMTAG_DISTRIBUTION, EXTRACTOR_METATYPE_PACKAGE_DISTRIBUTION},
-  {RPMTAG_BUILDHOST, EXTRACTOR_METATYPE_PACKAGE_BUILDHOST},
+  {RPMTAG_BUILDHOST, EXTRACTOR_METATYPE_BUILDHOST},
   {RPMTAG_VENDOR, EXTRACTOR_METATYPE_VENDOR},
   {RPMTAG_OS, EXTRACTOR_METATYPE_TARGET_OS},
   {RPMTAG_DESCRIPTION, EXTRACTOR_METATYPE_DESCRIPTION},