208570 2016-04-06 09:17:44 +0000 multimedia/qt5-multimedia: ALSA aliases not supported 2018-01-20 13:03:32 +0000 1 1 1 Unclassified Ports & Packages Individual Port(s) Latest Any Any Closed FIXED https://reviews.freebsd.org/D13992 --- Affects Only Me --- 1 shurd kde adrian adridg feld groot jbeich w.schwarzenfeld oldest_to_newest 873441 0 169029 shurd 2016-04-06 09:17:44 +0000 Created attachment 169029 Patch adding ALSA alises to the available devices. When using ALSA with FreeBSD, the direct snd_device instances are not available, only plugin devices and "default". For programs which use QAudio, this means there are *no* devices enumerated using QAudio::availableDevices(). The attached patch adds the aliases to the available device list. 873500 1 169043 shurd 2016-04-06 18:06:12 +0000 Created attachment 169043 Patch adding ALSA alises to the available devices. Update with unified diff. 874592 2 rakuco 2016-04-13 15:46:50 +0000 Does that code also work on Linux? It looks like something that should be reviewed upstream before we start shipping on FreeBSD. 874746 3 shurd 2016-04-14 18:37:32 +0000 (In reply to Raphael Kubo da Costa from comment #2) It should, but I'm not in a position to test it. 874748 4 rakuco 2016-04-14 18:43:56 +0000 OK. In any case, I think the best course of action is to submit it upstream via Gerrit (see https://wiki.qt.io/Qt_Contribution_Guidelines and https://wiki.qt.io/Gerrit_Introduction) so that the Qt folks can take a look at this and also make check if it works fine on Linux. 874797 5 shurd 2016-04-15 02:36:32 +0000 Submitted to upstream Gerrit... https://codereview.qt-project.org/155883 875585 6 shurd 2016-04-21 07:01:58 +0000 Upstream patch greatly simplified... 876830 7 jbeich 2016-05-01 03:17:05 +0000 ports r414376 may help enumerating pcm devices. "default" is still recommended due to implicit sample format conversion. $ aplay -L null Discard all samples (playback) or generate zero samples (capture) pulse PulseAudio Sound Server oss Open Sound System 883195 8 171369 groot 2016-06-13 09:53:33 +0000 Created attachment 171369 Test application Here is a test-application showing what QAudioDeviceInfo::availableDevices() shows. It just prints out the names of the devices that are found. Compile it with: c++ -o audiolist -fPIC -std=c++11 -I /usr/local/include/qt5 -L /usr/local/lib/ -lQt5Multimedia -lQt5Core audiolist.cpp (once qt5-multimedia is installed) 883198 9 groot 2016-06-13 10:09:33 +0000 What is the problem that is being solved here, and what role does ALSA (aplay) have here? For instance, I have a 10-STABLE machine here, with Qt 5.5.1 installed, and alsa-utils-1.1.1. This is the output of aplay -L: null Discard all samples (playback) or generate zero samples (capture) oss Open Sound System This is the output of my test application: AUDIO "oss" AUDIO "default" With the patch applied, this is the output: AUDIO "oss" AUDIO "oss" AUDIO "default" Yes, that's an extra line of "oss". This does not seem to be an improvement. My /dev/sndstat is this: pcm0: <Realtek (0x0900) (Rear Analog 7.1/2.0)> (play/rec) default pcm1: <Realtek (0x0900) (Front Analog)> (play/rec) pcm2: <Realtek (0x0900) (Onboard Digital)> (play) pcm3: <Intel (0x2809) (HDMI/DP 8ch)> (play) Is there some configuration that I would need to do to find these devices either with aplay or with the patched Qt5Multimedia? 883215 10 jbeich 2016-06-13 12:42:52 +0000 (In reply to groot from comment #9) > My /dev/sndstat is this: > pcm0: <Realtek (0x0900) (Rear Analog 7.1/2.0)> (play/rec) default > pcm1: <Realtek (0x0900) (Front Analog)> (play/rec) > pcm2: <Realtek (0x0900) (Onboard Digital)> (play) > pcm3: <Intel (0x2809) (HDMI/DP 8ch)> (play) > > Is there some configuration that I would need to do to find these devices > either with aplay or with the patched Qt5Multimedia? Only natively[1], better fall back to "default" PCM. 4Front OSS on Linux (e.g. oss4-dkms on Debian) likely has similar issue. $ aplay -l aplay: device_list:273: no soundcards found... In-kernel ALSA (i.e. hw:X,Y) exists only on Linux, other systems are limited to userland. OSS from alsa-plugins lacks support for MIDI sequencer, selecting/enumerating devices and probably more. Unlike OpenBSD (sndio) we don't have anyone actively working on adding OSSv4 support in ports/ tree. [1] http://manuals.opensound.com/developer/SNDCTL_CARDINFO.html (see example) 884043 11 shurd 2016-06-19 05:14:43 +0000 (In reply to groot from comment #9) > Is there some configuration that I would need to do to find these devices > either with aplay or with the patched Qt5Multimedia? You can create aliases in your ~/.asoundrc... here's mine: pcm.envy24 { type oss device /dev/dsp0 } pcm.mb_rear { type oss device /dev/dsp4 } pcm.mb_front { type oss device /dev/dsp5 } pcm.ts940 { type oss device /dev/dsp6 } ctl.envy24 { type oss device /dev/mixer0 } ctl.mb_rear { type oss device /dev/mixer4 } ctl.mb_front { type oss device /dev/mixer5 } ctl.ts940 { type oss device /dev/mixer6 } 884044 12 shurd 2016-06-19 05:25:37 +0000 Using the test application and the current upstream patch, I get this: AUDIO "default" AUDIO "envy24" AUDIO "mb_rear" AUDIO "mb_front" AUDIO "ts940" 884045 13 171561 shurd 2016-06-19 05:26:23 +0000 Created attachment 171561 Patch as submitted upstream Adding the currently submitted upstream patch. 942474 14 adrian 2017-07-15 19:19:32 +0000 hi! Is it possible to get this committed to our ports repository until the upstream issues are resolved? Otherwise right now we can't easily use multiple sound devices in QT multimedia applications w/ multiple sound cards, like wsjtx. Thanks! -adrian 973196 15 w.schwarzenfeld 2018-01-18 16:31:14 +0000 Any news here? 973244 16 adrian 2018-01-18 20:48:39 +0000 Hi, this has been lagging for too long. I'd like to commit this in 48 hours to unblock things so we can at least get SOME useful behaviour on qt5-multimedia until we get a more comprehensive upstream support plan. 973405 17 adridg 2018-01-19 23:01:30 +0000 See review; patch run through makepatch, and dropped one hunk that is no longer needed. 973477 18 commit-hook 2018-01-20 12:45:33 +0000 A commit references this bug: Author: adridg Date: Sat Jan 20 12:45:13 UTC 2018 New revision: 459518 URL: https://svnweb.freebsd.org/changeset/ports/459518 Log: Allow ALSA aliases in the Qt5 sound devices list. Patch by Stephen Hurd, seems to be ignored upstream. The new patch describes what it does and why it is needed. PR: 208570 Submitted by: Stephen Hurd Reported by: Stephen Hurd Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D13992 Changes: head/multimedia/qt5-multimedia/Makefile head/multimedia/qt5-multimedia/files/patch-src_plugins_alsa_qalsaaudiodeviceinfo.cpp 973479 19 adridg 2018-01-20 13:03:32 +0000 Applied to current Qt 5.9.3 port. Thanks Adrian for prodding. 169029 2016-04-06 09:17:44 +0000 2016-04-06 18:06:12 +0000 Patch adding ALSA alises to the available devices. qt5-multimedia-aliases.patch text/plain 1621 shurd Mzc2YTM3Nyw0MjcKPiAKPiAJLy8gTm93IGZpbmQgYWxpYXNlcy4uLgo+IAlpbnQgcmVzOwo+IAlz bmRfY29uZmlnX2l0ZXJhdG9yX3QgcG9zLCBuZXh0Owo+IAlzbmRfY29uZmlnX3QgKnRvcCwgKm5v ZGUsICp0cDsKPiAJc25kX3BjbV90ICpwY207Cj4gCXNuZF9wY21fc3RyZWFtX3Qgc3Q7Cj4gCWNv bnN0IGNoYXIgKnRwcywgKmlkcywgKippZzsKPiAJc3RhdGljIGNvbnN0IGNoYXIgKmlnbm9yZVtd ID0geyJodyIsICJwbHVnaHciLCAicGx1ZyIsICJkc25vb3AiLCAidGVlIiwKPiAJCQkiZmlsZSIs ICJudWxsIiwgInNobSIsICJjYXJkcyIsICJyYXRlX2NvbnZlcnQiLCBOVUxMfTsKPiAKPiAJLy8g UG9wdWxhdGUgc25kX2NvbmZpZy4uLgo+IAlpZiAoc25kX2NvbmZpZyA9PSBOVUxMKQo+IAkJc25k X2NvbmZpZ191cGRhdGUoKTsKPiAJaWYgKHNuZF9jb25maWcgIT0gTlVMTCkgewo+IAkJc3dpdGNo IChtb2RlKSB7Cj4gCQkJY2FzZSBRQXVkaW86OkF1ZGlvSW5wdXQ6Cj4gCQkJCXN0ID0gU05EX1BD TV9TVFJFQU1fQ0FQVFVSRTsKPiAJCQkJYnJlYWs7Cj4gCQkJY2FzZSBRQXVkaW86OkF1ZGlvT3V0 cHV0Ogo+IAkJCQlzdCA9IFNORF9QQ01fU1RSRUFNX1BMQVlCQUNLOwo+IAkJCQlicmVhazsKPiAJ CQlkZWZhdWx0Ogo+IAkJCQlnb3RvIGJhZF9tb2RlOwo+IAkJfQo+IAkJLy8gRmluZCAicGNtIiBu b2Rlcy4uLgo+IAkJaWYgKChyZXMgPSBzbmRfY29uZmlnX3NlYXJjaChzbmRfY29uZmlnLCAicGNt IiwgJnRvcCkpID49IDApIHsKPiAJCQlmb3IgKHBvcyA9IHNuZF9jb25maWdfaXRlcmF0b3JfZmly c3QodG9wKSwgbmV4dCA9IHNuZF9jb25maWdfaXRlcmF0b3JfbmV4dChwb3MpOwo+IAkJCQkgcG9z ICE9IHNuZF9jb25maWdfaXRlcmF0b3JfZW5kKHRvcCk7Cj4gCQkJCSBwb3MgPSBuZXh0LCBuZXh0 ID0gc25kX2NvbmZpZ19pdGVyYXRvcl9uZXh0KHBvcykpIHsKPiAJCQkJbm9kZSA9IHNuZF9jb25m aWdfaXRlcmF0b3JfZW50cnkocG9zKTsKPiAJCQkJaWYgKHNuZF9jb25maWdfc2VhcmNoKG5vZGUs ICJ0eXBlIiwgJnRwKSA8IDApCj4gCQkJCQljb250aW51ZTsKPiAJCQkJc25kX2NvbmZpZ19nZXRf c3RyaW5nKHRwLCAmdHBzKTsKPiAJCQkJc25kX2NvbmZpZ19nZXRfaWQobm9kZSwgJmlkcyk7Cj4g CQkJCWZvciAoaWcgPSBpZ25vcmU7ICppZzsgaWcrKykgewo+IAkJCQkJaWYgKHN0cmNtcCgqaWcs IGlkcykgPT0gMCkKPiAJCQkJCQlicmVhazsKPiAJCQkJfQo+IAkJCQlpZiAoKmlnKQo+IAkJCQkJ Y29udGludWU7Cj4gCQkJCS8vIEVuc3VyZSBpdCdzIGF2YWlsYWJsZS4uLgo+IAkJCQlpZiAoc25k X3BjbV9vcGVuKCZwY20sIGlkcywgc3QsIDApKQo+IAkJCQkJY29udGludWU7Cj4gCQkJCXNuZF9w Y21fY2xvc2UocGNtKTsKPiAJCQkJUVN0cmluZyBkZXZpY2VOYW1lID0gUUxhdGluMVN0cmluZyhp ZHMpOwo+IAkJCQlkZXZpY2VzLmFwcGVuZChkZXZpY2VOYW1lLnRvTG9jYWw4Qml0KCkuY29uc3RE YXRhKCkpOwo+IAkJCX0KPiAJCX0KPiAJfQo+IGJhZF9tb2RlOgozODdjNDM4CjwgICAgIGlmIChk ZXZpY2VzLnNpemUoKSA+IDApCi0tLQo+IAlpZiAoZGV2aWNlcy5zaXplKCkgPiAwICYmICFkZXZp Y2VzLmNvbnRhaW5zKCJkZWZhdWx0IikpCg== 169043 2016-04-06 18:06:12 +0000 2016-06-19 05:26:23 +0000 Patch adding ALSA alises to the available devices. qt5-multimedia-aliases.patch text/plain 2020 shurd LS0tIC9ob21lL2FkbWluL2Zic2QvcG9ydHMvaGVhZC9tdWx0aW1lZGlhL3F0NS1tdWx0aW1lZGlh L3dvcmsvcXRtdWx0aW1lZGlhLW9wZW5zb3VyY2Utc3JjLTUuNS4xL3NyYy9wbHVnaW5zL2Fsc2Ev cWFsc2FhdWRpb2RldmljZWluZm8uY3BwCTIwMTYtMDQtMDYgMDI6MDg6MTEuNTAxNDEwOTcxIC0w NzAwCisrKyBzcmMvcGx1Z2lucy9hbHNhL3FhbHNhYXVkaW9kZXZpY2VpbmZvLmNwcAkyMDE2LTA0 LTA2IDExOjAzOjA1LjU4MDE5OTk5NiAtMDcwMApAQCAtMzc0LDYgKzM3NCw1NyBAQAogICAgICAg ICArK247CiAgICAgfQogICAgIHNuZF9kZXZpY2VfbmFtZV9mcmVlX2hpbnQoaGludHMpOworCisJ Ly8gTm93IGZpbmQgYWxpYXNlcy4uLgorCWludCByZXM7CisJc25kX2NvbmZpZ19pdGVyYXRvcl90 IHBvcywgbmV4dDsKKwlzbmRfY29uZmlnX3QgKnRvcCwgKm5vZGUsICp0cDsKKwlzbmRfcGNtX3Qg KnBjbTsKKwlzbmRfcGNtX3N0cmVhbV90IHN0OworCWNvbnN0IGNoYXIgKnRwcywgKmlkcywgKipp ZzsKKwlzdGF0aWMgY29uc3QgY2hhciAqaWdub3JlW10gPSB7Imh3IiwgInBsdWdodyIsICJwbHVn IiwgImRzbm9vcCIsICJ0ZWUiLAorCQkJImZpbGUiLCAibnVsbCIsICJzaG0iLCAiY2FyZHMiLCAi cmF0ZV9jb252ZXJ0IiwgTlVMTH07CisKKwkvLyBQb3B1bGF0ZSBzbmRfY29uZmlnLi4uCisJaWYg KHNuZF9jb25maWcgPT0gTlVMTCkKKwkJc25kX2NvbmZpZ191cGRhdGUoKTsKKwlpZiAoc25kX2Nv bmZpZyAhPSBOVUxMKSB7CisJCXN3aXRjaCAobW9kZSkgeworCQkJY2FzZSBRQXVkaW86OkF1ZGlv SW5wdXQ6CisJCQkJc3QgPSBTTkRfUENNX1NUUkVBTV9DQVBUVVJFOworCQkJCWJyZWFrOworCQkJ Y2FzZSBRQXVkaW86OkF1ZGlvT3V0cHV0OgorCQkJCXN0ID0gU05EX1BDTV9TVFJFQU1fUExBWUJB Q0s7CisJCQkJYnJlYWs7CisJCQlkZWZhdWx0OgorCQkJCWdvdG8gYmFkX21vZGU7CisJCX0KKwkJ Ly8gRmluZCAicGNtIiBub2Rlcy4uLgorCQlpZiAoKHJlcyA9IHNuZF9jb25maWdfc2VhcmNoKHNu ZF9jb25maWcsICJwY20iLCAmdG9wKSkgPj0gMCkgeworCQkJZm9yIChwb3MgPSBzbmRfY29uZmln X2l0ZXJhdG9yX2ZpcnN0KHRvcCksIG5leHQgPSBzbmRfY29uZmlnX2l0ZXJhdG9yX25leHQocG9z KTsKKwkJCQkgcG9zICE9IHNuZF9jb25maWdfaXRlcmF0b3JfZW5kKHRvcCk7CisJCQkJIHBvcyA9 IG5leHQsIG5leHQgPSBzbmRfY29uZmlnX2l0ZXJhdG9yX25leHQocG9zKSkgeworCQkJCW5vZGUg PSBzbmRfY29uZmlnX2l0ZXJhdG9yX2VudHJ5KHBvcyk7CisJCQkJaWYgKHNuZF9jb25maWdfc2Vh cmNoKG5vZGUsICJ0eXBlIiwgJnRwKSA8IDApCisJCQkJCWNvbnRpbnVlOworCQkJCXNuZF9jb25m aWdfZ2V0X3N0cmluZyh0cCwgJnRwcyk7CisJCQkJc25kX2NvbmZpZ19nZXRfaWQobm9kZSwgJmlk cyk7CisJCQkJZm9yIChpZyA9IGlnbm9yZTsgKmlnOyBpZysrKSB7CisJCQkJCWlmIChzdHJjbXAo KmlnLCBpZHMpID09IDApCisJCQkJCQlicmVhazsKKwkJCQl9CisJCQkJaWYgKCppZykKKwkJCQkJ Y29udGludWU7CisJCQkJLy8gRW5zdXJlIGl0J3MgYXZhaWxhYmxlLi4uCisJCQkJaWYgKHNuZF9w Y21fb3BlbigmcGNtLCBpZHMsIHN0LCAwKSkKKwkJCQkJY29udGludWU7CisJCQkJc25kX3BjbV9j bG9zZShwY20pOworCQkJCVFTdHJpbmcgZGV2aWNlTmFtZSA9IFFMYXRpbjFTdHJpbmcoaWRzKTsK KwkJCQlkZXZpY2VzLmFwcGVuZChkZXZpY2VOYW1lLnRvTG9jYWw4Qml0KCkuY29uc3REYXRhKCkp OworCQkJfQorCQl9CisJfQorYmFkX21vZGU6CiAjZWxzZQogICAgIGludCBpZHggPSAwOwogICAg IGNoYXIqIG5hbWU7CkBAIC0zODQsNyArNDM1LDcgQEAKICAgICB9CiAjZW5kaWYKIAotICAgIGlm IChkZXZpY2VzLnNpemUoKSA+IDApCisJaWYgKGRldmljZXMuc2l6ZSgpID4gMCAmJiAhZGV2aWNl cy5jb250YWlucygiZGVmYXVsdCIpKQogICAgICAgICBkZXZpY2VzLmFwcGVuZCgiZGVmYXVsdCIp OwogCiAgICAgcmV0dXJuIGRldmljZXM7Cg== 171369 2016-06-13 09:53:33 +0000 2016-06-13 09:53:33 +0000 Test application audiolist.cpp text/plain 364 groot I2luY2x1ZGUgPFF0Q29yZS9RQ29yZUFwcGxpY2F0aW9uPgojaW5jbHVkZSA8UXRDb3JlL1FEZWJ1 Zz4KI2luY2x1ZGUgPFF0TXVsdGltZWRpYS9RQXVkaW9EZXZpY2VJbmZvPgoKaW50IG1haW4oaW50 IGFyZ2MsIGNoYXIgKiphcmd2KQp7CiAgIFFDb3JlQXBwbGljYXRpb24gYShhcmdjLCBhcmd2KTsK ICAgYXV0byBsID0gUUF1ZGlvRGV2aWNlSW5mbzo6YXZhaWxhYmxlRGV2aWNlcyhRQXVkaW86OkF1 ZGlvT3V0cHV0KTsKCiAgIGZvciAoYXV0byBpID0gbC5jb25zdEJlZ2luKCk7IGkgIT0gbC5jb25z dEVuZCgpOyArK2kpCiAgICAgICAgcURlYnVnKCkgPDwgIkFVRElPIiA8PCAoKmkpLmRldmljZU5h bWUoKTsKCiAgIHJldHVybiAwOwp9Cg== 171561 2016-06-19 05:26:23 +0000 2016-06-19 05:26:23 +0000 Patch as submitted upstream 0001-ALSA-Add-alias-support.patch text/plain 3478 shurd RnJvbSA1ZTRhNmU4MjIzZWQwNmFiZDM3NjhmMzY0Njg5OWVjOTBmMDM4YzQwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVwaGVuIEh1cmQgPHNodXJkQGZyZWVic2Qub3JnPgpEYXRl OiBUaHUsIDE0IEFwciAyMDE2IDE5OjA0OjQwIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gQUxTQTog QWRkIGFsaWFzIHN1cHBvcnQKCldoZW4gdXNpbmcgQUxTQSB3aXRoIEZyZWVCU0QsIHRoZSBkaXJl Y3Qgc25kX2RldmljZSBpbnN0YW5jZXMgYXJlIG5vdAphdmFpbGFibGUsIG9ubHkgcGx1Z2luIGRl dmljZXMgYW5kICJkZWZhdWx0Ii4gIEZvciBwcm9ncmFtcyB3aGljaCB1c2UKUUF1ZGlvLCB0aGlz IG1lYW5zIHRoZXJlIGFyZSAqbm8qIGRldmljZXMgZW51bWVyYXRlZCB1c2luZwpRQXVkaW86OmF2 YWlsYWJsZURldmljZXMoKS4KClRoaXMgcGF0Y2ggYWRkcyBhbGwgcGNtIGFsaWFzZXMgdG8gdGhl IGVuZCBvZiB0aGUgbGlzdCBhZnRlciB0aGUKY3VycmVudCBzZXQgb2YgZGV2aWNlcyBhcmUgYWRk ZWQuCgp2MjoKLSBVc2UgbW9yZSB2ZXJib3NlIHZhcmlhYmxlIG5hbWVzCi0gUmVtb3ZlIHVubmVl ZGVkIHZhcmlhYmxlcwotIGNvbnN0aWZ5IGRldmljZU5hbWUKCnYzOgotIEFkZCAjaWZkZWYgUV9P U19GUkVFQlNECgpDaGFuZ2UtSWQ6IElhZjQ1NjRlMjNiNzM4YzM2M2QxYjkxMTc0ZjM1MDY2NWQ4 YzU1MDYwCi0tLQogc3JjL3BsdWdpbnMvYWxzYS9xYWxzYWF1ZGlvZGV2aWNlaW5mby5jcHAgfCA1 NCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKystCiAxIGZpbGUgY2hhbmdlZCwgNTMgaW5z ZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL3NyYy9wbHVnaW5zL2Fsc2Ev cWFsc2FhdWRpb2RldmljZWluZm8uY3BwIGIvc3JjL3BsdWdpbnMvYWxzYS9xYWxzYWF1ZGlvZGV2 aWNlaW5mby5jcHAKaW5kZXggMzFhZDQ3Yy4uZGZkMjlmNiAxMDA2NDQKLS0tIGEvc3JjL3BsdWdp bnMvYWxzYS9xYWxzYWF1ZGlvZGV2aWNlaW5mby5jcHAKKysrIGIvc3JjL3BsdWdpbnMvYWxzYS9x YWxzYWF1ZGlvZGV2aWNlaW5mby5jcHAKQEAgLTM3NCw2ICszNzQsNTggQEAgUUxpc3Q8UUJ5dGVB cnJheT4gUUFsc2FBdWRpb0RldmljZUluZm86OmF2YWlsYWJsZURldmljZXMoUUF1ZGlvOjpNb2Rl IG1vZGUpCiAgICAgICAgICsrbjsKICAgICB9CiAgICAgc25kX2RldmljZV9uYW1lX2ZyZWVfaGlu dChoaW50cyk7CisKKyNpZmRlZiBRX09TX0ZSRUVCU0QKKyAgICAvLyBOb3cgZmluZCBhbGlhc2Vz Li4uCisgICAgc25kX2NvbmZpZ19pdGVyYXRvcl90IHBvcywgbmV4dDsKKyAgICBzbmRfY29uZmln X3QgKnRvcCwgKm5vZGUsICp0eXBlOworICAgIHNuZF9wY21fdCAqcGNtOworICAgIHNuZF9wY21f c3RyZWFtX3Qgc3RyZWFtVHlwZTsKKyAgICBjb25zdCBjaGFyICppZFN0cmluZzsKKyAgICBjb25z dCBjaGFyICoqaWdub3JlSWQ7CisgICAgc3RhdGljIGNvbnN0IGNoYXIgKmlnbm9yZVtdID0geyJo dyIsICJwbHVnaHciLCAicGx1ZyIsICJkc25vb3AiLCAidGVlIiwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgImZpbGUiLCAibnVsbCIsICJzaG0iLCAiY2FyZHMiLCAicmF0ZV9j b252ZXJ0IiwgTlVMTH07CisKKyAgICAvLyBQb3B1bGF0ZSBzbmRfY29uZmlnLi4uCisgICAgaWYg KHNuZF9jb25maWcgPT0gTlVMTCkKKyAgICAgICAgc25kX2NvbmZpZ191cGRhdGUoKTsKKyAgICBp ZiAoc25kX2NvbmZpZyAhPSBOVUxMKSB7CisgICAgICAgIHN3aXRjaCAobW9kZSkgeworICAgICAg ICBjYXNlIFFBdWRpbzo6QXVkaW9JbnB1dDoKKyAgICAgICAgICAgIHN0cmVhbVR5cGUgPSBTTkRf UENNX1NUUkVBTV9DQVBUVVJFOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgUUF1 ZGlvOjpBdWRpb091dHB1dDoKKyAgICAgICAgICAgIHN0cmVhbVR5cGUgPSBTTkRfUENNX1NUUkVB TV9QTEFZQkFDSzsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBkZWZhdWx0OgorICAgICAg ICAgICAgZ290byBiYWRfbW9kZTsKKyAgICAgICAgfQorICAgICAgICAvLyBGaW5kICJwY20iIG5v ZGVzLi4uCisgICAgICAgIGlmIChzbmRfY29uZmlnX3NlYXJjaChzbmRfY29uZmlnLCAicGNtIiwg JnRvcCkgPj0gMCkgeworICAgICAgICAgICAgZm9yIChwb3MgPSBzbmRfY29uZmlnX2l0ZXJhdG9y X2ZpcnN0KHRvcCksIG5leHQgPSBzbmRfY29uZmlnX2l0ZXJhdG9yX25leHQocG9zKTsKKyAgICAg ICAgICAgICAgICAgICAgcG9zICE9IHNuZF9jb25maWdfaXRlcmF0b3JfZW5kKHRvcCk7CisgICAg ICAgICAgICAgICAgICAgIHBvcyA9IG5leHQsIG5leHQgPSBzbmRfY29uZmlnX2l0ZXJhdG9yX25l eHQocG9zKSkgeworICAgICAgICAgICAgICAgIG5vZGUgPSBzbmRfY29uZmlnX2l0ZXJhdG9yX2Vu dHJ5KHBvcyk7CisgICAgICAgICAgICAgICAgaWYgKHNuZF9jb25maWdfc2VhcmNoKG5vZGUsICJ0 eXBlIiwgJnR5cGUpIDwgMCkKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAg ICAgICAgICAgc25kX2NvbmZpZ19nZXRfaWQobm9kZSwgJmlkU3RyaW5nKTsKKyAgICAgICAgICAg ICAgICBmb3IgKGlnbm9yZUlkID0gaWdub3JlOyAqaWdub3JlSWQ7IGlnbm9yZUlkKyspIHsKKyAg ICAgICAgICAgICAgICAgICAgaWYgKHN0cmNtcCgqaWdub3JlSWQsIGlkU3RyaW5nKSA9PSAwKQor ICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgfQorICAgICAg ICAgICAgICAgIGlmICgqaWdub3JlSWQpCisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwor ICAgICAgICAgICAgICAgIC8vIEVuc3VyZSBpdCdzIGF2YWlsYWJsZS4uLgorICAgICAgICAgICAg ICAgIGlmIChzbmRfcGNtX29wZW4oJnBjbSwgaWRTdHJpbmcsIHN0cmVhbVR5cGUsIDApKQorICAg ICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgICAgICBzbmRfcGNtX2Nsb3Nl KHBjbSk7CisgICAgICAgICAgICAgICAgY29uc3QgUVN0cmluZyBkZXZpY2VOYW1lID0gUUxhdGlu MVN0cmluZyhpZFN0cmluZyk7CisgICAgICAgICAgICAgICAgZGV2aWNlcy5hcHBlbmQoZGV2aWNl TmFtZS50b0xvY2FsOEJpdCgpLmNvbnN0RGF0YSgpKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg fQorICAgIH0KK2JhZF9tb2RlOgorI2VuZGlmCiAjZWxzZQogICAgIGludCBpZHggPSAwOwogICAg IGNoYXIqIG5hbWU7CkBAIC0zODQsNyArNDM2LDcgQEAgUUxpc3Q8UUJ5dGVBcnJheT4gUUFsc2FB dWRpb0RldmljZUluZm86OmF2YWlsYWJsZURldmljZXMoUUF1ZGlvOjpNb2RlIG1vZGUpCiAgICAg fQogI2VuZGlmCiAKLSAgICBpZiAoZGV2aWNlcy5zaXplKCkgPiAwKQorICAgIGlmIChkZXZpY2Vz LnNpemUoKSA+IDAgJiYgIWRldmljZXMuY29udGFpbnMoImRlZmF1bHQiKSkKICAgICAgICAgZGV2 aWNlcy5hcHBlbmQoImRlZmF1bHQiKTsKIAogICAgIHJldHVybiBkZXZpY2VzOwotLSAKMi44LjEK Cg==