1
=== modified file 'debian/control'
2
--- debian/control	2015-09-15 03:22:34 +0000
3
+++ debian/control	2015-09-20 10:12:45 +0000
4
@@ -7,6 +7,8 @@
5
7
               cmake-extras (>= 0.4),
7
               cmake-extras (>= 0.4),
6
8
               debhelper (>= 9),
8
               debhelper (>= 9),
7
9
               google-mock,
9
               google-mock,
8
10
               gstreamer1.0-fluendo-mp3,
9
11
               gstreamer1.0-plugins-bad-faad,
10
10
               gstreamer1.0-plugins-good,
12
               gstreamer1.0-plugins-good,
11
11
               libapparmor-dev,
13
               libapparmor-dev,
12
12
               libboost-filesystem-dev,
14
               libboost-filesystem-dev,
13
13
15
14
=== modified file 'src/thumbnailer.cpp'
15
--- src/thumbnailer.cpp	2015-09-15 09:37:17 +0000
16
+++ src/thumbnailer.cpp	2015-09-20 10:12:45 +0000
17
@@ -629,7 +629,6 @@
18
629
        Image full_size(string(raw_data.data(), raw_data.size()));
629
        Image full_size(string(raw_data.data(), raw_data.size()));
19
630
        return RequestBase::ImageData(full_size, RequestBase::CachePolicy::cache_fullsize, Location::remote);
630
        return RequestBase::ImageData(full_size, RequestBase::CachePolicy::cache_fullsize, Location::remote);
20
631
    }
631
    }
21
632
    qDebug() << "common_fetch(): Request failed:" << artreply->error_string();
22
633
    if (artreply->not_found_error())
632
    if (artreply->not_found_error())
