189782 2018-09-20 04:01:10 -0700 [MSE] Use some tolerance when deciding whether a frame should be appended to the decode queue 2018-09-20 13:59:57 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aboya aboya bugs-noreply calvaris commit-queue jer.noble oldest_to_newest 1461289 0 aboya 2018-09-20 04:01:10 -0700 Ideally, container formats should use exact timestamps and frames should not overlap. Unfortunately, there are lots of muxes out there where this is not always the case. This is particularly a problem in WebM, where timestamps are expressed in a power of 10 timescale, which forces some rounding. This patch makes SourceBuffer allow frames with a small overlaps (<=1ms) as those usually found in WebM. 1 ms is chosen because it's the default time scale of WebM files. This bug is reproducible on GStreamer-based WebKit ports using VP9 video on this URL: https://www.youtube.com/watch?v=XWytUOkaydo at PTS=0:00:05.367000000. In absence of this patch, that frame is not enqueued and playback gets stuck. 1461290 1 350185 aboya 2018-09-20 04:02:51 -0700 Created attachment 350185 Patch 1461294 2 350185 calvaris 2018-09-20 04:17:48 -0700 Comment on attachment 350185 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=350185&action=review > Source/WebCore/ChangeLog:7 > + should not overlap. Unfortunately, there are lots of muxes out there muxers > Source/WebCore/Modules/mediasource/SourceBuffer.cpp:1696 > + // lastEnqueuedDecodeEndTime or even a bit before that to accomodate muxes with imprecise timing information. muxers > Source/WebCore/Modules/mediasource/SourceBuffer.cpp:1698 > + // There are many muxes out there where the frame times are not perfectly contiguous, therefore a tolerance is needed. muxers 1461295 3 aboya 2018-09-20 04:20:52 -0700 (In reply to Xabier Rodríguez Calvar from comment #2) > Comment on attachment 350185 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=350185&action=review > > > Source/WebCore/ChangeLog:7 > > + should not overlap. Unfortunately, there are lots of muxes out there > > muxers > > > Source/WebCore/Modules/mediasource/SourceBuffer.cpp:1696 > > + // lastEnqueuedDecodeEndTime or even a bit before that to accomodate muxes with imprecise timing information. > > muxers > > > Source/WebCore/Modules/mediasource/SourceBuffer.cpp:1698 > > + // There are many muxes out there where the frame times are not perfectly contiguous, therefore a tolerance is needed. > > muxers Not really: Muxer: Application that muxes audio or video frames. Muxing: Encoding a sequence of frames into a file for later playback. Mux: File generated by a muxer. Muxes: Plural of mux. 1461313 4 aboya 2018-09-20 06:14:06 -0700 Since "mux (noun)" is not a word used very often and could still lead to confusion, I'll change it to "file". 1461315 5 350190 aboya 2018-09-20 06:21:23 -0700 Created attachment 350190 Patch 1461318 6 350190 calvaris 2018-09-20 06:25:43 -0700 Comment on attachment 350190 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=350190&action=review > Source/WebCore/ChangeLog:17 > + Reviewed by Xabier Rodriguez-Calvar. This should go in line 6 1461319 7 350192 aboya 2018-09-20 06:29:35 -0700 Created attachment 350192 Patch 1461329 8 350192 commit-queue 2018-09-20 07:08:25 -0700 Comment on attachment 350192 Patch Clearing flags on attachment: 350192 Committed r236258: <https://trac.webkit.org/changeset/236258> 1461330 9 commit-queue 2018-09-20 07:08:27 -0700 All reviewed patches have been landed. Closing bug. 1461410 10 jer.noble 2018-09-20 10:11:56 -0700 (In reply to Alicia Boya García from comment #0) > Ideally, container formats should use exact timestamps and frames should not > overlap. Unfortunately, there are lots of muxes out there where this is not > always the case. > > This is particularly a problem in WebM, where timestamps are expressed in a > power of 10 timescale, which forces some rounding. Ugh. > This patch makes SourceBuffer allow frames with a small overlaps (<=1ms) as > those usually found in WebM. 1 ms is chosen because it's the default time > scale of WebM files. > > This bug is reproducible on GStreamer-based WebKit ports using VP9 video on > this URL: https://www.youtube.com/watch?v=XWytUOkaydo at > PTS=0:00:05.367000000. In absence of this patch, that frame is not enqueued > and playback gets stuck. How did this overlap manage to survive the parsing process? Particularly step 1.14.1: "If last decode timestamp for track buffer is unset and presentation timestamp falls within the presentation interval of a coded frame in track buffer, then run the following steps..." The SampleMap makes some assumptions about its constituent samples, namely that they do not overlap. If we are allowing samples in the map to overlap, there may be other subtle bugs in the SourceBuffer code. Rather than patch up this behavior at render time, I'd rather we trim the duration of overlapping samples, either when they're emitted by the parser, or before they're added to the sample map. 1461411 11 jer.noble 2018-09-20 10:15:42 -0700 (In reply to Jer Noble from comment #10) > How did this overlap manage to survive the parsing process? Particularly > step 1.14.1: "If last decode timestamp for track buffer is unset and > presentation timestamp falls within the presentation interval of a coded > frame in track buffer, then run the following steps..." To answer my own question, we only replace overlapping frames when their start times are within 1 microsecond of each other. 1461413 12 jer.noble 2018-09-20 10:23:42 -0700 (In reply to Jer Noble from comment #10) > Rather than patch up this behavior at render time, I'd rather we trim the > duration of overlapping samples, either when they're emitted by the parser, > or before they're added to the sample map. Okay, looking more closely at this patch, I think we should just remove the "1ms" fudge factor, and enqueue any frame whose decodeTimestamp > lastEnqueuedDecodeTime (not lastEnqueuedDecodeEndTime). 1461526 13 aboya 2018-09-20 13:59:57 -0700 (In reply to Jer Noble from comment #12) > (In reply to Jer Noble from comment #10) > > Rather than patch up this behavior at render time, I'd rather we trim the > > duration of overlapping samples, either when they're emitted by the parser, > > or before they're added to the sample map. > > Okay, looking more closely at this patch, I think we should just remove the > "1ms" fudge factor, and enqueue any frame whose decodeTimestamp > > lastEnqueuedDecodeTime (not lastEnqueuedDecodeEndTime). It's an option I would not oppose. Durations are somewhat unreliable (especially in WebM), so the least we depend on them, the best. 350185 2018-09-20 04:02:51 -0700 2018-09-20 06:21:19 -0700 Patch bug-189782-20180920130250.patch text/plain 3318 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWZjYjY1NzE0MmVkN2Zl MjUwM2NjMjdmN2JkYWU2MzRlZmRmMjFlNC4uMTVmY2E5MDIzMzhjOTIyZjA4ODg1MDE5Njk3ZjU3 MmRhYmE3NDQwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA5LTIwICBBbGlj aWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbTVNFXSBVc2Ug c29tZSB0b2xlcmFuY2Ugd2hlbiBkZWNpZGluZyB3aGV0aGVyIGEgZnJhbWUgc2hvdWxkIGJlIGFw cGVuZGVkIHRvIHRoZSBkZWNvZGUgcXVldWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4OTc4MgorCisgICAgICAgIElkZWFsbHksIGNvbnRhaW5lciBm b3JtYXRzIHNob3VsZCB1c2UgZXhhY3QgdGltZXN0YW1wcyBhbmQgZnJhbWVzCisgICAgICAgIHNo b3VsZCBub3Qgb3ZlcmxhcC4gVW5mb3J0dW5hdGVseSwgdGhlcmUgYXJlIGxvdHMgb2YgbXV4ZXMg b3V0IHRoZXJlCisgICAgICAgIHdoZXJlIHRoaXMgaXMgbm90IGFsd2F5cyB0aGUgY2FzZS4KKwor ICAgICAgICBUaGlzIGlzIHBhcnRpY3VsYXJseSBhIHByb2JsZW0gaW4gV2ViTSwgd2hlcmUgdGlt ZXN0YW1wcyBhcmUgZXhwcmVzc2VkCisgICAgICAgIGluIGEgcG93ZXIgb2YgMTAgdGltZXNjYWxl LCB3aGljaCBmb3JjZXMgc29tZSByb3VuZGluZy4KKworICAgICAgICBUaGlzIHBhdGNoIG1ha2Vz IFNvdXJjZUJ1ZmZlciBhbGxvdyBmcmFtZXMgd2l0aCBhIHNtYWxsIG92ZXJsYXBzCisgICAgICAg ICg8PTFtcykgYXMgdGhvc2UgdXN1YWxseSBmb3VuZCBpbiBXZWJNLiAxIG1zIGlzIGNob3NlbiBi ZWNhdXNlIGl0J3MKKyAgICAgICAgdGhlIGRlZmF1bHQgdGltZSBzY2FsZSBvZiBXZWJNIGZpbGVz LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTW9k dWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U291 cmNlQnVmZmVyOjpzb3VyY2VCdWZmZXJQcml2YXRlRGlkUmVjZWl2ZVNhbXBsZSk6CisKIDIwMTgt MDktMTkgIFBoaWxpcHBlIE5vcm1hbmQgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAg W0dTdHJlYW1lcl0gQWRkIHN1cHBvcnQgZm9yIEFWMSBkZWNvZGluZwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwCmluZGV4IDIwYWE4 NGIzZDBiZjQ2MjZiODI4YjFiYmY0NWFmMmZiYzYyYWZiNGMuLjI3MGFhMmU1MDFkNGU1MDU3OWY5 M2RmNzU5ZDY5OGI3YjZmZjNhNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAKQEAgLTE2ODgsNyArMTY4OCwxNyBAQCB2b2lk IFNvdXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVyUHJpdmF0ZURpZFJlY2VpdmVTYW1wbGUoTWVkaWFT YW1wbGUmIHNhbXBsZSkKICAgICAgICAgLy8gQWRkIHRoZSBjb2RlZCBmcmFtZSB3aXRoIHRoZSBw cmVzZW50YXRpb24gdGltZXN0YW1wLCBkZWNvZGUgdGltZXN0YW1wLCBhbmQgZnJhbWUgZHVyYXRp b24gdG8gdGhlIHRyYWNrIGJ1ZmZlci4KICAgICAgICAgdHJhY2tCdWZmZXIuc2FtcGxlcy5hZGRT YW1wbGUoc2FtcGxlKTsKIAotICAgICAgICBpZiAodHJhY2tCdWZmZXIubGFzdEVucXVldWVkRGVj b2RlRW5kVGltZS5pc0ludmFsaWQoKSB8fCBkZWNvZGVUaW1lc3RhbXAgPj0gdHJhY2tCdWZmZXIu bGFzdEVucXVldWVkRGVjb2RlRW5kVGltZSkgeworICAgICAgICAvLyBOb3RlOiBUaGUgdGVybWlu b2xvZ3kgaGVyZSBpcyBjb25mdXNpbmc6ICJlbnF1ZXVpbmciIG1lYW5zIHByb3ZpZGluZyBhIGZy YW1lIHRvIHRoZSBpbm5lciBtZWRpYSBmcmFtZXdvcmsuCisgICAgICAgIC8vIEZpcnN0LCBmcmFt ZXMgYXJlIGluc2VydGVkIGluIHRoZSBkZWNvZGUgcXVldWU7IGxhdGVyLCBhdCB0aGUgZW5kIG9m IHRoZSBhcHBlbmQgYWxsIHRoZSBmcmFtZXMgaW4gdGhlIGRlY29kZQorICAgICAgICAvLyBxdWV1 ZSBhcmUgImVucXVldWVkIiAoc2VudCB0byB0aGUgaW5uZXIgbWVkaWEgZnJhbWV3b3JrKSBpbiBg cHJvdmlkZU1lZGlhRGF0YSgpYC4KKyAgICAgICAgLy8KKyAgICAgICAgLy8gSW4gb3JkZXIgdG8g Y2hlY2sgd2hldGhlciBhIGZyYW1lIHNob3VsZCBiZSBhZGRlZCB0byB0aGUgZGVjb2RlIHF1ZXVl IHdlIGNoZWNrIHdoZXRoZXIgaXQgc3RhcnRzIGFmdGVyIHRoZQorICAgICAgICAvLyBsYXN0RW5x dWV1ZWREZWNvZGVFbmRUaW1lIG9yIGV2ZW4gYSBiaXQgYmVmb3JlIHRoYXQgdG8gYWNjb21vZGF0 ZSBtdXhlcyB3aXRoIGltcHJlY2lzZSB0aW1pbmcgaW5mb3JtYXRpb24uCisgICAgICAgIC8vCisg ICAgICAgIC8vIFRoZXJlIGFyZSBtYW55IG11eGVzIG91dCB0aGVyZSB3aGVyZSB0aGUgZnJhbWUg dGltZXMgYXJlIG5vdCBwZXJmZWN0bHkgY29udGlndW91cywgdGhlcmVmb3JlIGEgdG9sZXJhbmNl IGlzIG5lZWRlZC4KKyAgICAgICAgLy8gRm9yIGluc3RhbmNlLCBtb3N0IFdlYk0gZmlsZXMgYXJl IG11eGVkIHJvdW5kZWQgdG8gdGhlIG1pbGxpc2Vjb25kICh0aGUgZGVmYXVsdCBUaW1lY29kZVNj YWxlIG9mIHRoZSBmb3JtYXQpLgorICAgICAgICBjb25zdCBNZWRpYVRpbWUgY29udGlndW91c0Zy YW1lVG9sZXJhbmNlID0gTWVkaWFUaW1lKDEsIDEwMDApOworICAgICAgICBpZiAodHJhY2tCdWZm ZXIubGFzdEVucXVldWVkRGVjb2RlRW5kVGltZS5pc0ludmFsaWQoKSB8fCBkZWNvZGVUaW1lc3Rh bXAgPj0gKHRyYWNrQnVmZmVyLmxhc3RFbnF1ZXVlZERlY29kZUVuZFRpbWUgLSBjb250aWd1b3Vz RnJhbWVUb2xlcmFuY2UpKSB7CiAgICAgICAgICAgICBEZWNvZGVPcmRlclNhbXBsZU1hcDo6S2V5 VHlwZSBkZWNvZGVLZXkoc2FtcGxlLmRlY29kZVRpbWUoKSwgc2FtcGxlLnByZXNlbnRhdGlvblRp bWUoKSk7CiAgICAgICAgICAgICB0cmFja0J1ZmZlci5kZWNvZGVRdWV1ZS5pbnNlcnQoRGVjb2Rl T3JkZXJTYW1wbGVNYXA6Ok1hcFR5cGU6OnZhbHVlX3R5cGUoZGVjb2RlS2V5LCAmc2FtcGxlKSk7 CiAgICAgICAgIH0K 350190 2018-09-20 06:21:23 -0700 2018-09-20 06:29:31 -0700 Patch bug-189782-20180920152122.patch text/plain 3327 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWZjYjY1NzE0MmVkN2Zl MjUwM2NjMjdmN2JkYWU2MzRlZmRmMjFlNC4uMmM1NzNhMjA5YTM5YmRkODNiYzIyMzg2OWIxMjEw MDhmNDYzOWNhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA5LTIwICBBbGlj aWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbTVNFXSBVc2Ug c29tZSB0b2xlcmFuY2Ugd2hlbiBkZWNpZGluZyB3aGV0aGVyIGEgZnJhbWUgc2hvdWxkIGJlIGFw cGVuZGVkIHRvIHRoZSBkZWNvZGUgcXVldWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4OTc4MgorCisgICAgICAgIElkZWFsbHksIGNvbnRhaW5lciBm b3JtYXRzIHNob3VsZCB1c2UgZXhhY3QgdGltZXN0YW1wcyBhbmQgZnJhbWVzCisgICAgICAgIHNo b3VsZCBub3Qgb3ZlcmxhcC4gVW5mb3J0dW5hdGVseSwgdGhlcmUgYXJlIGxvdHMgb2YgZmlsZXMg b3V0IHRoZXJlCisgICAgICAgIHdoZXJlIHRoaXMgaXMgbm90IGFsd2F5cyB0aGUgY2FzZS4KKwor ICAgICAgICBUaGlzIGlzIHBhcnRpY3VsYXJseSBhIHByb2JsZW0gaW4gV2ViTSwgd2hlcmUgdGlt ZXN0YW1wcyBhcmUgZXhwcmVzc2VkCisgICAgICAgIGluIGEgcG93ZXIgb2YgMTAgdGltZXNjYWxl LCB3aGljaCBmb3JjZXMgc29tZSByb3VuZGluZy4KKworICAgICAgICBUaGlzIHBhdGNoIG1ha2Vz IFNvdXJjZUJ1ZmZlciBhbGxvdyBmcmFtZXMgd2l0aCBhIHNtYWxsIG92ZXJsYXBzCisgICAgICAg ICg8PTFtcykgYXMgdGhvc2UgdXN1YWxseSBmb3VuZCBpbiBXZWJNLiAxIG1zIGlzIGNob3NlbiBi ZWNhdXNlIGl0J3MKKyAgICAgICAgdGhlIGRlZmF1bHQgdGltZSBzY2FsZSBvZiBXZWJNIGZpbGVz LgorCisgICAgICAgIFJldmlld2VkIGJ5IFhhYmllciBSb2RyaWd1ZXotQ2FsdmFyLgorCisgICAg ICAgICogTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U291cmNlQnVmZmVyOjpzb3VyY2VCdWZmZXJQcml2YXRlRGlkUmVjZWl2ZVNhbXBsZSk6 CisKIDIwMTgtMDktMTkgIFBoaWxpcHBlIE5vcm1hbmQgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAK ICAgICAgICAgW0dTdHJlYW1lcl0gQWRkIHN1cHBvcnQgZm9yIEFWMSBkZWNvZGluZwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwCmlu ZGV4IDIwYWE4NGIzZDBiZjQ2MjZiODI4YjFiYmY0NWFmMmZiYzYyYWZiNGMuLmFmZDEyMDA3NWE0 MTBhYzUwOTM0MGY0YjVlYTA4MThmNzU5NjE4ZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAKQEAgLTE2ODgsNyArMTY4OCwx NyBAQCB2b2lkIFNvdXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVyUHJpdmF0ZURpZFJlY2VpdmVTYW1w bGUoTWVkaWFTYW1wbGUmIHNhbXBsZSkKICAgICAgICAgLy8gQWRkIHRoZSBjb2RlZCBmcmFtZSB3 aXRoIHRoZSBwcmVzZW50YXRpb24gdGltZXN0YW1wLCBkZWNvZGUgdGltZXN0YW1wLCBhbmQgZnJh bWUgZHVyYXRpb24gdG8gdGhlIHRyYWNrIGJ1ZmZlci4KICAgICAgICAgdHJhY2tCdWZmZXIuc2Ft cGxlcy5hZGRTYW1wbGUoc2FtcGxlKTsKIAotICAgICAgICBpZiAodHJhY2tCdWZmZXIubGFzdEVu cXVldWVkRGVjb2RlRW5kVGltZS5pc0ludmFsaWQoKSB8fCBkZWNvZGVUaW1lc3RhbXAgPj0gdHJh Y2tCdWZmZXIubGFzdEVucXVldWVkRGVjb2RlRW5kVGltZSkgeworICAgICAgICAvLyBOb3RlOiBU aGUgdGVybWlub2xvZ3kgaGVyZSBpcyBjb25mdXNpbmc6ICJlbnF1ZXVpbmciIG1lYW5zIHByb3Zp ZGluZyBhIGZyYW1lIHRvIHRoZSBpbm5lciBtZWRpYSBmcmFtZXdvcmsuCisgICAgICAgIC8vIEZp cnN0LCBmcmFtZXMgYXJlIGluc2VydGVkIGluIHRoZSBkZWNvZGUgcXVldWU7IGxhdGVyLCBhdCB0 aGUgZW5kIG9mIHRoZSBhcHBlbmQgYWxsIHRoZSBmcmFtZXMgaW4gdGhlIGRlY29kZQorICAgICAg ICAvLyBxdWV1ZSBhcmUgImVucXVldWVkIiAoc2VudCB0byB0aGUgaW5uZXIgbWVkaWEgZnJhbWV3 b3JrKSBpbiBgcHJvdmlkZU1lZGlhRGF0YSgpYC4KKyAgICAgICAgLy8KKyAgICAgICAgLy8gSW4g b3JkZXIgdG8gY2hlY2sgd2hldGhlciBhIGZyYW1lIHNob3VsZCBiZSBhZGRlZCB0byB0aGUgZGVj b2RlIHF1ZXVlIHdlIGNoZWNrIHdoZXRoZXIgaXQgc3RhcnRzIGFmdGVyIHRoZQorICAgICAgICAv LyBsYXN0RW5xdWV1ZWREZWNvZGVFbmRUaW1lIG9yIGV2ZW4gYSBiaXQgYmVmb3JlIHRoYXQgdG8g YWNjb21vZGF0ZSBmaWxlcyB3aXRoIGltcHJlY2lzZSB0aW1pbmcgaW5mb3JtYXRpb24uCisgICAg ICAgIC8vCisgICAgICAgIC8vIFRoZXJlIGFyZSBtYW55IGZpbGVzIG91dCB0aGVyZSB3aGVyZSB0 aGUgZnJhbWUgdGltZXMgYXJlIG5vdCBwZXJmZWN0bHkgY29udGlndW91cywgdGhlcmVmb3JlIGEg dG9sZXJhbmNlIGlzIG5lZWRlZC4KKyAgICAgICAgLy8gRm9yIGluc3RhbmNlLCBtb3N0IFdlYk0g ZmlsZXMgYXJlIG11eGVkIHJvdW5kZWQgdG8gdGhlIG1pbGxpc2Vjb25kICh0aGUgZGVmYXVsdCBU aW1lY29kZVNjYWxlIG9mIHRoZSBmb3JtYXQpLgorICAgICAgICBjb25zdCBNZWRpYVRpbWUgY29u dGlndW91c0ZyYW1lVG9sZXJhbmNlID0gTWVkaWFUaW1lKDEsIDEwMDApOworICAgICAgICBpZiAo dHJhY2tCdWZmZXIubGFzdEVucXVldWVkRGVjb2RlRW5kVGltZS5pc0ludmFsaWQoKSB8fCBkZWNv ZGVUaW1lc3RhbXAgPj0gKHRyYWNrQnVmZmVyLmxhc3RFbnF1ZXVlZERlY29kZUVuZFRpbWUgLSBj b250aWd1b3VzRnJhbWVUb2xlcmFuY2UpKSB7CiAgICAgICAgICAgICBEZWNvZGVPcmRlclNhbXBs ZU1hcDo6S2V5VHlwZSBkZWNvZGVLZXkoc2FtcGxlLmRlY29kZVRpbWUoKSwgc2FtcGxlLnByZXNl bnRhdGlvblRpbWUoKSk7CiAgICAgICAgICAgICB0cmFja0J1ZmZlci5kZWNvZGVRdWV1ZS5pbnNl cnQoRGVjb2RlT3JkZXJTYW1wbGVNYXA6Ok1hcFR5cGU6OnZhbHVlX3R5cGUoZGVjb2RlS2V5LCAm c2FtcGxlKSk7CiAgICAgICAgIH0K 350192 2018-09-20 06:29:35 -0700 2018-09-20 07:08:25 -0700 Patch bug-189782-20180920152934.patch text/plain 3327 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWZjYjY1NzE0MmVkN2Zl MjUwM2NjMjdmN2JkYWU2MzRlZmRmMjFlNC4uZDNkMWJjMzAzMDIwMjJiZWE1YTMxMWRhYzFmYTBk NTUyMmRmYzMwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA5LTIwICBBbGlj aWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbTVNFXSBVc2Ug c29tZSB0b2xlcmFuY2Ugd2hlbiBkZWNpZGluZyB3aGV0aGVyIGEgZnJhbWUgc2hvdWxkIGJlIGFw cGVuZGVkIHRvIHRoZSBkZWNvZGUgcXVldWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4OTc4MgorCisgICAgICAgIFJldmlld2VkIGJ5IFhhYmllciBS b2RyaWd1ZXotQ2FsdmFyLgorCisgICAgICAgIElkZWFsbHksIGNvbnRhaW5lciBmb3JtYXRzIHNo b3VsZCB1c2UgZXhhY3QgdGltZXN0YW1wcyBhbmQgZnJhbWVzCisgICAgICAgIHNob3VsZCBub3Qg b3ZlcmxhcC4gVW5mb3J0dW5hdGVseSwgdGhlcmUgYXJlIGxvdHMgb2YgZmlsZXMgb3V0IHRoZXJl CisgICAgICAgIHdoZXJlIHRoaXMgaXMgbm90IGFsd2F5cyB0aGUgY2FzZS4KKworICAgICAgICBU aGlzIGlzIHBhcnRpY3VsYXJseSBhIHByb2JsZW0gaW4gV2ViTSwgd2hlcmUgdGltZXN0YW1wcyBh cmUgZXhwcmVzc2VkCisgICAgICAgIGluIGEgcG93ZXIgb2YgMTAgdGltZXNjYWxlLCB3aGljaCBm b3JjZXMgc29tZSByb3VuZGluZy4KKworICAgICAgICBUaGlzIHBhdGNoIG1ha2VzIFNvdXJjZUJ1 ZmZlciBhbGxvdyBmcmFtZXMgd2l0aCBhIHNtYWxsIG92ZXJsYXBzCisgICAgICAgICg8PTFtcykg YXMgdGhvc2UgdXN1YWxseSBmb3VuZCBpbiBXZWJNLiAxIG1zIGlzIGNob3NlbiBiZWNhdXNlIGl0 J3MKKyAgICAgICAgdGhlIGRlZmF1bHQgdGltZSBzY2FsZSBvZiBXZWJNIGZpbGVzLgorCisgICAg ICAgICogTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U291cmNlQnVmZmVyOjpzb3VyY2VCdWZmZXJQcml2YXRlRGlkUmVjZWl2ZVNhbXBsZSk6 CisKIDIwMTgtMDktMTkgIFBoaWxpcHBlIE5vcm1hbmQgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAK ICAgICAgICAgW0dTdHJlYW1lcl0gQWRkIHN1cHBvcnQgZm9yIEFWMSBkZWNvZGluZwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwCmlu ZGV4IDIwYWE4NGIzZDBiZjQ2MjZiODI4YjFiYmY0NWFmMmZiYzYyYWZiNGMuLmFmZDEyMDA3NWE0 MTBhYzUwOTM0MGY0YjVlYTA4MThmNzU5NjE4ZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAKQEAgLTE2ODgsNyArMTY4OCwx NyBAQCB2b2lkIFNvdXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVyUHJpdmF0ZURpZFJlY2VpdmVTYW1w bGUoTWVkaWFTYW1wbGUmIHNhbXBsZSkKICAgICAgICAgLy8gQWRkIHRoZSBjb2RlZCBmcmFtZSB3 aXRoIHRoZSBwcmVzZW50YXRpb24gdGltZXN0YW1wLCBkZWNvZGUgdGltZXN0YW1wLCBhbmQgZnJh bWUgZHVyYXRpb24gdG8gdGhlIHRyYWNrIGJ1ZmZlci4KICAgICAgICAgdHJhY2tCdWZmZXIuc2Ft cGxlcy5hZGRTYW1wbGUoc2FtcGxlKTsKIAotICAgICAgICBpZiAodHJhY2tCdWZmZXIubGFzdEVu cXVldWVkRGVjb2RlRW5kVGltZS5pc0ludmFsaWQoKSB8fCBkZWNvZGVUaW1lc3RhbXAgPj0gdHJh Y2tCdWZmZXIubGFzdEVucXVldWVkRGVjb2RlRW5kVGltZSkgeworICAgICAgICAvLyBOb3RlOiBU aGUgdGVybWlub2xvZ3kgaGVyZSBpcyBjb25mdXNpbmc6ICJlbnF1ZXVpbmciIG1lYW5zIHByb3Zp ZGluZyBhIGZyYW1lIHRvIHRoZSBpbm5lciBtZWRpYSBmcmFtZXdvcmsuCisgICAgICAgIC8vIEZp cnN0LCBmcmFtZXMgYXJlIGluc2VydGVkIGluIHRoZSBkZWNvZGUgcXVldWU7IGxhdGVyLCBhdCB0 aGUgZW5kIG9mIHRoZSBhcHBlbmQgYWxsIHRoZSBmcmFtZXMgaW4gdGhlIGRlY29kZQorICAgICAg ICAvLyBxdWV1ZSBhcmUgImVucXVldWVkIiAoc2VudCB0byB0aGUgaW5uZXIgbWVkaWEgZnJhbWV3 b3JrKSBpbiBgcHJvdmlkZU1lZGlhRGF0YSgpYC4KKyAgICAgICAgLy8KKyAgICAgICAgLy8gSW4g b3JkZXIgdG8gY2hlY2sgd2hldGhlciBhIGZyYW1lIHNob3VsZCBiZSBhZGRlZCB0byB0aGUgZGVj b2RlIHF1ZXVlIHdlIGNoZWNrIHdoZXRoZXIgaXQgc3RhcnRzIGFmdGVyIHRoZQorICAgICAgICAv LyBsYXN0RW5xdWV1ZWREZWNvZGVFbmRUaW1lIG9yIGV2ZW4gYSBiaXQgYmVmb3JlIHRoYXQgdG8g YWNjb21vZGF0ZSBmaWxlcyB3aXRoIGltcHJlY2lzZSB0aW1pbmcgaW5mb3JtYXRpb24uCisgICAg ICAgIC8vCisgICAgICAgIC8vIFRoZXJlIGFyZSBtYW55IGZpbGVzIG91dCB0aGVyZSB3aGVyZSB0 aGUgZnJhbWUgdGltZXMgYXJlIG5vdCBwZXJmZWN0bHkgY29udGlndW91cywgdGhlcmVmb3JlIGEg dG9sZXJhbmNlIGlzIG5lZWRlZC4KKyAgICAgICAgLy8gRm9yIGluc3RhbmNlLCBtb3N0IFdlYk0g ZmlsZXMgYXJlIG11eGVkIHJvdW5kZWQgdG8gdGhlIG1pbGxpc2Vjb25kICh0aGUgZGVmYXVsdCBU aW1lY29kZVNjYWxlIG9mIHRoZSBmb3JtYXQpLgorICAgICAgICBjb25zdCBNZWRpYVRpbWUgY29u dGlndW91c0ZyYW1lVG9sZXJhbmNlID0gTWVkaWFUaW1lKDEsIDEwMDApOworICAgICAgICBpZiAo dHJhY2tCdWZmZXIubGFzdEVucXVldWVkRGVjb2RlRW5kVGltZS5pc0ludmFsaWQoKSB8fCBkZWNv ZGVUaW1lc3RhbXAgPj0gKHRyYWNrQnVmZmVyLmxhc3RFbnF1ZXVlZERlY29kZUVuZFRpbWUgLSBj b250aWd1b3VzRnJhbWVUb2xlcmFuY2UpKSB7CiAgICAgICAgICAgICBEZWNvZGVPcmRlclNhbXBs ZU1hcDo6S2V5VHlwZSBkZWNvZGVLZXkoc2FtcGxlLmRlY29kZVRpbWUoKSwgc2FtcGxlLnByZXNl bnRhdGlvblRpbWUoKSk7CiAgICAgICAgICAgICB0cmFja0J1ZmZlci5kZWNvZGVRdWV1ZS5pbnNl cnQoRGVjb2RlT3JkZXJTYW1wbGVNYXA6Ok1hcFR5cGU6OnZhbHVlX3R5cGUoZGVjb2RlS2V5LCAm c2FtcGxlKSk7CiAgICAgICAgIH0K