Merge lp:~jamesh/mediascanner2/m4a-coverart into lp:mediascanner2

[James Henstridge]

Fix the metadata extractor so that it correctly extracts the date and presence of cover art from MPEG 4 audio files.

Add a test for metadata extraction of MPEG 4 audio files. This showed a few problems in the extraction support for this file format:

1. presence of cover art was not being detected correctly (it is exposed as a preview image rather than an image, as detailed in bug 1492407).

2. the release date was not being extracted correctly (it is also exposed as a different tag by the GStreamer element).

This branch fixes both of those issues.

I also altered the supports_decoder() test helper so that it can distinguish between the different MPEG audio types (MP3 and M4A).

[Michi Henning (michihenning)]

Looks good to me. On line 76 and 79 of the diff, that appears to be left-behind debug trace?

[James Henstridge (jamesh)]

I've pulled the debug printfs now.

[lp:~jamesh/mediascanner2/m4a-coverart]

311. By James Henstridge on 2015-10-09

Remove debug printfs.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:311
http://jenkins.qa.ubuntu.com/job/mediascanner2-ci/190/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-i386-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-i386-ci/2

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

review: Approve (continuous-integration)

=== modified file 'src/daemon/MetadataExtractor.cc'
--- src/daemon/MetadataExtractor.cc	2015-07-07 04:36:02 +0000
+++ src/daemon/MetadataExtractor.cc	2015-10-09 05:33:28 +0000
@@ -150,7 +150,7 @@
     int i, num;
     string tagname(tag);
 
-    if(tagname == GST_TAG_IMAGE) {
+    if(tagname == GST_TAG_IMAGE || tagname == GST_TAG_PREVIEW_IMAGE) {
         mfb->setHasThumbnail(true);
         return;
     }
@@ -180,6 +180,17 @@
                 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));

=== added file 'test/media/testfile.m4a'
Binary files test/media/testfile.m4a	1970-01-01 00:00:00 +0000 and test/media/testfile.m4a	2015-10-09 05:33:28 +0000 differ
=== modified file 'test/test_metadataextractor.cc'
--- test/test_metadataextractor.cc	2015-07-07 04:36:02 +0000
+++ test/test_metadataextractor.cc	2015-10-09 05:33:28 +0000
@@ -40,7 +40,8 @@
 
 bool supports_decoder(const std::string& format)
 {
-    static std::set<std::string> formats;
+    typedef std::unique_ptr<GstCaps, decltype(&gst_caps_unref)> CapsPtr;
+    static std::vector<CapsPtr> formats;
 
     if (formats.empty())
     {
@@ -59,19 +60,29 @@
                 {
                     continue;
                 }
-
-                std::unique_ptr<GstCaps, decltype(&gst_caps_unref)> caps(gst_static_caps_get(&t->static_caps),
-                                                                         gst_caps_unref);
-                for (unsigned int i = 0; i < gst_caps_get_size(caps.get()); i++)
-                {
-                    const auto structure = gst_caps_get_structure(caps.get(), i);
-                    formats.emplace(gst_structure_get_name(structure));
+                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));
             }
         }
     }
 
-    return formats.find(format) != formats.end();
+    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;
 }
 
 }
@@ -142,7 +153,7 @@
 }
 
 TEST_F(MetadataExtractorTest, extract_mp3) {
-    if (!supports_decoder("audio/mpeg")) {
+    if (!supports_decoder("audio/mpeg, mpegversion=(int)1, layer=(int)3")) {
         printf("MP3 codec not supported\n");
         return;
     }
@@ -163,6 +174,32 @@
     EXPECT_EQ(st.st_mtime, file.getModificationTime());
 }
 
+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;
+    string testfile = SOURCE_DIR "/media/testfile.m4a";
+    MediaFile file = e.extract(e.detect(testfile));
+
+    EXPECT_EQ(AudioMedia, file.getType());
+    EXPECT_EQ("Title", file.getTitle());
+    EXPECT_EQ("Artist", file.getAuthor());
+    EXPECT_EQ("Album", file.getAlbum());
+    EXPECT_EQ("Album Artist", file.getAlbumArtist());
+    EXPECT_EQ("2015-10-07", file.getDate());
+    EXPECT_EQ(4, file.getTrackNumber());
+    EXPECT_EQ(1, file.getDiscNumber());
+    EXPECT_EQ(1, file.getDuration());
+    EXPECT_EQ("Rock", file.getGenre());
+    EXPECT_EQ(true, file.getHasThumbnail());
+    struct stat st;
+    ASSERT_EQ(0, stat(testfile.c_str(), &st));
+    EXPECT_EQ(st.st_mtime, file.getModificationTime());
+}
+
 TEST_F(MetadataExtractorTest, extract_video) {
     MetadataExtractor e;
 
@@ -220,7 +257,7 @@
 }
 
 TEST_F(MetadataExtractorTest, extract_mp3_bad_date) {
-    if (!supports_decoder("audio/mpeg")) {
+    if (!supports_decoder("audio/mpeg, mpegversion=(int)1, layer=(int)3")) {
         printf("MP3 codec not supported\n");
         return;
     }