23
634
    {
633
    {
24
635
        return RequestBase::ImageData(RequestBase::FetchStatus::not_found, Location::remote);
634
        return RequestBase::ImageData(RequestBase::FetchStatus::not_found, Location::remote);
25
@@ -638,6 +637,7 @@
26
638
    {
637
    {
27
639
        return RequestBase::ImageData(RequestBase::FetchStatus::no_network, Location::remote);
638
        return RequestBase::ImageData(RequestBase::FetchStatus::no_network, Location::remote);
28
640
    }
639
    }
29
640
    qCritical() << "common_fetch(): Request failed:" << artreply->error_string();
30
641
    return RequestBase::ImageData(RequestBase::FetchStatus::error, Location::remote);
641
    return RequestBase::ImageData(RequestBase::FetchStatus::error, Location::remote);
31
642
}
642
}
32
643
643
33
644
644
34
=== modified file 'src/vs-thumb/thumbnailextractor.cpp'
35
--- src/vs-thumb/thumbnailextractor.cpp	2015-09-10 06:58:42 +0000
36
+++ src/vs-thumb/thumbnailextractor.cpp	2015-09-20 10:12:45 +0000
37
@@ -171,14 +171,59 @@
38
171
171
39
172
struct ThumbnailExtractor::Private
172
struct ThumbnailExtractor::Private
40
173
{
173
{
41
174
    void find_audio_cover(GstTagList* tags, char const* tag_name);
42
175
43
176
    enum ImageType { cover, other };
44
177
45
174
    gobj_ptr<GstElement> playbin;
178
    gobj_ptr<GstElement> playbin;
46
175
    gint64 duration = -1;
179
    gint64 duration = -1;
47
176
180
48
177
    std::unique_ptr<GstSample, decltype(&gst_sample_unref)> sample{nullptr, gst_sample_unref};
181
    std::unique_ptr<GstSample, decltype(&gst_sample_unref)> sample{nullptr, gst_sample_unref};
49
178
    GdkPixbufRotation sample_rotation = GDK_PIXBUF_ROTATE_NONE;
182
    GdkPixbufRotation sample_rotation = GDK_PIXBUF_ROTATE_NONE;
50
179
    bool sample_raw = true;
183
    bool sample_raw = true;
51
184
    ImageType image_type;
52
180
};
185
};
53
181
186
54
187
// Look for an image with the specified tag. If we find a cover image, image_type is set to cover,
55
188
// and sample points at the image. If we find some other (non-cover) image, image_type is set to other,
56
189
// and sample points at the image. Otherwise, if we can't find any image at all, sample is set to nullptr.
57
190
58
191
void ThumbnailExtractor::Private::find_audio_cover(GstTagList* tags, const char* tag_name)
59
192
{
60
193
    image_type = ThumbnailExtractor::Private::other;
61
194
62
195
    bool found_cover = false;
63
196
    for (int i = 0; !found_cover; i++)
64
197
    {
65
198
        GstSample* s;
66
199
        if (!gst_tag_list_get_sample_index(tags, tag_name, i, &s))
67
200
        {
68
201
            break;
69
202
        }
70
203
        assert(s);
71
204
        // Check the type of this image
72
205
        int type = GST_TAG_IMAGE_TYPE_UNDEFINED;
73
206
        auto structure = gst_sample_get_info(s);
74
207
        if (structure)
75
208
        {
76
209
            gst_structure_get_enum(structure, "image-type", GST_TYPE_TAG_IMAGE_TYPE, &type);
77
210
        }
78
211
        if (type == GST_TAG_IMAGE_TYPE_FRONT_COVER)
79
212
        {
80
213
            sample.reset(gst_sample_ref(s));
81
214
            found_cover = true;
82
215
            image_type = ThumbnailExtractor::Private::cover;
83
216
        }
84
217
        else if (type == GST_TAG_IMAGE_TYPE_UNDEFINED && !sample)
85
218
        {
86
219
            // Save the first unknown image tag, but continue scanning
87
220
            // in case there is one marked as the cover.
88
221
            sample.reset(gst_sample_ref(s));
89
222
        }
90
223
        gst_sample_unref(s);
91
224
    }
92
225
}
93
226
94
182
/* GstPlayFlags flags from playbin.
227
/* GstPlayFlags flags from playbin.
95
183
 *
228
 *
96
184
 * GStreamer does not install headers for the enums of individual
229
 * GStreamer does not install headers for the enums of individual
97
@@ -294,6 +339,7 @@
98
294
    g_signal_emit_by_name(p->playbin.get(), "get-video-tags", 0, &tags);
339
    g_signal_emit_by_name(p->playbin.get(), "get-video-tags", 0, &tags);
99
295
    if (tags)
340
    if (tags)
100
296
    {
341
    {
101
342
        // TODO: The "flip-rotate-*" transforms defined in gst/gsttaglist.h need to be added here.
102
297
        char* orientation = nullptr;
343
        char* orientation = nullptr;
103
298
        if (gst_tag_list_get_string_index(tags, GST_TAG_IMAGE_ORIENTATION, 0, &orientation) && orientation != nullptr)
344
        if (gst_tag_list_get_string_index(tags, GST_TAG_IMAGE_ORIENTATION, 0, &orientation) && orientation != nullptr)
104
299
        {
345
        {
105
@@ -326,32 +372,26 @@
106
326
    p->sample.reset();
372
    p->sample.reset();
107
327
    p->sample_rotation = GDK_PIXBUF_ROTATE_NONE;
373
    p->sample_rotation = GDK_PIXBUF_ROTATE_NONE;
108
328
    p->sample_raw = false;
374
    p->sample_raw = false;
111
329
    bool found_cover = false;
375
112
330
    for (int i = 0; !found_cover; i++)
376
    p->find_audio_cover(tags, GST_TAG_IMAGE);
113
377
    if (!p->sample || p->image_type == ThumbnailExtractor::Private::other)
114
331
    {
378
    {
137
332
        GstSample* sample;
379
        // Save whatever the first look-up returned (possibly nothing).
138
333
        if (!gst_tag_list_get_sample_index(tags, GST_TAG_IMAGE, i, &sample))
380
        auto provisional_sample = std::move(p->sample);
139
334
        {
381
140
335
            break;
382
        // We didn't find a full-size image, or we found an image that is not marked as the cover.
141
336
        }
383
        // Try to find a preview image instead.
142
337
        // Check the type of this image
384
        p->find_audio_cover(tags, GST_TAG_PREVIEW_IMAGE);
143
338
        auto caps = gst_sample_get_caps(sample);
385
        if (p->image_type == ThumbnailExtractor::Private::other && provisional_sample)
144
339
        auto structure = gst_caps_get_structure(caps, 0);
386
        {
145
340
        int type = GST_TAG_IMAGE_TYPE_UNDEFINED;
387
            // We found a preview image that is *not* a cover, and the
146
341
        gst_structure_get_enum(structure, "image-type", GST_TYPE_TAG_IMAGE_TYPE, &type);
388
            // first look-up for a normal image returned something
147
342
        if (type == GST_TAG_IMAGE_TYPE_FRONT_COVER)
389
            // full-size that is *also* not a cover. Return the image
148
343
        {
390
            // from the first look-up in preference to this one.
149
344
            p->sample.reset(gst_sample_ref(sample));
391
            p->sample = std::move(provisional_sample);
150
345
            found_cover = true;
392
        }
129
346
        }
130
347
        else if (type == GST_TAG_IMAGE_TYPE_UNDEFINED && !p->sample)
131
348
        {
132
349
            // Save the first unknown image tag, but continue scanning
133
350
            // in case there is one marked as the cover.
134
351
            p->sample.reset(gst_sample_ref(sample));
135
352
        }
136
353
        gst_sample_unref(sample);
151
354
    }
393
    }
152
394
153
355
    gst_tag_list_unref(tags);
395
    gst_tag_list_unref(tags);
154
356
    return bool(p->sample);
396
    return bool(p->sample);
155
357
}
397
}
156
358
398
157
=== modified file 'tests/stress/stress_test.cpp'
158
--- tests/stress/stress_test.cpp	2015-07-31 06:23:59 +0000
159
+++ tests/stress/stress_test.cpp	2015-09-20 10:12:45 +0000
160
@@ -23,6 +23,19 @@
161
23
#include <utils/dbusserver.h>
23
#include <utils/dbusserver.h>
162
24
#include <utils/supports_decoder.h>
24
#include <utils/supports_decoder.h>
163
25
25
164
26
#pragma GCC diagnostic push
165
27
#pragma GCC diagnostic ignored "-Wold-style-cast"
166
28
#pragma GCC diagnostic ignored "-Wcast-qual"
167
29
#pragma GCC diagnostic ignored "-Wcast-align"
168
30
#ifdef __clang__
169
31
#pragma clang diagnostic ignored "-Wparentheses-equality"
170
32
#endif
171
33
#include <gst/gst.h>
172
34
#ifdef __clang__
173
35
#pragma clang diagnostic pop
174
36
#endif
175
37
#pragma GCC diagnostic pop
176
38
177
26
#include <boost/filesystem.hpp>
39
#include <boost/filesystem.hpp>
178
27
#include <gtest/gtest.h>
40
#include <gtest/gtest.h>
179
28
#include <QSignalSpy>
41
#include <QSignalSpy>
180
@@ -296,6 +309,9 @@
181
296
309
182
297
int main(int argc, char** argv)
310
int main(int argc, char** argv)
183
298
{
311
{
184
312
    // Need this because we are using a static test fixture and can't rely an global constructor order.
185
313
    gst_init(&argc, &argv);
186
314
187
299
    QCoreApplication app(argc, argv);
315
    QCoreApplication app(argc, argv);
188
300
316
189
301
    setenv("GSETTINGS_BACKEND", "memory", true);
317
    setenv("GSETTINGS_BACKEND", "memory", true);
190
302
318
191
=== modified file 'tests/vs-thumb/vs-thumb_test.cpp'
192
--- tests/vs-thumb/vs-thumb_test.cpp	2015-09-10 06:58:42 +0000
193
+++ tests/vs-thumb/vs-thumb_test.cpp	2015-09-20 10:12:45 +0000
194
@@ -50,6 +50,8 @@
195
50
const char MP4_LANDSCAPE_TEST_FILE[] = TESTDATADIR "/gegl-landscape.mp4";
50
const char MP4_LANDSCAPE_TEST_FILE[] = TESTDATADIR "/gegl-landscape.mp4";
196
51
const char MP4_PORTRAIT_TEST_FILE[] = TESTDATADIR "/gegl-portrait.mp4";
51
const char MP4_PORTRAIT_TEST_FILE[] = TESTDATADIR "/gegl-portrait.mp4";
197
52
const char VORBIS_TEST_FILE[] = TESTDATADIR "/testsong.ogg";
52
const char VORBIS_TEST_FILE[] = TESTDATADIR "/testsong.ogg";
198
53
const char AAC_TEST_FILE[] = TESTDATADIR "/testsong.m4a";
199
54
const char MP3_TEST_FILE[] = TESTDATADIR "/testsong.mp3";
200
53
55
201
54
class ExtractorTest : public ::testing::Test
56
class ExtractorTest : public ::testing::Test
202
55
{
57
{
203
@@ -181,6 +183,48 @@
204
181
    EXPECT_EQ(gdk_pixbuf_get_height(image.get()), 200);
183
    EXPECT_EQ(gdk_pixbuf_get_height(image.get()), 200);
205
182
}
184
}
206
183
185
207
186
TEST_F(ExtractorTest, extract_aac_cover_art)
208
187
{
209
188
    if (!supports_decoder("audio/mpeg"))
210
189
    {
211
190
        fprintf(stderr, "No support for AAC decoder\n");
212
191
        return;
213
192
    }
214
193
215
194
    ThumbnailExtractor extractor;
216
195
217
196
    std::string outfile = tempdir + "/out.jpg";
218
197
    extractor.set_uri(filename_to_uri(AAC_TEST_FILE));
219
198
    ASSERT_FALSE(extractor.has_video());
220
199
    ASSERT_TRUE(extractor.extract_audio_cover_art());
221
200
    extractor.save_screenshot(outfile);
222
201
223
202
    auto image = load_image(outfile);
224
203
    EXPECT_EQ(gdk_pixbuf_get_width(image.get()), 200);
225
204
    EXPECT_EQ(gdk_pixbuf_get_height(image.get()), 200);
226
205
}
227
206
228
207
TEST_F(ExtractorTest, extract_mp3_cover_art)
229
208
{
230
209
    if (!supports_decoder("audio/mpeg"))
231
210
    {
232
211
        fprintf(stderr, "No support for MP3 decoder\n");
233
212
        return;
234
213
    }
235
214
236
215
    ThumbnailExtractor extractor;
237
216
238
217
    std::string outfile = tempdir + "/out.jpg";
239
218
    extractor.set_uri(filename_to_uri(MP3_TEST_FILE));
240
219
    ASSERT_FALSE(extractor.has_video());
241
220
    ASSERT_TRUE(extractor.extract_audio_cover_art());
242
221
    extractor.save_screenshot(outfile);
243
222
244
223
    auto image = load_image(outfile);
245
224
    EXPECT_EQ(gdk_pixbuf_get_width(image.get()), 200);
246
225
    EXPECT_EQ(gdk_pixbuf_get_height(image.get()), 200);
247
226
}
248
227
249
184
TEST_F(ExtractorTest, file_not_found)
228
TEST_F(ExtractorTest, file_not_found)
250
185
{
229
{
251
186
    ThumbnailExtractor extractor;
230
    ThumbnailExtractor extractor;
Reviewer	Review Type	Date Requested	Status
James Henstridge		2015-09-15	Approve on 2015-09-30
PS Jenkins bot (community)	continuous-integration		Approve on 2015-09-21
Review via email: mp+271063@code.launchpad.net