1
=== modified file 'src/core/media/gstreamer/playbin.cpp'
2
--- src/core/media/gstreamer/playbin.cpp	2016-02-22 18:34:11 +0000
3
+++ src/core/media/gstreamer/playbin.cpp	2016-03-07 21:05:50 +0000
4
@@ -467,23 +467,25 @@
5
467
    if (current_uri and do_pipeline_reset)
467
    if (current_uri and do_pipeline_reset)
6
468
        reset_pipeline();
468
        reset_pipeline();
7
469
469
9
470
    std::string encoded_uri;
470
    std::string tmp_uri{uri};
10
471
    media::UriCheck::Ptr uri_check{std::make_shared<media::UriCheck>(uri)};
471
    media::UriCheck::Ptr uri_check{std::make_shared<media::UriCheck>(uri)};
12
472
    if (uri_check->is_encoded())
472
    if (uri_check->is_local_file())
13
473
    {
473
    {
15
474
        encoded_uri = decode_uri(uri);
474
        if (uri_check->is_encoded())
16
475
        {
17
476
            // First decode the URI just in case it's partially encoded already
18
477
            tmp_uri = decode_uri(uri);
19
475
#ifdef VERBOSE_DEBUG
478
#ifdef VERBOSE_DEBUG
21
476
        std::cout << "File URI was encoded, now decoded: " << encoded_uri << std::endl;
479
            std::cout << "File URI was encoded, now decoded: " << tmp_uri << std::endl;
22
477
#endif
480
#endif
24
478
        encoded_uri = encode_uri(encoded_uri);
481
        }
25
482
        tmp_uri = encode_uri(tmp_uri);
26
479
    }
483
    }
27
480
    else
28
481
        encoded_uri = encode_uri(uri);
29
482
484
32
483
    g_object_set(pipeline, "uri", encoded_uri.c_str(), NULL);
485
    g_object_set(pipeline, "uri", tmp_uri.c_str(), NULL);
33
484
    if (is_video_file(encoded_uri))
486
    if (is_video_file(tmp_uri))
34
485
        file_type = MEDIA_FILE_TYPE_VIDEO;
487
        file_type = MEDIA_FILE_TYPE_VIDEO;
36
486
    else if (is_audio_file(encoded_uri))
488
    else if (is_audio_file(tmp_uri))
37
487
        file_type = MEDIA_FILE_TYPE_AUDIO;
489
        file_type = MEDIA_FILE_TYPE_AUDIO;
38
488
490
39
489
    request_headers = headers;
491
    request_headers = headers;
Reviewer	Review Type	Date Requested	Status
Alfonso Sanchez-Beato			Approve on 2016-03-08
Konrad Zapałowicz (community)			Approve on 2016-03-07
PS Jenkins bot	continuous-integration		Approve on 2016-03-07
Simon Fels		2016-03-04	Approve on 2016-03-06
Review via email: mp+288174@code.launchpad.net