diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -108,6 +108,10 @@
         TEST_NAME "taglibextractortest"
         LINK_LIBRARIES Qt5::Test KF5::FileMetaData ${TAGLIB_LIBRARIES}
     )
+    ecm_add_test(embeddedimagedatatest.cpp ../src/embeddedimagedata.cpp
+        TEST_NAME "embeddedimagedatatest"
+        LINK_LIBRARIES Qt5::Test KF5::FileMetaData ${TAGLIB_LIBRARIES}
+    )
 endif()
 
 
diff --git a/autotests/embeddedimagedatatest.h b/autotests/embeddedimagedatatest.h
new file mode 100644
--- /dev/null
+++ b/autotests/embeddedimagedatatest.h
@@ -0,0 +1,38 @@
+/*
+ * EmbeddedImageData tests.
+ *
+ * Copyright (C) 2018  Alexander Stippich <a.stippich@gmx.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef EMBEDDEDIMAGEDATATEST_H
+#define EMBEDDEDIMAGEDATATEST_H
+
+#include <QObject>
+#include "properties.h"
+
+class EmbeddedImageDataTest : public QObject
+{
+    Q_OBJECT
+private:
+    QString testFilePath(const QString& fileName) const;
+
+private Q_SLOTS:
+    void test();
+};
+
+#endif // EMBEDDEDIMAGEDATATEST_H
diff --git a/autotests/embeddedimagedatatest.cpp b/autotests/embeddedimagedatatest.cpp
new file mode 100644
--- /dev/null
+++ b/autotests/embeddedimagedatatest.cpp
@@ -0,0 +1,63 @@
+/*
+ * EmbeddedImageData tests.
+ *
+ * Copyright (C) 2018  Alexander Stippich <a.stippich@gmx.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include "embeddedimagedatatest.h"
+#include "embeddedimagedata.h"
+#include "indexerextractortestsconfig.h"
+
+#include <QTest>
+
+using namespace KFileMetaData;
+
+QString EmbeddedImageDataTest::testFilePath(const QString& fileName) const
+{
+    return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QDir::separator() + fileName;
+}
+
+void EmbeddedImageDataTest::test()
+{
+    QMap<EmbeddedImageData::ImageType, QByteArray> images;
+    QByteArray originalFrontCoverImage;
+    QFile testFile(testFilePath("test.jpg"));
+    testFile.open(QIODevice::ReadOnly);
+    originalFrontCoverImage = testFile.readAll();
+
+    EmbeddedImageData imageData;
+    images = imageData.imageData(testFilePath("test.opus"));
+    QCOMPARE(images.value(EmbeddedImageData::FrontCover), originalFrontCoverImage);
+
+    images = imageData.imageData(testFilePath("test.ogg"));
+    QCOMPARE(images.value(EmbeddedImageData::FrontCover), originalFrontCoverImage);
+
+    images = imageData.imageData(testFilePath("test.flac"));
+    QCOMPARE(images.value(EmbeddedImageData::FrontCover), originalFrontCoverImage);
+
+    images = imageData.imageData(testFilePath("test.mp3"));
+    QCOMPARE(images.value(EmbeddedImageData::FrontCover), originalFrontCoverImage);
+
+    images = imageData.imageData(testFilePath("test.m4a"));
+    QCOMPARE(images.value(EmbeddedImageData::FrontCover), originalFrontCoverImage);
+
+    images = imageData.imageData(testFilePath("test.mpc"));
+    QCOMPARE(images.value(EmbeddedImageData::FrontCover), originalFrontCoverImage);
+}
+
+QTEST_GUILESS_MAIN(EmbeddedImageDataTest)
diff --git a/autotests/samplefiles/test.mpc b/autotests/samplefiles/test.mpc
index a7a4d460db6d12391d233e4f414a638416bfab6d..221b1b9fc01eabecd5521275b417b375d17a1850
GIT binary patch
literal 5244
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

literal 3756
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
ND*q$9f`0n}{|7$qjk*8;

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,6 +16,13 @@
     )
 ecm_qt_declare_logging_category(KF5FileMetaData_SRCS HEADER kfilemetadata_debug.h IDENTIFIER KFILEMETADATA_LOG CATEGORY_NAME kf5.kfilemetadata)
 
+if(TAGLIB_FOUND)
+    set(KF5FileMetaData_SRCS
+        ${KF5FileMetaData_SRCS}
+        embeddedimagedata.cpp
+        )
+endif()
+
 add_library(KF5FileMetaData
     ${KF5FileMetaData_SRCS}
 )
@@ -29,6 +36,15 @@
     KF5::I18n
 )
 
+if(TAGLIB_FOUND)
+    include_directories(${TAGLIB_INCLUDES})
+
+    target_link_libraries(KF5FileMetaData
+        PUBLIC
+        ${TAGLIB_LIBRARIES}
+    )
+endif()
+
 generate_export_header(KF5FileMetaData BASE_NAME KFileMetaData EXPORT_FILE_NAME kfilemetadata_export.h)
 
 set_target_properties(KF5FileMetaData PROPERTIES
@@ -55,6 +71,7 @@
     Writer
     WriterPlugin
     WriterCollection
+    EmbeddedImageData
 
     PREFIX kfilemetadata
     REQUIRED_HEADERS KF5FileMetaData_HEADERS
diff --git a/src/embeddedimagedata.h b/src/embeddedimagedata.h
new file mode 100644
--- /dev/null
+++ b/src/embeddedimagedata.h
@@ -0,0 +1,65 @@
+/*
+ * EmbeddedImageData extracts binary data of cover art files.
+ * Copyright (C) 2018  Alexander Stippich <a.stippich@gmx.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef KFILEMETADATA_EMBEDDEDIMAGEDATA_H
+#define KFILEMETADATA_EMBEDDEDIMAGEDATA_H
+
+#include "kfilemetadata_export.h"
+#include <QByteArray>
+#include <QFlags>
+#include <memory>
+
+namespace KFileMetaData {
+
+/**
+ * \class EmbeddedImageData embeddedimagedata.h <KFileMetaData/EmbeddedImageData>
+ *
+ * \brief The EmbeddedImageData is a class which extracts the images stored
+ * in the metadata tags of files as byte arrays. For example, the front cover
+ * art of music albums may be extracted with this class. The byte array will
+ * mostly contain jpeg or png files, which can be loaded into e.g. QImage.
+ *
+ * \author Alexander Stippich <a.stippich@gmx.net>
+ */
+class KFILEMETADATA_EXPORT EmbeddedImageData {
+public:
+    EmbeddedImageData();
+    virtual ~EmbeddedImageData();
+    enum ImageType {
+        FrontCover = 0x01,
+        AllImages = FrontCover
+    };
+    Q_DECLARE_FLAGS(ImageTypes, ImageType)
+
+    /**
+     * Extracts the images stored in the metadata tags from a file.
+     * By default, the front cover is extracted.
+     */
+    QMap<ImageType, QByteArray> imageData(const QString &fileUrl, const EmbeddedImageData::ImageTypes types = FrontCover) const;
+
+private:
+    class Private;
+    std::unique_ptr<Private> d;
+    EmbeddedImageData& operator=(const EmbeddedImageData&);
+};
+
+}
+
+#endif // KFILEMETADATA_EMBEDDEDIMAGEDATA_H
diff --git a/src/embeddedimagedata.cpp b/src/embeddedimagedata.cpp
new file mode 100644
--- /dev/null
+++ b/src/embeddedimagedata.cpp
@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2018  Alexander Stippich <a.stippich@gmx.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include "embeddedimagedata.h"
+// Taglib includes
+#include <taglib.h>
+#include <tag.h>
+#include <tfilestream.h>
+#include <mpegfile.h>
+#include <oggfile.h>
+#include <mp4file.h>
+#include <flacfile.h>
+#include <vorbisfile.h>
+#include <opusfile.h>
+#include <apetag.h>
+#include <mpcfile.h>
+#include <id3v2tag.h>
+#include <attachedpictureframe.h>
+#include <mp4tag.h>
+#include <xiphcomment.h>
+
+#include <QMimeDatabase>
+#include <QDebug>
+
+using namespace KFileMetaData;
+
+class Q_DECL_HIDDEN EmbeddedImageData::Private
+{
+public:
+    QMimeDatabase mMimeDatabase;
+    QByteArray getFrontCover(const QString &fileUrl, const QString &mimeType) const;
+
+};
+
+EmbeddedImageData::EmbeddedImageData()
+    : d(std::unique_ptr<Private>(new Private()))
+{
+}
+
+EmbeddedImageData::~EmbeddedImageData()
+= default;
+
+QMap<EmbeddedImageData::ImageType, QByteArray>
+EmbeddedImageData::imageData(const QString &fileUrl,
+                             const EmbeddedImageData::ImageTypes types) const
+{
+    QMap<EmbeddedImageData::ImageType, QByteArray> imageData;
+
+    const auto &fileMimeType = d->mMimeDatabase.mimeTypeForFile(fileUrl);
+    if (fileMimeType.name().startsWith(QStringLiteral("audio/"))) {
+        if (types & EmbeddedImageData::FrontCover) {
+            imageData.insert(EmbeddedImageData::FrontCover, d->getFrontCover(fileUrl, fileMimeType.name()));
+        }
+    }
+
+    return imageData;
+}
+
+QByteArray
+EmbeddedImageData::Private::getFrontCover(const QString &fileUrl,
+                                          const QString &mimeType) const
+{
+    TagLib::FileStream stream(fileUrl.toUtf8().constData(), true);
+    if (!stream.isOpen()) {
+        qWarning() << "Unable to open file readonly: " << fileUrl;
+        return QByteArray();
+    }
+    if ((mimeType == QStringLiteral("audio/mpeg"))
+            || (mimeType == QStringLiteral("audio/mpeg3"))
+            || (mimeType == QStringLiteral("audio/x-mpeg"))) {
+
+        // Handling multiple tags in mpeg files.
+        TagLib::MPEG::File mpegFile(&stream, TagLib::ID3v2::FrameFactory::instance(), true);
+        if (!mpegFile.ID3v2Tag() || mpegFile.ID3v2Tag()->isEmpty()) {
+            return QByteArray();
+        }
+
+        TagLib::ID3v2::FrameList lstID3v2;
+        // Attached Front Picture.
+        lstID3v2 = mpegFile.ID3v2Tag()->frameListMap()["APIC"];
+        if (!lstID3v2.isEmpty()) {
+            for (TagLib::ID3v2::FrameList::ConstIterator it = lstID3v2.begin(); it != lstID3v2.end(); ++it) {
+                auto *frontCoverFrame = static_cast<TagLib::ID3v2::AttachedPictureFrame *>(*it);
+                if (frontCoverFrame->type() == frontCoverFrame->FrontCover) {
+                    return QByteArray(frontCoverFrame->picture().data(), frontCoverFrame->picture().size());
+                }
+            }
+        }
+
+    } else if (mimeType == QStringLiteral("audio/mp4")) {
+
+        TagLib::MP4::File mp4File(&stream, true);
+        if (!mp4File.tag() || mp4File.tag()->isEmpty()) {
+            return QByteArray();
+        }
+        TagLib::MP4::Item coverArtItem = mp4File.tag()->item("covr");
+        if (coverArtItem.isValid())
+        {
+            TagLib::MP4::CoverArtList coverArtList = coverArtItem.toCoverArtList();
+            TagLib::MP4::CoverArt& frontCover = coverArtList.front();
+            return QByteArray(frontCover.data().data(), frontCover.data().size());
+        }
+
+    } else if (mimeType == QStringLiteral("audio/x-musepack")) {
+
+        TagLib::MPC::File mpcFile(&stream, true);
+        if (!mpcFile.tag() || mpcFile.tag()->isEmpty()) {
+            return QByteArray();
+        }
+
+        TagLib::APE::ItemListMap lstMusepack = mpcFile.APETag()->itemListMap();
+        TagLib::APE::ItemListMap::ConstIterator itMPC;
+
+        /* The cover art tag for APEv2 tags starts with the filename as string
+         * with zero termination followed by the actual picture data */
+        itMPC = lstMusepack.find("COVER ART (FRONT)");
+        if (itMPC != lstMusepack.end()) {
+            TagLib::ByteVector pictureData = (*itMPC).second.binaryData();
+            int dataPosition = pictureData.find('\0') + 1;
+            return QByteArray(pictureData.data() + dataPosition, pictureData.size() - dataPosition);
+        }
+
+    } else if (mimeType == QStringLiteral("audio/flac")) {
+
+        TagLib::FLAC::File flacFile(&stream, TagLib::ID3v2::FrameFactory::instance(), true);
+        TagLib::List<TagLib::FLAC::Picture *> lstPic = flacFile.pictureList();
+
+        if (!lstPic.isEmpty()) {
+            for (TagLib::List<TagLib::FLAC::Picture *>::Iterator it = lstPic.begin(); it != lstPic.end(); ++it) {
+                TagLib::FLAC::Picture *picture = *it;
+                if (picture->type() == picture->FrontCover) {
+                    return QByteArray(picture->data().data(), picture->data().size());
+                }
+            }
+        }
+
+    } else {
+
+        TagLib::List<TagLib::FLAC::Picture *> lstPic;
+        if (mimeType == QStringLiteral("audio/ogg") || mimeType == QStringLiteral("audio/x-vorbis+ogg")) {
+            TagLib::Ogg::Vorbis::File oggFile(&stream, true);
+            if (oggFile.tag() && !oggFile.tag()->isEmpty()) {
+                lstPic = oggFile.tag()->pictureList();
+            }
+        }
+        if (mimeType == QStringLiteral("audio/opus") || mimeType == QStringLiteral("audio/x-opus+ogg")) {
+            TagLib::Ogg::Opus::File opusFile(&stream, true);
+            if (opusFile.tag() && !opusFile.tag()->isEmpty()) {
+                lstPic = opusFile.tag()->pictureList();
+            }
+        }
+        if (!lstPic.isEmpty()) {
+            for (TagLib::List<TagLib::FLAC::Picture *>::Iterator it = lstPic.begin(); it != lstPic.end(); ++it) {
+                TagLib::FLAC::Picture *picture = *it;
+                if (picture->type() == picture->FrontCover) {
+                    return QByteArray(picture->data().data(), picture->data().size());
+                }
+            }
+        }
+    }
+    return QByteArray();
+}