Merge lp:~jpakkane/thumbnailer/embedded-album-art into lp:thumbnailer

[Jussi Pakkanen]

Re-enable embedded album art.

Re-enable embedded album art.

CHECK MANUALLY THAT IT DOES NOT CAUSE GSTREAMER CLASHES!

Check both device and desktop.

The last time was nerve wrecking enough. :)

[Pete Woods (pete-woods)]

Well this doesn't make the phone or desktop stuff crash as best as I can tell.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:93
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/69/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-utopic-amd64-ci/14/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-utopic-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-utopic-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-utopic-i386-ci/14

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

review: Needs Fixing (continuous-integration)

[Pete Woods (pete-woods)]

I tried this out with the following QML:

import QtQuick 2.0
import Ubuntu.Thumbnailer 0.1

Image {
    anchors.fill: parent
    source: "image://thumbnailer/home/USERNAME/Music/path/to/your.mp3"
}

and I just get back white images with a grey border. That's not quite what I'd expected.

review: Needs Information

[Pete Woods (pete-woods)]

I should add that I wasn't pointing it to the Beatles' "White Album" ;)

[Jussi Pakkanen (jpakkane)]

What happens if you compile it yourself and then do "tools/cachetool /home/USERNAME/Music/path/to/your.mp3"?

[Pete Woods (pete-woods)]

That seems to spit out the correct image file.

[Jussi Pakkanen (jpakkane)]

Does that qml file work if you point it to an image file?

[Pete Woods (pete-woods)]

Yes, of course it does.

[Jussi Pakkanen (jpakkane)]

This don't make no sense. The code in cachetool does this:

std::string ofilename = t.get_thumbnail(ifilename, TN_SIZE_LARGE);

and the code in the plugin does this:

tgt_path = tn.get_thumbnail(src_path, desiredSize);

That is to say the exact same thing. Can you post the specific steps you take to run that qml bit including how you tell it to use your self built plugin instead of the global one? Thanks.

[Pete Woods (pete-woods)]

I installed the package using a .deb just to be paranoid.

You then can run the qml by doing:

qmlscene name_of_qml_file.qml

If you really want to run it from the local dir instead of from the system installed version do the following:

LD_LIBRARY_PATH=YOUR_BUILD_DIR/src QML2_IMPORT_PATH=YOUR_BUILD_DIR/plugins qmlscene name_of_qml_file.qml

[Jussi Pakkanen (jpakkane)]

This works for me if you add the missing slash:

source: "image://thumbnailer/home/USERNAME/Music/path/to/your.mp3"
                            A
Here: ----------------------|

There need to be two slashes, ootherwise the path is relative and not absolute. The uri specification swallows the first slash.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:93
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/79/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-utopic-amd64-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-utopic-armhf-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/thumbnailer-utopic-i386-ci/24/console

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

review: Needs Fixing (continuous-integration)

[Paweł Stołowski (stolowski)]

Looks good, no regressions. +1

review: Approve

[Victor Thompson (vthompson)]

I know this is already Approved and in a silo, but myself and the rest of the Music app developers would like to how we would use this and fallback to using "image://albumart" if there is no embedded art. Or would that not be possible?

review: Needs Information

[Jussi Pakkanen (jpakkane)]

We have a mediascanner branch outstanding which will make query results contain a boolean telling whether the file contains an embedded image. Then you would do something like this:

if mediafile.has_thumbnail
  // get thumbnail with image://thumbnailer//path/to/file
else
  // get thumbnail with image://albumart/just_like_currently
endif

[Victor Thompson (vthompson)]

Excellent, thank you Jussi!

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-07-31 14:49:36 +0000
+++ src/CMakeLists.txt	2014-08-18 14:48:47 +0000
@@ -1,5 +1,5 @@
 add_library(thumbnailer SHARED
-#audioimageextractor.cpp
+audioimageextractor.cpp
 imagescaler.cpp
 lastfmdownloader.cpp
 mediaartcache.cpp
@@ -12,7 +12,8 @@
 
 set(symbol_map "${CMAKE_CURRENT_SOURCE_DIR}/libthumbnailer.map")
 
-target_link_libraries(thumbnailer #${GST_DEPS_LDFLAGS}
+target_link_libraries(thumbnailer
+ ${GST_DEPS_LDFLAGS}
  ${GLIB_DEPS_LDFLAGS}
  ${GIO_DEPS_LDFLAGS}
  ${IMG_DEPS_LDFLAGS}

=== modified file 'src/thumbnailer.cpp'
--- src/thumbnailer.cpp	2014-08-11 14:20:24 +0000
+++ src/thumbnailer.cpp	2014-08-18 14:48:47 +0000
@@ -47,7 +47,7 @@
 
 public:
     ThumbnailCache cache;
-//    AudioImageExtractor audio;
+    AudioImageExtractor audio;
     VideoScreenshotter video;
     ImageScaler scaler;
     MediaArtCache macache;
@@ -85,13 +85,11 @@
     return fname;
 }
 
-string ThumbnailerPrivate::create_audio_thumbnail(const string &/*abspath*/,
-        ThumbnailSize /*desired_size*/, ThumbnailPolicy /*policy*/) {
-    // There was a symbol clash between 1.0 and 0.10 versions of
-    // GStreamer on the desktop so we need to disable in-process
-    // usage of gstreamer. Re-enable this once desktop moves to
-    // newer Qt multimedia that has GStreamer 1.0.
-/*
+string ThumbnailerPrivate::create_audio_thumbnail(const string &abspath,
+        ThumbnailSize desired_size, ThumbnailPolicy /*policy*/) {
+    string tnfile = cache.get_cache_file_name(abspath, desired_size);
+    string tmpname = create_random_filename();
+    bool extracted = false;
     try {
         if(audio.extract(abspath, tmpname)) {
             extracted = true;
@@ -103,7 +101,6 @@
         unlink(tmpname.c_str());
         return tnfile;
     }
-    */
     return "";
 }
 string ThumbnailerPrivate::create_generic_thumbnail(const string &abspath, ThumbnailSize desired_size) {