Merge lp:~jamesh/mediascanner2/taglib-extractor into lp:mediascanner2

[James Henstridge]

Use taglib to extract metadata from Vorbis, Opus, Flac, MP3 and MP4 audio files. Other formats will fall back to the existing GStreamer code path.

Use taglib to extract metadata from Vorbis, Opus, Flac, MP3 and MP4 files.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:325
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jamesh/mediascanner2/taglib-extractor/+merge/285834/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mediascanner2-ci/206/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-armhf-ci/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-i386-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner2-ci/206/rebuild

review: Needs Fixing (continuous-integration)

[Michi Henning (michihenning)]

This is a reasonably significant change. It might warrant a bump in the version number, and it probably should be mentioned in the changelog?

Splitting the extractor into separate helper classes has made this much cleaner and comprehensible, thanks!

I'm wondering whether we should still make a corresponding change to the thumbnailer taglib branch to avoid the files being opened read/write?

I'm seeing a core dump when runnig the test_qml_nodb test. This is probably worth looking at.

Program terminated with signal SIGABRT, Aborted.
#0 0x00007f7018eff227 in __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:55
55 ../sysdeps/unix/sysv/linux/raise.c: No such file or directory.
[Current thread is 1 (Thread 0x7f701b1d6800 (LWP 6972))]
(gdb) bt
#0 0x00007f7018eff227 in __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:55
#1 0x00007f7018f00e8a in __GI_abort () at abort.c:89
#2 0x00000000004285cd in (anonymous namespace)::ExtractorDaemon::handleExtractMetadata (invocation=0x7f7008006880,
    filename=0x11317a0 "/home/michi/src/mediascanner2/taglib-extractor/test/media/testfile.ogg",
    etag=0x1129000 "1455579826:124200", content_type=0x11318e0 "audio/ogg", mtime=1455579826, type=1,
    user_data=0x7ffd784f8f60) at /home/michi/src/mediascanner2/taglib-extractor/src/extractor/main.cc:147
#3 0x00007f7016ee1e40 in ffi_call_unix64 () from /usr/lib/x86_64-linux-gnu/libffi.so.6
#4 0x00007f7016ee18ab in ffi_call () from /usr/lib/x86_64-linux-gnu/libffi.so.6
#5 0x00007f7019e217c9 in g_cclosure_marshal_generic () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#6 0x00007f7019e20fa5 in g_closure_invoke () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#7 0x00007f7019e32ff1 in ?? () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#8 0x00007f7019e3ad71 in g_signal_emitv () from /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
#9 0x0000000000436eec in _ms_extractor_skeleton_handle_method_call (connection=0x11001c0,
    sender=0x7f70080011a0 ":1.0", object_path=0x7f70080053d0 "/com/canonical/MediaScanner2/Extractor",
    interface_name=0x7f7008002f80 "com.canonical.MediaScanner2.Extractor",
    method_name=0x7f70080051f0 "ExtractMetadata", parameters=0x113a720, invocation=0x7f7008006880, user_data=0x1111a10)
    at /home/michi/src/mediascanner2/taglib-extractor/build/src/extractor/dbus-generated.c:933

review: Needs Fixing

[Michi Henning (michihenning)]

OK, after speaking with James, the core dump is red herring; it is intentional. It would be good to remove the core at the end of the test so, when the test fails, I don't jump to conclusions.

Turns out that the failure was actually caused by me not having qt5-default installed, and not having set QT_SELECT. Again, some message to that effect when the test fails would be useful. Otherwise, someone not familiar with the code might spend ages trying to figure out the failure.

Besides those two niggles, this looks really nice!

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:326
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jamesh/mediascanner2/taglib-extractor/+merge/285834/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mediascanner2-ci/207/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-amd64-ci/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-armhf-ci/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-i386-ci/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-i386-ci/19/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner2-ci/207/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:327
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jamesh/mediascanner2/taglib-extractor/+merge/285834/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mediascanner2-ci/208/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-amd64-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-armhf-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-i386-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-amd64-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-i386-ci/20/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner2-ci/208/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:328
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jamesh/mediascanner2/taglib-extractor/+merge/285834/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mediascanner2-ci/209/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-amd64-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-armhf-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-i386-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-amd64-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-armhf-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-i386-ci/21/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner2-ci/209/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:328
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jamesh/mediascanner2/taglib-extractor/+merge/285834/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mediascanner2-ci/210/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-armhf-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-armhf-ci/47/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-i386-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-i386-ci/22

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner2-ci/210/rebuild

review: Needs Fixing (continuous-integration)

[Michi Henning (michihenning)]

Sweet, thank you!

review: Approve

[Michi Henning (michihenning)]

Cool, thanks!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-12-16 07:07:41 +0000
+++ CMakeLists.txt	2016-02-24 05:55:29 +0000
@@ -30,6 +30,7 @@
 pkg_check_modules(GLIB glib-2.0 REQUIRED)
 pkg_check_modules(PIXBUF gdk-pixbuf-2.0 REQUIRED)
 pkg_check_modules(EXIF libexif REQUIRED)
+pkg_check_modules(TAGLIB taglib REQUIRED)
 pkg_check_modules(DBUSCPP dbus-cpp REQUIRED)
 pkg_check_modules(APPARMOR libapparmor REQUIRED)
 pkg_check_modules(UDISKS udisks2 REQUIRED)

=== added file 'HACKING'
--- HACKING	1970-01-01 00:00:00 +0000
+++ HACKING	2016-02-24 05:55:29 +0000
@@ -0,0 +1,22 @@
+Building the code
+-----------------
+
+The list of packages required to build mediascanner can be found in
+the Build-Depends stanza of the debian/control.in file.  In addition
+to those packages, you should install "qt5-default" to ensure that the
+Qt 5.x versions of build tools are used in preference to the Qt 4.x
+versions.
+
+The software can then be built with the following commands:
+
+    $ mkdir build
+    $ cd build
+    $ cmake ..
+    $ make
+
+The tests can then be run using:
+
+    $ make test
+
+Note that "make test" will not trigger a rebuild, so it is necessary
+to rerun "make" first if any code has been changed.

=== modified file 'debian/control'
--- debian/control	2015-11-02 02:36:21 +0000
+++ debian/control	2016-02-24 05:55:29 +0000
@@ -23,6 +23,7 @@
                libgtest-dev,
                libproperties-cpp-dev,
                libsqlite3-dev (>= 3.8.5),
+               libtag1-dev,
                libudisks2-dev,
                lsb-release,
                qtbase5-dev,

=== modified file 'debian/control.in'
--- debian/control.in	2015-11-02 02:36:21 +0000
+++ debian/control.in	2016-02-24 05:55:29 +0000
@@ -18,6 +18,7 @@
                libgtest-dev,
                libproperties-cpp-dev,
                libsqlite3-dev (>= 3.8.5),
+               libtag1-dev,
                libudisks2-dev,
                lsb-release,
                qtbase5-dev,

=== modified file 'src/extractor/CMakeLists.txt'
--- src/extractor/CMakeLists.txt	2015-12-15 04:27:08 +0000
+++ src/extractor/CMakeLists.txt	2016-02-24 05:55:29 +0000
@@ -1,5 +1,5 @@
 
-add_definitions(${MEDIASCANNER_DEPS_CFLAGS} ${GST_CFLAGS} ${EXIF_CFLAGS} ${PIXBUF_CFLAGS})
+add_definitions(${MEDIASCANNER_DEPS_CFLAGS} ${GST_CFLAGS} ${EXIF_CFLAGS} ${PIXBUF_CFLAGS} ${TAGLIB_CFLAGS})
 include_directories(.. ${CMAKE_CURRENT_BINARY_DIR})
 
 # Build stubs/skeletons for D-Bus interface
