33453 2010-01-10 15:22:29 -0800 [Qt] MediaPlayerPrivate: expose supported types to WebCore 2010-03-22 11:42:00 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC All RESOLVED FIXED Qt P3 Normal --- 33842 1 jwieczorek webkit-qt-unassigned arabelo diegohcg eric.carlson eric hausmann kent.hansen ossy tonikitoo vestbo oldest_to_newest 179181 0 jwieczorek 2010-01-10 15:22:29 -0800 MediaPlayerPrivate should expose the MIME types that are supported by the underlying backend in Phonon. MediaPlayerPrivate::supportsType() and ::getSupportedTypes() need to be implemented. It will get HTMLMediaElement::canPlay() to work as expected in JS and, since this is extensively used in media layout tests, some of them could be finally enabled (all of them are skipped now). 179183 1 46246 jwieczorek 2010-01-10 15:29:58 -0800 Created attachment 46246 patch This patch uses Phonon::BackendCapabilities to get the supported media types. Note: to work-around the fact that GStreamer does not list MIME types such as video/ogg, audio/ogg, video/mp4 even if it supports them, the code will check for other types equivalent to them. The Gtk port does the same thing. Perhaps this kind of work-around should go into Phonon itself. 179184 2 jwieczorek 2010-01-10 15:36:20 -0800 Regarding the layout tests: I am getting strange crashes when running the /media tests but only sequentially (running each test separately is fine) and only in DRT, I can't reproduce the crashes in QtLauncher (with -r as well). Can someone confirm that or would it even be possible to check them on the build bot? 179337 3 tonikitoo 2010-01-11 05:31:19 -0800 (In reply to comment #2) > Regarding the layout tests: I am getting strange crashes when running the > /media tests but only sequentially (running each test separately is fine) and > only in DRT, I can't reproduce the crashes in QtLauncher (with -r as well). Can > someone confirm that or would it even be possible to check them on the build > bot? ossy, could you please help jakub on this ? 179374 4 ossy 2010-01-11 08:32:54 -0800 (In reply to comment #2) > Regarding the layout tests: I am getting strange crashes when running the > /media tests but only sequentially (running each test separately is fine) and > only in DRT, I can't reproduce the crashes in QtLauncher (with -r as well). Can > someone confirm that or would it even be possible to check them on the build > bot? I will test it on buildbot. 179411 5 ossy 2010-01-11 10:04:41 -0800 I tested media tests on official QtBuildBot (Debian Lenny). results of "run-webkit-tests media --skipped=ignore" : 9 test cases (8%) succeeded 38 test cases (37%) had incorrect layout 10 test cases (9%) were new 45 test cases (44%) crashed 46 test cases (45%) had stderr output results of "run-webkit-tests media --skipped=ignore --singly" : 16 test cases (15%) succeeded 69 test cases (67%) had incorrect layout 17 test cases (16%) were new 84 test cases (82%) had stderr output Additionally I tried media tests with your patch and the number of passing/failing test wasn't changed. 179413 6 ossy 2010-01-11 10:10:15 -0800 I have no idea what caused the 45 strange crashes. (7 new, 7 passed, 31 failed with --singly option) It can be a DRT bug needs more investigation. 179434 7 jwieczorek 2010-01-11 11:04:01 -0800 (In reply to comment #5) > Additionally I tried media tests with your patch and the number of > passing/failing test wasn't changed. I am getting different results here with and without the patch: Before: 18 test cases (17%) succeeded 66 test cases (64%) had incorrect layout 17 test cases (16%) were new 1 test case (<1%) timed out 61 test cases (59%) had stderr output After: 50 test cases (49%) succeeded 35 test cases (34%) had incorrect layout 17 test cases (16%) were new 26 test cases (25%) had stderr output I suppose this is dependant on the available gstreamer plugins. 180220 8 ossy 2010-01-13 07:52:59 -0800 I installed the missing packages, and I got similar results as you. results of "run-webkit-tests media --skipped=only --singly": 52 test cases (50%) succeeded 34 test cases (33%) had incorrect layout 17 test cases (16%) were new 18 test cases (17%) had stderr output 181497 9 46246 hausmann 2010-01-16 01:04:35 -0800 Comment on attachment 46246 patch In general this patch looks good to me! I'm only nitpicking a bit :) > +static HashSet<String>* supportedTypes = 0; Shouldn't this be a global static object, so that the has is freed? > + > MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player) > : m_player(player) > , m_networkState(MediaPlayer::Empty) > @@ -145,15 +149,64 @@ MediaPlayerPrivate::~MediaPlayerPrivate() > m_mediaObject = 0; > } > > -void MediaPlayerPrivate::getSupportedTypes(HashSet<String>&) > +void MediaPlayerPrivate::rebuildSupportedTypesCache() > { > - notImplemented(); > + ASSERT(!supportedTypes); > + supportedTypes = new HashSet<String>; Why is the function called _rebuild_SupportedTypesCache() when it can only be called once? :) (Assert in debug build, leak in release build) 181759 10 ossy 2010-01-18 00:28:32 -0800 The patch would be good, but don't forget about crashes. If we run tests in the same DRT, we get 38 crashed test. If we run them separately (with --singly option), 15 of them pass, 15 of them failed, 8 of them are new. I think we should find the reason of crashes and fix it before landing. 182232 11 jwieczorek 2010-01-19 07:51:45 -0800 (In reply to comment #10) > The patch would be good, but don't forget about crashes. If we run tests in the > same DRT, we get 38 crashed test. If we run them separately (with --singly > option), 15 of them pass, 15 of them failed, 8 of them are new. > > I think we should find the reason of crashes and fix it before landing. Definitely! I filed https://bugs.webkit.org/show_bug.cgi?id=33842 with a backtrace. 183198 12 47121 jwieczorek 2010-01-21 08:23:15 -0800 Created attachment 47121 patch Updated the patch according to the suggestions from Simon on IRC. This one includes the Skipped list update. I went through the tests and unskipped those that are stable enough so that they hopefully won't cause problems on the bot. Ossy, could you please check this one on the bot and see if the tests are reliable? 183968 13 47121 hausmann 2010-01-23 01:47:33 -0800 Comment on attachment 47121 patch r=me. Do you want to try it out on the bot on monday or otherwise early next week, or do you want to try now and we set cq+? :) 183969 14 jwieczorek 2010-01-23 01:55:48 -0800 (In reply to comment #13) > (From update of attachment 47121 [details]) > r=me. Do you want to try it out on the bot on monday or otherwise early next > week, or do you want to try now and we set cq+? :) Thanks. OK, let's try it now. If anything goes wrong, will you be able to roll it out? :) 183980 15 47121 ossy 2010-01-23 04:41:53 -0800 Comment on attachment 47121 patch Unfortunately I have bad news. I executed a test on bot, but 3 tests failed and 2 crashed. failed: media/audio-mpeg-supported.html media/audio-play-event.html media/video-pause-immediately.html crashed: media/video-source-add-src.html media/video-volume.html I skipped them, but another one test failed and another 2 crashed. :S I think there are some flakey tesst enabled brake the others, so I "cq-"-ed it, and later (after 21-22 pm GMT+1) I will find what caused this strange thing. 184113 16 ossy 2010-01-24 14:35:37 -0800 I played a lot with the skiplist, but I can't make a safe skiplist. :( I have 55 stable passing tests if I execute run-webkit-test with --singly option. But without --singly DRT get crazy. :S If I skipped a failing or crashing test, another one failed. I tried to find which test cause which test, but I can't find crasher/crashee pairs :( And then I tried with --valgrind option, but all tests crashed. :o Now I have no idea have can we kill these flakeyness ... I can play with it at monday and tuesday night. (I won't be online in the daytime.) 187149 17 eric 2010-02-02 14:19:43 -0800 Ping? This was r+'d a week ago. 191213 18 eric 2010-02-17 14:26:16 -0800 Ping? This was r+'d over 3 weeks ago. Is this patch abandoned? 191225 19 jwieczorek 2010-02-17 14:37:47 -0800 (In reply to comment #18) > Ping? This was r+'d over 3 weeks ago. Is this patch abandoned? No, it's not. This patch can't be landed as-is, because there are still some random crashes in the tests that are to be unskipped (unrelated to the patch itself) - see comment #15. I can't investigate them in the next days unfortunately, so either the patch can be committed without the Skipped list update or will need to wait another couple of days. 196678 20 47121 eric 2010-03-05 14:39:45 -0800 Comment on attachment 47121 patch Marking r-. No update in over 2 weeks. This can be re-reviewed when it's ready to land. 202579 21 51301 jwieczorek 2010-03-22 10:25:15 -0700 Created attachment 51301 patch OK, one more try with this patch. It's the same as the last version except that it doesn't unskip all the media tests: just two that only cover what we are fixing here and are stable enough. The rest is just too flakey when running in a group, they either time out or crash and I couldn't track it down. Possibly still many of the tests can be safely unskipped, but I'll just leave it for another patch. Hopefully the tests can perform better with the new media backend. Simon, can you please have a look once again? Thanks. 202580 22 jwieczorek 2010-03-22 10:27:24 -0700 I should have mentioned what are the tests I've unskipped: media/media-can-play-ogg.html media/video-can-play-type.html 202605 23 51301 kenneth 2010-03-22 10:57:26 -0700 Comment on attachment 51301 patch Let me carry on the r+ from Simon. Let's see how this does on the commit-queue. 202638 24 51301 jwieczorek 2010-03-22 11:34:04 -0700 Comment on attachment 51301 patch (In reply to comment #23) > (From update of attachment 51301 [details]) > Let me carry on the r+ from Simon. Let's see how this does on the commit-queue. Thanks, I'll land it myself. 202650 25 51301 jwieczorek 2010-03-22 11:41:48 -0700 Comment on attachment 51301 patch Clearing flags on attachment: 51301 Committed r56349: <http://trac.webkit.org/changeset/56349> 202651 26 jwieczorek 2010-03-22 11:42:00 -0700 All reviewed patches have been landed. Closing bug. 46246 2010-01-10 15:29:58 -0800 2010-01-21 08:23:15 -0800 patch 0001-Qt-MediaPlayerPrivate-expose-supported-types-to-WebC.patch text/plain 5785 jwieczorek RnJvbSA5MGE5MzIyYjRkNWRhOWQ5MzRjZGRjODRmYTU0YWEzODlkMmNhNDUzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYWt1YiBXaWVjem9yZWsgPGZhdzIxN0BnbWFpbC5jb20+CkRh dGU6IFN1biwgMTAgSmFuIDIwMTAgMTg6MDE6MTIgKzAwMDAKU3ViamVjdDogW1BBVENIXSBbUXRd IE1lZGlhUGxheWVyUHJpdmF0ZTogZXhwb3NlIHN1cHBvcnRlZCB0eXBlcyB0byBXZWJDb3JlCgpo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzM0NTMKCk1lZGlhUGxheWVy UHJpdmF0ZSBzaG91bGQgZXhwb3NlIHRoZSBNSU1FIHR5cGVzIHRoYXQgYXJlIHN1cHBvcnRlZApi eSB0aGUgdW5kZXJseWluZyBiYWNrZW5kIGluIFBob25vbi4KLS0tCiBXZWJDb3JlL0NoYW5nZUxv ZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTcgKysrKysKIC4uLi9ncmFw aGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVQaG9ub24uY3BwICAgICAgIHwgICA2OSArKysrKysr KysrKysrKysrKy0tCiAuLi4vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUGhvbm9uLmgg ICAgICAgICB8ICAgIDEgKwogMyBmaWxlcyBjaGFuZ2VkLCA3OSBpbnNlcnRpb25zKCspLCA4IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFu Z2VMb2cKaW5kZXggZTQxYjc0YS4uNzA0ZGRjMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VM b2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wMS0xMCAg SmFrdWIgV2llY3pvcmVrICA8ZmF3MjE3QGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIE1lZGlhUGxheWVyUHJpdmF0ZTogZXhw b3NlIHN1cHBvcnRlZCB0eXBlcyB0byBXZWJDb3JlCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMzNDUzCisKKyAgICAgICAgTWVkaWFQbGF5ZXJQcml2 YXRlIHNob3VsZCBleHBvc2UgdGhlIE1JTUUgdHlwZXMgdGhhdCBhcmUgc3VwcG9ydGVkCisgICAg ICAgIGJ5IHRoZSB1bmRlcmx5aW5nIGJhY2tlbmQgaW4gUGhvbm9uLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUGhvbm9uLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZTo6cmVidWlsZFN1cHBvcnRlZFR5cGVzQ2FjaGUp OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlOjpnZXRTdXBwb3J0ZWRUeXBl cyk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGU6OnN1cHBvcnRzVHlwZSk6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUGhvbm9u Lmg6CisKIDIwMTAtMDEtMDggIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAg ICAgICBVbnJldmlld2VkLiAgRml4IG5hbWVzcGFjZSBpbmRlbnQgZm9yIFNlY3VyaXR5T3JpZ2lu LmguCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVy UHJpdmF0ZVBob25vbi5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxh eWVyUHJpdmF0ZVBob25vbi5jcHAKaW5kZXggODVjZWQyNi4uMDY1ZDMwZiAxMDA2NDQKLS0tIGEv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVQaG9ub24uY3Bw CisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUGhv bm9uLmNwcApAQCAtMjYsMjAgKzI2LDIyIEBACiAjaW5jbHVkZSAiQ1N0cmluZy5oIgogI2luY2x1 ZGUgIkZyYW1lVmlldy5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgorI2luY2x1ZGUg Ik1JTUVUeXBlUmVnaXN0cnkuaCIKICNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5oIgogI2luY2x1 ZGUgIlRpbWVSYW5nZXMuaCIKICNpbmNsdWRlICJXaWRnZXQuaCIKICNpbmNsdWRlIDx3dGYvSGFz aFNldC5oPgogCiAjaW5jbHVkZSA8UURlYnVnPgorI2luY2x1ZGUgPFFFdmVudD4KKyNpbmNsdWRl IDxRTWV0YUVudW0+CiAjaW5jbHVkZSA8UVBhaW50ZXI+CiAjaW5jbHVkZSA8UVdpZGdldD4KLSNp bmNsdWRlIDxRTWV0YUVudW0+CiAjaW5jbHVkZSA8UVVybD4KLSNpbmNsdWRlIDxRRXZlbnQ+CiAK LSNpbmNsdWRlIDxwaG9ub24vcGF0aC5oPgogI2luY2x1ZGUgPHBob25vbi9hdWRpb291dHB1dC5o PgorI2luY2x1ZGUgPHBob25vbi9iYWNrZW5kY2FwYWJpbGl0aWVzLmg+CisjaW5jbHVkZSA8cGhv bm9uL3BhdGguaD4KICNpbmNsdWRlIDxwaG9ub24vbWVkaWFvYmplY3QuaD4KICNpbmNsdWRlIDxw aG9ub24vdmlkZW93aWRnZXQuaD4KIApAQCAtODEsNiArODMsOCBAQCB1c2luZyBuYW1lc3BhY2Ug V1RGOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK3N0YXRpYyBIYXNoU2V0PFN0cmluZz4qIHN1 cHBvcnRlZFR5cGVzID0gMDsKKwogTWVkaWFQbGF5ZXJQcml2YXRlOjpNZWRpYVBsYXllclByaXZh dGUoTWVkaWFQbGF5ZXIqIHBsYXllcikKICAgICA6IG1fcGxheWVyKHBsYXllcikKICAgICAsIG1f bmV0d29ya1N0YXRlKE1lZGlhUGxheWVyOjpFbXB0eSkKQEAgLTE0NSwxNSArMTQ5LDY0IEBAIE1l ZGlhUGxheWVyUHJpdmF0ZTo6fk1lZGlhUGxheWVyUHJpdmF0ZSgpCiAgICAgbV9tZWRpYU9iamVj dCA9IDA7CiB9CiAKLXZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlOjpnZXRTdXBwb3J0ZWRUeXBlcyhI YXNoU2V0PFN0cmluZz4mKQordm9pZCBNZWRpYVBsYXllclByaXZhdGU6OnJlYnVpbGRTdXBwb3J0 ZWRUeXBlc0NhY2hlKCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIEFTU0VSVCghc3Vw cG9ydGVkVHlwZXMpOworICAgIHN1cHBvcnRlZFR5cGVzID0gbmV3IEhhc2hTZXQ8U3RyaW5nPjsK KworICAgIC8vIEZJWE1FOiB3ZSBzaG91bGQgcmVidWlsZCB0aGUgTUlNRSB0eXBlIGNhY2hlIGV2 ZXJ5IHRpbWUgdGhlIGJhY2tlbmQgaXMgY2hhbmdlZCwKKyAgICAvLyBob3dldmVyLCB0aGlzIHdv dWxkIGhhdmUgbm8gZWZmZWN0IG9uIE1JTUVUeXBlUmVnaXN0cnkgYW55d2F5LCBiZWNhdXNlIGl0 CisgICAgLy8gcHVsbHMgdGhpcyBkYXRhIG9ubHkgb25jZS4KKworICAgIFFTdHJpbmdMaXN0IHR5 cGVzID0gUGhvbm9uOjpCYWNrZW5kQ2FwYWJpbGl0aWVzOjphdmFpbGFibGVNaW1lVHlwZXMoKTsK KyAgICBmb3JlYWNoIChjb25zdCBRU3RyaW5nJiB0eXBlLCB0eXBlcykgeworICAgICAgICBRU3Ry aW5nIGZpcnN0ID0gdHlwZS5zcGxpdChRTGF0aW4xQ2hhcignLycpKS5hdCgwKTsKKworICAgICAg ICAvLyBXZSdyZSBvbmx5IGludGVyZXN0ZWQgaW4gdHlwZXMgd2hpY2ggYXJlIG5vdCBzdXBwb3J0 ZWQgYnkgV2ViQ29yZSBpdHNlbGYuCisgICAgICAgIGlmIChmaXJzdCAhPSBRTGF0aW4xU3RyaW5n KCJ2aWRlbyIpCisgICAgICAgICAgICAmJiBmaXJzdCAhPSBRTGF0aW4xU3RyaW5nKCJhdWRpbyIp CisgICAgICAgICAgICAmJiBmaXJzdCAhPSBRTGF0aW4xU3RyaW5nKCJhcHBsaWNhdGlvbiIpKQor ICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIGlmIChNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1 cHBvcnRlZE5vbkltYWdlTUlNRVR5cGUodHlwZSkpCisgICAgICAgICAgICBjb250aW51ZTsKKwor ICAgICAgICBzdXBwb3J0ZWRUeXBlcy0+YWRkKFN0cmluZyh0eXBlKSk7CisgICAgfQorCisgICAg Ly8gVGhlc2UgZm9ybWF0cyBhcmUgc3VwcG9ydGVkIGJ5IEdTdHJlYW1lciwgYnV0IG5vdCBjb3Jy ZWN0bHkgYWR2ZXJ0aXNlZC4KKyAgICBpZiAoc3VwcG9ydGVkVHlwZXMtPmNvbnRhaW5zKFN0cmlu ZygidmlkZW8veC1oMjY0IikpCisgICAgICAgIHx8IHN1cHBvcnRlZFR5cGVzLT5jb250YWlucyhT dHJpbmcoImF1ZGlvL3gtbTRhIikpKSB7CisgICAgICAgIHN1cHBvcnRlZFR5cGVzLT5hZGQoU3Ry aW5nKCJ2aWRlby9tcDQiKSk7CisgICAgICAgIHN1cHBvcnRlZFR5cGVzLT5hZGQoU3RyaW5nKCJh dWRpby9hYWMiKSk7CisgICAgfQorCisgICAgaWYgKHN1cHBvcnRlZFR5cGVzLT5jb250YWlucyhT dHJpbmcoInZpZGVvL3gtdGhlb3JhIikpKQorICAgICAgICBzdXBwb3J0ZWRUeXBlcy0+YWRkKFN0 cmluZygidmlkZW8vb2dnIikpOworCisgICAgaWYgKHN1cHBvcnRlZFR5cGVzLT5jb250YWlucyhT dHJpbmcoImF1ZGlvL3gtdm9yYmlzIikpKQorICAgICAgICBzdXBwb3J0ZWRUeXBlcy0+YWRkKFN0 cmluZygiYXVkaW8vb2dnIikpOworCisgICAgaWYgKHN1cHBvcnRlZFR5cGVzLT5jb250YWlucyhT dHJpbmcoImF1ZGlvL3gtd2F2IikpKQorICAgICAgICBzdXBwb3J0ZWRUeXBlcy0+YWRkKFN0cmlu ZygiYXVkaW8vd2F2IikpOwogfQogCi1NZWRpYVBsYXllcjo6U3VwcG9ydHNUeXBlIE1lZGlhUGxh eWVyUHJpdmF0ZTo6c3VwcG9ydHNUeXBlKGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYpCit2 b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6Z2V0U3VwcG9ydGVkVHlwZXMoSGFzaFNldDxTdHJpbmc+ JiB0eXBlcykKIHsKLSAgICAvLyBGSVhNRTogZG8gdGhlIHJlYWwgdGhpbmcKLSAgICBub3RJbXBs ZW1lbnRlZCgpOworICAgIGlmICghc3VwcG9ydGVkVHlwZXMpCisgICAgICAgIHJlYnVpbGRTdXBw b3J0ZWRUeXBlc0NhY2hlKCk7CisgICAgdHlwZXMgPSAqc3VwcG9ydGVkVHlwZXM7Cit9CisKK01l ZGlhUGxheWVyOjpTdXBwb3J0c1R5cGUgTWVkaWFQbGF5ZXJQcml2YXRlOjpzdXBwb3J0c1R5cGUo Y29uc3QgU3RyaW5nJiB0eXBlLCBjb25zdCBTdHJpbmcmIGNvZGVjcykKK3sKKyAgICBpZiAodHlw ZS5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBNZWRpYVBsYXllcjo6SXNOb3RTdXBwb3J0ZWQ7 CisKKyAgICBpZiAoIXN1cHBvcnRlZFR5cGVzKQorICAgICAgICByZWJ1aWxkU3VwcG9ydGVkVHlw ZXNDYWNoZSgpOworCisgICAgaWYgKHN1cHBvcnRlZFR5cGVzLT5jb250YWlucyh0eXBlKSkKKyAg ICAgICAgcmV0dXJuIGNvZGVjcy5pc0VtcHR5KCkgPyBNZWRpYVBsYXllcjo6TWF5QmVTdXBwb3J0 ZWQgOiBNZWRpYVBsYXllcjo6SXNTdXBwb3J0ZWQ7CiAgICAgcmV0dXJuIE1lZGlhUGxheWVyOjpJ c05vdFN1cHBvcnRlZDsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9xdC9NZWRpYVBsYXllclByaXZhdGVQaG9ub24uaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUGhvbm9uLmgKaW5kZXggZTExOTNiNi4uNWEyMTBhOCAx MDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZh dGVQaG9ub24uaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVy UHJpdmF0ZVBob25vbi5oCkBAIC0xMzYsNiArMTM2LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog CiAgICAgICAgIHN0YXRpYyB2b2lkIGdldFN1cHBvcnRlZFR5cGVzKEhhc2hTZXQ8U3RyaW5nPiYp OwogICAgICAgICBzdGF0aWMgTWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlwZSBzdXBwb3J0c1R5cGUo Y29uc3QgU3RyaW5nJiB0eXBlLCBjb25zdCBTdHJpbmcmIGNvZGVjcyk7CisgICAgICAgIHN0YXRp YyB2b2lkIHJlYnVpbGRTdXBwb3J0ZWRUeXBlc0NhY2hlKCk7CiAgICAgICAgIHN0YXRpYyBib29s IGlzQXZhaWxhYmxlKCkgeyByZXR1cm4gdHJ1ZTsgfQogCiAgICAgICAgIHZvaWQgdXBkYXRlU3Rh dGVzKCk7Ci0tIAoxLjYuNi43NS5nMzdiYWUKCg== 47121 2010-01-21 08:23:15 -0800 2010-03-22 10:25:15 -0700 patch 0001-Qt-MediaPlayerPrivate-expose-supported-types-to-WebC.patch text/plain 9597 jwieczorek RnJvbSBhMmI2ZjAyYjE5YjhmZTkzM2VhMGU4YTU3OTM1MzljZjE3NTcyOTYxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYWt1YiBXaWVjem9yZWsgPGZhdzIxN0BnbWFpbC5jb20+CkRh dGU6IFRodSwgMjEgSmFuIDIwMTAgMDk6NDI6MTkgKzAxMDAKU3ViamVjdDogW1BBVENIXSBbUXRd IE1lZGlhUGxheWVyUHJpdmF0ZTogZXhwb3NlIHN1cHBvcnRlZCB0eXBlcyB0byBXZWJDb3JlCgpo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzM0NTMKCk1lZGlhUGxheWVy UHJpdmF0ZSBzaG91bGQgZXhwb3NlIHRoZSBNSU1FIHR5cGVzIHRoYXQgYXJlIHN1cHBvcnRlZApi eSB0aGUgdW5kZXJseWluZyBiYWNrZW5kIGluIFBob25vbi4KLS0tCiBMYXlvdXRUZXN0cy9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTIgKysrCiBMYXlvdXRUZXN0 cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkICAgICAgICAgICAgICAgICAgICB8ICAgNzQgKysrKysrKysr KysrKysrKysrLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgfCAgIDE3ICsrKysrCiAuLi4vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUGhv bm9uLmNwcCAgICAgICB8ICAgNjUgKysrKysrKysrKysrKysrLS0KIC4uLi9ncmFwaGljcy9xdC9N ZWRpYVBsYXllclByaXZhdGVQaG9ub24uaCAgICAgICAgIHwgICAgMSArCiA1IGZpbGVzIGNoYW5n ZWQsIDE1NyBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDYzYTdkOS4u YWNiYjJkYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEwLTAxLTIxICBKYWt1YiBXaWVjem9y ZWsgIDxmYXcyMTdAZ21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtRdF0gTWVkaWFQbGF5ZXJQcml2YXRlOiBleHBvc2Ugc3VwcG9ydGVk IHR5cGVzIHRvIFdlYkNvcmUKKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzM0NTMKKworICAgICAgICBVbnNraXAgcGFzc2luZyBsYXlvdXQgdGVzdHMu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9Ta2lwcGVkOgorCiAyMDEwLTAxLTIwICBQaGlsaXBw ZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBF cmljIENhcmxzb24uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVk IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAppbmRleCBmZmM1OWRlLi43ZGI5NzQ5 IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCisrKyBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKQEAgLTkwLDcgKzkwLDYgQEAgaHR0cC90ZXN0cy9t dWx0aXBhcnQvaW52YWxpZC1pbWFnZS1kYXRhLXN0YW5kYWxvbmUuaHRtbAogCiAjIC0tLS0tLS0g bWlzc2luZyBmZWF0dXJlcwogYWNjZXNzaWJpbGl0eQotbWVkaWEKIHdlYmFyY2hpdmUKIHN2Zy93 ZWJhcmNoaXZlCiAKQEAgLTEyOCw2ICsxMjcsNzYgQEAgZmFzdC9jYW52YXMvY2FudmFzLWdldElt YWdlRGF0YS5odG1sCiAjIC0tLS0tLS0gY3Jhc2hlcwogZmFzdC90ZXh0L2ZpbmQtaGlkZGVuLXRl eHQuaHRtbAogCisjIG1lZGlhIHRlc3RzIHdpdGhvdXQgZXhwZWN0ZWQgcmVzdWx0cworbWVkaWEv YXVkaW8tY29udHJvbHMtcmVuZGVyaW5nLmh0bWwKK21lZGlhL2F1ZGlvLW5vLWluc3RhbGxlZC1l bmdpbmVzLmh0bWwKK21lZGlhL2NvbnRyb2xzLWFmdGVyLXJlbG9hZC5odG1sCittZWRpYS9jb250 cm9scy1kcmFnLXRpbWViYXIuaHRtbAorbWVkaWEvY29udHJvbHMtc3RyaWN0Lmh0bWwKK21lZGlh L2NvbnRyb2xzLXN0eWxpbmcuaHRtbAorbWVkaWEvdmlkZW8tYXNwZWN0LXJhdGlvLmh0bWwKK21l ZGlhL3ZpZGVvLWNvbnRyb2xzLXZpc2libGUtYXVkaW8tb25seS5odG1sCittZWRpYS92aWRlby1k aXNwbGF5LXRvZ2dsZS5odG1sCittZWRpYS92aWRlby1lbXB0eS1zb3VyY2UuaHRtbAorbWVkaWEv dmlkZW8tbGF5ZXItY3Jhc2guaHRtbAorbWVkaWEvdmlkZW8tbm8tYXVkaW8uaHRtbAorbWVkaWEv dmlkZW8tdHJhbnNmb3JtZWQuaHRtbAorbWVkaWEvdmlkZW8tdm9sdW1lLXNsaWRlci5odG1sCitt ZWRpYS92aWRlby16b29tLWNvbnRyb2xzLmh0bWwKK21lZGlhL3ZpZGVvLXpvb20uaHRtbAorCisj IGZhaWxpbmcgbWVkaWEgdGVzdHMKK21lZGlhL2F1ZGlvLWRhdGEtdXJsLmh0bWwKK21lZGlhL2F1 ZGlvLWRlbGV0ZS13aGlsZS1zbGlkZXItdGh1bWItY2xpY2tlZC5odG1sCittZWRpYS9hdWRpby1k ZWxldGUtd2hpbGUtc3RlcC1idXR0b24tY2xpY2tlZC5odG1sCittZWRpYS9icm9rZW4tdmlkZW8u aHRtbAorbWVkaWEvZXZlbnQtYXR0cmlidXRlcy5odG1sCittZWRpYS9tZWRpYS1jYXB0aW9ucy5o dG1sCittZWRpYS9tZWRpYS1mdWxsc2NyZWVuLWlubGluZS5odG1sCittZWRpYS9tZWRpYS1mdWxs c2NyZWVuLW5vdC1pbi1kb2N1bWVudC5odG1sCittZWRpYS9yZXN0b3JlLWZyb20tcGFnZS1jYWNo ZS5odG1sCittZWRpYS91bnN1cHBvcnRlZC1ydHNwLmh0bWwKK21lZGlhL3Vuc3VwcG9ydGVkLXRy YWNrcy5odG1sCittZWRpYS92aWRlby1hdXRvcGxheS5odG1sCittZWRpYS92aWRlby1idWZmZXJl ZC5odG1sCittZWRpYS92aWRlby1jYW52YXMtc291cmNlLmh0bWwKK21lZGlhL3ZpZGVvLWNsaWNr LWRibGNraWNrLXN0YW5kYWxvbmUuaHRtbAorbWVkaWEvdmlkZW8tY29udHJvbHMtcmVuZGVyaW5n Lmh0bWwKK21lZGlhL3ZpZGVvLWN1cnJlbnRUaW1lLXNldDIuaHRtbAorbWVkaWEvdmlkZW8tY3Vy cmVudFRpbWUtc2V0Lmh0bWwKK21lZGlhL3ZpZGVvLWRvY3VtZW50LXR5cGVzLmh0bWwKK21lZGlh L3ZpZGVvLWVycm9yLWRvZXMtbm90LWV4aXN0Lmh0bWwKK21lZGlhL3ZpZGVvLWxvYWQtbmV0d29y a1N0YXRlLmh0bWwKK21lZGlhL3ZpZGVvLWxvYWQtcmVhZHlTdGF0ZS5odG1sCittZWRpYS92aWRl by1sb29wLmh0bWwKK21lZGlhL3ZpZGVvLXBsYXllZC1jb2xsYXBzZS5odG1sCittZWRpYS92aWRl by1wbGF5ZWQtcmFuZ2VzLTEuaHRtbAorbWVkaWEvdmlkZW8tcGxheWVkLXJlc2V0Lmh0bWwKK21l ZGlhL3ZpZGVvLXBsYXktZW1wdHktZXZlbnRzLmh0bWwKK21lZGlhL3ZpZGVvLXNlZWthYmxlLmh0 bWwKK21lZGlhL3ZpZGVvLXNlZWtpbmcuaHRtbAorbWVkaWEvdmlkZW8tc2Vlay1wYXN0LWVuZC1w YXVzZWQuaHRtbAorbWVkaWEvdmlkZW8tc2Vlay1wYXN0LWVuZC1wbGF5aW5nLmh0bWwKK21lZGlh L3ZpZGVvLXNpemUtaW50cmluc2ljLXNjYWxlLmh0bWwKK21lZGlhL3ZpZGVvLXNvdXJjZS1lcnJv ci5odG1sCittZWRpYS92aWRlby1zb3VyY2Utbm9uZS1zdXBwb3J0ZWQuaHRtbAorbWVkaWEvdmlk ZW8tc3JjLWNoYW5nZS5odG1sCittZWRpYS92aWRlby1zcmMtZW1wdHkuaHRtbAorbWVkaWEvdmlk ZW8tc3JjLWludmFsaWQtcmVtb3ZlLmh0bWwKK21lZGlhL3ZpZGVvLXNyYy1wbHVzLXNvdXJjZS5o dG1sCisKKyMgZmxha2V5IG1lZGlhIHRlc3RzCittZWRpYS9tZWRpYS1zdGFydFRpbWUuaHRtbAor bWVkaWEvdmlkZW8tcGF1c2UtZW1wdHktZXZlbnRzLmh0bWwKK21lZGlhL3ZpZGVvLXBsYXktcGF1 c2UtZXhjZXB0aW9uLmh0bWwKK21lZGlhL3ZpZGVvLXBvc3Rlci1zY2FsZS5odG1sCittZWRpYS92 aWRlby1wb3N0ZXIuaHRtbAorbWVkaWEvdmlkZW8tc2Vlay1uby1zcmMtZXhjZXB0aW9uLmh0bWwK K21lZGlhL3ZpZGVvLXNpemUuaHRtbAorbWVkaWEvdmlkZW8tc291cmNlLXR5cGUtcGFyYW1zLmh0 bWwKK21lZGlhL3ZpZGVvLXNyYy5odG1sCittZWRpYS92aWRlby10aW1ldXBkYXRlLWR1cmluZy1w bGF5YmFjay5odG1sCisKICMgPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSAjCiAjIENyYXNoaW5nIHRlc3RzIGR1 ZSB0byByZS1lbmFibGVkIFBob25vbiBzdXBwb3J0IGluIEJ1aWxkYm90J3MgUXQgICAgICAgICAg IwogIyBTa2lwIHRoZXNlIHVudGlsIGEgcHJvcGVyIHNvbHV0aW9uIGZvciB0aGUgUGhvbm9uIHJl bGF0ZWQgY3JhY2hlcyBmb3VuZC4gICMKQEAgLTUwMzUsOSArNTEwNCw2IEBAIGh0dHAvdGVzdHMv c2VjdXJpdHkvZGF0YVVSTC94c3MtREVOSUVELWZyb20tamF2YXNjcmlwdC11cmwtd2luZG93LW9w ZW4uaHRtbAogaHR0cC90ZXN0cy9zZWN1cml0eS9qYXZhc2NyaXB0VVJML3hzcy1BTExPV0VELWZy b20tamF2YXNjcmlwdC11cmwtd2luZG93LW9wZW4uaHRtbAogaHR0cC90ZXN0cy9zZWN1cml0eS9q YXZhc2NyaXB0VVJML3hzcy1ERU5JRUQtZnJvbS1qYXZhc2NyaXB0LXVybC1pbi1mb3JlaWduLWRv bWFpbi13aW5kb3ctb3Blbi5odG1sCiAKLSMgVGhpcyB0ZXN0IHJlcXVpcmVzIG9nZyBjb2RlY3MK LW1lZGlhL21lZGlhLWNhbi1wbGF5LW9nZy5odG1sCi0KICMgQnVuY2ggb2YgdGVzdHMgZmFpbGlu ZyBzaW5jZSBhIHdoaWxlIG9uIHRoZSBRdCBzbGF2ZS4gUGxlYXNlIGludmVzdGlnYXRlLgogY3Nz MS9jbGFzc2lmaWNhdGlvbi93aGl0ZV9zcGFjZS5odG1sCiBmYXN0L2Jsb2NrL3Bvc2l0aW9uaW5n L3JlbGF0aXZlLXBvc2l0aW9uZWQtaW5saW5lLWNvbnRhaW5lci5odG1sCmRpZmYgLS1naXQgYS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGRmZjYxZTQuLjY1ZGVk NzkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDEtMjEgIEpha3ViIFdpZWN6b3JlayAgPGZhdzIxN0Bn bWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgW1F0XSBNZWRpYVBsYXllclByaXZhdGU6IGV4cG9zZSBzdXBwb3J0ZWQgdHlwZXMgdG8gV2Vi Q29yZQorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z MzQ1MworCisgICAgICAgIE1lZGlhUGxheWVyUHJpdmF0ZSBzaG91bGQgZXhwb3NlIHRoZSBNSU1F IHR5cGVzIHRoYXQgYXJlIHN1cHBvcnRlZAorICAgICAgICBieSB0aGUgdW5kZXJseWluZyBiYWNr ZW5kIGluIFBob25vbi4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxh eWVyUHJpdmF0ZVBob25vbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZh dGU6OnN1cHBvcnRlZFR5cGVzQ2FjaGUpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQ cml2YXRlOjpnZXRTdXBwb3J0ZWRUeXBlcyk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXll clByaXZhdGU6OnN1cHBvcnRzVHlwZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQv TWVkaWFQbGF5ZXJQcml2YXRlUGhvbm9uLmg6CisKIDIwMTAtMDEtMjEgIE5vJ2FtIFJvc2VudGhh bCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1v biBIYXVzbWFubi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVk aWFQbGF5ZXJQcml2YXRlUGhvbm9uLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQv TWVkaWFQbGF5ZXJQcml2YXRlUGhvbm9uLmNwcAppbmRleCA4NWNlZDI2Li4zZWQzMGY3IDEwMDY0 NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVBo b25vbi5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclBy aXZhdGVQaG9ub24uY3BwCkBAIC0yNiwyMCArMjYsMjIgQEAKICNpbmNsdWRlICJDU3RyaW5nLmgi CiAjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0LmgiCisj aW5jbHVkZSAiTUlNRVR5cGVSZWdpc3RyeS5oIgogI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgi CiAjaW5jbHVkZSAiVGltZVJhbmdlcy5oIgogI2luY2x1ZGUgIldpZGdldC5oIgogI2luY2x1ZGUg PHd0Zi9IYXNoU2V0Lmg+CiAKICNpbmNsdWRlIDxRRGVidWc+CisjaW5jbHVkZSA8UUV2ZW50Pgor I2luY2x1ZGUgPFFNZXRhRW51bT4KICNpbmNsdWRlIDxRUGFpbnRlcj4KICNpbmNsdWRlIDxRV2lk Z2V0PgotI2luY2x1ZGUgPFFNZXRhRW51bT4KICNpbmNsdWRlIDxRVXJsPgotI2luY2x1ZGUgPFFF dmVudD4KIAotI2luY2x1ZGUgPHBob25vbi9wYXRoLmg+CiAjaW5jbHVkZSA8cGhvbm9uL2F1ZGlv b3V0cHV0Lmg+CisjaW5jbHVkZSA8cGhvbm9uL2JhY2tlbmRjYXBhYmlsaXRpZXMuaD4KKyNpbmNs dWRlIDxwaG9ub24vcGF0aC5oPgogI2luY2x1ZGUgPHBob25vbi9tZWRpYW9iamVjdC5oPgogI2lu Y2x1ZGUgPHBob25vbi92aWRlb3dpZGdldC5oPgogCkBAIC0xNDUsMTUgKzE0Nyw2MiBAQCBNZWRp YVBsYXllclByaXZhdGU6On5NZWRpYVBsYXllclByaXZhdGUoKQogICAgIG1fbWVkaWFPYmplY3Qg PSAwOwogfQogCi12b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6Z2V0U3VwcG9ydGVkVHlwZXMoSGFz aFNldDxTdHJpbmc+JikKK0hhc2hTZXQ8U3RyaW5nPiYgTWVkaWFQbGF5ZXJQcml2YXRlOjpzdXBw b3J0ZWRUeXBlc0NhY2hlKCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIHN0YXRpYyBI YXNoU2V0PFN0cmluZz4gc3VwcG9ydGVkVHlwZXM7CisgICAgaWYgKCFzdXBwb3J0ZWRUeXBlcy5p c0VtcHR5KCkpCisgICAgICAgIHJldHVybiBzdXBwb3J0ZWRUeXBlczsKKworICAgIC8vIEZJWE1F OiB3ZSBzaG91bGQgcmVidWlsZCB0aGUgTUlNRSB0eXBlIGNhY2hlIGV2ZXJ5IHRpbWUgdGhlIGJh Y2tlbmQgaXMgY2hhbmdlZCwKKyAgICAvLyBob3dldmVyLCB0aGlzIHdvdWxkIGhhdmUgbm8gZWZm ZWN0IG9uIE1JTUVUeXBlUmVnaXN0cnkgYW55d2F5LCBiZWNhdXNlIGl0CisgICAgLy8gcHVsbHMg dGhpcyBkYXRhIG9ubHkgb25jZS4KKworICAgIFFTdHJpbmdMaXN0IHR5cGVzID0gUGhvbm9uOjpC YWNrZW5kQ2FwYWJpbGl0aWVzOjphdmFpbGFibGVNaW1lVHlwZXMoKTsKKyAgICBmb3JlYWNoIChj b25zdCBRU3RyaW5nJiB0eXBlLCB0eXBlcykgeworICAgICAgICBRU3RyaW5nIGZpcnN0ID0gdHlw ZS5zcGxpdChRTGF0aW4xQ2hhcignLycpKS5hdCgwKTsKKworICAgICAgICAvLyBXZSdyZSBvbmx5 IGludGVyZXN0ZWQgaW4gdHlwZXMgd2hpY2ggYXJlIG5vdCBzdXBwb3J0ZWQgYnkgV2ViQ29yZSBp dHNlbGYuCisgICAgICAgIGlmIChmaXJzdCAhPSBRTGF0aW4xU3RyaW5nKCJ2aWRlbyIpCisgICAg ICAgICAgICAmJiBmaXJzdCAhPSBRTGF0aW4xU3RyaW5nKCJhdWRpbyIpCisgICAgICAgICAgICAm JiBmaXJzdCAhPSBRTGF0aW4xU3RyaW5nKCJhcHBsaWNhdGlvbiIpKQorICAgICAgICAgICAgY29u dGludWU7CisgICAgICAgIGlmIChNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZE5vbkltYWdl TUlNRVR5cGUodHlwZSkpCisgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICBzdXBwb3J0 ZWRUeXBlcy5hZGQoU3RyaW5nKHR5cGUpKTsKKyAgICB9CisKKyAgICAvLyBUaGVzZSBmb3JtYXRz IGFyZSBzdXBwb3J0ZWQgYnkgR1N0cmVhbWVyLCBidXQgbm90IGNvcnJlY3RseSBhZHZlcnRpc2Vk LgorICAgIGlmIChzdXBwb3J0ZWRUeXBlcy5jb250YWlucyhTdHJpbmcoInZpZGVvL3gtaDI2NCIp KQorICAgICAgICB8fCBzdXBwb3J0ZWRUeXBlcy5jb250YWlucyhTdHJpbmcoImF1ZGlvL3gtbTRh IikpKSB7CisgICAgICAgIHN1cHBvcnRlZFR5cGVzLmFkZChTdHJpbmcoInZpZGVvL21wNCIpKTsK KyAgICAgICAgc3VwcG9ydGVkVHlwZXMuYWRkKFN0cmluZygiYXVkaW8vYWFjIikpOworICAgIH0K KworICAgIGlmIChzdXBwb3J0ZWRUeXBlcy5jb250YWlucyhTdHJpbmcoInZpZGVvL3gtdGhlb3Jh IikpKQorICAgICAgICBzdXBwb3J0ZWRUeXBlcy5hZGQoU3RyaW5nKCJ2aWRlby9vZ2ciKSk7CisK KyAgICBpZiAoc3VwcG9ydGVkVHlwZXMuY29udGFpbnMoU3RyaW5nKCJhdWRpby94LXZvcmJpcyIp KSkKKyAgICAgICAgc3VwcG9ydGVkVHlwZXMuYWRkKFN0cmluZygiYXVkaW8vb2dnIikpOworCisg ICAgaWYgKHN1cHBvcnRlZFR5cGVzLmNvbnRhaW5zKFN0cmluZygiYXVkaW8veC13YXYiKSkpCisg ICAgICAgIHN1cHBvcnRlZFR5cGVzLmFkZChTdHJpbmcoImF1ZGlvL3dhdiIpKTsKKworICAgIHJl dHVybiBzdXBwb3J0ZWRUeXBlczsKIH0KIAotTWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlwZSBNZWRp YVBsYXllclByaXZhdGU6OnN1cHBvcnRzVHlwZShjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcm KQordm9pZCBNZWRpYVBsYXllclByaXZhdGU6OmdldFN1cHBvcnRlZFR5cGVzKEhhc2hTZXQ8U3Ry aW5nPiYgdHlwZXMpCiB7Ci0gICAgLy8gRklYTUU6IGRvIHRoZSByZWFsIHRoaW5nCi0gICAgbm90 SW1wbGVtZW50ZWQoKTsKKyAgICB0eXBlcyA9IHN1cHBvcnRlZFR5cGVzQ2FjaGUoKTsKK30KKwor TWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlwZSBNZWRpYVBsYXllclByaXZhdGU6OnN1cHBvcnRzVHlw ZShjb25zdCBTdHJpbmcmIHR5cGUsIGNvbnN0IFN0cmluZyYgY29kZWNzKQoreworICAgIGlmICh0 eXBlLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIE1lZGlhUGxheWVyOjpJc05vdFN1cHBvcnRl ZDsKKworICAgIGlmIChzdXBwb3J0ZWRUeXBlc0NhY2hlKCkuY29udGFpbnModHlwZSkpCisgICAg ICAgIHJldHVybiBjb2RlY3MuaXNFbXB0eSgpID8gTWVkaWFQbGF5ZXI6Ok1heUJlU3VwcG9ydGVk IDogTWVkaWFQbGF5ZXI6OklzU3VwcG9ydGVkOwogICAgIHJldHVybiBNZWRpYVBsYXllcjo6SXNO b3RTdXBwb3J0ZWQ7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv cXQvTWVkaWFQbGF5ZXJQcml2YXRlUGhvbm9uLmggYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3F0L01lZGlhUGxheWVyUHJpdmF0ZVBob25vbi5oCmluZGV4IGUxMTkzYjYuLjgxMTg3ODYgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRl UGhvbm9uLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclBy aXZhdGVQaG9ub24uaApAQCAtMTM2LDYgKzEzNiw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAog ICAgICAgICBzdGF0aWMgdm9pZCBnZXRTdXBwb3J0ZWRUeXBlcyhIYXNoU2V0PFN0cmluZz4mKTsK ICAgICAgICAgc3RhdGljIE1lZGlhUGxheWVyOjpTdXBwb3J0c1R5cGUgc3VwcG9ydHNUeXBlKGNv bnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBjb2RlY3MpOworICAgICAgICBzdGF0aWMg SGFzaFNldDxTdHJpbmc+JiBzdXBwb3J0ZWRUeXBlc0NhY2hlKCk7CiAgICAgICAgIHN0YXRpYyBi b29sIGlzQXZhaWxhYmxlKCkgeyByZXR1cm4gdHJ1ZTsgfQogCiAgICAgICAgIHZvaWQgdXBkYXRl U3RhdGVzKCk7Ci0tIAoxLjYuNgoK 51301 2010-03-22 10:25:15 -0700 2010-03-22 11:41:48 -0700 patch MediaPlayer-Phonon.patch text/plain 10209 jwieczorek ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxY2I1MjZiLi5mZTk3NmRlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDMt MjIgIEpha3ViIFdpZWN6b3JlayAgPGZhdzIxN0BnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBQaG9ub24gbWVkaWEgYmFja2Vu ZDogZXhwb3NlIHN1cHBvcnRlZCBNSU1FIHR5cGVzIHRvIFdlYkNvcmUKKworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzM0NTMKKworICAgICAgICBMaXN0 IGFsbCBza2lwcGVkIG1lZGlhIHRlc3RzIGluZGl2aWR1YWxseSBhbmQgdW5za2lwIHR3byBmaXhl ZCBieSB0aGUgcGF0Y2guCisKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9Ta2lwcGVkOgorCiAyMDEw LTAzLTIyICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9xdC9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAppbmRleCA0 Y2NiMDJiLi5jODdmNDY3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lw cGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKQEAgLTk3LDcgKzk3LDYg QEAgaHR0cC90ZXN0cy9tdWx0aXBhcnQvaW52YWxpZC1pbWFnZS1kYXRhLXN0YW5kYWxvbmUuaHRt bAogCiAjIC0tLS0tLS0gbWlzc2luZyBmZWF0dXJlcwogYWNjZXNzaWJpbGl0eQotbWVkaWEKIHdl YmFyY2hpdmUKIHN2Zy93ZWJhcmNoaXZlCiAKQEAgLTEzOSw2ICsxMzgsMTE4IEBAIHN2Zy9jdXN0 b20vZ2x5cGgtc2V0dGluZy1kLWF0dHJpYnV0ZS5zdmcKICMgLS0tLS0tLSBjcmFzaGVzCiBmYXN0 L3RleHQvZmluZC1oaWRkZW4tdGV4dC5odG1sCiAKKyMgZmFpbGluZyBtZWRpYSB0ZXN0cworbWVk aWEvYWRvcHQtbm9kZS1jcmFzaC5odG1sCittZWRpYS9hdWRpby1jb25zdHJ1Y3Rvci5odG1sCitt ZWRpYS9hdWRpby1jb25zdHJ1Y3Rvci1wcmVsb2FkLmh0bWwKK21lZGlhL2F1ZGlvLWNvbnN0cnVj dG9yLXNyYy5odG1sCittZWRpYS9hdWRpby1jb250cm9scy1yZW5kZXJpbmcuaHRtbAorbWVkaWEv YXVkaW8tZGF0YS11cmwuaHRtbAorbWVkaWEvYXVkaW8tZGVsZXRlLXdoaWxlLXNsaWRlci10aHVt Yi1jbGlja2VkLmh0bWwKK21lZGlhL2F1ZGlvLWRlbGV0ZS13aGlsZS1zdGVwLWJ1dHRvbi1jbGlj a2VkLmh0bWwKK21lZGlhL2F1ZGlvLW1wZWctc3VwcG9ydGVkLmh0bWwKK21lZGlhL2F1ZGlvLW5v LWluc3RhbGxlZC1lbmdpbmVzLmh0bWwKK21lZGlhL2F1ZGlvLXBsYXktZXZlbnQuaHRtbAorbWVk aWEvYmVmb3JlLWxvYWQtbWVtYmVyLWFjY2Vzcy5odG1sCittZWRpYS9icm9rZW4tdmlkZW8uaHRt bAorbWVkaWEvY29uc3RydWN0b3JzLmh0bWwKK21lZGlhL2NvbnRyb2xzLWFmdGVyLXJlbG9hZC5o dG1sCittZWRpYS9jb250cm9scy1jc3Mtb3ZlcmxvYWQuaHRtbAorbWVkaWEvY29udHJvbHMtZHJh Zy10aW1lYmFyLmh0bWwKK21lZGlhL2NvbnRyb2xzLXJpZ2h0LWNsaWNrLW9uLXRpbWViYXIuaHRt bAorbWVkaWEvY29udHJvbHMtc3RyaWN0Lmh0bWwKK21lZGlhL2NvbnRyb2xzLXN0eWxpbmcuaHRt bAorbWVkaWEvZXZlbnQtYXR0cmlidXRlcy5odG1sCittZWRpYS9mYWxsYmFjay5odG1sCittZWRp YS9tZWRpYS1jYXB0aW9ucy5odG1sCittZWRpYS9tZWRpYS1jb25zdGFudHMuaHRtbAorbWVkaWEv bWVkaWEtZnVsbHNjcmVlbi1pbmxpbmUuaHRtbAorbWVkaWEvbWVkaWEtZnVsbHNjcmVlbi1ub3Qt aW4tZG9jdW1lbnQuaHRtbAorbWVkaWEvbWVkaWEtbG9hZC1ldmVudC5odG1sCittZWRpYS9tZWRp YS1zdGFydFRpbWUuaHRtbAorbWVkaWEvcmVtb3ZlLWZyb20tZG9jdW1lbnQuaHRtbAorbWVkaWEv cmVtb3ZlLWZyb20tZG9jdW1lbnQtbm8tbG9hZC5odG1sCittZWRpYS9yZXN0b3JlLWZyb20tcGFn ZS1jYWNoZS5odG1sCittZWRpYS91bnN1cHBvcnRlZC1ydHNwLmh0bWwKK21lZGlhL3Vuc3VwcG9y dGVkLXRyYWNrcy5odG1sCittZWRpYS92aWRlby1hcHBlbmQtc291cmNlLmh0bWwKK21lZGlhL3Zp ZGVvLWFzcGVjdC1yYXRpby5odG1sCittZWRpYS92aWRlby1hdXRvcGxheS5odG1sCittZWRpYS92 aWRlby1idWZmZXJlZC5odG1sCittZWRpYS92aWRlby1jYW52YXMuaHRtbC1kaXNhYmxlZAorbWVk aWEvdmlkZW8tY2FudmFzLXNvdXJjZS5odG1sCittZWRpYS92aWRlby1jbGljay1kYmxja2ljay1z dGFuZGFsb25lLmh0bWwKK21lZGlhL3ZpZGVvLWNvbnRyb2xzLmh0bWwKK21lZGlhL3ZpZGVvLWNv bnRyb2xzLXJlbmRlcmluZy5odG1sCittZWRpYS92aWRlby1jb250cm9scy10cmFuc2Zvcm1lZC5o dG1sCittZWRpYS92aWRlby1jb250cm9scy12aXNpYmxlLWF1ZGlvLW9ubHkuaHRtbAorbWVkaWEv dmlkZW8tY29udHJvbHMtd2l0aC1tdXRhdGlvbi1ldmVudC1oYW5kbGVyLmh0bWwKK21lZGlhL3Zp ZGVvLWNvbnRyb2xzLXpvb21lZC5odG1sCittZWRpYS92aWRlby1jdXJyZW50VGltZS5odG1sCitt ZWRpYS92aWRlby1jdXJyZW50VGltZS1zZXQyLmh0bWwKK21lZGlhL3ZpZGVvLWN1cnJlbnRUaW1l LXNldC5odG1sCittZWRpYS92aWRlby1kaXNwbGF5LWFzcGVjdC1yYXRpby5odG1sCittZWRpYS92 aWRlby1kaXNwbGF5LW5vbmUtY3Jhc2guaHRtbAorbWVkaWEvdmlkZW8tZGlzcGxheS10b2dnbGUu aHRtbAorbWVkaWEvdmlkZW8tZG9jdW1lbnQtdHlwZXMuaHRtbAorbWVkaWEvdmlkZW8tZG9tLWF1 dG9wbGF5Lmh0bWwKK21lZGlhL3ZpZGVvLWRvbS1wcmVsb2FkLmh0bWwKK21lZGlhL3ZpZGVvLWRv bS1zcmMuaHRtbAorbWVkaWEvdmlkZW8tZW1wdHktc291cmNlLmh0bWwKK21lZGlhL3ZpZGVvLWVy cm9yLWRvZXMtbm90LWV4aXN0Lmh0bWwKK21lZGlhL3ZpZGVvLWxheWVyLWNyYXNoLmh0bWwKK21l ZGlhL3ZpZGVvLWxvYWQtbmV0d29ya1N0YXRlLmh0bWwKK21lZGlhL3ZpZGVvLWxvYWQtcmVhZHlT dGF0ZS5odG1sCittZWRpYS92aWRlby1sb29wLmh0bWwKK21lZGlhL3ZpZGVvLW11dGVkLmh0bWwK K21lZGlhL3ZpZGVvLW5vLWF1ZGlvLmh0bWwKK21lZGlhL3ZpZGVvLW5vLWF1dG9wbGF5Lmh0bWwK K21lZGlhL3ZpZGVvLXBhdXNlLWVtcHR5LWV2ZW50cy5odG1sCittZWRpYS92aWRlby1wYXVzZS1p bW1lZGlhdGVseS5odG1sCittZWRpYS92aWRlby1wbGF5ZWQtY29sbGFwc2UuaHRtbAorbWVkaWEv dmlkZW8tcGxheWVkLXJhbmdlcy0xLmh0bWwKK21lZGlhL3ZpZGVvLXBsYXllZC1yZXNldC5odG1s CittZWRpYS92aWRlby1wbGF5LWVtcHR5LWV2ZW50cy5odG1sCittZWRpYS92aWRlby1wbGF5LXBh dXNlLWV2ZW50cy5odG1sCittZWRpYS92aWRlby1wbGF5LXBhdXNlLWV4Y2VwdGlvbi5odG1sCitt ZWRpYS92aWRlby1wb3N0ZXIuaHRtbAorbWVkaWEvdmlkZW8tcG9zdGVyLXNjYWxlLmh0bWwKK21l ZGlhL3ZpZGVvLXByZWxvYWQuaHRtbAorbWVkaWEvdmlkZW8tcmVwbGFjZXMtcG9zdGVyLmh0bWwK K21lZGlhL3ZpZGVvLXJldmVyc2UtcGxheS1kdXJhdGlvbi5odG1sCittZWRpYS92aWRlby1zZWVr YWJsZS5odG1sCittZWRpYS92aWRlby1zZWVraW5nLmh0bWwKK21lZGlhL3ZpZGVvLXNlZWstbm8t c3JjLWV4Y2VwdGlvbi5odG1sCittZWRpYS92aWRlby1zZWVrLXBhc3QtZW5kLXBhdXNlZC5odG1s CittZWRpYS92aWRlby1zZWVrLXBhc3QtZW5kLXBsYXlpbmcuaHRtbAorbWVkaWEvdmlkZW8tc2l6 ZS5odG1sCittZWRpYS92aWRlby1zaXplLWludHJpbnNpYy1zY2FsZS5odG1sCittZWRpYS92aWRl by1zb3VyY2UtYWRkLXNyYy5odG1sCittZWRpYS92aWRlby1zb3VyY2UtZXJyb3IuaHRtbAorbWVk aWEvdmlkZW8tc291cmNlLWVycm9yLW5vLWNhbmRpZGF0ZS5odG1sCittZWRpYS92aWRlby1zb3Vy Y2UuaHRtbAorbWVkaWEvdmlkZW8tc291cmNlLW1lZGlhLmh0bWwKK21lZGlhL3ZpZGVvLXNvdXJj ZS1ub25lLXN1cHBvcnRlZC5odG1sCittZWRpYS92aWRlby1zb3VyY2UtdHlwZS5odG1sCittZWRp YS92aWRlby1zb3VyY2UtdHlwZS1wYXJhbXMuaHRtbAorbWVkaWEvdmlkZW8tc3JjLWNoYW5nZS5o dG1sCittZWRpYS92aWRlby1zcmMtZW1wdHkuaHRtbAorbWVkaWEvdmlkZW8tc3JjLmh0bWwKK21l ZGlhL3ZpZGVvLXNyYy1pbnZhbGlkLXJlbW92ZS5odG1sCittZWRpYS92aWRlby1zcmMtbm9uZS5o dG1sCittZWRpYS92aWRlby1zcmMtcGx1cy1zb3VyY2UuaHRtbAorbWVkaWEvdmlkZW8tc3JjLXJl bW92ZS5odG1sCittZWRpYS92aWRlby1zcmMtc2V0Lmh0bWwKK21lZGlhL3ZpZGVvLXNyYy1zb3Vy Y2UuaHRtbAorbWVkaWEvdmlkZW8tdGltZXVwZGF0ZS1kdXJpbmctcGxheWJhY2suaHRtbAorbWVk aWEvdmlkZW8tdGltZXVwZGF0ZS1yZXZlcnNlLXBsYXkuaHRtbAorbWVkaWEvdmlkZW8tdHJhbnNm b3JtZWQuaHRtbAorbWVkaWEvdmlkZW8tdm9sdW1lLmh0bWwKK21lZGlhL3ZpZGVvLXZvbHVtZS1z bGlkZXIuaHRtbAorbWVkaWEvdmlkZW8td2lkdGgtaGVpZ2h0Lmh0bWwKK21lZGlhL3ZpZGVvLXpv b20tY29udHJvbHMuaHRtbAorbWVkaWEvdmlkZW8tem9vbS5odG1sCisKICMgPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PSAjCiAjIENyYXNoaW5nIHRlc3RzIGR1ZSB0byByZS1lbmFibGVkIFBob25vbiBzdXBwb3J0 IGluIEJ1aWxkYm90J3MgUXQgICAgICAgICAgIwogIyBTa2lwIHRoZXNlIHVudGlsIGEgcHJvcGVy IHNvbHV0aW9uIGZvciB0aGUgUGhvbm9uIHJlbGF0ZWQgY3JhY2hlcyBmb3VuZC4gICMKQEAgLTQ5 NjQsOSArNTA3NSw2IEBAIGZhc3QvZG9tL2phdmFzY3JpcHQtdXJsLWNyYXNoLWZ1bmN0aW9uLmh0 bWwKIGZhc3QvZG9tL2xvY2F0aW9uLW5ldy13aW5kb3ctbm8tY3Jhc2guaHRtbAogaHR0cC90ZXN0 cy9zZWN1cml0eS9qYXZhc2NyaXB0VVJML3hzcy1BTExPV0VELWZyb20tamF2YXNjcmlwdC11cmwt d2luZG93LW9wZW4uaHRtbAogCi0jIFRoaXMgdGVzdCByZXF1aXJlcyBvZ2cgY29kZWNzCi1tZWRp YS9tZWRpYS1jYW4tcGxheS1vZ2cuaHRtbAotCiAjIEJ1bmNoIG9mIHRlc3RzIGZhaWxpbmcgc2lu Y2UgYSB3aGlsZSBvbiB0aGUgUXQgc2xhdmUuIFBsZWFzZSBpbnZlc3RpZ2F0ZS4KIGNzczEvY2xh c3NpZmljYXRpb24vd2hpdGVfc3BhY2UuaHRtbAogZmFzdC9ibG9jay9wb3NpdGlvbmluZy9yZWxh dGl2ZS1wb3NpdGlvbmVkLWlubGluZS1jb250YWluZXIuaHRtbApkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2NGI2YjBmLi5iY2RlZDI2IDEw MDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDIwIEBACisyMDEwLTAzLTIyICBKYWt1YiBXaWVjem9yZWsgIDxmYXcyMTdAZ21haWwu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtR dF0gUGhvbm9uIG1lZGlhIGJhY2tlbmQ6IGV4cG9zZSBzdXBwb3J0ZWQgTUlNRSB0eXBlcyB0byBX ZWJDb3JlCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTMzNDUzCisKKyAgICAgICAgTWVkaWFQbGF5ZXJQcml2YXRlIHNob3VsZCBleHBvc2UgdGhlIE1J TUUgdHlwZXMgdGhhdCBhcmUgc3VwcG9ydGVkCisgICAgICAgIGJ5IHRoZSB1bmRlcmx5aW5nIGJh Y2tlbmQgaW4gUGhvbm9uLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQ bGF5ZXJQcml2YXRlUGhvbm9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJp dmF0ZTo6c3VwcG9ydGVkVHlwZXNDYWNoZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXll clByaXZhdGU6OmdldFN1cHBvcnRlZFR5cGVzKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxh eWVyUHJpdmF0ZTo6c3VwcG9ydHNUeXBlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9x dC9NZWRpYVBsYXllclByaXZhdGVQaG9ub24uaDoKKwogMjAxMC0wMy0yMiAgWXVyeSBTZW1pa2hh dHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBG ZWxkbWFuLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBs YXllclByaXZhdGVQaG9ub24uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRp YVBsYXllclByaXZhdGVQaG9ub24uY3BwCmluZGV4IDMyNzRkYjUuLjg4YzdhMWMgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUGhvbm9u LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0 ZVBob25vbi5jcHAKQEAgLTI2LDIwICsyNiwyMiBAQAogI2luY2x1ZGUgIkNTdHJpbmcuaCIKICNp bmNsdWRlICJGcmFtZVZpZXcuaCIKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKKyNpbmNs dWRlICJNSU1FVHlwZVJlZ2lzdHJ5LmgiCiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKICNp bmNsdWRlICJUaW1lUmFuZ2VzLmgiCiAjaW5jbHVkZSAiV2lkZ2V0LmgiCiAjaW5jbHVkZSA8d3Rm L0hhc2hTZXQuaD4KIAogI2luY2x1ZGUgPFFEZWJ1Zz4KKyNpbmNsdWRlIDxRRXZlbnQ+CisjaW5j bHVkZSA8UU1ldGFFbnVtPgogI2luY2x1ZGUgPFFQYWludGVyPgogI2luY2x1ZGUgPFFXaWRnZXQ+ Ci0jaW5jbHVkZSA8UU1ldGFFbnVtPgogI2luY2x1ZGUgPFFVcmw+Ci0jaW5jbHVkZSA8UUV2ZW50 PgogCi0jaW5jbHVkZSA8cGhvbm9uL3BhdGguaD4KICNpbmNsdWRlIDxwaG9ub24vYXVkaW9vdXRw dXQuaD4KKyNpbmNsdWRlIDxwaG9ub24vYmFja2VuZGNhcGFiaWxpdGllcy5oPgorI2luY2x1ZGUg PHBob25vbi9wYXRoLmg+CiAjaW5jbHVkZSA8cGhvbm9uL21lZGlhb2JqZWN0Lmg+CiAjaW5jbHVk ZSA8cGhvbm9uL3ZpZGVvd2lkZ2V0Lmg+CiAKQEAgLTE0MywxNSArMTQ1LDYyIEBAIE1lZGlhUGxh eWVyUHJpdmF0ZTo6fk1lZGlhUGxheWVyUHJpdmF0ZSgpCiAgICAgbV9tZWRpYU9iamVjdCA9IDA7 CiB9CiAKLXZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlOjpnZXRTdXBwb3J0ZWRUeXBlcyhIYXNoU2V0 PFN0cmluZz4mKQorSGFzaFNldDxTdHJpbmc+JiBNZWRpYVBsYXllclByaXZhdGU6OnN1cHBvcnRl ZFR5cGVzQ2FjaGUoKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgc3RhdGljIEhhc2hT ZXQ8U3RyaW5nPiBzdXBwb3J0ZWRUeXBlczsKKyAgICBpZiAoIXN1cHBvcnRlZFR5cGVzLmlzRW1w dHkoKSkKKyAgICAgICAgcmV0dXJuIHN1cHBvcnRlZFR5cGVzOworCisgICAgLy8gRklYTUU6IHdl IHNob3VsZCByZWJ1aWxkIHRoZSBNSU1FIHR5cGUgY2FjaGUgZXZlcnkgdGltZSB0aGUgYmFja2Vu ZCBpcyBjaGFuZ2VkLAorICAgIC8vIGhvd2V2ZXIsIHRoaXMgd291bGQgaGF2ZSBubyBlZmZlY3Qg b24gTUlNRVR5cGVSZWdpc3RyeSBhbnl3YXksIGJlY2F1c2UgaXQKKyAgICAvLyBwdWxscyB0aGlz IGRhdGEgb25seSBvbmNlLgorCisgICAgUVN0cmluZ0xpc3QgdHlwZXMgPSBQaG9ub246OkJhY2tl bmRDYXBhYmlsaXRpZXM6OmF2YWlsYWJsZU1pbWVUeXBlcygpOworICAgIGZvcmVhY2ggKGNvbnN0 IFFTdHJpbmcmIHR5cGUsIHR5cGVzKSB7CisgICAgICAgIFFTdHJpbmcgZmlyc3QgPSB0eXBlLnNw bGl0KFFMYXRpbjFDaGFyKCcvJykpLmF0KDApOworCisgICAgICAgIC8vIFdlJ3JlIG9ubHkgaW50 ZXJlc3RlZCBpbiB0eXBlcyB3aGljaCBhcmUgbm90IHN1cHBvcnRlZCBieSBXZWJDb3JlIGl0c2Vs Zi4KKyAgICAgICAgaWYgKGZpcnN0ICE9IFFMYXRpbjFTdHJpbmcoInZpZGVvIikKKyAgICAgICAg ICAgICYmIGZpcnN0ICE9IFFMYXRpbjFTdHJpbmcoImF1ZGlvIikKKyAgICAgICAgICAgICYmIGZp cnN0ICE9IFFMYXRpbjFTdHJpbmcoImFwcGxpY2F0aW9uIikpCisgICAgICAgICAgICBjb250aW51 ZTsKKyAgICAgICAgaWYgKE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkTm9uSW1hZ2VNSU1F VHlwZSh0eXBlKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgIHN1cHBvcnRlZFR5 cGVzLmFkZChTdHJpbmcodHlwZSkpOworICAgIH0KKworICAgIC8vIFRoZXNlIGZvcm1hdHMgYXJl IHN1cHBvcnRlZCBieSBHU3RyZWFtZXIsIGJ1dCBub3QgY29ycmVjdGx5IGFkdmVydGlzZWQuCisg ICAgaWYgKHN1cHBvcnRlZFR5cGVzLmNvbnRhaW5zKFN0cmluZygidmlkZW8veC1oMjY0IikpCisg ICAgICAgIHx8IHN1cHBvcnRlZFR5cGVzLmNvbnRhaW5zKFN0cmluZygiYXVkaW8veC1tNGEiKSkp IHsKKyAgICAgICAgc3VwcG9ydGVkVHlwZXMuYWRkKFN0cmluZygidmlkZW8vbXA0IikpOworICAg ICAgICBzdXBwb3J0ZWRUeXBlcy5hZGQoU3RyaW5nKCJhdWRpby9hYWMiKSk7CisgICAgfQorCisg ICAgaWYgKHN1cHBvcnRlZFR5cGVzLmNvbnRhaW5zKFN0cmluZygidmlkZW8veC10aGVvcmEiKSkp CisgICAgICAgIHN1cHBvcnRlZFR5cGVzLmFkZChTdHJpbmcoInZpZGVvL29nZyIpKTsKKworICAg IGlmIChzdXBwb3J0ZWRUeXBlcy5jb250YWlucyhTdHJpbmcoImF1ZGlvL3gtdm9yYmlzIikpKQor ICAgICAgICBzdXBwb3J0ZWRUeXBlcy5hZGQoU3RyaW5nKCJhdWRpby9vZ2ciKSk7CisKKyAgICBp ZiAoc3VwcG9ydGVkVHlwZXMuY29udGFpbnMoU3RyaW5nKCJhdWRpby94LXdhdiIpKSkKKyAgICAg ICAgc3VwcG9ydGVkVHlwZXMuYWRkKFN0cmluZygiYXVkaW8vd2F2IikpOworCisgICAgcmV0dXJu IHN1cHBvcnRlZFR5cGVzOwogfQogCi1NZWRpYVBsYXllcjo6U3VwcG9ydHNUeXBlIE1lZGlhUGxh eWVyUHJpdmF0ZTo6c3VwcG9ydHNUeXBlKGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYpCit2 b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6Z2V0U3VwcG9ydGVkVHlwZXMoSGFzaFNldDxTdHJpbmc+ JiB0eXBlcykKIHsKLSAgICAvLyBGSVhNRTogZG8gdGhlIHJlYWwgdGhpbmcKLSAgICBub3RJbXBs ZW1lbnRlZCgpOworICAgIHR5cGVzID0gc3VwcG9ydGVkVHlwZXNDYWNoZSgpOworfQorCitNZWRp YVBsYXllcjo6U3VwcG9ydHNUeXBlIE1lZGlhUGxheWVyUHJpdmF0ZTo6c3VwcG9ydHNUeXBlKGNv bnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBjb2RlY3MpCit7CisgICAgaWYgKHR5cGUu aXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gTWVkaWFQbGF5ZXI6OklzTm90U3VwcG9ydGVkOwor CisgICAgaWYgKHN1cHBvcnRlZFR5cGVzQ2FjaGUoKS5jb250YWlucyh0eXBlKSkKKyAgICAgICAg cmV0dXJuIGNvZGVjcy5pc0VtcHR5KCkgPyBNZWRpYVBsYXllcjo6TWF5QmVTdXBwb3J0ZWQgOiBN ZWRpYVBsYXllcjo6SXNTdXBwb3J0ZWQ7CiAgICAgcmV0dXJuIE1lZGlhUGxheWVyOjpJc05vdFN1 cHBvcnRlZDsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9N ZWRpYVBsYXllclByaXZhdGVQaG9ub24uaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQv TWVkaWFQbGF5ZXJQcml2YXRlUGhvbm9uLmgKaW5kZXggZTc2MzBhMS4uZmY2YTAxYyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVQaG9u b24uaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0 ZVBob25vbi5oCkBAIC0xMzIsNiArMTMyLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAg ICAgIHN0YXRpYyB2b2lkIGdldFN1cHBvcnRlZFR5cGVzKEhhc2hTZXQ8U3RyaW5nPiYpOwogICAg ICAgICBzdGF0aWMgTWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlwZSBzdXBwb3J0c1R5cGUoY29uc3Qg U3RyaW5nJiB0eXBlLCBjb25zdCBTdHJpbmcmIGNvZGVjcyk7CisgICAgICAgIHN0YXRpYyBIYXNo U2V0PFN0cmluZz4mIHN1cHBvcnRlZFR5cGVzQ2FjaGUoKTsKICAgICAgICAgc3RhdGljIGJvb2wg aXNBdmFpbGFibGUoKSB7IHJldHVybiB0cnVlOyB9CiAKICAgICAgICAgdm9pZCB1cGRhdGVTdGF0 ZXMoKTsK