154538 2016-02-22 08:34:26 -0800 Web Audio becomes distorted after sample rate changes 2019-03-02 16:28:22 -0800 1 1 1 Unclassified WebKit Web Audio Safari 9 iPhone / iPad iOS 9.2 RESOLVED FIXED InRadar P2 Major --- 1 ashley jer.noble ae barthdo93 commit-queue darin ddkilzer eric.carlson jer.noble jonlee nchase webkit-bug-importer oldest_to_newest 1167021 0 ashley 2016-02-22 08:34:26 -0800 Repro URL: https://www.scirra.com/labs/bugs/iosdistort/ Steps to reproduce: 1. Visit the URL. 2. Observe the displayed audioContext.sampleRate. It should be 44100 Hz. 3. Press the button. A sound should play, and a regular sound starts playing. 4. Kill Safari (double press-and-hold home button, swipe away Safari from apps list) 5. Open Safari again 6. Safari restores the previous page 7. Press the button again 8. Observe sample rate and listen to audio quality Observed result: The audio quality is severely distorted and sounds terrible. The sample rate has also changed to 48000 Hz, which may be related. Expected result: Audio quality same as on first listen, and sample rate should probably stay at 44100 Hz. This appears to be a device-specific issue. This does not reproduce on an iPad Air 2, but it does reproduce on an iPhone 4S, all running iOS 9.2.1. This is causing significant problems for all Construct 2 content on iOS. See here: https://www.scirra.com/forum/ios-sound-problems-since-ios-9-2_t167412 According to user reports, it only happens on iPhones and not iPads, the webview is affected, and the problem is new as of iOS 9.2. After the audio sounds distorted, closing the Safari tab and reopening it seems to restore the audio quality and the 44100 sample rate. However note this is not an option with Cordova apps. We have also found what seems to be a workaround we can apply from our engine: if on startup we create an AudioContext, immediately call close() on it, throw it away, then create a new AudioContext which we use for the rest of the app, it appears to work correctly. We will shortly be shipping this workaround for iOS devices, but this should be fixed as it affects all existing deployed web content. 1167067 1 webkit-bug-importer 2016-02-22 10:14:40 -0800 <rdar://problem/24771292> 1167412 2 jer.noble 2016-02-23 09:11:04 -0800 Ashley, WebKit uses AVAudioSession to determine the hardware sample rate currently supported by the system. See <https://developer.apple.com/library/ios/qa/qa1631/_index.html>: "Important: Different hardware can have different capabilities. For example, the internal speaker on the iPhone 6S models only support a sample rate of 48kHz while previous iPhone models supported a collection of sample rates. If you assume current values will always be your preferred values and for example fill our your client format using the hardware format expecting 44.1kHz when the actual sample rate is 48kHz, your application can suffer problems like audio distortion with the further possibility of other failures." So even if we were able to fix this problem (which we may not, or at least, not at the WebKit level), you will still have to deal with a 48kHz sample rate if your users are playing to an iPhone 6S internal speaker. 1167416 3 jer.noble 2016-02-23 09:19:36 -0800 That said, I do wonder if the audio hardware's sample rate is changing out from under us. The distortion might be explained if we believe at AudioContext creation time that the sample rate is 48k, and at render time it switches to 44.1k. 1167583 4 ashley 2016-02-23 16:24:44 -0800 Hi Jer, thanks for looking in to this. However I'm a little confused by your response. When you say "you will still have to deal with a 48kHz sample rate", are you addressing that to web developers? As far as I am aware, there is no other platform that requires us to have to care about the output sample rate, since in general any content at a different sample rate is just automatically resampled to the output sample rate if necessary. In fact the Web Audio API spec states regarding decodeAudioData: "Take the result, representing the decoded linear PCM audio data, and resample it to the sample-rate of the AudioContext if it is different from the sample-rate of audioData." So this appears to be an explicit requirement that Safari's implementation should be complying with. If we have to do anything differently to handle this, firstly I think iOS would be unique in that regard, which creates a web compatibility issue. Secondly I am not even sure what we would do differently in terms of the Web Audio API? Are we supposed to throw away all our buffers and re-decode them or something? The problem happens on startup, so it's a mystery to me what we would need to do differently and under what circumstances we ought to do it. If I were to hazard a guess as to what's really going on, I'd guess Safari mistakes the output sample rate for 48 KHz when it's really 44.1 KHz, and accordingly decodeAudioData is resampled to the wrong rate, or something like that. 1167825 5 jer.noble 2016-02-24 10:36:06 -0800 (In reply to comment #4) > Hi Jer, thanks for looking in to this. However I'm a little confused by your > response. When you say "you will still have to deal with a 48kHz sample > rate", are you addressing that to web developers? As far as I am aware, > there is no other platform that requires us to have to care about the output > sample rate, since in general any content at a different sample rate is just > automatically resampled to the output sample rate if necessary. In fact the > Web Audio API spec states regarding decodeAudioData: "Take the result, > representing the decoded linear PCM audio data, and resample it to the > sample-rate of the AudioContext if it is different from the sample-rate of > audioData." So this appears to be an explicit requirement that Safari's > implementation should be complying with. All I'm saying is that Web Audio developers can't assume that the output sample rate will always be 44.1kHz. If they are manually creating and filling buffers assuming that the sample rate is 44.1kHz (when instead it's 48kHz), they could playback artifacts. Say, for example, if they were implementing a grain-based player; they could conceivably have gaps between the grains if their sample-rate assumptions were invalid. > If we have to do anything differently to handle this, firstly I think iOS > would be unique in that regard, which creates a web compatibility issue. > Secondly I am not even sure what we would do differently in terms of the Web > Audio API? Are we supposed to throw away all our buffers and re-decode them > or something? The problem happens on startup, so it's a mystery to me what > we would need to do differently and under what circumstances we ought to do > it. I'm pointing out a situation where the hardware audio sample rate could change dynamically within the lifetime of an AudioContext. A iPhone user could unplug their headphones, the active route would change to the internal speaker, and the audio hardware would switch up from 44.1kHz to 48kHz. There is API in the spec to signal such a rate change, so WebKit would have to resample the Web Audio output in that case. > If I were to hazard a guess as to what's really going on, I'd guess Safari > mistakes the output sample rate for 48 KHz when it's really 44.1 KHz, and > accordingly decodeAudioData is resampled to the wrong rate, or something > like that. It very well may be, though I think it's more likely that, at the time the AudioContext was created, the hardware sample rate really was 48k, but that the hardware sample rate changed sometime after playback began. 1167830 6 jer.noble 2016-02-24 10:46:54 -0800 I ran your test case against an iPhone 6S running iOS 9.2, and observed the following behavior: Playing to the internal speaker. 1. Load page, hit OK. 2. Sample rate is 48kHz, no distortion. 3. Plug in headphones. 4. Distortion observed over headphones. 5. Unplugged headphones (restoring playback to the internal speaker). 6. Distortion disappeared. However: Playing over headphones. 1. Load page, hit OK. 2. Sample rate is 44kHz, no distortion. 3. Unplug headphones. 4. Distortion observed over internal speaker. 5. Plug in headphones. 6. Distortion disappeared. So this appears to validate the theory that the audio hardware sample rate is changing dynamically between 44.1kHz and 48kHz and causing the distortion. 1167835 7 jer.noble 2016-02-24 10:57:40 -0800 (In reply to comment #5) > There is API in the spec to signal such a rate change (Sorry, this should read "there is _not_ API in the spec to signal such a rate change".) 1167852 8 ashley 2016-02-24 11:36:45 -0800 (In reply to comment #5) > All I'm saying is that Web Audio developers can't assume that the output > sample rate will always be 44.1kHz. If they are manually creating and > filling buffers assuming that the sample rate is 44.1kHz (when instead it's > 48kHz), they could playback artifacts. I should point out Web Audio developers make no such assumptions - we don't choose the sample rate of decoded buffers, the AudioContext does. I suppose if anything, the spec itself is making the assumption the AudioContext keeps running at the same sample rate. I think the spec requires that anything played at a different sample rate to the AudioContext be resampled, since you can call createBuffer() to create a buffer at a given sample rate (e.g. 22050) and play it, and it presumably is resampled to the AudioContext rate. If the AudioContext sample rate changes after creation, shouldn't this kick in for existing buffers? 1167869 9 jer.noble 2016-02-24 12:20:20 -0800 (In reply to comment #8) > (In reply to comment #5) > > All I'm saying is that Web Audio developers can't assume that the output > > sample rate will always be 44.1kHz. If they are manually creating and > > filling buffers assuming that the sample rate is 44.1kHz (when instead it's > > 48kHz), they could playback artifacts. > I should point out Web Audio developers make no such assumptions - we don't > choose the sample rate of decoded buffers, the AudioContext does. I suppose > if anything, the spec itself is making the assumption the AudioContext keeps > running at the same sample rate. For decoded buffers yes. But some Web Audio authors do crazy stuff with custom decoders and generators; for them, they must pay attention to the output sample rate. > I think the spec requires that anything played at a different sample rate to > the AudioContext be resampled, since you can call createBuffer() to create a > buffer at a given sample rate (e.g. 22050) and play it, and it presumably is > resampled to the AudioContext rate. If the AudioContext sample rate changes > after creation, shouldn't this kick in for existing buffers? Yes, it should, and now I need to figure out why it's not. :) 1167961 10 jer.noble 2016-02-24 15:54:24 -0800 Aha! The sample rate change was a red herring. CoreAudio's output audio node includes a format converter that should handle resampling the output node's input from one sample rate to another. The real reason for the crazy distortion is because, when the output route changes from the internal speaker to headphones, not only does the sample rate change, but the output channel count changes as well. 1168330 11 jer.noble 2016-02-25 17:49:09 -0800 (In reply to comment #10) > Aha! The sample rate change was a red herring. And that itself was a red herring. Turns out, the output unit will request fewer samples when moving from a higher sample rate to a lower one, and the Web Audio engine chokes in that case. 1168331 12 272270 jer.noble 2016-02-25 17:50:37 -0800 Created attachment 272270 Patch 1168334 13 commit-queue 2016-02-25 17:52:36 -0800 Attachment 272270 did not pass style-queue: ERROR: Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp:241: More than one command on the same line [whitespace/newline] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1168355 14 272280 jer.noble 2016-02-25 19:32:29 -0800 Created attachment 272280 Patch 1172552 15 272280 darin 2016-03-09 09:10:24 -0800 Comment on attachment 272280 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=272280&action=review Why no regression test? > Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp:203 > +static void assignAudioBuffersToBus(AudioBuffer* buffers, AudioBus* bus, UInt32 numberOfBuffers, UInt32 numberOfFrames, UInt32 frameOffset, UInt32 framesThisTime) Bus here should be a reference rather than a pointer. > Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp:208 > + float* memory = (float*)((char*)buffers[i].mData + byteOffset); We normally prefer C++ casts to C style. > Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp:228 > + m_firstSpareFrame = m_lastSpareFrame = 0; Two separate lines please. 1172560 16 jer.noble 2016-03-09 09:14:39 -0800 (In reply to comment #15) > Comment on attachment 272280 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=272280&action=review > > Why no regression test? Two reasons: 1) we have no way to directly control the platform behavior (of requesting fewer or more samples per callback) and 2) the path we use for Web Audio regression tests does its rendering offline, so doesn't actually touch this code. > > Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp:203 > > +static void assignAudioBuffersToBus(AudioBuffer* buffers, AudioBus* bus, UInt32 numberOfBuffers, UInt32 numberOfFrames, UInt32 frameOffset, UInt32 framesThisTime) > > Bus here should be a reference rather than a pointer. Ok. > > Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp:208 > > + float* memory = (float*)((char*)buffers[i].mData + byteOffset); > > We normally prefer C++ casts to C style. Ok. > > Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp:228 > > + m_firstSpareFrame = m_lastSpareFrame = 0; > > Two separate lines please. Ok. 1173808 17 jer.noble 2016-03-11 11:35:36 -0800 Committed r198035 <http://trac.webkit.org/changeset/198035> 1189826 18 ddkilzer 2016-05-03 13:27:38 -0700 Same issue? <http://stackoverflow.com/questions/17892345/webkit-audio-distorts-on-ios-6-iphone-5-first-time-after-power-cycling> 1189886 19 jer.noble 2016-05-03 15:54:16 -0700 (In reply to comment #18) > Same issue? > <http://stackoverflow.com/questions/17892345/webkit-audio-distorts-on-ios-6- > iphone-5-first-time-after-power-cycling> Yes, very likely. 1273672 20 ae 2017-02-06 12:05:37 -0800 This problem is still occuring in iOS 10.2.1 if there's an active WebAudio context, and then a <video> element with a video with 48 kHz sampling rate starts playing. The WebAudio output is either distorted afterwards, or plays too fast (44.1 -> 48). 1273692 21 jer.noble 2017-02-06 13:22:17 -0800 (In reply to comment #20) > This problem is still occuring in iOS 10.2.1 if there's an active WebAudio > context, and then a <video> element with a video with 48 kHz sampling rate > starts playing. > > The WebAudio output is either distorted afterwards, or plays too fast (44.1 > -> 48). Could you attach or link to a reproduction case? Then I'll take a look. 1273911 22 ae 2017-02-07 03:14:03 -0800 Sorry this is happening in a hybrid app, so no simple way to make a testcase. But basically it's really simple: - Initialize Web Audio API, play a sound from a buffer source - Create a <video> element via JS with an MPEG4 file that has a 48 kHz audio stream, and play it - Play the buffer source again. It's either distorted, plays too fast by 48/44.1, or not at all. 1273912 23 ae 2017-02-07 03:20:46 -0800 What I can provide is the video file that causes the issue: http://instinctive.de/prolevel/calibration-tutorial.mp4 1274058 24 jonlee 2017-02-07 10:41:21 -0800 Jer, or ae@, can we file a new bug to track the issue? 1275067 25 ae 2017-02-09 15:02:45 -0800 Should I do that, or someone else? By the way, I just noticed that closing the Web Audio context and re-opening it (after playing the <video> element) fixes the issue... 1275555 26 darin 2017-02-10 15:02:26 -0800 (In reply to comment #25) > Should I do that, or someone else? If you are willing, yes, you should do it. 1275780 27 ae 2017-02-11 03:54:49 -0800 I've constructed a minimal testcase for the video problem and submitted a new report: https://bugs.webkit.org/show_bug.cgi?id=168165 272270 2016-02-25 17:50:37 -0800 2016-02-25 19:32:26 -0800 Patch bug-154538-20160225175020.patch text/plain 8064 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2OTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjE4YjNlNmU1MGI3MDYw OTIyYzg2MDcyNTI2NjJjMjBiNmU4MjY4OS4uYjk5ZWY4ZDIyMmViODlmZWM0NGU3MzhiZDkwYThm YWRiYjk3NGE3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE2LTAyLTI1ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBBdWRpbyBiZWNvbWVz IGRpc3RvcnRlZCBhZnRlciBzYW1wbGUgcmF0ZSBjaGFuZ2VzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTQ1MzgKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzI0NzcxMjkyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdoZW4gdGhlIHVuZGVybHlpbmcgYXVkaW8gaGFyZHdhcmUgc2FtcGxlIHJhdGUgY2hh bmdlcywgdGhlIEF1ZGlvVW5pdCByZW5kZXIgY2FsbGJhY2sgd2lsbCBiZWdpbiBhc2tpbmcKKyAg ICAgICAgZm9yIGZld2VyIG9yIG1vcmUgZnJhbWVzLiBGb3IgZXhhbXBsZSwgd2hlbiB0aGUgc2Ft cGxlIHJhdGUgZ29lcyBmcm9tIDQ0LjFrSHogdG8gNDhrSHosIGl0IHdpbGwgYXNrIGZvcgorICAg ICAgICAxMTggc2FtcGxlcyBpbnN0ZWFkIG9mIDEyOC4gKEFuZCB2aWNlLXZlcnNhLCAxNDAgc2Ft cGxlcyBpbnN0ZWFkIG9mIDEyOC4pIEJ1dCB0aGUgV2ViIEF1ZGlvIGVuZ2luZSBjYW4gb25seQor ICAgICAgICByZWFsbHkgaGFuZGxlIHJlcXVlc3RzIGluIG11bHRpcGxlcyBvZiAxMjggc2FtcGxl cy4gSW4gdGhlIGNhc2Ugd2hlcmUgdGhlcmUgYXJlIHJlcXVlc3RzIGZvciA8IDEyOCBzYW1wbGVz LAorICAgICAgICBhY3R1YWxseSByZW5kZXIgMTI4LCBidXQgc2F2ZSBvZmYgdGhlIHVucmVxdWVz dGVkIHNhbXBsZXMgaW4gYSBzZXBhcmF0ZSBidXMuIFRoZW4gZmlsbCB0aGF0IGJ1cyBkdXJpbmcg dGhlCisgICAgICAgIG5leHQgcmVxdWVzdC4KKworICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL0F1 ZGlvQnVzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvQnVzOjpjb3B5RnJvbVJhbmdlKTog QWRkZWQgdXRpbGl0eSBtZXRob2QuCisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vQXVkaW9CdXMu aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9pb3MvQXVkaW9EZXN0aW5hdGlvbklPUy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpBdWRpb0Rlc3RpbmF0aW9uSU9TOjpBdWRpb0Rlc3RpbmF0aW9u SU9TKTogQ3JlYXRlIGEgInNwYXJlIiBidXMuCisgICAgICAgIChXZWJDb3JlOjphc3NpZ25BdWRp b0J1ZmZlcnNUb0J1cyk6IE1vdmVkIGZyb20gaW5zaWRlIHJlbmRlci4KKyAgICAgICAgKFdlYkNv cmU6OkF1ZGlvRGVzdGluYXRpb25JT1M6OnJlbmRlcik6IFNhdmUgb2ZmIGV4dHJhIHNhbXBsZXMg dG8gdGhlICJzcGFyZSIgYnVzLgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL2lvcy9BdWRpb0Rl c3RpbmF0aW9uSU9TLmg6CisKIDIwMTYtMDItMTkgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBs ZS5jb20+CiAKICAgICAgICAgQWRvcHQgQ2FjaGVkUmF3UmVzb3VyY2VDbGllbnQ6OnNob3VsZENh Y2hlUmVzcG9uc2UoKSBpbiBNZWRpYVJlc291cmNlTG9hZGVyIGFuZCBXZWJDb3JlTlNVUkxTZXNz aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9BdWRpb0J1cy5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9BdWRpb0J1cy5jcHAKaW5kZXggZmFh OTYxNzBhOGM0MTBkZjhmMmRjOGU4Y2FmNDgzNTQ3NjBmM2I0Yy4uZWMwMmFjNDg3NzFmODYwMzg0 NTEyZTZlNzgyZmMyOTQwYjlhZDZkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vYXVkaW8vQXVkaW9CdXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlv L0F1ZGlvQnVzLmNwcApAQCAtMjEzLDYgKzIxMywzMyBAQCB2b2lkIEF1ZGlvQnVzOjpzY2FsZShm bG9hdCBzY2FsZSkKICAgICAgICAgY2hhbm5lbChpKS0+c2NhbGUoc2NhbGUpOwogfQogCit2b2lk IEF1ZGlvQnVzOjpjb3B5RnJvbVJhbmdlKGNvbnN0IEF1ZGlvQnVzJiBzb3VyY2VCdXMsIHVuc2ln bmVkIHN0YXJ0RnJhbWUsIHVuc2lnbmVkIGVuZEZyYW1lKQoreworICAgIGlmICghdG9wb2xvZ3lN YXRjaGVzKHNvdXJjZUJ1cykpIHsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAg ICAgIHplcm8oKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIHNpemVfdCBudW1iZXJP ZlNvdXJjZUZyYW1lcyA9IHNvdXJjZUJ1cy5sZW5ndGgoKTsKKyAgICBib29sIGlzUmFuZ2VTYWZl ID0gc3RhcnRGcmFtZSA8IGVuZEZyYW1lICYmIGVuZEZyYW1lIDw9IG51bWJlck9mU291cmNlRnJh bWVzOworICAgIEFTU0VSVChpc1JhbmdlU2FmZSk7CisgICAgaWYgKCFpc1JhbmdlU2FmZSkgewor ICAgICAgICB6ZXJvKCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICB1bnNpZ25lZCBu dW1iZXJPZkNoYW5uZWxzID0gdGhpcy0+bnVtYmVyT2ZDaGFubmVscygpOworICAgIEFTU0VSVChu dW1iZXJPZkNoYW5uZWxzIDw9IE1heEJ1c0NoYW5uZWxzKTsKKyAgICBpZiAobnVtYmVyT2ZDaGFu bmVscyA+IE1heEJ1c0NoYW5uZWxzKSB7CisgICAgICAgIHplcm8oKTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKworICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBudW1iZXJPZkNoYW5uZWxz OyArK2kpCisgICAgICAgIGNoYW5uZWwoaSktPmNvcHlGcm9tUmFuZ2Uoc291cmNlQnVzLmNoYW5u ZWwoaSksIHN0YXJ0RnJhbWUsIGVuZEZyYW1lKTsKK30KKwogdm9pZCBBdWRpb0J1czo6Y29weUZy b20oY29uc3QgQXVkaW9CdXMmIHNvdXJjZUJ1cywgQ2hhbm5lbEludGVycHJldGF0aW9uIGNoYW5u ZWxJbnRlcnByZXRhdGlvbikKIHsKICAgICBpZiAoJnNvdXJjZUJ1cyA9PSB0aGlzKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vQXVkaW9CdXMuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL0F1ZGlvQnVzLmgKaW5kZXggOGQ2ODM5ZjAxMjExMGRiZmQ3 YzBmNTAxYjdkMDQzM2U0MzQwNjQwZS4uNGY5YjVmNTVjYzg0M2Y0YWI4N2RlMzU1NDM5Zjg2ZDk3 ODZkMTZlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vQXVkaW9C dXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9BdWRpb0J1cy5oCkBAIC0x MjIsNiArMTIyLDkgQEAgcHVibGljOgogICAgIHZvaWQgcmVzZXQoKSB7IG1faXNGaXJzdFRpbWUg PSB0cnVlOyB9IC8vIGZvciBkZS16aXBwZXJpbmcKIAogICAgIC8vIENvcGllcyB0aGUgc2FtcGxl cyBmcm9tIHRoZSBzb3VyY2UgYnVzIHRvIHRoaXMgb25lLgorICAgIHZvaWQgY29weUZyb21SYW5n ZShjb25zdCBBdWRpb0J1cyYgc291cmNlQnVzLCB1bnNpZ25lZCBzdGFydEZyYW1lLCB1bnNpZ25l ZCBlbmRGcmFtZSk7CisKKyAgICAvLyBDb3BpZXMgdGhlIHNhbXBsZXMgZnJvbSB0aGUgc291cmNl IGJ1cyB0byB0aGlzIG9uZS4KICAgICAvLyBUaGlzIGlzIGp1c3QgYSBzaW1wbGUgcGVyLWNoYW5u ZWwgY29weSBpZiB0aGUgbnVtYmVyIG9mIGNoYW5uZWxzIG1hdGNoLCBvdGhlcndpc2UgYW4gdXAt bWl4IG9yIGRvd24tbWl4IGlzIGRvbmUuCiAgICAgdm9pZCBjb3B5RnJvbShjb25zdCBBdWRpb0J1 cyYgc291cmNlQnVzLCBDaGFubmVsSW50ZXJwcmV0YXRpb24gPSBTcGVha2Vycyk7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lvcy9BdWRpb0Rlc3RpbmF0aW9u SU9TLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lvcy9BdWRpb0Rlc3RpbmF0 aW9uSU9TLmNwcAppbmRleCBhZGRiNTI0ZjAxN2ExN2VhOTEyMTEyMzU5OTMyMjBkOGM5YjE0MTlj Li45NmUxYmI2M2VkMmJmN2U2ZjAyNzc1NGMyNjNkNjJjNGQ0NjNiN2I1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvQXVkaW9EZXN0aW5hdGlvbklPUy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vaW9zL0F1ZGlvRGVzdGluYXRpb25J T1MuY3BwCkBAIC0xMDEsNiArMTAxLDcgQEAgQXVkaW9EZXN0aW5hdGlvbklPUzo6QXVkaW9EZXN0 aW5hdGlvbklPUyhBdWRpb0lPQ2FsbGJhY2smIGNhbGxiYWNrLCBkb3VibGUgc2FtcGwKICAgICA6 IG1fb3V0cHV0VW5pdCgwKQogICAgICwgbV9jYWxsYmFjayhjYWxsYmFjaykKICAgICAsIG1fcmVu ZGVyQnVzKEF1ZGlvQnVzOjpjcmVhdGUoMiwga1JlbmRlckJ1ZmZlclNpemUsIGZhbHNlKSkKKyAg ICAsIG1fc3BhcmVCdXMoQXVkaW9CdXM6OmNyZWF0ZSgyLCBrUmVuZGVyQnVmZmVyU2l6ZSwgdHJ1 ZSkpCiAgICAgLCBtX3NhbXBsZVJhdGUoc2FtcGxlUmF0ZSkKICAgICAsIG1faXNQbGF5aW5nKGZh bHNlKQogewpAQCAtMTk5LDE5ICsyMDAsNDYgQEAgdm9pZCBBdWRpb0Rlc3RpbmF0aW9uSU9TOjpz dG9wKCkKICAgICAgICAgc2V0SXNQbGF5aW5nKGZhbHNlKTsKIH0KIAorc3RhdGljIHZvaWQgYXNz aWduQXVkaW9CdWZmZXJzVG9CdXMoQXVkaW9CdWZmZXIqIGJ1ZmZlcnMsIEF1ZGlvQnVzKiBidXMs IFVJbnQzMiBudW1iZXJPZkJ1ZmZlcnMsIFVJbnQzMiBudW1iZXJPZkZyYW1lcywgVUludDMyIGZy YW1lT2Zmc2V0LCBVSW50MzIgZnJhbWVzVGhpc1RpbWUpCit7CisgICAgZm9yIChVSW50MzIgaSA9 IDA7IGkgPCBudW1iZXJPZkJ1ZmZlcnM7ICsraSkgeworICAgICAgICBVSW50MzIgYnl0ZXNQZXJG cmFtZSA9IGJ1ZmZlcnNbaV0ubURhdGFCeXRlU2l6ZSAvIG51bWJlck9mRnJhbWVzOworICAgICAg ICBVSW50MzIgYnl0ZU9mZnNldCA9IGZyYW1lT2Zmc2V0ICogYnl0ZXNQZXJGcmFtZTsKKyAgICAg ICAgZmxvYXQqIG1lbW9yeSA9IChmbG9hdCopKChjaGFyKilidWZmZXJzW2ldLm1EYXRhICsgYnl0 ZU9mZnNldCk7CisgICAgICAgIGJ1cy0+c2V0Q2hhbm5lbE1lbW9yeShpLCBtZW1vcnksIGZyYW1l c1RoaXNUaW1lKTsKKyAgICB9Cit9CisKIC8vIFB1bGxzIG9uIG91ciBwcm92aWRlciB0byBnZXQg cmVuZGVyZWQgYXVkaW8gc3RyZWFtLgogT1NTdGF0dXMgQXVkaW9EZXN0aW5hdGlvbklPUzo6cmVu ZGVyKFVJbnQzMiBudW1iZXJPZkZyYW1lcywgQXVkaW9CdWZmZXJMaXN0KiBpb0RhdGEpCiB7CiAg ICAgQXVkaW9CdWZmZXIqIGJ1ZmZlcnMgPSBpb0RhdGEtPm1CdWZmZXJzOwotICAgIGZvciAoVUlu dDMyIGZyYW1lT2Zmc2V0ID0gMDsgZnJhbWVPZmZzZXQgKyBrUmVuZGVyQnVmZmVyU2l6ZSA8PSBu dW1iZXJPZkZyYW1lczsgZnJhbWVPZmZzZXQgKz0ga1JlbmRlckJ1ZmZlclNpemUpIHsKLSAgICAg ICAgVUludDMyIHJlbWFpbmluZ0ZyYW1lcyA9IHN0ZDo6bWluPFVJbnQzMj4oa1JlbmRlckJ1ZmZl clNpemUsIG51bWJlck9mRnJhbWVzIC0gZnJhbWVPZmZzZXQpOwotICAgICAgICBmb3IgKFVJbnQz MiBpID0gMDsgaSA8IGlvRGF0YS0+bU51bWJlckJ1ZmZlcnM7ICsraSkgewotICAgICAgICAgICAg VUludDMyIGJ5dGVzUGVyRnJhbWUgPSBidWZmZXJzW2ldLm1EYXRhQnl0ZVNpemUgLyBudW1iZXJP ZkZyYW1lczsKLSAgICAgICAgICAgIFVJbnQzMiBieXRlT2Zmc2V0ID0gZnJhbWVPZmZzZXQgKiBi eXRlc1BlckZyYW1lOwotICAgICAgICAgICAgZmxvYXQqIG1lbW9yeSA9IChmbG9hdCopKChjaGFy KilidWZmZXJzW2ldLm1EYXRhICsgYnl0ZU9mZnNldCk7Ci0gICAgICAgICAgICBtX3JlbmRlckJ1 cy0+c2V0Q2hhbm5lbE1lbW9yeShpLCBtZW1vcnksIHJlbWFpbmluZ0ZyYW1lcyk7CisgICAgVUlu dDMyIG51bWJlck9mQnVmZmVycyA9IGlvRGF0YS0+bU51bWJlckJ1ZmZlcnM7CisgICAgVUludDMy IGZyYW1lc1JlbWFpbmluZyA9IG51bWJlck9mRnJhbWVzOworICAgIFVJbnQzMiBmcmFtZU9mZnNl dCA9IDA7CisgICAgd2hpbGUgKGZyYW1lc1JlbWFpbmluZyA+IDApIHsKKyAgICAgICAgaWYgKG1f Zmlyc3RTcGFyZUZyYW1lICYmIG1fbGFzdFNwYXJlRnJhbWUpIHsKKyAgICAgICAgICAgIEFTU0VS VChtX2ZpcnN0U3BhcmVGcmFtZSA8IG1fbGFzdFNwYXJlRnJhbWUpOworICAgICAgICAgICAgVUlu dDMyIGZyYW1lc1RoaXNUaW1lID0gbV9sYXN0U3BhcmVGcmFtZSAtIG1fZmlyc3RTcGFyZUZyYW1l OworICAgICAgICAgICAgYXNzaWduQXVkaW9CdWZmZXJzVG9CdXMoYnVmZmVycywgbV9yZW5kZXJC dXMuZ2V0KCksIG51bWJlck9mQnVmZmVycywgbnVtYmVyT2ZGcmFtZXMsIGZyYW1lT2Zmc2V0LCBm cmFtZXNUaGlzVGltZSk7CisgICAgICAgICAgICBtX3JlbmRlckJ1cy0+Y29weUZyb21SYW5nZSgq bV9zcGFyZUJ1cywgbV9maXJzdFNwYXJlRnJhbWUsIG1fbGFzdFNwYXJlRnJhbWUpOworICAgICAg ICAgICAgZnJhbWVPZmZzZXQgKz0gZnJhbWVzVGhpc1RpbWU7CisgICAgICAgICAgICBmcmFtZXNS ZW1haW5pbmcgLT0gZnJhbWVzVGhpc1RpbWU7CisgICAgICAgICAgICBtX2ZpcnN0U3BhcmVGcmFt ZSA9IG1fbGFzdFNwYXJlRnJhbWUgPSAwOwogICAgICAgICB9Ci0gICAgICAgIG1fY2FsbGJhY2su cmVuZGVyKDAsIG1fcmVuZGVyQnVzLmdldCgpLCByZW1haW5pbmdGcmFtZXMpOworCisgICAgICAg IFVJbnQzMiBmcmFtZXNUaGlzVGltZSA9IHN0ZDo6bWluPFVJbnQzMj4oa1JlbmRlckJ1ZmZlclNp emUsIGZyYW1lc1JlbWFpbmluZyk7CisgICAgICAgIGFzc2lnbkF1ZGlvQnVmZmVyc1RvQnVzKGJ1 ZmZlcnMsIG1fcmVuZGVyQnVzLmdldCgpLCBudW1iZXJPZkJ1ZmZlcnMsIG51bWJlck9mRnJhbWVz LCBmcmFtZU9mZnNldCwgZnJhbWVzVGhpc1RpbWUpOworCisgICAgICAgIGlmIChmcmFtZXNUaGlz VGltZSA8IGtSZW5kZXJCdWZmZXJTaXplKSB7CisgICAgICAgICAgICBtX2NhbGxiYWNrLnJlbmRl cigwLCBtX3NwYXJlQnVzLmdldCgpLCBrUmVuZGVyQnVmZmVyU2l6ZSk7CisgICAgICAgICAgICBt X3JlbmRlckJ1cy0+Y29weUZyb21SYW5nZSgqbV9zcGFyZUJ1cywgMCwgZnJhbWVzVGhpc1RpbWUp OworICAgICAgICAgICAgbV9maXJzdFNwYXJlRnJhbWUgPSBmcmFtZXNUaGlzVGltZTsKKyAgICAg ICAgICAgIG1fbGFzdFNwYXJlRnJhbWUgPSBrUmVuZGVyQnVmZmVyU2l6ZSAtIDE7CisgICAgICAg IH0gZWxzZQorICAgICAgICAgICAgbV9jYWxsYmFjay5yZW5kZXIoMCwgbV9yZW5kZXJCdXMuZ2V0 KCksIGZyYW1lc1RoaXNUaW1lKTsKKyAgICAgICAgZnJhbWVPZmZzZXQgKz0gZnJhbWVzVGhpc1Rp bWU7OworICAgICAgICBmcmFtZXNSZW1haW5pbmcgLT0gZnJhbWVzVGhpc1RpbWU7CiAgICAgfQog CiAgICAgcmV0dXJuIG5vRXJyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v YXVkaW8vaW9zL0F1ZGlvRGVzdGluYXRpb25JT1MuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2F1ZGlvL2lvcy9BdWRpb0Rlc3RpbmF0aW9uSU9TLmgKaW5kZXggODEyNDg3YTMzZmYwYThjNjNh ZWE0YTBjYzdkNDc4OTY3NmNmZTNhMy4uMWE0NTk4ZWNiMzc1YjExYmEyZWUxMWNiNmE1ZmZhNThj NzNiYTcwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vaW9zL0F1 ZGlvRGVzdGluYXRpb25JT1MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9p b3MvQXVkaW9EZXN0aW5hdGlvbklPUy5oCkBAIC02NSw2ICs2NSw5IEBAIHByaXZhdGU6CiAgICAg QXVkaW9Vbml0IG1fb3V0cHV0VW5pdDsKICAgICBBdWRpb0lPQ2FsbGJhY2smIG1fY2FsbGJhY2s7 CiAgICAgUmVmUHRyPEF1ZGlvQnVzPiBtX3JlbmRlckJ1czsKKyAgICBSZWZQdHI8QXVkaW9CdXM+ IG1fc3BhcmVCdXM7CisgICAgdW5zaWduZWQgbV9maXJzdFNwYXJlRnJhbWUgeyAwIH07CisgICAg dW5zaWduZWQgbV9sYXN0U3BhcmVGcmFtZSB7IDAgfTsKIAogICAgIGRvdWJsZSBtX3NhbXBsZVJh dGU7CiAgICAgYm9vbCBtX2lzUGxheWluZzsK 272280 2016-02-25 19:32:29 -0800 2016-03-09 09:10:24 -0800 Patch bug-154538-20160225193212.patch text/plain 8063 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2OTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjE4YjNlNmU1MGI3MDYw OTIyYzg2MDcyNTI2NjJjMjBiNmU4MjY4OS4uYjk5ZWY4ZDIyMmViODlmZWM0NGU3MzhiZDkwYThm YWRiYjk3NGE3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE2LTAyLTI1ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBBdWRpbyBiZWNvbWVz IGRpc3RvcnRlZCBhZnRlciBzYW1wbGUgcmF0ZSBjaGFuZ2VzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTQ1MzgKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzI0NzcxMjkyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdoZW4gdGhlIHVuZGVybHlpbmcgYXVkaW8gaGFyZHdhcmUgc2FtcGxlIHJhdGUgY2hh bmdlcywgdGhlIEF1ZGlvVW5pdCByZW5kZXIgY2FsbGJhY2sgd2lsbCBiZWdpbiBhc2tpbmcKKyAg ICAgICAgZm9yIGZld2VyIG9yIG1vcmUgZnJhbWVzLiBGb3IgZXhhbXBsZSwgd2hlbiB0aGUgc2Ft cGxlIHJhdGUgZ29lcyBmcm9tIDQ0LjFrSHogdG8gNDhrSHosIGl0IHdpbGwgYXNrIGZvcgorICAg ICAgICAxMTggc2FtcGxlcyBpbnN0ZWFkIG9mIDEyOC4gKEFuZCB2aWNlLXZlcnNhLCAxNDAgc2Ft cGxlcyBpbnN0ZWFkIG9mIDEyOC4pIEJ1dCB0aGUgV2ViIEF1ZGlvIGVuZ2luZSBjYW4gb25seQor ICAgICAgICByZWFsbHkgaGFuZGxlIHJlcXVlc3RzIGluIG11bHRpcGxlcyBvZiAxMjggc2FtcGxl cy4gSW4gdGhlIGNhc2Ugd2hlcmUgdGhlcmUgYXJlIHJlcXVlc3RzIGZvciA8IDEyOCBzYW1wbGVz LAorICAgICAgICBhY3R1YWxseSByZW5kZXIgMTI4LCBidXQgc2F2ZSBvZmYgdGhlIHVucmVxdWVz dGVkIHNhbXBsZXMgaW4gYSBzZXBhcmF0ZSBidXMuIFRoZW4gZmlsbCB0aGF0IGJ1cyBkdXJpbmcg dGhlCisgICAgICAgIG5leHQgcmVxdWVzdC4KKworICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL0F1 ZGlvQnVzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvQnVzOjpjb3B5RnJvbVJhbmdlKTog QWRkZWQgdXRpbGl0eSBtZXRob2QuCisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vQXVkaW9CdXMu aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9pb3MvQXVkaW9EZXN0aW5hdGlvbklPUy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpBdWRpb0Rlc3RpbmF0aW9uSU9TOjpBdWRpb0Rlc3RpbmF0aW9u SU9TKTogQ3JlYXRlIGEgInNwYXJlIiBidXMuCisgICAgICAgIChXZWJDb3JlOjphc3NpZ25BdWRp b0J1ZmZlcnNUb0J1cyk6IE1vdmVkIGZyb20gaW5zaWRlIHJlbmRlci4KKyAgICAgICAgKFdlYkNv cmU6OkF1ZGlvRGVzdGluYXRpb25JT1M6OnJlbmRlcik6IFNhdmUgb2ZmIGV4dHJhIHNhbXBsZXMg dG8gdGhlICJzcGFyZSIgYnVzLgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL2lvcy9BdWRpb0Rl c3RpbmF0aW9uSU9TLmg6CisKIDIwMTYtMDItMTkgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBs ZS5jb20+CiAKICAgICAgICAgQWRvcHQgQ2FjaGVkUmF3UmVzb3VyY2VDbGllbnQ6OnNob3VsZENh Y2hlUmVzcG9uc2UoKSBpbiBNZWRpYVJlc291cmNlTG9hZGVyIGFuZCBXZWJDb3JlTlNVUkxTZXNz aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9BdWRpb0J1cy5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9BdWRpb0J1cy5jcHAKaW5kZXggZmFh OTYxNzBhOGM0MTBkZjhmMmRjOGU4Y2FmNDgzNTQ3NjBmM2I0Yy4uZWMwMmFjNDg3NzFmODYwMzg0 NTEyZTZlNzgyZmMyOTQwYjlhZDZkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vYXVkaW8vQXVkaW9CdXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlv L0F1ZGlvQnVzLmNwcApAQCAtMjEzLDYgKzIxMywzMyBAQCB2b2lkIEF1ZGlvQnVzOjpzY2FsZShm bG9hdCBzY2FsZSkKICAgICAgICAgY2hhbm5lbChpKS0+c2NhbGUoc2NhbGUpOwogfQogCit2b2lk IEF1ZGlvQnVzOjpjb3B5RnJvbVJhbmdlKGNvbnN0IEF1ZGlvQnVzJiBzb3VyY2VCdXMsIHVuc2ln bmVkIHN0YXJ0RnJhbWUsIHVuc2lnbmVkIGVuZEZyYW1lKQoreworICAgIGlmICghdG9wb2xvZ3lN YXRjaGVzKHNvdXJjZUJ1cykpIHsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAg ICAgIHplcm8oKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIHNpemVfdCBudW1iZXJP ZlNvdXJjZUZyYW1lcyA9IHNvdXJjZUJ1cy5sZW5ndGgoKTsKKyAgICBib29sIGlzUmFuZ2VTYWZl ID0gc3RhcnRGcmFtZSA8IGVuZEZyYW1lICYmIGVuZEZyYW1lIDw9IG51bWJlck9mU291cmNlRnJh bWVzOworICAgIEFTU0VSVChpc1JhbmdlU2FmZSk7CisgICAgaWYgKCFpc1JhbmdlU2FmZSkgewor ICAgICAgICB6ZXJvKCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICB1bnNpZ25lZCBu dW1iZXJPZkNoYW5uZWxzID0gdGhpcy0+bnVtYmVyT2ZDaGFubmVscygpOworICAgIEFTU0VSVChu dW1iZXJPZkNoYW5uZWxzIDw9IE1heEJ1c0NoYW5uZWxzKTsKKyAgICBpZiAobnVtYmVyT2ZDaGFu bmVscyA+IE1heEJ1c0NoYW5uZWxzKSB7CisgICAgICAgIHplcm8oKTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKworICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBudW1iZXJPZkNoYW5uZWxz OyArK2kpCisgICAgICAgIGNoYW5uZWwoaSktPmNvcHlGcm9tUmFuZ2Uoc291cmNlQnVzLmNoYW5u ZWwoaSksIHN0YXJ0RnJhbWUsIGVuZEZyYW1lKTsKK30KKwogdm9pZCBBdWRpb0J1czo6Y29weUZy b20oY29uc3QgQXVkaW9CdXMmIHNvdXJjZUJ1cywgQ2hhbm5lbEludGVycHJldGF0aW9uIGNoYW5u ZWxJbnRlcnByZXRhdGlvbikKIHsKICAgICBpZiAoJnNvdXJjZUJ1cyA9PSB0aGlzKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vQXVkaW9CdXMuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL0F1ZGlvQnVzLmgKaW5kZXggOGQ2ODM5ZjAxMjExMGRiZmQ3 YzBmNTAxYjdkMDQzM2U0MzQwNjQwZS4uNGY5YjVmNTVjYzg0M2Y0YWI4N2RlMzU1NDM5Zjg2ZDk3 ODZkMTZlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vQXVkaW9C dXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9BdWRpb0J1cy5oCkBAIC0x MjIsNiArMTIyLDkgQEAgcHVibGljOgogICAgIHZvaWQgcmVzZXQoKSB7IG1faXNGaXJzdFRpbWUg PSB0cnVlOyB9IC8vIGZvciBkZS16aXBwZXJpbmcKIAogICAgIC8vIENvcGllcyB0aGUgc2FtcGxl cyBmcm9tIHRoZSBzb3VyY2UgYnVzIHRvIHRoaXMgb25lLgorICAgIHZvaWQgY29weUZyb21SYW5n ZShjb25zdCBBdWRpb0J1cyYgc291cmNlQnVzLCB1bnNpZ25lZCBzdGFydEZyYW1lLCB1bnNpZ25l ZCBlbmRGcmFtZSk7CisKKyAgICAvLyBDb3BpZXMgdGhlIHNhbXBsZXMgZnJvbSB0aGUgc291cmNl IGJ1cyB0byB0aGlzIG9uZS4KICAgICAvLyBUaGlzIGlzIGp1c3QgYSBzaW1wbGUgcGVyLWNoYW5u ZWwgY29weSBpZiB0aGUgbnVtYmVyIG9mIGNoYW5uZWxzIG1hdGNoLCBvdGhlcndpc2UgYW4gdXAt bWl4IG9yIGRvd24tbWl4IGlzIGRvbmUuCiAgICAgdm9pZCBjb3B5RnJvbShjb25zdCBBdWRpb0J1 cyYgc291cmNlQnVzLCBDaGFubmVsSW50ZXJwcmV0YXRpb24gPSBTcGVha2Vycyk7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lvcy9BdWRpb0Rlc3RpbmF0aW9u SU9TLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lvcy9BdWRpb0Rlc3RpbmF0 aW9uSU9TLmNwcAppbmRleCBhZGRiNTI0ZjAxN2ExN2VhOTEyMTEyMzU5OTMyMjBkOGM5YjE0MTlj Li43NmNlOTQyZjFjYTYzMmQ0ZTlhNjEyMzkwNDc3OGExZWJlNTg1NTUyIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvQXVkaW9EZXN0aW5hdGlvbklPUy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vaW9zL0F1ZGlvRGVzdGluYXRpb25J T1MuY3BwCkBAIC0xMDEsNiArMTAxLDcgQEAgQXVkaW9EZXN0aW5hdGlvbklPUzo6QXVkaW9EZXN0 aW5hdGlvbklPUyhBdWRpb0lPQ2FsbGJhY2smIGNhbGxiYWNrLCBkb3VibGUgc2FtcGwKICAgICA6 IG1fb3V0cHV0VW5pdCgwKQogICAgICwgbV9jYWxsYmFjayhjYWxsYmFjaykKICAgICAsIG1fcmVu ZGVyQnVzKEF1ZGlvQnVzOjpjcmVhdGUoMiwga1JlbmRlckJ1ZmZlclNpemUsIGZhbHNlKSkKKyAg ICAsIG1fc3BhcmVCdXMoQXVkaW9CdXM6OmNyZWF0ZSgyLCBrUmVuZGVyQnVmZmVyU2l6ZSwgdHJ1 ZSkpCiAgICAgLCBtX3NhbXBsZVJhdGUoc2FtcGxlUmF0ZSkKICAgICAsIG1faXNQbGF5aW5nKGZh bHNlKQogewpAQCAtMTk5LDE5ICsyMDAsNDYgQEAgdm9pZCBBdWRpb0Rlc3RpbmF0aW9uSU9TOjpz dG9wKCkKICAgICAgICAgc2V0SXNQbGF5aW5nKGZhbHNlKTsKIH0KIAorc3RhdGljIHZvaWQgYXNz aWduQXVkaW9CdWZmZXJzVG9CdXMoQXVkaW9CdWZmZXIqIGJ1ZmZlcnMsIEF1ZGlvQnVzKiBidXMs IFVJbnQzMiBudW1iZXJPZkJ1ZmZlcnMsIFVJbnQzMiBudW1iZXJPZkZyYW1lcywgVUludDMyIGZy YW1lT2Zmc2V0LCBVSW50MzIgZnJhbWVzVGhpc1RpbWUpCit7CisgICAgZm9yIChVSW50MzIgaSA9 IDA7IGkgPCBudW1iZXJPZkJ1ZmZlcnM7ICsraSkgeworICAgICAgICBVSW50MzIgYnl0ZXNQZXJG cmFtZSA9IGJ1ZmZlcnNbaV0ubURhdGFCeXRlU2l6ZSAvIG51bWJlck9mRnJhbWVzOworICAgICAg ICBVSW50MzIgYnl0ZU9mZnNldCA9IGZyYW1lT2Zmc2V0ICogYnl0ZXNQZXJGcmFtZTsKKyAgICAg ICAgZmxvYXQqIG1lbW9yeSA9IChmbG9hdCopKChjaGFyKilidWZmZXJzW2ldLm1EYXRhICsgYnl0 ZU9mZnNldCk7CisgICAgICAgIGJ1cy0+c2V0Q2hhbm5lbE1lbW9yeShpLCBtZW1vcnksIGZyYW1l c1RoaXNUaW1lKTsKKyAgICB9Cit9CisKIC8vIFB1bGxzIG9uIG91ciBwcm92aWRlciB0byBnZXQg cmVuZGVyZWQgYXVkaW8gc3RyZWFtLgogT1NTdGF0dXMgQXVkaW9EZXN0aW5hdGlvbklPUzo6cmVu ZGVyKFVJbnQzMiBudW1iZXJPZkZyYW1lcywgQXVkaW9CdWZmZXJMaXN0KiBpb0RhdGEpCiB7CiAg ICAgQXVkaW9CdWZmZXIqIGJ1ZmZlcnMgPSBpb0RhdGEtPm1CdWZmZXJzOwotICAgIGZvciAoVUlu dDMyIGZyYW1lT2Zmc2V0ID0gMDsgZnJhbWVPZmZzZXQgKyBrUmVuZGVyQnVmZmVyU2l6ZSA8PSBu dW1iZXJPZkZyYW1lczsgZnJhbWVPZmZzZXQgKz0ga1JlbmRlckJ1ZmZlclNpemUpIHsKLSAgICAg ICAgVUludDMyIHJlbWFpbmluZ0ZyYW1lcyA9IHN0ZDo6bWluPFVJbnQzMj4oa1JlbmRlckJ1ZmZl clNpemUsIG51bWJlck9mRnJhbWVzIC0gZnJhbWVPZmZzZXQpOwotICAgICAgICBmb3IgKFVJbnQz MiBpID0gMDsgaSA8IGlvRGF0YS0+bU51bWJlckJ1ZmZlcnM7ICsraSkgewotICAgICAgICAgICAg VUludDMyIGJ5dGVzUGVyRnJhbWUgPSBidWZmZXJzW2ldLm1EYXRhQnl0ZVNpemUgLyBudW1iZXJP ZkZyYW1lczsKLSAgICAgICAgICAgIFVJbnQzMiBieXRlT2Zmc2V0ID0gZnJhbWVPZmZzZXQgKiBi eXRlc1BlckZyYW1lOwotICAgICAgICAgICAgZmxvYXQqIG1lbW9yeSA9IChmbG9hdCopKChjaGFy KilidWZmZXJzW2ldLm1EYXRhICsgYnl0ZU9mZnNldCk7Ci0gICAgICAgICAgICBtX3JlbmRlckJ1 cy0+c2V0Q2hhbm5lbE1lbW9yeShpLCBtZW1vcnksIHJlbWFpbmluZ0ZyYW1lcyk7CisgICAgVUlu dDMyIG51bWJlck9mQnVmZmVycyA9IGlvRGF0YS0+bU51bWJlckJ1ZmZlcnM7CisgICAgVUludDMy IGZyYW1lc1JlbWFpbmluZyA9IG51bWJlck9mRnJhbWVzOworICAgIFVJbnQzMiBmcmFtZU9mZnNl dCA9IDA7CisgICAgd2hpbGUgKGZyYW1lc1JlbWFpbmluZyA+IDApIHsKKyAgICAgICAgaWYgKG1f Zmlyc3RTcGFyZUZyYW1lICYmIG1fbGFzdFNwYXJlRnJhbWUpIHsKKyAgICAgICAgICAgIEFTU0VS VChtX2ZpcnN0U3BhcmVGcmFtZSA8IG1fbGFzdFNwYXJlRnJhbWUpOworICAgICAgICAgICAgVUlu dDMyIGZyYW1lc1RoaXNUaW1lID0gbV9sYXN0U3BhcmVGcmFtZSAtIG1fZmlyc3RTcGFyZUZyYW1l OworICAgICAgICAgICAgYXNzaWduQXVkaW9CdWZmZXJzVG9CdXMoYnVmZmVycywgbV9yZW5kZXJC dXMuZ2V0KCksIG51bWJlck9mQnVmZmVycywgbnVtYmVyT2ZGcmFtZXMsIGZyYW1lT2Zmc2V0LCBm cmFtZXNUaGlzVGltZSk7CisgICAgICAgICAgICBtX3JlbmRlckJ1cy0+Y29weUZyb21SYW5nZSgq bV9zcGFyZUJ1cywgbV9maXJzdFNwYXJlRnJhbWUsIG1fbGFzdFNwYXJlRnJhbWUpOworICAgICAg ICAgICAgZnJhbWVPZmZzZXQgKz0gZnJhbWVzVGhpc1RpbWU7CisgICAgICAgICAgICBmcmFtZXNS ZW1haW5pbmcgLT0gZnJhbWVzVGhpc1RpbWU7CisgICAgICAgICAgICBtX2ZpcnN0U3BhcmVGcmFt ZSA9IG1fbGFzdFNwYXJlRnJhbWUgPSAwOwogICAgICAgICB9Ci0gICAgICAgIG1fY2FsbGJhY2su cmVuZGVyKDAsIG1fcmVuZGVyQnVzLmdldCgpLCByZW1haW5pbmdGcmFtZXMpOworCisgICAgICAg IFVJbnQzMiBmcmFtZXNUaGlzVGltZSA9IHN0ZDo6bWluPFVJbnQzMj4oa1JlbmRlckJ1ZmZlclNp emUsIGZyYW1lc1JlbWFpbmluZyk7CisgICAgICAgIGFzc2lnbkF1ZGlvQnVmZmVyc1RvQnVzKGJ1 ZmZlcnMsIG1fcmVuZGVyQnVzLmdldCgpLCBudW1iZXJPZkJ1ZmZlcnMsIG51bWJlck9mRnJhbWVz LCBmcmFtZU9mZnNldCwgZnJhbWVzVGhpc1RpbWUpOworCisgICAgICAgIGlmIChmcmFtZXNUaGlz VGltZSA8IGtSZW5kZXJCdWZmZXJTaXplKSB7CisgICAgICAgICAgICBtX2NhbGxiYWNrLnJlbmRl cigwLCBtX3NwYXJlQnVzLmdldCgpLCBrUmVuZGVyQnVmZmVyU2l6ZSk7CisgICAgICAgICAgICBt X3JlbmRlckJ1cy0+Y29weUZyb21SYW5nZSgqbV9zcGFyZUJ1cywgMCwgZnJhbWVzVGhpc1RpbWUp OworICAgICAgICAgICAgbV9maXJzdFNwYXJlRnJhbWUgPSBmcmFtZXNUaGlzVGltZTsKKyAgICAg ICAgICAgIG1fbGFzdFNwYXJlRnJhbWUgPSBrUmVuZGVyQnVmZmVyU2l6ZSAtIDE7CisgICAgICAg IH0gZWxzZQorICAgICAgICAgICAgbV9jYWxsYmFjay5yZW5kZXIoMCwgbV9yZW5kZXJCdXMuZ2V0 KCksIGZyYW1lc1RoaXNUaW1lKTsKKyAgICAgICAgZnJhbWVPZmZzZXQgKz0gZnJhbWVzVGhpc1Rp bWU7CisgICAgICAgIGZyYW1lc1JlbWFpbmluZyAtPSBmcmFtZXNUaGlzVGltZTsKICAgICB9CiAK ICAgICByZXR1cm4gbm9FcnI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9h dWRpby9pb3MvQXVkaW9EZXN0aW5hdGlvbklPUy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v YXVkaW8vaW9zL0F1ZGlvRGVzdGluYXRpb25JT1MuaAppbmRleCA4MTI0ODdhMzNmZjBhOGM2M2Fl YTRhMGNjN2Q0Nzg5Njc2Y2ZlM2EzLi4xYTQ1OThlY2IzNzViMTFiYTJlZTExY2I2YTVmZmE1OGM3 M2JhNzA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvQXVk aW9EZXN0aW5hdGlvbklPUy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lv cy9BdWRpb0Rlc3RpbmF0aW9uSU9TLmgKQEAgLTY1LDYgKzY1LDkgQEAgcHJpdmF0ZToKICAgICBB dWRpb1VuaXQgbV9vdXRwdXRVbml0OwogICAgIEF1ZGlvSU9DYWxsYmFjayYgbV9jYWxsYmFjazsK ICAgICBSZWZQdHI8QXVkaW9CdXM+IG1fcmVuZGVyQnVzOworICAgIFJlZlB0cjxBdWRpb0J1cz4g bV9zcGFyZUJ1czsKKyAgICB1bnNpZ25lZCBtX2ZpcnN0U3BhcmVGcmFtZSB7IDAgfTsKKyAgICB1 bnNpZ25lZCBtX2xhc3RTcGFyZUZyYW1lIHsgMCB9OwogCiAgICAgZG91YmxlIG1fc2FtcGxlUmF0 ZTsKICAgICBib29sIG1faXNQbGF5aW5nOwo=