From 23f8516346fb3823b018653b8e35042f1b3369af Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Tue, 5 Jan 2016 10:27:52 +0000
Subject: ffmpeg: added support for m4a embedded album art

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5974 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp |  4 ++--
 src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp  | 29 +++++++++++++++++++----
 src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h    |  1 +
 3 files changed, 28 insertions(+), 6 deletions(-)

(limited to 'src/plugins/Input/ffmpeg')

diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
index 296c48381..b836a5d92 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -94,8 +94,8 @@ const DecoderProperties DecoderFFmpegFactory::properties() const
     filters << "*.wma" << "*.ape" << "*.tta" << "*.m4a" << "*.ra" << "*.shn" << "*.vqf" << "*.ac3";
     filters = settings.value("FFMPEG/filters", filters).toStringList();
 
-    //removed unsupported filters
-#if (LIBAVCODEC_VERSION_INT >= ((55<<16)+(34<<8)+0)) //libav 10
+    //remove unsupported filters
+#if (LIBAVCODEC_VERSION_INT >= ((54<<16) + (51<<8) + 100)) //libav 10
     if(!avcodec_find_decoder(AV_CODEC_ID_WMAV1))
         filters.removeAll("*.wma");
     if(!avcodec_find_decoder(AV_CODEC_ID_APE))
diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
index 3f38be4be..0049c80f1 100644
--- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
+++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009-2014 by Ilya Kotov                                 *
+ *   Copyright (C) 2009-2015 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,6 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
+#include <stdint.h>
 #include "ffmpegmetadatamodel.h"
 
 FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent)
@@ -47,10 +48,10 @@ QHash<QString, QString> FFmpegMetaDataModel::audioProperties()
     ap.insert(tr("Bitrate"), QString("%1 "+tr("kbps")).arg(m_in->bit_rate/1000));
 
     AVCodecContext *c = 0;
-    uint wma_idx;
-    for (wma_idx = 0; wma_idx < m_in->nb_streams; wma_idx++)
+    uint idx;
+    for (idx = 0; idx < m_in->nb_streams; idx++)
     {
-        c = m_in->streams[wma_idx]->codec;
+        c = m_in->streams[idx]->codec;
         if (c->codec_type == AVMEDIA_TYPE_AUDIO)
             break;
     }
@@ -61,3 +62,23 @@ QHash<QString, QString> FFmpegMetaDataModel::audioProperties()
     }
     return ap;
 }
+
+QPixmap FFmpegMetaDataModel::cover()
+{
+    AVCodecContext *c = 0;
+    for (uint idx = 0; idx < m_in->nb_streams; idx++)
+    {
+        c = m_in->streams[idx]->codec;
+        if (c->codec_type == AVMEDIA_TYPE_VIDEO && c->codec_id == AV_CODEC_ID_MJPEG)
+            break;
+    }
+    if (c)
+    {
+        AVPacket pkt;
+        av_read_frame(m_in, &pkt);
+        QPixmap pix;
+        pix.loadFromData(QByteArray((const char*)pkt.data, pkt.size));
+        return pix;
+    }
+    return QPixmap();
+}
diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h
index d2e3e4e87..5a7f9a23a 100644
--- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h
+++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h
@@ -38,6 +38,7 @@ public:
     FFmpegMetaDataModel(const QString &path, QObject *parent);
     ~FFmpegMetaDataModel();
     QHash<QString, QString> audioProperties();
+    QPixmap cover();
 
 private:
     AVFormatContext *m_in;
-- 
cgit v1.2.3-13-gbd6f