@@ -32,12 +32,16 @@
 # The backend code for the extractor daemon, as a library for use by tests
 add_library(extractor-backend STATIC
   ExtractorBackend.cc
+  GStreamerExtractor.cc
+  ImageExtractor.cc
+  TaglibExtractor.cc
 )
 target_link_libraries(extractor-backend
   extractor-client
   ${GST_LDFLAGS}
   ${EXIF_LDFLAGS}
   ${PIXBUF_LDFLAGS}
+  ${TAGLIB_LDFLAGS}
 )
 
 add_executable(mediascanner-extractor

=== modified file 'src/extractor/ExtractorBackend.cc'
--- src/extractor/ExtractorBackend.cc	2015-11-02 09:38:48 +0000
+++ src/extractor/ExtractorBackend.cc	2016-02-24 05:55:29 +0000
@@ -20,363 +20,35 @@
 
 #include "ExtractorBackend.hh"
 #include "DetectedFile.hh"
+#include "GStreamerExtractor.hh"
+#include "ImageExtractor.hh"
+#include "TaglibExtractor.hh"
 #include "../mediascanner/MediaFile.hh"
 #include "../mediascanner/MediaFileBuilder.hh"
-#include "../mediascanner/internal/utils.hh"
-
-#include <exif-loader.h>
-#include <glib-object.h>
-#include <gio/gio.h>
-#include <gst/gst.h>
-#include <gst/pbutils/pbutils.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include <cstdio>
-#include <ctime>
-#include <memory>
 #include <string>
-#include <stdexcept>
-#include <vector>
-
-#include <unistd.h>
 
 using namespace std;
 
-namespace {
-const char exif_date_template[] = "%Y:%m:%d %H:%M:%S";
-const char iso8601_date_format[] = "%Y-%m-%dT%H:%M:%S";
-const char iso8601_date_with_zone_format[] = "%Y-%m-%dT%H:%M:%S%z";
-}
-
 namespace mediascanner {
 
 struct ExtractorBackendPrivate {
-    std::unique_ptr<GstDiscoverer, decltype(&g_object_unref)> discoverer;
-    ExtractorBackendPrivate() : discoverer(nullptr, g_object_unref) {};
+    ExtractorBackendPrivate(int seconds) : gstreamer(seconds) {}
 
-    void extract_gst(const DetectedFile &d, MediaFileBuilder &mfb);
-    bool extract_exif(const DetectedFile &d, MediaFileBuilder &mfb);
-    void extract_pixbuf(const DetectedFile &d, MediaFileBuilder &mfb);
+    GStreamerExtractor gstreamer;
+    ImageExtractor image;
+    TaglibExtractor taglib;
 };
 
-ExtractorBackend::ExtractorBackend(int seconds) {
-    p = new ExtractorBackendPrivate();
-    GError *error = nullptr;
-
-    p->discoverer.reset(gst_discoverer_new(GST_SECOND * seconds, &error));
-    if (not p->discoverer) {
-        string errortxt(error->message);
-        g_error_free(error);
-        delete p;
-
-        string msg = "Failed to create discoverer: ";
-        msg += errortxt;
-        throw runtime_error(msg);
-    }
-    if (error) {
-        // Sometimes this is filled in even though no error happens.
-        g_error_free(error);
-    }
+ExtractorBackend::ExtractorBackend(int seconds)
+    : p(new ExtractorBackendPrivate(seconds)) {
 }
 
 ExtractorBackend::~ExtractorBackend() {
     delete p;
 }
 
-static void
-extract_tag_info (const GstTagList * list, const gchar * tag, gpointer user_data) {
-    MediaFileBuilder *mfb = (MediaFileBuilder *) user_data;
-    int i, num;
-    string tagname(tag);
-
-    if(tagname == GST_TAG_IMAGE || tagname == GST_TAG_PREVIEW_IMAGE) {
-        mfb->setHasThumbnail(true);
-        return;
-    }
-    num = gst_tag_list_get_tag_size (list, tag);
-    for (i = 0; i < num; ++i) {
-        const GValue *val;
-
-        val = gst_tag_list_get_value_index (list, tag, i);
-        if (G_VALUE_HOLDS_STRING(val)) {
-            if (tagname == GST_TAG_ARTIST)
-                mfb->setAuthor(g_value_get_string(val));
-            else if (tagname == GST_TAG_TITLE)
-                mfb->setTitle(g_value_get_string(val));
-            else if (tagname == GST_TAG_ALBUM)
-                mfb->setAlbum(g_value_get_string(val));
-            else if (tagname == GST_TAG_ALBUM_ARTIST)
-                mfb->setAlbumArtist(g_value_get_string(val));
-            else if (tagname == GST_TAG_GENRE)
-                mfb->setGenre(g_value_get_string(val));
-        } else if (G_VALUE_HOLDS(val, GST_TYPE_DATE_TIME)) {
-            if (tagname == GST_TAG_DATE_TIME) {
-                GstDateTime *dt = static_cast<GstDateTime*>(g_value_get_boxed(val));
-                if (!dt) {
-                    continue;
-                }
-                char *dt_string = gst_date_time_to_iso8601_string(dt);
-                mfb->setDate(dt_string);
-                g_free(dt_string);
-            }
-        } else if (G_VALUE_HOLDS(val, G_TYPE_DATE)) {
-            if (tagname == GST_TAG_DATE) {
-                GDate *dt = static_cast<GDate*>(g_value_get_boxed(val));
-                if (!dt) {
-                    continue;
-                }
-                char buf[100];
-                if (g_date_strftime(buf, sizeof(buf), "%Y-%m-%d", dt) != 0) {
-                    mfb->setDate(buf);
-                }
-            }
-        } else if (G_VALUE_HOLDS_UINT(val)) {
-            if (tagname == GST_TAG_TRACK_NUMBER) {
-                mfb->setTrackNumber(g_value_get_uint(val));
-            } else if (tagname == GST_TAG_ALBUM_VOLUME_NUMBER) {
-                mfb->setDiscNumber(g_value_get_uint(val));
-            }
-        }
-
-    }
-}
-
-void ExtractorBackendPrivate::extract_gst(const DetectedFile &d, MediaFileBuilder &mfb) {
-    string uri = getUri(d.filename);
-
-    GError *error = nullptr;
-    unique_ptr<GstDiscovererInfo, void(*)(void *)> info(
-        gst_discoverer_discover_uri(discoverer.get(), uri.c_str(), &error),
-        g_object_unref);
-    if (info.get() == nullptr) {
-        string errortxt(error->message);
-        g_error_free(error);
-
-        string msg = "Discovery of file ";
-        msg += d.filename;
-        msg += " failed: ";
-        msg += errortxt;
-        throw runtime_error(msg);
-    }
-    if (error) {
-        // Sometimes this gets filled in even if no error actually occurs.
-        g_error_free(error);
-        error = nullptr;
-    }
-
-    if (gst_discoverer_info_get_result(info.get()) != GST_DISCOVERER_OK) {
-        throw runtime_error("Unable to discover file " + d.filename);
-    }
-
-    const GstTagList *tags = gst_discoverer_info_get_tags(info.get());
-    if (tags != nullptr) {
-        gst_tag_list_foreach(tags, extract_tag_info, &mfb);
-    }
-    mfb.setDuration(static_cast<int>(
-        gst_discoverer_info_get_duration(info.get())/GST_SECOND));
-
-    /* Check for video specific information */
-    unique_ptr<GList, void(*)(GList*)> streams(
-        gst_discoverer_info_get_stream_list(info.get()),
-        gst_discoverer_stream_info_list_free);
-    for (const GList *l = streams.get(); l != nullptr; l = l->next) {
-        auto stream_info = static_cast<GstDiscovererStreamInfo*>(l->data);
-
-        if (GST_IS_DISCOVERER_VIDEO_INFO(stream_info)) {
-            mfb.setWidth(gst_discoverer_video_info_get_width(
-                             GST_DISCOVERER_VIDEO_INFO(stream_info)));
-            mfb.setHeight(gst_discoverer_video_info_get_height(
-                              GST_DISCOVERER_VIDEO_INFO(stream_info)));
-            break;
-        }
-    }
-}
-
-static void parse_exif_date(ExifData *data, ExifByteOrder order, MediaFileBuilder &mfb) {
-    static const std::vector<ExifTag> date_tags{
-        EXIF_TAG_DATE_TIME,
-        EXIF_TAG_DATE_TIME_ORIGINAL,
-        EXIF_TAG_DATE_TIME_DIGITIZED
-    };
-    struct tm timeinfo;
-    bool have_date = false;
-
-    for (ExifTag tag : date_tags) {
-        ExifEntry *ent = exif_data_get_entry(data, tag);
-        if (ent == nullptr) {
-            continue;
-        }
-        if (strptime((const char*)ent->data, exif_date_template, &timeinfo) != nullptr) {
-            have_date = true;
-            break;
-        }
-    }
-    if (!have_date) {
-        return;
-    }
-
-    char buf[100];
-    ExifEntry *ent = exif_data_get_entry(data, EXIF_TAG_TIME_ZONE_OFFSET);
-    if (ent) {
-        timeinfo.tm_gmtoff = (int)exif_get_sshort(ent->data, order) * 3600;
-
-        if (strftime(buf, sizeof(buf), iso8601_date_with_zone_format, &timeinfo) != 0) {
-            mfb.setDate(buf);
-        }
-    } else {
-        /* No time zone info */
-        if (strftime(buf, sizeof(buf), iso8601_date_format, &timeinfo) != 0) {
-            mfb.setDate(buf);
-        }
-    }
-}
-
-static int get_exif_int(ExifEntry *ent, ExifByteOrder order) {
-    switch (ent->format) {
-    case EXIF_FORMAT_BYTE:
-        return (unsigned char)ent->data[0];
-    case EXIF_FORMAT_SHORT:
-        return exif_get_short(ent->data, order);
-    case EXIF_FORMAT_LONG:
-        return exif_get_long(ent->data, order);
-    case EXIF_FORMAT_SBYTE:
-        return (signed char)ent->data[0];
-    case EXIF_FORMAT_SSHORT:
-        return exif_get_sshort(ent->data, order);
-    case EXIF_FORMAT_SLONG:
-        return exif_get_slong(ent->data, order);
-    default:
-        break;
-    }
-    return 0;
-}
-
-static void parse_exif_dimensions(ExifData *data, ExifByteOrder order, MediaFileBuilder &mfb) {
-    ExifEntry *w_ent = exif_data_get_entry(data, EXIF_TAG_PIXEL_X_DIMENSION);
-    ExifEntry *h_ent = exif_data_get_entry(data, EXIF_TAG_PIXEL_Y_DIMENSION);
-    ExifEntry *o_ent = exif_data_get_entry(data, EXIF_TAG_ORIENTATION);
-
-    if (!w_ent || !h_ent) {
-        return;
-    }
-    int width = get_exif_int(w_ent, order);
-    int height = get_exif_int(h_ent, order);
-
-    // Optionally swap height and width depending on orientation
-    if (o_ent) {
-        int tmp;
-
-        // exif_data_fix() has ensured this is a short.
-        switch (exif_get_short(o_ent->data, order)) {
-        case 5: // Mirror horizontal and rotate 270 CW
-        case 6: // Rotate 90 CW
-        case 7: // Mirror horizontal and rotate 90 CW
-        case 8: // Rotate 270 CW
-            tmp = width;
-            width = height;
-            height = tmp;
-            break;
-        default:
-            break;
-        }
-    }
-    mfb.setWidth(width);
-    mfb.setHeight(height);
-}
-
-static bool rational_to_degrees(ExifEntry *ent, ExifByteOrder order, double *out) {
-    if (ent->format != EXIF_FORMAT_RATIONAL) {
-        return false;
-    }
-
-    ExifRational r = exif_get_rational(ent->data, order);
-    *out = ((double) r.numerator) / r.denominator;
-
-    // Minutes
-    if (ent->components >= 2) {
-        r = exif_get_rational(ent->data + exif_format_get_size(EXIF_FORMAT_RATIONAL), order);
-        *out += ((double) r.numerator) / r.denominator / 60;
-    }
-    // Seconds
-    if (ent->components >= 3) {
-        r = exif_get_rational(ent->data + 2 * exif_format_get_size(EXIF_FORMAT_RATIONAL), order);
-        *out += ((double) r.numerator) / r.denominator / 3600;
-    }
-    return true;
-}
-
-static void parse_exif_location(ExifData *data, ExifByteOrder order, MediaFileBuilder &mfb) {
-    ExifContent *ifd = data->ifd[EXIF_IFD_GPS];
-    ExifEntry *lat_ent = exif_content_get_entry(ifd, (ExifTag)EXIF_TAG_GPS_LATITUDE);
-    ExifEntry *latref_ent = exif_content_get_entry(ifd, (ExifTag)EXIF_TAG_GPS_LATITUDE_REF);
-    ExifEntry *long_ent = exif_content_get_entry(ifd, (ExifTag)EXIF_TAG_GPS_LONGITUDE);
-    ExifEntry *longref_ent = exif_content_get_entry(ifd, (ExifTag)EXIF_TAG_GPS_LONGITUDE_REF);
-
-    if (!lat_ent || !long_ent) {
-        return;
-    }
-
-    double latitude, longitude;
-    if (!rational_to_degrees(lat_ent, order, &latitude)) {
-        return;
-    }
-    if (!rational_to_degrees(long_ent, order, &longitude)) {
-        return;
-    }
-    if (latref_ent && latref_ent->data[0] == 'S') {
-        latitude = -latitude;
-    }
-    if (longref_ent && longref_ent->data[0] == 'W') {
-        longitude = -longitude;
-    }
-    mfb.setLatitude(latitude);
-    mfb.setLongitude(longitude);
-}
-
-bool ExtractorBackendPrivate::extract_exif(const DetectedFile &d, MediaFileBuilder &mfb) {
-    std::unique_ptr<ExifLoader, void(*)(ExifLoader*)> loader(
-        exif_loader_new(), exif_loader_unref);
-    exif_loader_write_file(loader.get(), d.filename.c_str());
-
-    std::unique_ptr<ExifData, void(*)(ExifData*)> data(
-        exif_loader_get_data(loader.get()), exif_data_unref);
-    loader.reset();
-
-    if (!data) {
-        return false;
-    }
-    exif_data_fix(data.get());
-    ExifByteOrder order = exif_data_get_byte_order(data.get());
-
-    parse_exif_date(data.get(), order, mfb);
-    parse_exif_dimensions(data.get(), order, mfb);
-    parse_exif_location(data.get(), order, mfb);
-    return true;
-}
-
-void ExtractorBackendPrivate::extract_pixbuf(const DetectedFile &d, MediaFileBuilder &mfb) {
-    gint width, height;
-
-    if(!gdk_pixbuf_get_file_info(d.filename.c_str(), &width, &height)) {
-        string msg("Could not determine resolution of ");
-        msg += d.filename;
-        msg += ".";
-        throw runtime_error(msg);
-    }
-    mfb.setWidth(width);
-    mfb.setHeight(height);
-
-    if (d.mtime != 0) {
-        auto t = static_cast<time_t>(d.mtime);
-        char buf[1024];
-        struct tm ptm;
-        localtime_r(&t, &ptm);
-        if (strftime(buf, sizeof(buf), iso8601_date_format, &ptm) != 0) {
-            mfb.setDate(buf);
-        }
-    }
-}
-
 MediaFile ExtractorBackend::extract(const DetectedFile &d) {
     printf("Extracting metadata from %s.\n", d.filename.c_str());
     MediaFileBuilder mfb(d.filename);
@@ -387,12 +59,15 @@
 
     switch (d.type) {
     case ImageMedia:
-        if(!p->extract_exif(d, mfb)) {
-            p->extract_pixbuf(d, mfb);
+        p->image.extract(d, mfb);
+        break;
+    case AudioMedia:
+        if (!p->taglib.extract(d, mfb)) {
+            p->gstreamer.extract(d, mfb);
         }
         break;
     default:
-        p->extract_gst(d, mfb);
+        p->gstreamer.extract(d, mfb);
         break;
     }
 

=== added file 'src/extractor/GStreamerExtractor.cc'
--- src/extractor/GStreamerExtractor.cc	1970-01-01 00:00:00 +0000
+++ src/extractor/GStreamerExtractor.cc	2016-02-24 05:55:29 +0000
@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2013-2014 Canonical, Ltd.
+ *
+ * Authors:
+ *    Jussi Pakkanen <[e-mail]>
+ *    James Henstridge <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "GStreamerExtractor.hh"
+#include "DetectedFile.hh"
+#include "../mediascanner/MediaFile.hh"
+#include "../mediascanner/MediaFileBuilder.hh"
+#include "../mediascanner/internal/utils.hh"
+
+#include <glib-object.h>
+#include <gio/gio.h>
+#include <gst/gst.h>
+#include <gst/pbutils/pbutils.h>
+
+#include <memory>
+#include <string>
+#include <stdexcept>
+
+using namespace std;
+using mediascanner::MediaFileBuilder;
+
+namespace {
+
+void extract_tag_info (const GstTagList *list, const gchar *tag, void *user_data) {
+    MediaFileBuilder *mfb = (MediaFileBuilder *) user_data;
+    int i, num;
+    string tagname(tag);
+
+    if(tagname == GST_TAG_IMAGE || tagname == GST_TAG_PREVIEW_IMAGE) {
+        mfb->setHasThumbnail(true);
+        return;
+    }
+    num = gst_tag_list_get_tag_size (list, tag);
+    for (i = 0; i < num; ++i) {
+        const GValue *val;
+
+        val = gst_tag_list_get_value_index (list, tag, i);
+        if (G_VALUE_HOLDS_STRING(val)) {
+            const char *value = g_value_get_string(val);
+            if (!value) {
+                continue;
+            }
+            if (tagname == GST_TAG_ARTIST)
+                mfb->setAuthor(value);
+            else if (tagname == GST_TAG_TITLE)
+                mfb->setTitle(value);
+            else if (tagname == GST_TAG_ALBUM)
+                mfb->setAlbum(value);
+            else if (tagname == GST_TAG_ALBUM_ARTIST)
+                mfb->setAlbumArtist(value);
+            else if (tagname == GST_TAG_GENRE)
+                mfb->setGenre(value);
+        } else if (G_VALUE_HOLDS(val, GST_TYPE_DATE_TIME)) {
+            if (tagname == GST_TAG_DATE_TIME) {
+                GstDateTime *dt = static_cast<GstDateTime*>(g_value_get_boxed(val));
+                if (!dt) {
+                    continue;
+                }
+                char *dt_string = gst_date_time_to_iso8601_string(dt);
+                mfb->setDate(dt_string);
+                g_free(dt_string);
+            }
+        } else if (G_VALUE_HOLDS(val, G_TYPE_DATE)) {
+            if (tagname == GST_TAG_DATE) {
+                GDate *dt = static_cast<GDate*>(g_value_get_boxed(val));
+                if (!dt) {
+                    continue;
+                }
+                char buf[100];
+                if (g_date_strftime(buf, sizeof(buf), "%Y-%m-%d", dt) != 0) {
+                    mfb->setDate(buf);
+                }
+            }
+        } else if (G_VALUE_HOLDS_UINT(val)) {
+            if (tagname == GST_TAG_TRACK_NUMBER) {
+                mfb->setTrackNumber(g_value_get_uint(val));
+            } else if (tagname == GST_TAG_ALBUM_VOLUME_NUMBER) {
+                mfb->setDiscNumber(g_value_get_uint(val));
+            }
+        }
+
+    }
+}
+
+}
+
+namespace mediascanner {
+
+GStreamerExtractor::GStreamerExtractor(int seconds)
+    : discoverer(nullptr, g_object_unref) {
+    GError *error = nullptr;
+
+    discoverer.reset(gst_discoverer_new(GST_SECOND * seconds, &error));
+    if (not discoverer) {
+        string errortxt(error->message);
+        g_error_free(error);
+
+        string msg = "Failed to create discoverer: ";
+        msg += errortxt;
+        throw runtime_error(msg);
+    }
+    if (error) {
+        // Sometimes this is filled in even though no error happens.
+        g_error_free(error);
+    }
+}
+
+GStreamerExtractor::~GStreamerExtractor() = default;
+
+void GStreamerExtractor::extract(const DetectedFile &d, MediaFileBuilder &mfb) {
+    string uri = getUri(d.filename);
+
+    GError *error = nullptr;
+    unique_ptr<GstDiscovererInfo, void(*)(void *)> info(
+        gst_discoverer_discover_uri(discoverer.get(), uri.c_str(), &error),
+        g_object_unref);
+    if (info.get() == nullptr) {
+        string errortxt(error->message);
+        g_error_free(error);
+
+        string msg = "Discovery of file ";
+        msg += d.filename;
+        msg += " failed: ";
+        msg += errortxt;
+        throw runtime_error(msg);
+    }
+    if (error) {
+        // Sometimes this gets filled in even if no error actually occurs.
+        g_error_free(error);
+        error = nullptr;
+    }
+
+    if (gst_discoverer_info_get_result(info.get()) != GST_DISCOVERER_OK) {
+        throw runtime_error("Unable to discover file " + d.filename);
+    }
+
+    const GstTagList *tags = gst_discoverer_info_get_tags(info.get());
+    if (tags != nullptr) {
+        gst_tag_list_foreach(tags, extract_tag_info, &mfb);
+    }
+    mfb.setDuration(static_cast<int>(
+        gst_discoverer_info_get_duration(info.get())/GST_SECOND));
+
+    /* Check for video specific information */
+    unique_ptr<GList, void(*)(GList*)> streams(
+        gst_discoverer_info_get_stream_list(info.get()),
+        gst_discoverer_stream_info_list_free);
+    for (const GList *l = streams.get(); l != nullptr; l = l->next) {
+        auto stream_info = static_cast<GstDiscovererStreamInfo*>(l->data);
+
+        if (GST_IS_DISCOVERER_VIDEO_INFO(stream_info)) {
+            mfb.setWidth(gst_discoverer_video_info_get_width(
+                             GST_DISCOVERER_VIDEO_INFO(stream_info)));
+            mfb.setHeight(gst_discoverer_video_info_get_height(
+                              GST_DISCOVERER_VIDEO_INFO(stream_info)));
+            break;
+        }
+    }
+}
+
+}

=== added file 'src/extractor/GStreamerExtractor.hh'
--- src/extractor/GStreamerExtractor.hh	1970-01-01 00:00:00 +0000
+++ src/extractor/GStreamerExtractor.hh	2016-02-24 05:55:29 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2013-2014 Canonical, Ltd.
+ *
+ * Authors:
+ *    Jussi Pakkanen <[e-mail]>
+ *    James Henstridge <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef EXTRACTOR_GSTREAMEREXTRACTOR_H
+#define EXTRACTOR_GSTREAMEREXTRACTOR_H
+
+#include <memory>
+
+typedef struct _GstDiscoverer GstDiscoverer;
+
+namespace mediascanner {
+
+class MediaFileBuilder;
+struct DetectedFile;
+
+class GStreamerExtractor final {
+public:
+    explicit GStreamerExtractor(int seconds);
+    ~GStreamerExtractor();
+    GStreamerExtractor(const GStreamerExtractor&) = delete;
+    GStreamerExtractor& operator=(GStreamerExtractor &o) = delete;
+
+    void extract(const DetectedFile &d, MediaFileBuilder &builder);
+
+private:
+    std::unique_ptr<GstDiscoverer, void(*)(void*)> discoverer;
+};
+
+}
+
+#endif

=== added file 'src/extractor/ImageExtractor.cc'
--- src/extractor/ImageExtractor.cc	1970-01-01 00:00:00 +0000
+++ src/extractor/ImageExtractor.cc	2016-02-24 05:55:29 +0000
@@ -0,0 +1,241 @@
+/*
+ * Copyright (C) 2013-2014 Canonical, Ltd.
+ *
+ * Authors:
+ *    Jussi Pakkanen <[e-mail]>
+ *    James Henstridge <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ImageExtractor.hh"
+#include "DetectedFile.hh"
+#include "../mediascanner/MediaFile.hh"
+#include "../mediascanner/MediaFileBuilder.hh"
+
+#include <exif-loader.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include <ctime>
+#include <memory>
+#include <string>
+#include <stdexcept>
+#include <vector>
+
+#include <unistd.h>
+
+using namespace std;
+using mediascanner::MediaFileBuilder;
+
+namespace {
+const char exif_date_template[] = "%Y:%m:%d %H:%M:%S";
+const char iso8601_date_format[] = "%Y-%m-%dT%H:%M:%S";
+const char iso8601_date_with_zone_format[] = "%Y-%m-%dT%H:%M:%S%z";
+
+void parse_exif_date(ExifData *data, ExifByteOrder order, MediaFileBuilder &mfb) {
+    static const std::vector<ExifTag> date_tags{
+        EXIF_TAG_DATE_TIME,
+        EXIF_TAG_DATE_TIME_ORIGINAL,
+        EXIF_TAG_DATE_TIME_DIGITIZED
+    };
+    struct tm timeinfo;
+    bool have_date = false;
+
+    for (ExifTag tag : date_tags) {
+        ExifEntry *ent = exif_data_get_entry(data, tag);
+        if (ent == nullptr) {
+            continue;
+        }
+        if (strptime((const char*)ent->data, exif_date_template, &timeinfo) != nullptr) {
+            have_date = true;
+            break;
+        }
+    }
+    if (!have_date) {
+        return;
+    }
+
+    char buf[100];
+    ExifEntry *ent = exif_data_get_entry(data, EXIF_TAG_TIME_ZONE_OFFSET);
+    if (ent) {
+        timeinfo.tm_gmtoff = (int)exif_get_sshort(ent->data, order) * 3600;
+
+        if (strftime(buf, sizeof(buf), iso8601_date_with_zone_format, &timeinfo) != 0) {
+            mfb.setDate(buf);
+        }
+    } else {
+        /* No time zone info */
+        if (strftime(buf, sizeof(buf), iso8601_date_format, &timeinfo) != 0) {
+            mfb.setDate(buf);
+        }
+    }
+}
+
+int get_exif_int(ExifEntry *ent, ExifByteOrder order) {
+    switch (ent->format) {
+    case EXIF_FORMAT_BYTE:
+        return (unsigned char)ent->data[0];
+    case EXIF_FORMAT_SHORT:
+        return exif_get_short(ent->data, order);
+    case EXIF_FORMAT_LONG:
+        return exif_get_long(ent->data, order);
+    case EXIF_FORMAT_SBYTE:
+        return (signed char)ent->data[0];
+    case EXIF_FORMAT_SSHORT:
+        return exif_get_sshort(ent->data, order);
+    case EXIF_FORMAT_SLONG:
+        return exif_get_slong(ent->data, order);
+    default:
+        break;
+    }
+    return 0;
+}
+
+void parse_exif_dimensions(ExifData *data, ExifByteOrder order, MediaFileBuilder &mfb) {
+    ExifEntry *w_ent = exif_data_get_entry(data, EXIF_TAG_PIXEL_X_DIMENSION);
+    ExifEntry *h_ent = exif_data_get_entry(data, EXIF_TAG_PIXEL_Y_DIMENSION);
+    ExifEntry *o_ent = exif_data_get_entry(data, EXIF_TAG_ORIENTATION);
+
+    if (!w_ent || !h_ent) {
+        return;
+    }
+    int width = get_exif_int(w_ent, order);
+    int height = get_exif_int(h_ent, order);
+
+    // Optionally swap height and width depending on orientation
+    if (o_ent) {
+        int tmp;
+
+        // exif_data_fix() has ensured this is a short.
+        switch (exif_get_short(o_ent->data, order)) {
+        case 5: // Mirror horizontal and rotate 270 CW
+        case 6: // Rotate 90 CW
+        case 7: // Mirror horizontal and rotate 90 CW
+        case 8: // Rotate 270 CW
+            tmp = width;
+            width = height;
+            height = tmp;
+            break;
+        default:
+            break;
+        }
+    }
+    mfb.setWidth(width);
+    mfb.setHeight(height);
+}
+
+bool rational_to_degrees(ExifEntry *ent, ExifByteOrder order, double *out) {
+    if (ent->format != EXIF_FORMAT_RATIONAL) {
+        return false;
+    }
+
+    ExifRational r = exif_get_rational(ent->data, order);
+    *out = ((double) r.numerator) / r.denominator;
+
+    // Minutes
+    if (ent->components >= 2) {
+        r = exif_get_rational(ent->data + exif_format_get_size(EXIF_FORMAT_RATIONAL), order);
+        *out += ((double) r.numerator) / r.denominator / 60;
+    }
+    // Seconds
+    if (ent->components >= 3) {
+        r = exif_get_rational(ent->data + 2 * exif_format_get_size(EXIF_FORMAT_RATIONAL), order);
+        *out += ((double) r.numerator) / r.denominator / 3600;
+    }
+    return true;
+}
+
+void parse_exif_location(ExifData *data, ExifByteOrder order, MediaFileBuilder &mfb) {
+    ExifContent *ifd = data->ifd[EXIF_IFD_GPS];
+    ExifEntry *lat_ent = exif_content_get_entry(ifd, (ExifTag)EXIF_TAG_GPS_LATITUDE);
+    ExifEntry *latref_ent = exif_content_get_entry(ifd, (ExifTag)EXIF_TAG_GPS_LATITUDE_REF);
+    ExifEntry *long_ent = exif_content_get_entry(ifd, (ExifTag)EXIF_TAG_GPS_LONGITUDE);
+    ExifEntry *longref_ent = exif_content_get_entry(ifd, (ExifTag)EXIF_TAG_GPS_LONGITUDE_REF);
+
+    if (!lat_ent || !long_ent) {
+        return;
+    }
+
+    double latitude, longitude;
+    if (!rational_to_degrees(lat_ent, order, &latitude)) {
+        return;
+    }
+    if (!rational_to_degrees(long_ent, order, &longitude)) {
+        return;
+    }
+    if (latref_ent && latref_ent->data[0] == 'S') {
+        latitude = -latitude;
+    }
+    if (longref_ent && longref_ent->data[0] == 'W') {
+        longitude = -longitude;
+    }
+    mfb.setLatitude(latitude);
+    mfb.setLongitude(longitude);
+}
+
+}
+
+namespace mediascanner {
+
+bool ImageExtractor::extract_exif(const DetectedFile &d, MediaFileBuilder &mfb) {
+    std::unique_ptr<ExifLoader, void(*)(ExifLoader*)> loader(
+        exif_loader_new(), exif_loader_unref);
+    exif_loader_write_file(loader.get(), d.filename.c_str());
+
+    std::unique_ptr<ExifData, void(*)(ExifData*)> data(
+        exif_loader_get_data(loader.get()), exif_data_unref);
+    loader.reset();
+
+    if (!data) {
+        return false;
+    }
+    exif_data_fix(data.get());
+    ExifByteOrder order = exif_data_get_byte_order(data.get());
+
+    parse_exif_date(data.get(), order, mfb);
+    parse_exif_dimensions(data.get(), order, mfb);
+    parse_exif_location(data.get(), order, mfb);
+    return true;
+}
+
+void ImageExtractor::extract_pixbuf(const DetectedFile &d, MediaFileBuilder &builder) {
+    gint width, height;
+
+    if(!gdk_pixbuf_get_file_info(d.filename.c_str(), &width, &height)) {
+        string msg("Could not determine resolution of ");
+        msg += d.filename;
+        msg += ".";
+        throw runtime_error(msg);
+    }
+    builder.setWidth(width);
+    builder.setHeight(height);
+
+    if (d.mtime != 0) {
+        auto t = static_cast<time_t>(d.mtime);
+        char buf[1024];
+        struct tm ptm;
+        localtime_r(&t, &ptm);
+        if (strftime(buf, sizeof(buf), iso8601_date_format, &ptm) != 0) {
+            builder.setDate(buf);
+        }
+    }
+}
+
+void ImageExtractor::extract(const DetectedFile &d, MediaFileBuilder &builder) {
+    if (!extract_exif(d, builder)) {
+        extract_pixbuf(d, builder);
+    }
+    return;
+}
+
+}

=== added file 'src/extractor/ImageExtractor.hh'
--- src/extractor/ImageExtractor.hh	1970-01-01 00:00:00 +0000
+++ src/extractor/ImageExtractor.hh	2016-02-24 05:55:29 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2013-2014 Canonical, Ltd.
+ *
+ * Authors:
+ *    Jussi Pakkanen <[e-mail]>
+ *    James Henstridge <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef EXTRACTOR_IMAGEEXTRACTOR_H
+#define EXTRACTOR_IMAGEEXTRACTOR_H
+
+#include <string>
+
+namespace mediascanner {
+
+class MediaFileBuilder;
+struct DetectedFile;
+
+class ImageExtractor final {
+public:
+    ImageExtractor() = default;
+    ~ImageExtractor() = default;
+    ImageExtractor(const ImageExtractor&) = delete;
+    ImageExtractor& operator=(ImageExtractor &o) = delete;
+
+    void extract(const DetectedFile &d, MediaFileBuilder &builder);
+
+private:
+    bool extract_exif(const DetectedFile &d, MediaFileBuilder &builder);
+    void extract_pixbuf(const DetectedFile &d, MediaFileBuilder &builder);
+};
+
+}
+
+#endif

=== added file 'src/extractor/TaglibExtractor.cc'
--- src/extractor/TaglibExtractor.cc	1970-01-01 00:00:00 +0000
+++ src/extractor/TaglibExtractor.cc	2016-02-24 05:55:29 +0000
@@ -0,0 +1,295 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * Authors:
+ *    James Henstridge <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "TaglibExtractor.hh"
+#include "DetectedFile.hh"
+#include "../mediascanner/MediaFile.hh"
+#include "../mediascanner/MediaFileBuilder.hh"
+
+#include <glib.h>
+#include <gio/gio.h>
+#include <gst/gstdatetime.h>
+
+#include <taglib/flacfile.h>
+#include <taglib/id3v1tag.h>
+#include <taglib/id3v2framefactory.h>
+#include <taglib/id3v2tag.h>
+#include <taglib/mp4file.h>
+#include <taglib/mpegfile.h>
+#include <taglib/oggflacfile.h>
+#include <taglib/opusfile.h>
+#include <taglib/tfilestream.h>
+#include <taglib/unknownframe.h>
+#include <taglib/vorbisfile.h>
+
+#include <cassert>
+#include <cstdio>
+#include <memory>
+#include <string>
+#include <stdexcept>
+
+using namespace std;
+using mediascanner::MediaFileBuilder;
+
+namespace {
+
+string get_content_type(const string &filename) {
+    unique_ptr<GFile, decltype(&g_object_unref)> file(
+        g_file_new_for_path(filename.c_str()), g_object_unref);
+    assert(file);
+
+    GError *error = nullptr;
+    unique_ptr<GFileInfo, decltype(&g_object_unref)> info(
+        g_file_query_info(
+            file.get(),
+            G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+            G_FILE_QUERY_INFO_NONE, nullptr, &error),
+        g_object_unref);
+    if (!info) {
+        fprintf(stderr, "Failed to detect content type of '%s': %s\n",
+                filename.c_str(), error->message);
+        g_error_free(error);
+        return string();
+    }
+    return g_file_info_get_content_type(info.get());
+}
+
+typedef unique_ptr<GstDateTime, decltype(&gst_date_time_unref)> DatePtr;
+
+DatePtr parse_iso_date(const string &date_string) {
+    return DatePtr(
+        gst_date_time_new_from_iso8601_string(date_string.c_str()),
+        gst_date_time_unref);
+}
+
+string format_iso_date(const DatePtr &dt) {
+    if (!dt) {
+        return string();
+    }
+    char *iso = gst_date_time_to_iso8601_string(dt.get());
+    if (!iso) {
+        return string();
+    }
+    string result(iso);
+    g_free(iso);
+    return result;
+}
+
+string check_date(const string &date_string) {
+    // Parse and reserialise the date using GstDateTime to check its
+    // consistency.
+    return format_iso_date(parse_iso_date(date_string));
+}
+
+void parse_common(const TagLib::File &file, MediaFileBuilder &builder) {
+    TagLib::Tag *tag = file.tag();
+
+    const TagLib::AudioProperties *audio_props = file.audioProperties();
+    if (audio_props) {
+        builder.setDuration(audio_props->length());
+    }
+
+    TagLib::String s = tag->title();
+    if (!s.isEmpty()) {
+        builder.setTitle(s.to8Bit(true));
+    }
+    s = tag->artist();
+    if (!s.isEmpty()) {
+        builder.setAuthor(s.to8Bit(true));
+    }
+    s = tag->album();
+    if (!s.isEmpty()) {
+        builder.setAlbum(s.to8Bit(true));
+    }
+    s = tag->genre();
+    if (!s.isEmpty()) {
+        builder.setGenre(s.to8Bit(true));
+    }
+    unsigned int year = tag->year();
+    if (year > 0 && year <= 9999) {
+        DatePtr dt(gst_date_time_new_y(year), gst_date_time_unref);
+        builder.setDate(format_iso_date(dt));
+    }
+
+    unsigned int track = tag->track();
+    if (track != 0) {
+        builder.setTrackNumber(track);
+    }
+}
+
+void parse_xiph_comment(const TagLib::Ogg::XiphComment *tag, MediaFileBuilder &builder) {
+    const auto& fields = tag->fieldListMap();
+
+    if (!fields["DATE"].isEmpty()) {
+        builder.setDate(check_date(fields["DATE"].front().to8Bit(true)));
+    }
+
+    if (!fields["ALBUMARTIST"].isEmpty()) {
+        builder.setAlbumArtist(fields["ALBUMARTIST"].front().to8Bit(true));
+    }
+
+    if (!fields["DISCNUMBER"].isEmpty()) {
+        builder.setDiscNumber(fields["DISCNUMBER"].front().toInt());
+    }
+
+    if (!fields["COVERART"].isEmpty() || !fields["METADATA_BLOCK_PICTURE"].isEmpty()) {
+        builder.setHasThumbnail(true);
+    }
+}
+
+void parse_id3v2(const TagLib::ID3v2::Tag *tag, MediaFileBuilder &builder) {
+    const auto& frames = tag->frameListMap();
+
+    if (!frames["TDRC"].isEmpty()) {
+        DatePtr dt = parse_iso_date(frames["TDRC"].front()->toString().to8Bit(true));
+        // Taglib automatically renames the old TYER frame to TDRC,
+        // but doesn't migrate over the day and month from TDAT.
+        if (!gst_date_time_has_month(dt.get()) && !frames["TDAT"].isEmpty()) {
+            const TagLib::ID3v2::Frame *frame = frames["TDAT"].front();
+            // TagLib converts TDAT to an "UnknownFrame" type frame,
+            // since it believes it should be ignored.  Create a text
+            // frame so we can get at the data.
+            TagLib::String data;
+            auto *unknown = dynamic_cast<const TagLib::ID3v2::UnknownFrame*>(frame);
+            if (unknown) {
+                // Text information frames consist of one byte for the
+                // encoding, followed the string data.
+                auto encoding = static_cast<TagLib::String::Type>(unknown->data()[0]);
+                data = TagLib::String(unknown->data().mid(1), encoding);
+            } else {
+                data = frame->toString();
+            }
+            int ddmm = data.toInt();
+            int day = ddmm / 100;
+            int month = ddmm % 100;
+            dt.reset(gst_date_time_new_ymd(
+                         gst_date_time_get_year(dt.get()),
+                         g_date_valid_month(static_cast<GDateMonth>(month)) ? month : -1,
+                         g_date_valid_day(day) ? day : -1));
+        }
+        builder.setDate(format_iso_date(dt));
+    }
+
+    if (!frames["TPE2"].isEmpty()) {
+        builder.setAlbumArtist(frames["TPE2"].front()->toString().to8Bit(true));
+    }
+
+    if (!frames["TPOS"].isEmpty()) {
+        builder.setDiscNumber(frames["TPOS"].front()->toString().toInt());
+    }
+
+    if (!frames["APIC"].isEmpty()) {
+        builder.setHasThumbnail(true);
+    }
+}
+
+void parse_mp4(const TagLib::MP4::Tag *tag, MediaFileBuilder &builder) {
+    const auto& items = const_cast<TagLib::MP4::Tag*>(tag)->itemListMap();
+
+    if (items.contains("\251day")) {
+        builder.setDate(check_date(items["\251day"].toStringList().front().to8Bit(true)));
+    }
+
+    if (items.contains("aART")) {
+        builder.setAlbumArtist(items["aART"].toStringList().front().to8Bit(true));
+    }
+
+    if (items.contains("disk")) {
+        builder.setDiscNumber(items["disk"].toIntPair().first);
+    }
+
+    if (items.contains("covr")) {
+        builder.setHasThumbnail(true);
+    }
+}
+
+}
+
+namespace mediascanner {
+
+bool TaglibExtractor::extract(const DetectedFile &d, MediaFileBuilder &builder) {
+    string content_type = get_content_type(d.filename);
+    if (content_type.empty()) {
+        return false;
+    }
+
+    unique_ptr<TagLib::FileStream> fs(new TagLib::FileStream(d.filename.c_str(), true));
+    if (!fs->isOpen()) {
+        return false;
+    }
+
+    if (content_type == "audio/x-vorbis+ogg") {
+        TagLib::Ogg::Vorbis::File file(fs.get());
+        if (!file.isValid()) {
+            return false;
+        }
+        parse_common(file, builder);
+        parse_xiph_comment(file.tag(), builder);
+    } else if (content_type == "audio/x-opus+ogg") {
+        TagLib::Ogg::Opus::File file(fs.get());
+        if (!file.isValid()) {
+            return false;
+        }
+        parse_common(file, builder);
+        parse_xiph_comment(file.tag(), builder);
+    } else if (content_type == "audio/x-flac+ogg") {
+        TagLib::Ogg::FLAC::File file(fs.get());
+        if (!file.isValid()) {
+            return false;
+        }
+        parse_common(file, builder);
+        parse_xiph_comment(file.tag(), builder);
+    } else if (content_type == "audio/flac") {
+        TagLib::FLAC::File file(fs.get(), TagLib::ID3v2::FrameFactory::instance());
+        if (!file.isValid()) {
+            return false;
+        }
+        parse_common(file, builder);
+        if (file.hasID3v2Tag()) {
+            parse_id3v2(file.ID3v2Tag(), builder);
+        }
+        if (file.hasXiphComment()) {
+            parse_xiph_comment(file.xiphComment(), builder);
+        }
+        if (!file.pictureList().isEmpty()) {
+            builder.setHasThumbnail(true);
+        }
+    } else if (content_type == "audio/mpeg") {
+        TagLib::MPEG::File file(fs.get(), TagLib::ID3v2::FrameFactory::instance());
+        if (!file.isValid()) {
+            return false;
+        }
+        parse_common(file, builder);
+        if (file.hasID3v2Tag()) {
+            parse_id3v2(file.ID3v2Tag(), builder);
+        }
+    } else if (content_type == "audio/mp4") {
+        TagLib::MP4::File file(fs.get());
+        if (!file.isValid()) {
+            return false;
+        }
+        parse_common(file, builder);
+        parse_mp4(file.tag(), builder);
+    } else {
+        return false;
+    }
+    return true;
+}
+
+}

=== added file 'src/extractor/TaglibExtractor.hh'
--- src/extractor/TaglibExtractor.hh	1970-01-01 00:00:00 +0000
+++ src/extractor/TaglibExtractor.hh	2016-02-24 05:55:29 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * Authors:
+ *    James Henstridge <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef EXTRACTOR_TAGLIBEXTRACTOR_H
+#define EXTRACTOR_TAGLIBEXTRACTOR_H
+
+#include <string>
+
+namespace mediascanner {
+
+class MediaFileBuilder;
+struct DetectedFile;
+
+class TaglibExtractor final {
+public:
+    TaglibExtractor() = default;
+    ~TaglibExtractor() = default;
+    TaglibExtractor(const TaglibExtractor&) = delete;
+    TaglibExtractor& operator=(TaglibExtractor &o) = delete;
+
+    bool extract(const DetectedFile &d, MediaFileBuilder &builder);
+};
+
+}
+
+#endif

=== modified file 'test/CMakeLists.txt'
--- test/CMakeLists.txt	2015-12-11 06:34:01 +0000
+++ test/CMakeLists.txt	2016-02-24 05:55:29 +0000
@@ -47,7 +47,7 @@
 add_test(test_extractorbackend test_extractorbackend)
 
 add_executable(test_metadataextractor test_metadataextractor.cc)
-target_link_libraries(test_metadataextractor extractor-client gtest ${GST_LDFLAGS})
+target_link_libraries(test_metadataextractor extractor-client gtest)
 add_test(test_metadataextractor test_metadataextractor)
 # The gvfs modules interfere with the private D-Bus test fixtures
 set_tests_properties(test_metadataextractor PROPERTIES

=== modified file 'test/test_extractorbackend.cc'
--- test/test_extractorbackend.cc	2015-10-22 08:40:58 +0000
+++ test/test_extractorbackend.cc	2016-02-24 05:55:29 +0000
@@ -19,8 +19,11 @@
  */
 
 #include <mediascanner/MediaFile.hh>
+#include <mediascanner/MediaFileBuilder.hh>
 #include <extractor/DetectedFile.hh>
 #include <extractor/ExtractorBackend.hh>
+#include <extractor/GStreamerExtractor.hh>
+#include <extractor/TaglibExtractor.hh>
 
 #include "test_config.h"
 
@@ -33,6 +36,57 @@
 using namespace std;
 using namespace mediascanner;
 
+namespace {
+
+bool supports_decoder(const std::string& format)
+{
+    typedef std::unique_ptr<GstCaps, decltype(&gst_caps_unref)> CapsPtr;
+    static std::vector<CapsPtr> formats;
+
+    if (formats.empty())
+    {
+        std::unique_ptr<GList, decltype(&gst_plugin_feature_list_free)> decoders(
+            gst_element_factory_list_get_elements(GST_ELEMENT_FACTORY_TYPE_DECODER, GST_RANK_NONE),
+            gst_plugin_feature_list_free);
+        for (const GList* l = decoders.get(); l != nullptr; l = l->next)
+        {
+            const auto factory = static_cast<GstElementFactory*>(l->data);
+
+            const GList* templates = gst_element_factory_get_static_pad_templates(factory);
+            for (const GList* l = templates; l != nullptr; l = l->next)
+            {
+                const auto t = static_cast<GstStaticPadTemplate*>(l->data);
+                if (t->direction != GST_PAD_SINK)
+                {
+                    continue;
+                }
+                CapsPtr caps(gst_static_caps_get(&t->static_caps),
+                             gst_caps_unref);
+                if (gst_caps_is_any(caps.get())) {
+                    continue;
+                }
+                formats.emplace_back(std::move(caps));
+            }
+        }
+    }
+
+    char *end = nullptr;
+    GstStructure *structure = gst_structure_from_string(format.c_str(), &end);
+    assert(structure != nullptr);
+    assert(end == format.c_str() + format.size());
+    // GstCaps adopts the GstStructure
+    CapsPtr caps(gst_caps_new_full(structure, nullptr), gst_caps_unref);
+
+    for (const auto &other : formats) {
+        if (gst_caps_is_always_compatible(caps.get(), other.get())) {
+            return true;
+        }
+    }
+    return false;
+}
+
+}
+
 class ExtractorBackendTest : public ::testing::Test {
 protected:
     ExtractorBackendTest() {
@@ -53,7 +107,7 @@
     ExtractorBackend extractor;
 }
 
-TEST_F(ExtractorBackendTest, extract_audio) {
+TEST_F(ExtractorBackendTest, extract_vorbis) {
     ExtractorBackend e;
     string testfile = SOURCE_DIR "/media/testfile.ogg";
     DetectedFile df(testfile, "etag", "audio/ogg", 42, AudioMedia);
@@ -68,6 +122,38 @@
     EXPECT_EQ(file.getDuration(), 5);
 }
 
+TEST_F(ExtractorBackendTest, extract_mp3) {
+    ExtractorBackend e;
+    string testfile = SOURCE_DIR "/media/testfile.mp3";
+    DetectedFile df(testfile, "etag", "audio/mpeg", 42, AudioMedia);
+    MediaFile file = e.extract(df);
+
+    EXPECT_EQ(file.getType(), AudioMedia);
+    EXPECT_EQ(file.getTitle(), "track1");
+    EXPECT_EQ(file.getAuthor(), "artist1");
+    EXPECT_EQ(file.getAlbum(), "album1");
+    EXPECT_EQ(file.getGenre(), "Hip-Hop");
+    EXPECT_EQ(file.getDate(), "2013-06-03");
+    EXPECT_EQ(file.getTrackNumber(), 1);
+    EXPECT_EQ(file.getDuration(), 1);
+}
+
+TEST_F(ExtractorBackendTest, extract_m4a) {
+    ExtractorBackend e;
+    string testfile = SOURCE_DIR "/media/testfile.m4a";
+    DetectedFile df(testfile, "etag", "audio/mpeg4", 42, AudioMedia);
+    MediaFile file = e.extract(df);
+
+    EXPECT_EQ(file.getType(), AudioMedia);
+    EXPECT_EQ(file.getTitle(), "Title");
+    EXPECT_EQ(file.getAuthor(), "Artist");
+    EXPECT_EQ(file.getAlbum(), "Album");
+    EXPECT_EQ(file.getGenre(), "Rock");
+    EXPECT_EQ(file.getDate(), "2015-10-07");
+    EXPECT_EQ(file.getTrackNumber(), 4);
+    EXPECT_EQ(file.getDuration(), 1);
+}
+
 TEST_F(ExtractorBackendTest, extract_video) {
     ExtractorBackend e;
 
@@ -117,6 +203,56 @@
     EXPECT_DOUBLE_EQ(153.1727346, file.getLongitude());
 }
 
+void compare_taglib_gst(const DetectedFile d) {
+    GStreamerExtractor gst(5);
+    MediaFileBuilder builder_gst(d.filename);
+    gst.extract(d, builder_gst);
+
+    TaglibExtractor taglib;
+    MediaFileBuilder builder_taglib(d.filename);
+    ASSERT_TRUE(taglib.extract(d, builder_taglib));
+
+    MediaFile media_gst(builder_gst);
+    MediaFile media_taglib(builder_taglib);
+    EXPECT_EQ(media_gst, media_taglib);
+
+    // And check individual keys to improve error handling:
+    EXPECT_EQ(media_gst.getTitle(), media_taglib.getTitle());
+    EXPECT_EQ(media_gst.getAuthor(), media_taglib.getAuthor());
+    EXPECT_EQ(media_gst.getAlbum(), media_taglib.getAlbum());
+    EXPECT_EQ(media_gst.getAlbumArtist(), media_taglib.getAlbumArtist());
+    EXPECT_EQ(media_gst.getDate(), media_taglib.getDate());
+    EXPECT_EQ(media_gst.getGenre(), media_taglib.getGenre());
+    EXPECT_EQ(media_gst.getDiscNumber(), media_taglib.getDiscNumber());
+    EXPECT_EQ(media_gst.getTrackNumber(), media_taglib.getTrackNumber());
+    EXPECT_EQ(media_gst.getDuration(), media_taglib.getDuration());
+    EXPECT_EQ(media_gst.getHasThumbnail(), media_taglib.getHasThumbnail());
+}
+
+TEST_F(ExtractorBackendTest, check_taglib_gst_vorbis) {
+    DetectedFile d(SOURCE_DIR "/media/testfile.ogg", "etag", "audio/ogg", 42, AudioMedia);
+    compare_taglib_gst(d);
+}
+
+TEST_F(ExtractorBackendTest, check_taglib_gst_mp3) {
+    if (!supports_decoder("audio/mpeg, mpegversion=(int)1, layer=(int)3")) {
+        printf("MP3 codec not supported\n");
+        return;
+    }
+    DetectedFile d(SOURCE_DIR "/media/testfile.mp3", "etag", "audio/mpeg", 42, AudioMedia);
+    compare_taglib_gst(d);
+}
+
+TEST_F(ExtractorBackendTest, check_taglib_gst_m4a) {
+    if (!supports_decoder("audio/mpeg, mpegversion=(int)4, stream-format=(string)raw")) {
+        printf("M4A codec not supported\n");
+        return;
+    }
+    DetectedFile d(SOURCE_DIR "/media/testfile.m4a", "etag", "audio/mp4", 42, AudioMedia);
+    compare_taglib_gst(d);
+}
+
+
 int main(int argc, char **argv) {
     gst_init(&argc, &argv);
     ::testing::InitGoogleTest(&argc, argv);

=== modified file 'test/test_metadataextractor.cc'
--- test/test_metadataextractor.cc	2015-11-08 01:50:15 +0000
+++ test/test_metadataextractor.cc	2016-02-24 05:55:29 +0000
@@ -32,64 +32,12 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <gst/gst.h>
 #include <gio/gio.h>
 #include <gtest/gtest.h>
 
 using namespace std;
 using namespace mediascanner;
 
-namespace {
-
-bool supports_decoder(const std::string& format)
-{
-    typedef std::unique_ptr<GstCaps, decltype(&gst_caps_unref)> CapsPtr;
-    static std::vector<CapsPtr> formats;
-
-    if (formats.empty())
-    {
-        std::unique_ptr<GList, decltype(&gst_plugin_feature_list_free)> decoders(
-            gst_element_factory_list_get_elements(GST_ELEMENT_FACTORY_TYPE_DECODER, GST_RANK_NONE),
-            gst_plugin_feature_list_free);
-        for (const GList* l = decoders.get(); l != nullptr; l = l->next)
-        {
-            const auto factory = static_cast<GstElementFactory*>(l->data);
-
-            const GList* templates = gst_element_factory_get_static_pad_templates(factory);
-            for (const GList* l = templates; l != nullptr; l = l->next)
-            {
-                const auto t = static_cast<GstStaticPadTemplate*>(l->data);
-                if (t->direction != GST_PAD_SINK)
-                {
-                    continue;
-                }
-                CapsPtr caps(gst_static_caps_get(&t->static_caps),
-                             gst_caps_unref);
-                if (gst_caps_is_any(caps.get())) {
-                    continue;
-                }
-                formats.emplace_back(std::move(caps));
-            }
-        }
-    }
-
-    char *end = nullptr;
-    GstStructure *structure = gst_structure_from_string(format.c_str(), &end);
-    assert(structure != nullptr);
-    assert(end == format.c_str() + format.size());
-    // GstCaps adopts the GstStructure
-    CapsPtr caps(gst_caps_new_full(structure, nullptr), gst_caps_unref);
-
-    for (const auto &other : formats) {
-        if (gst_caps_is_always_compatible(caps.get(), other.get())) {
-            return true;
-        }
-    }
-    return false;
-}
-
-}
-
 class MetadataExtractorTest : public ::testing::Test {
 protected:
     virtual void SetUp() override {
@@ -187,10 +135,6 @@
 }
 
 TEST_F(MetadataExtractorTest, extract_mp3) {
-    if (!supports_decoder("audio/mpeg, mpegversion=(int)1, layer=(int)3")) {
-        printf("MP3 codec not supported\n");
-        return;
-    }
     MetadataExtractor e(session_bus());
     string testfile = SOURCE_DIR "/media/testfile.mp3";
     MediaFile file = e.extract(e.detect(testfile));
@@ -209,11 +153,6 @@
 }
 
 TEST_F(MetadataExtractorTest, extract_m4a) {
-    if (!supports_decoder("audio/mpeg, mpegversion=(int)4, stream-format=(string)raw")) {
-        printf("M4A codec not supported\n");
-        return;
-    }
-
     MetadataExtractor e(session_bus());
     string testfile = SOURCE_DIR "/media/testfile.m4a";
     MediaFile file = e.extract(e.detect(testfile));
@@ -291,10 +230,6 @@
 }
 
 TEST_F(MetadataExtractorTest, extract_mp3_bad_date) {
-    if (!supports_decoder("audio/mpeg, mpegversion=(int)1, layer=(int)3")) {
-        printf("MP3 codec not supported\n");
-        return;
-    }
     MetadataExtractor e(session_bus());
     string testfile = SOURCE_DIR "/media/baddate.mp3";
     MediaFile file = e.extract(e.detect(testfile));
@@ -371,7 +306,6 @@
 }
 
 int main(int argc, char **argv) {
-    gst_init(&argc, &argv);
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();
 }