This is an automated email from the git hooks/post-receive script.
richard pushed a change to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
at c801d6d34aec9 Bug 1684739: Only check if swipe tracking is enabled on macOS if the event is a scrollwheel event. r=mstange, a=RyanVM
This branch includes the following new commits:
new c1af3994aa3cb No bug - Tagging 3b54d6b5407fca03efdb2e2f57a9838498e0d038 with FIREFOX_91_8_0esr_BUILD1 a=release CLOSED TREE DONTBUILD new 6de823bfbb801 No Bug, mozilla-esr91 repo-update remote-settings - a=repo-update r=RyanVM new 5e7702180a7e0 Bug 1762505 - [firefox-ui] Disable test_ssl_status_after_restart.py because badssl.com is not reachable. r=webdriver-reviewers,jdescottes a=test-only DONTBUILD new a4c0548a4d64a Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release new df951fd359661 No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings tld-suffixes - a=repo-update r=RyanVM new c9d2874a0aa1e No bug - Tagging 3b54d6b5407fca03efdb2e2f57a9838498e0d038 with FIREFOX_91_8_0esr_RELEASE a=release CLOSED TREE DONTBUILD new e2311d000ac02 No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings tld-suffixes - a=repo-update r=RyanVM new 2441d0fa27c06 Bug 1761850 - Fix wasm select on ARM64. r=jseward, a=RyanVM new aeb147b24efe7 Bug 1762899 - Fix {f32,f64}.copysign for Aarch64. r=lth, a=RyanVM new 62893846ebb1a No bug - Bump gecko_decision to 4.0.0 r=ahal,aki a=release new 52cc1bd557983 Bug 1762128 - bump the cache name for decision images to stop interfering with other trees. r=releng-reviewers,ahal a=release new 4310d0d6dd464 No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings - a=repo-update, r=dsmith new 2459a021c91ab No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings tld-suffixes - a=repo-update,a=dsmith new 2f5340c78f0a0 Bug 1761981, r=smaug,a=dsmith new ec1239b68b31f Bug 1761981 - fix unexpected-pass wpts,a=dsmith new e692ca4879c94 No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings tld-suffixes - a=repo-update,a=dsmith new e8b1bf77a2774 No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings - a=repo-update,r=dsmith new adbcbe5ad63ba Bug 1753298 - Improve error handling in BaseMediaResource::ModifyLoadFlags. r=padenot,a=dsmith new 6f108e7ce8efe Bug 1747879 - Pass Thunderbird subrepo srcpath to symbolstore.py. r=firefox-build-system-reviewers,andi,a=dsmith new 405e75b662d69 Bug 1762125. Allow DXVA on newer Intel drivers. r=aosmond a=a=dsmith new 2ccdca191a440 Bug 1762614: Update libopus to 2654707e86cc94413998976d179b2ab4a2aa3114 r=kinetik,a=dsmith new cb6f44feab79b Bug 1762614: Remove unneccessary files r=kinetik,a=dsmith new 520de8913f984 Bug 1762620 - Only pad audio buffers when doing up mixing. r=alwu,a=dsmith new e2fd91626feb6 No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings - a=repo-update,r=dsmith new 54ec83b3d10df Bug 1764778 - Check media.webspeech.synth.enabled in AllocPSpeechSynthesisParent. r=eeejay,a=dsmith new ba3151d51bab4 Bug 1746448; r=smaug,a=dsmith new b43a81f502f88 Bug 1706441 - Check for non-empty span. r=gfx-reviewers,aosmond,a=dsmith new 9b1a5a12a081a Bug 1692655. r=nika,mtigley,smaug a=RyanVM new b5eee973c99f7 Bug 1755081 - Allow more containers to participate in FeaturePolicy r=smaug,ckerschb a=RyanVM new 330014207d6fc Bug 1766056 - Fix YUV color matrix for SWGL slow and fast paths. r=jrmuizel, a=RyanVM new d8df832e0b287 Bug 1760674. r=mak, a=RyanVM new 9957e3e22c1dd Bug 1752466 - Block WRusr.dll to stop the deadlock issue. r=haik, a=RyanVM new cbc7804823691 Bug 1745915 - Add test for resizing a fullscreen window; r=smaug a=test-only new c801d6d34aec9 Bug 1684739: Only check if swipe tracking is enabled on macOS if the event is a scrollwheel event. r=mstange, a=RyanVM
The 34 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit c1af3994aa3cb00f16f25dd4240555b1553f78a5 Author: Mozilla Releng Treescript release+treescript@mozilla.org AuthorDate: Wed Mar 30 19:16:44 2022 +0000
No bug - Tagging 3b54d6b5407fca03efdb2e2f57a9838498e0d038 with FIREFOX_91_8_0esr_BUILD1 a=release CLOSED TREE DONTBUILD --- .hgtags | 1 + 1 file changed, 1 insertion(+)
diff --git a/.hgtags b/.hgtags index df26ed0451f54..2470f7057f9fc 100644 --- a/.hgtags +++ b/.hgtags @@ -3164,3 +3164,4 @@ a9d3c0f4732a9a62428089fff64ae8ff3d608918 FIREFOX_91_7_0esr_RELEASE 42c4e735b19a0fad800bbba829bf6451a351a586 FIREFOX_91_7_1esr_BUILD1 9ed28ee4263d289b30e236fc520c8254fb65e764 FIREFOX_91_7_1esr_BUILD2 9ed28ee4263d289b30e236fc520c8254fb65e764 FIREFOX_91_7_1esr_RELEASE +3b54d6b5407fca03efdb2e2f57a9838498e0d038 FIREFOX_91_8_0esr_BUILD1
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit 6de823bfbb8017071b9a77ff5935cb8dcb50a572 Author: ffxbld ffxbld@mozilla.com AuthorDate: Thu Mar 31 10:55:55 2022 +0000
No Bug, mozilla-esr91 repo-update remote-settings - a=repo-update r=RyanVM
Differential Revision: https://phabricator.services.mozilla.com/D142540 --- .../dumps/security-state/intermediates.json | 438 ++++++++++++--------- 1 file changed, 255 insertions(+), 183 deletions(-)
diff --git a/services/settings/dumps/security-state/intermediates.json b/services/settings/dumps/security-state/intermediates.json index 541269a59f404..c479dd77fbbc6 100644 --- a/services/settings/dumps/security-state/intermediates.json +++ b/services/settings/dumps/security-state/intermediates.json @@ -1,7 +1,205 @@ { "data": [ { - "schema": 1648176526823, + "schema": 1648667430650, + "derHash": "XScMtO/1h61s0Xyytg2QhKFT130qp5oss9sd25BGhPU=", + "subject": "CN=DigiCert High Assurance TLS Hybrid ECC SHA256 2020 CA1,O=DigiCert\, Inc.,C=US", + "subjectDN": "MGcxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE/MD0GA1UEAxM2RGlnaUNlcnQgSGlnaCBBc3N1cmFuY2UgVExTIEh5YnJpZCBFQ0MgU0hBMjU2IDIwMjAgQ0Ex", + "whitelist": false, + "attachment": { + "hash": "3ea69b8dafeb8e68666332244529451eccd6e970a91f738b5ddac122f8ad34d2", + "size": 1500, + "filename": "vnCogm4QYze_Bc9r88xdA6NTQY74p4BAz2w5gxkLG2M=.pem", + "location": "security-state-staging/intermediates/80e952ea-02dd-40b2-9b1d-7cc71c4315a3.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "vnCogm4QYze/Bc9r88xdA6NTQY74p4BAz2w5gxkLG2M=", + "crlite_enrolled": false, + "id": "5db1751f-eb67-4a74-b38e-d17a823eed64", + "last_modified": 1648695444528 + }, + { + "schema": 1648694933779, + "derHash": "dOq1c9p9sZUJe+DpDzNJNMekyJ6Ag3WdtDM6AO3SQ9k=", + "subject": "CN=DigiCert High Assurance TLS Hybrid ECC SHA256 2020 CA1,O=DigiCert\, Inc.,C=US", + "subjectDN": "MGcxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE/MD0GA1UEAxM2RGlnaUNlcnQgSGlnaCBBc3N1cmFuY2UgVExTIEh5YnJpZCBFQ0MgU0hBMjU2IDIwMjAgQ0Ex", + "whitelist": false, + "attachment": { + "hash": "11a50056d6027ba92a4d016bbdd72de6b8e7498171f12762ce2eda7a60762e6e", + "size": 1483, + "filename": "vnCogm4QYze_Bc9r88xdA6NTQY74p4BAz2w5gxkLG2M=.pem", + "location": "security-state-staging/intermediates/7bf16759-da8d-43e0-b260-f55aac6a39b7.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "vnCogm4QYze/Bc9r88xdA6NTQY74p4BAz2w5gxkLG2M=", + "crlite_enrolled": false, + "id": "ce744321-7f4d-4f9c-9da1-63454f6d33bb", + "last_modified": 1648695444515 + }, + { + "schema": 1648544242965, + "derHash": "0tfUvuj/G33rpCd0AIHAf3sYai8poSNg1T+MINRVU40=", + "subject": "CN=TrustAsia RSA OV SSL Server CA,O=TrustAsia Technologies\, Inc.,ST=Shanghai,C=CN", + "subjectDN": "MHAxCzAJBgNVBAYTAkNOMREwDwYDVQQIEwhTaGFuZ2hhaTElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEnMCUGA1UEAxMeVHJ1c3RBc2lhIFJTQSBPViBTU0wgU2VydmVyIENB", + "whitelist": false, + "attachment": { + "hash": "cef0257132e6443d4fa6a6f012339e0c0a90ba4eb8ce5d8083038ca1f5461393", + "size": 2133, + "filename": "ZyqPojkZzOKu3M2n4NkoNEh6f1YBTiJm2DtfHJroAWA=.pem", + "location": "security-state-staging/intermediates/f5b72560-0bb5-40bd-b68b-381a9e82b9e3.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "ZyqPojkZzOKu3M2n4NkoNEh6f1YBTiJm2DtfHJroAWA=", + "crlite_enrolled": false, + "id": "e944087f-76e7-41f9-a1bb-8ef5a2cd787a", + "last_modified": 1648609047053 + }, + { + "schema": 1648543719121, + "derHash": "QciXRzsDafp0sfT51/iRKUhcGjBcBxmoZ9yHFOCHAgA=", + "subject": "CN=D-TRUST EV CA 1-20-1 2020,O=D-Trust GmbH,C=DE", + "subjectDN": "MEgxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxIjAgBgNVBAMTGUQtVFJVU1QgRVYgQ0EgMS0yMC0xIDIwMjA=", + "whitelist": false, + "attachment": { + "hash": "e7243885420768bcfaeaac83d278d2ecce102cec4ec1d4dfe7dcd96b7fd8729d", + "size": 1662, + "filename": "SJEHwcDvLp0G_-CfkfLyIPLHc6_k-E4CaepcoEBFq5s=.pem", + "location": "security-state-staging/intermediates/ff509022-df05-462c-8f12-7d582a910132.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "SJEHwcDvLp0G/+CfkfLyIPLHc6/k+E4CaepcoEBFq5s=", + "crlite_enrolled": false, + "id": "5767e4fa-0b6e-4802-be9d-d4bf52538de8", + "last_modified": 1648544242415 + }, + { + "schema": 1648543717132, + "derHash": "smjRaTSrW6Iy8XnNn1x/wH6oWDpWqafB1stY/ggjv1o=", + "subject": "CN=D-TRUST BR CA 1-20-2 2020,O=D-Trust GmbH,C=DE", + "subjectDN": "MEgxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxIjAgBgNVBAMTGUQtVFJVU1QgQlIgQ0EgMS0yMC0yIDIwMjA=", + "whitelist": false, + "attachment": { + "hash": "f0c02de6205d137c443f7dfaca0471f9e5055ebab902816844871afd5048a50e", + "size": 1666, + "filename": "mYMhLRmTQhVj2rn5bt1WUUNesYqFtN-rN6zvKEu8akY=.pem", + "location": "security-state-staging/intermediates/a9d2887c-fa0f-4b64-80b4-b9d290b7c78a.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "mYMhLRmTQhVj2rn5bt1WUUNesYqFtN+rN6zvKEu8akY=", + "crlite_enrolled": false, + "id": "9f5f757a-0664-40de-9df0-ddb2f904aa4b", + "last_modified": 1648544242406 + }, + { + "schema": 1648543718185, + "derHash": "GZqyqq//QEAeCjt7h+6ZZGWe/6lKH+y+kYrhNuS04Kg=", + "subject": "CN=D-TRUST BR CA 1-20-1 2020,O=D-Trust GmbH,C=DE", + "subjectDN": "MEgxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxIjAgBgNVBAMTGUQtVFJVU1QgQlIgQ0EgMS0yMC0xIDIwMjA=", + "whitelist": false, + "attachment": { + "hash": "83449537aac8862f1ea8058fb335366b6fa8c7a51110de57bb5435ab54ab0804", + "size": 1662, + "filename": "kVO5KcVhLn-EO7KjAiRhLgxhA1OOzdUgODPbCEfZ-kQ=.pem", + "location": "security-state-staging/intermediates/75be562f-315d-4bd4-a243-fe93b83b194b.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "kVO5KcVhLn+EO7KjAiRhLgxhA1OOzdUgODPbCEfZ+kQ=", + "crlite_enrolled": false, + "id": "cc812a01-562a-4570-bb57-65b903984b64", + "last_modified": 1648544242397 + }, + { + "schema": 1648514935601, + "derHash": "NoevAsSXMco0/k/bm15eDsrNiiBpVvGa+zggOsXwpWc=", + "subject": "CN=E-Tugra TLS ECC SubCA R1,O=E-TUGRA EBG BILISIM TEKNOLOJILERI VE HIZMETLERI ANONIM SIRKETI,C=TR", + "subjectDN": "MHkxCzAJBgNVBAYTAlRSMUcwRQYDVQQKDD5FLVRVR1JBIEVCRyBCSUxJU0lNIFRFS05PTE9KSUxFUkkgVkUgSElaTUVUTEVSSSBBTk9OSU0gU0lSS0VUSTEhMB8GA1UEAwwYRS1UdWdyYSBUTFMgRUNDIFN1YkNBIFIx", + "whitelist": false, + "attachment": { + "hash": "42fa634a3eb98e54074f17d0fe0aab755c5e4067770fd05698206528ab594d6d", + "size": 1264, + "filename": "LEpoPBInvdPKvBnEvgOGVD6niF1p0SyPl8CVl1YmY3A=.pem", + "location": "security-state-staging/intermediates/4c248f82-43b8-41d7-ad2d-517e741f7bd1.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "LEpoPBInvdPKvBnEvgOGVD6niF1p0SyPl8CVl1YmY3A=", + "crlite_enrolled": true, + "id": "fc1b0c95-092b-42ed-9f22-9aab3be7f515", + "last_modified": 1648522634563 + }, + { + "schema": 1648479477863, + "derHash": "Xq8Fz8mgF3MNAeZojW45cQ4B/eN050sbJdOkgHauXbg=", + "subject": "CN=TrustSafe TLS ECC SubCA R1,O=Isimtescil Bilisim A.S.,C=TR", + "subjectDN": "MFQxCzAJBgNVBAYTAlRSMSAwHgYDVQQKDBdJc2ltdGVzY2lsIEJpbGlzaW0gQS5TLjEjMCEGA1UEAwwaVHJ1c3RTYWZlIFRMUyBFQ0MgU3ViQ0EgUjE=", + "whitelist": false, + "attachment": { + "hash": "cef634a3d7c8f2241427ca02aa357aa14537f9bb1c601d32b24ac5c78454e98d", + "size": 1215, + "filename": "SKjptlNHzgEvyArVrdTup8ORkGWGikm3iFmLJI4ZRGM=.pem", + "location": "security-state-staging/intermediates/830ef734-1768-45ce-9ec0-edcea0f351c5.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "SKjptlNHzgEvyArVrdTup8ORkGWGikm3iFmLJI4ZRGM=", + "crlite_enrolled": true, + "id": "e25b26fc-5592-49af-bdc3-e378c0642fca", + "last_modified": 1648522634551 + }, + { + "schema": 1648514935045, + "derHash": "0WuprLdP7kqoCH7kguhuf29fVfrFAlY5cwdT/h5wXjw=", + "subject": "CN=TrustAsia RSA OV TLS CA - S1,O=TrustAsia Technologies\, Inc.,C=CN", + "subjectDN": "MFsxCzAJBgNVBAYTAkNOMSUwIwYDVQQKDBxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSUwIwYDVQQDDBxUcnVzdEFzaWEgUlNBIE9WIFRMUyBDQSAtIFMx", + "whitelist": false, + "attachment": { + "hash": "3478555efe90114245336918b07ce2fd5642c151b04ae871aa5b719513eff08c", + "size": 2044, + "filename": "3sdsoSIuRvtjF8OsOc4xIdevOWOclELQuaEQ85MqCYY=.pem", + "location": "security-state-staging/intermediates/a04c15b5-f9b9-47f9-91bc-106fd7754d29.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "3sdsoSIuRvtjF8OsOc4xIdevOWOclELQuaEQ85MqCYY=", + "crlite_enrolled": true, + "id": "4a8de048-65c5-4477-b64e-79f9f290218e", + "last_modified": 1648522634539 + }, + { + "schema": 1648514936138, + "derHash": "G095TXcNxuBdx6QVhFD4JZVy621Z3mZ6PD++CNoBJIE=", + "subject": "CN=Global Trust CA - OV (RSA),O=Global Digital Inc.,C=TW", + "subjectDN": "MFAxCzAJBgNVBAYTAlRXMRwwGgYDVQQKExNHbG9iYWwgRGlnaXRhbCBJbmMuMSMwIQYDVQQDExpHbG9iYWwgVHJ1c3QgQ0EgLSBPViAoUlNBKQ==", + "whitelist": false, + "attachment": { + "hash": "136048afa3b294583ccc15f0a0a6102dcca6cc9bf7d5c19811460c54c4e79fce", + "size": 2089, + "filename": "K6VGZ_ktzZYufpj5GSQX1fCds5dLtjs5vlSRcV-Oe8U=.pem", + "location": "security-state-staging/intermediates/002c6e58-6238-435b-9b0d-7b0691d17ed4.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "K6VGZ/ktzZYufpj5GSQX1fCds5dLtjs5vlSRcV+Oe8U=", + "crlite_enrolled": true, + "id": "d6d94677-fd6d-4901-bbae-6817f8abcd97", + "last_modified": 1648522634527 + }, + { + "schema": 1648514935421, + "derHash": "PhR5gEdlpiu3vU8N3rtVqUaiBjzSiC8FRhsXVPG2Z7E=", + "subject": "CN=HARICA Administration SSL ECC SubCA R2,O=Hellenic Academic and Research Institutions Cert. Authority,L=Athens,C=GR", + "subjectDN": "MIGVMQswCQYDVQQGEwJHUjEPMA0GA1UEBwwGQXRoZW5zMUQwQgYDVQQKDDtIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTEvMC0GA1UEAwwmSEFSSUNBIEFkbWluaXN0cmF0aW9uIFNTTCBFQ0MgU3ViQ0EgUjI=", + "whitelist": false, + "attachment": { + "hash": "d70d3f0dfbc3af1e7f43be02aa899e7f11297273559465b856d65421bb15a24c", + "size": 1890, + "filename": "XLCUgwMafFqrcdmzcM5gMLCX0OBG7_vbnVKij5FQYhg=.pem", + "location": "security-state-staging/intermediates/cd67a4e0-5a13-4946-972f-125a5e277867.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "XLCUgwMafFqrcdmzcM5gMLCX0OBG7/vbnVKij5FQYhg=", + "crlite_enrolled": true, + "id": "e274886d-aee1-4955-a7c1-fc32f4c81589", + "last_modified": 1648522634516 + }, + { + "schema": 1648514935242, "derHash": "wGjXdnhCVXcrvGrp9wpTakEK1oilDd6vv2a8xSVHlvY=", "subject": "CN=AC Firmaprofesional - Secure Web 2022,OU=Security Services,O=Firmaprofesional S.A.,C=ES", "subjectDN": "MIGTMQswCQYDVQQGEwJFUzEeMBwGA1UECgwVRmlybWFwcm9mZXNpb25hbCBTLkEuMRgwFgYDVQRhDA9WQVRFUy1BNjI2MzQwNjgxGjAYBgNVBAsMEVNlY3VyaXR5IFNlcnZpY2VzMS4wLAYDVQQDDCVBQyBGaXJtYXByb2Zlc2lvbmFsIC0gU2VjdXJlIFdlYiAyMDIy", @@ -14,9 +212,63 @@ "mimetype": "application/x-pem-file" }, "pubKeyHash": "AzLO0BInI3V3PWBUXkW0rLPDpBwERRuBl6yYvAtDJ3M=", - "crlite_enrolled": false, + "crlite_enrolled": true, "id": "fb1dc569-0bb6-4432-bd65-32a8206361a7", - "last_modified": 1648177065480 + "last_modified": 1648522634504 + }, + { + "schema": 1648514935941, + "derHash": "mxby9oDXxL1qZ/YJNA2mQWq/nkPxMmsBuYgZInHQtfI=", + "subject": "CN=TWCA Secure SSL Certification Authority,OU=Secure SSL Sub-CA,O=TAIWAN-CA,C=TW", + "subjectDN": "MG8xCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExGjAYBgNVBAsTEVNlY3VyZSBTU0wgU3ViLUNBMTAwLgYDVQQDEydUV0NBIFNlY3VyZSBTU0wgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=", + "whitelist": false, + "attachment": { + "hash": "acd717a163c1e31ec674bb2953f2f16be424838b5d36e703984df5d77c80d023", + "size": 2032, + "filename": "8hqbhsMMFPaPA8t81pxqFer9-neHBcQvO7-TAKjWkb0=.pem", + "location": "security-state-staging/intermediates/b5f4faa4-0521-4c2b-939b-4bef5f921421.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "8hqbhsMMFPaPA8t81pxqFer9+neHBcQvO7+TAKjWkb0=", + "crlite_enrolled": true, + "id": "163c4d13-0624-40c4-83d7-7b9bbea0f129", + "last_modified": 1648522634492 + }, + { + "schema": 1648514934852, + "derHash": "SWlaXw9+9u32mBk9me1Iuq3iDqRXQDwRzq1JLEWGZdo=", + "subject": "CN=TWCA Global EVSSL Certification Authority,OU=Global EVSSL Sub-CA,O=TAIWAN-CA,C=TW", + "subjectDN": "MHMxCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExHDAaBgNVBAsTE0dsb2JhbCBFVlNTTCBTdWItQ0ExMjAwBgNVBAMTKVRXQ0EgR2xvYmFsIEVWU1NMIENlcnRpZmljYXRpb24gQXV0aG9yaXR5", + "whitelist": false, + "attachment": { + "hash": "4f777697d0c427439f9282b53a652b4a868074c5e1ae55a6dfe51dc32d19b817", + "size": 1955, + "filename": "3sXbPfqhHfn3hza4ob3X6iuMjfN9qdgOhBAC5GOp-TY=.pem", + "location": "security-state-staging/intermediates/1b6005ce-3d05-4336-b84f-46f273145539.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "3sXbPfqhHfn3hza4ob3X6iuMjfN9qdgOhBAC5GOp+TY=", + "crlite_enrolled": true, + "id": "c44d3056-f6b6-415c-8f13-43d0b71fb7b5", + "last_modified": 1648522634480 + }, + { + "schema": 1648514935769, + "derHash": "8Hu73gdvm0DFfMS+/t6Xyh9Tua4UfwNdKEy/U/NDL7g=", + "subject": "CN=CFCA OV OCA,O=China Financial Certification Authority,C=CN", + "subjectDN": "MFUxCzAJBgNVBAYTAkNOMTAwLgYDVQQKDCdDaGluYSBGaW5hbmNpYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxFDASBgNVBAMMC0NGQ0EgT1YgT0NB", + "whitelist": false, + "attachment": { + "hash": "bc37658d1568750ae385b92be54ede64df31899d30f67211fd1e015c9dc7803b", + "size": 1963, + "filename": "uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=.pem", + "location": "security-state-staging/intermediates/8a832b56-3f0a-4b5f-8966-8a1da5242863.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=", + "crlite_enrolled": true, + "id": "b2b776e5-2b2f-4c8e-819d-026b8d3855d2", + "last_modified": 1648522634468 }, { "schema": 1648111717634, @@ -198,60 +450,6 @@ "id": "73d165e8-c4b1-4300-a6eb-607ee522dabe", "last_modified": 1648025848795 }, - { - "schema": 1648025320193, - "derHash": "mxby9oDXxL1qZ/YJNA2mQWq/nkPxMmsBuYgZInHQtfI=", - "subject": "CN=TWCA Secure SSL Certification Authority,OU=Secure SSL Sub-CA,O=TAIWAN-CA,C=TW", - "subjectDN": "MG8xCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExGjAYBgNVBAsTEVNlY3VyZSBTU0wgU3ViLUNBMTAwLgYDVQQDEydUV0NBIFNlY3VyZSBTU0wgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHk=", - "whitelist": false, - "attachment": { - "hash": "acd717a163c1e31ec674bb2953f2f16be424838b5d36e703984df5d77c80d023", - "size": 2032, - "filename": "8hqbhsMMFPaPA8t81pxqFer9-neHBcQvO7-TAKjWkb0=.pem", - "location": "security-state-staging/intermediates/b5f4faa4-0521-4c2b-939b-4bef5f921421.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "8hqbhsMMFPaPA8t81pxqFer9+neHBcQvO7+TAKjWkb0=", - "crlite_enrolled": false, - "id": "163c4d13-0624-40c4-83d7-7b9bbea0f129", - "last_modified": 1648025848786 - }, - { - "schema": 1648025319180, - "derHash": "SWlaXw9+9u32mBk9me1Iuq3iDqRXQDwRzq1JLEWGZdo=", - "subject": "CN=TWCA Global EVSSL Certification Authority,OU=Global EVSSL Sub-CA,O=TAIWAN-CA,C=TW", - "subjectDN": "MHMxCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExHDAaBgNVBAsTE0dsb2JhbCBFVlNTTCBTdWItQ0ExMjAwBgNVBAMTKVRXQ0EgR2xvYmFsIEVWU1NMIENlcnRpZmljYXRpb24gQXV0aG9yaXR5", - "whitelist": false, - "attachment": { - "hash": "4f777697d0c427439f9282b53a652b4a868074c5e1ae55a6dfe51dc32d19b817", - "size": 1955, - "filename": "3sXbPfqhHfn3hza4ob3X6iuMjfN9qdgOhBAC5GOp-TY=.pem", - "location": "security-state-staging/intermediates/1b6005ce-3d05-4336-b84f-46f273145539.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "3sXbPfqhHfn3hza4ob3X6iuMjfN9qdgOhBAC5GOp+TY=", - "crlite_enrolled": false, - "id": "c44d3056-f6b6-415c-8f13-43d0b71fb7b5", - "last_modified": 1648025848777 - }, - { - "schema": 1647788245578, - "derHash": "8Hu73gdvm0DFfMS+/t6Xyh9Tua4UfwNdKEy/U/NDL7g=", - "subject": "CN=CFCA OV OCA,O=China Financial Certification Authority,C=CN", - "subjectDN": "MFUxCzAJBgNVBAYTAkNOMTAwLgYDVQQKDCdDaGluYSBGaW5hbmNpYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxFDASBgNVBAMMC0NGQ0EgT1YgT0NB", - "whitelist": false, - "attachment": { - "hash": "bc37658d1568750ae385b92be54ede64df31899d30f67211fd1e015c9dc7803b", - "size": 1963, - "filename": "uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=.pem", - "location": "security-state-staging/intermediates/8a832b56-3f0a-4b5f-8966-8a1da5242863.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=", - "crlite_enrolled": false, - "id": "b2b776e5-2b2f-4c8e-819d-026b8d3855d2", - "last_modified": 1647853041835 - }, { "schema": 1647701328614, "derHash": "mKDDuhiZJYWV0E8V0TTFcy6GS3VcZIpI0cF/CiYO9ac=", @@ -1098,24 +1296,6 @@ "id": "a5acb099-b5f7-485c-a851-34cf19a7efc6", "last_modified": 1646967480339 }, - { - "schema": 1646751472958, - "derHash": "G095TXcNxuBdx6QVhFD4JZVy621Z3mZ6PD++CNoBJIE=", - "subject": "CN=Global Trust CA - OV (RSA),O=Global Digital Inc.,C=TW", - "subjectDN": "MFAxCzAJBgNVBAYTAlRXMRwwGgYDVQQKExNHbG9iYWwgRGlnaXRhbCBJbmMuMSMwIQYDVQQDExpHbG9iYWwgVHJ1c3QgQ0EgLSBPViAoUlNBKQ==", - "whitelist": false, - "attachment": { - "hash": "136048afa3b294583ccc15f0a0a6102dcca6cc9bf7d5c19811460c54c4e79fce", - "size": 2089, - "filename": "K6VGZ_ktzZYufpj5GSQX1fCds5dLtjs5vlSRcV-Oe8U=.pem", - "location": "security-state-staging/intermediates/002c6e58-6238-435b-9b0d-7b0691d17ed4.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "K6VGZ/ktzZYufpj5GSQX1fCds5dLtjs5vlSRcV+Oe8U=", - "crlite_enrolled": false, - "id": "d6d94677-fd6d-4901-bbae-6817f8abcd97", - "last_modified": 1646881071888 - }, { "schema": 1646449055023, "derHash": "YO9BLqvnw/xjme7RtjO3d3R1FbKdchuWPdJYvEmKspI=", @@ -1206,24 +1386,6 @@ "id": "2dea51d4-7fea-4eb2-a507-7fa4ef9b5e26", "last_modified": 1646513861656 }, - { - "schema": 1646448537822, - "derHash": "NoevAsSXMco0/k/bm15eDsrNiiBpVvGa+zggOsXwpWc=", - "subject": "CN=E-Tugra TLS ECC SubCA R1,O=E-TUGRA EBG BILISIM TEKNOLOJILERI VE HIZMETLERI ANONIM SIRKETI,C=TR", - "subjectDN": "MHkxCzAJBgNVBAYTAlRSMUcwRQYDVQQKDD5FLVRVR1JBIEVCRyBCSUxJU0lNIFRFS05PTE9KSUxFUkkgVkUgSElaTUVUTEVSSSBBTk9OSU0gU0lSS0VUSTEhMB8GA1UEAwwYRS1UdWdyYSBUTFMgRUNDIFN1YkNBIFIx", - "whitelist": false, - "attachment": { - "hash": "42fa634a3eb98e54074f17d0fe0aab755c5e4067770fd05698206528ab594d6d", - "size": 1264, - "filename": "LEpoPBInvdPKvBnEvgOGVD6niF1p0SyPl8CVl1YmY3A=.pem", - "location": "security-state-staging/intermediates/4c248f82-43b8-41d7-ad2d-517e741f7bd1.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "LEpoPBInvdPKvBnEvgOGVD6niF1p0SyPl8CVl1YmY3A=", - "crlite_enrolled": false, - "id": "fc1b0c95-092b-42ed-9f22-9aab3be7f515", - "last_modified": 1646449054505 - }, { "schema": 1646448540616, "derHash": "Z2JSLktXrtCWBXSrBh957qBoxa49gV9QqXHOxJWKkrg=", @@ -1242,24 +1404,6 @@ "id": "06990766-0ff3-4021-befb-00332e591022", "last_modified": 1646449054486 }, - { - "schema": 1646448541989, - "derHash": "Xq8Fz8mgF3MNAeZojW45cQ4B/eN050sbJdOkgHauXbg=", - "subject": "CN=TrustSafe TLS ECC SubCA R1,O=Isimtescil Bilisim A.S.,C=TR", - "subjectDN": "MFQxCzAJBgNVBAYTAlRSMSAwHgYDVQQKDBdJc2ltdGVzY2lsIEJpbGlzaW0gQS5TLjEjMCEGA1UEAwwaVHJ1c3RTYWZlIFRMUyBFQ0MgU3ViQ0EgUjE=", - "whitelist": false, - "attachment": { - "hash": "cef634a3d7c8f2241427ca02aa357aa14537f9bb1c601d32b24ac5c78454e98d", - "size": 1215, - "filename": "SKjptlNHzgEvyArVrdTup8ORkGWGikm3iFmLJI4ZRGM=.pem", - "location": "security-state-staging/intermediates/830ef734-1768-45ce-9ec0-edcea0f351c5.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "SKjptlNHzgEvyArVrdTup8ORkGWGikm3iFmLJI4ZRGM=", - "crlite_enrolled": false, - "id": "e25b26fc-5592-49af-bdc3-e378c0642fca", - "last_modified": 1646449054477 - }, { "schema": 1646448543405, "derHash": "o2wcxiPs8+2JmprBT91WIJGYWOYh5od+Ae9Q2h22o6s=", @@ -3096,24 +3240,6 @@ "id": "75aa3a64-ae1e-4d39-b34e-97bb23150bd8", "last_modified": 1645579197981 }, - { - "schema": 1645578780981, - "derHash": "XScMtO/1h61s0Xyytg2QhKFT130qp5oss9sd25BGhPU=", - "subject": "CN=DigiCert High Assurance TLS Hybrid ECC SHA256 2020 CA1,O=DigiCert\, Inc.,C=US", - "subjectDN": "MGcxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE/MD0GA1UEAxM2RGlnaUNlcnQgSGlnaCBBc3N1cmFuY2UgVExTIEh5YnJpZCBFQ0MgU0hBMjU2IDIwMjAgQ0Ex", - "whitelist": false, - "attachment": { - "hash": "3ea69b8dafeb8e68666332244529451eccd6e970a91f738b5ddac122f8ad34d2", - "size": 1500, - "filename": "vnCogm4QYze_Bc9r88xdA6NTQY74p4BAz2w5gxkLG2M=.pem", - "location": "security-state-staging/intermediates/80e952ea-02dd-40b2-9b1d-7cc71c4315a3.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "vnCogm4QYze/Bc9r88xdA6NTQY74p4BAz2w5gxkLG2M=", - "crlite_enrolled": true, - "id": "5db1751f-eb67-4a74-b38e-d17a823eed64", - "last_modified": 1645579197964 - }, { "schema": 1645578822211, "derHash": "Ol9O91ja1i5DaSRkReBo5Nrf3Uhi3Nw1LLyj9YyxAoo=", @@ -5238,24 +5364,6 @@ "id": "bdf72262-6812-4fce-aa9f-8a7a2d68ef29", "last_modified": 1645578268527 }, - { - "schema": 1645577368234, - "derHash": "0WuprLdP7kqoCH7kguhuf29fVfrFAlY5cwdT/h5wXjw=", - "subject": "CN=TrustAsia RSA OV TLS CA - S1,O=TrustAsia Technologies\, Inc.,C=CN", - "subjectDN": "MFsxCzAJBgNVBAYTAkNOMSUwIwYDVQQKDBxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSUwIwYDVQQDDBxUcnVzdEFzaWEgUlNBIE9WIFRMUyBDQSAtIFMx", - "whitelist": false, - "attachment": { - "hash": "3478555efe90114245336918b07ce2fd5642c151b04ae871aa5b719513eff08c", - "size": 2044, - "filename": "3sdsoSIuRvtjF8OsOc4xIdevOWOclELQuaEQ85MqCYY=.pem", - "location": "security-state-staging/intermediates/a04c15b5-f9b9-47f9-91bc-106fd7754d29.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "3sdsoSIuRvtjF8OsOc4xIdevOWOclELQuaEQ85MqCYY=", - "crlite_enrolled": false, - "id": "4a8de048-65c5-4477-b64e-79f9f290218e", - "last_modified": 1645578268465 - }, { "schema": 1645577377719, "derHash": "vOcJE1XSQXo3+M/irI8XwnSIiLoO6pAAD8mA7PwtBB8=", @@ -7524,24 +7632,6 @@ "id": "fff9a2df-08f2-4fef-b8f3-e1462f74c9dd", "last_modified": 1643540242054 }, - { - "schema": 1643539744538, - "derHash": "dOq1c9p9sZUJe+DpDzNJNMekyJ6Ag3WdtDM6AO3SQ9k=", - "subject": "CN=DigiCert High Assurance TLS Hybrid ECC SHA256 2020 CA1,O=DigiCert\, Inc.,C=US", - "subjectDN": "MGcxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE/MD0GA1UEAxM2RGlnaUNlcnQgSGlnaCBBc3N1cmFuY2UgVExTIEh5YnJpZCBFQ0MgU0hBMjU2IDIwMjAgQ0Ex", - "whitelist": false, - "attachment": { - "hash": "11a50056d6027ba92a4d016bbdd72de6b8e7498171f12762ce2eda7a60762e6e", - "size": 1483, - "filename": "vnCogm4QYze_Bc9r88xdA6NTQY74p4BAz2w5gxkLG2M=.pem", - "location": "security-state-staging/intermediates/7bf16759-da8d-43e0-b260-f55aac6a39b7.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "vnCogm4QYze/Bc9r88xdA6NTQY74p4BAz2w5gxkLG2M=", - "crlite_enrolled": true, - "id": "ce744321-7f4d-4f9c-9da1-63454f6d33bb", - "last_modified": 1643540242043 - }, { "schema": 1643539751823, "derHash": "tfYuw4ExzRSx/JW4d/TSEL5L+sx+amqhQi2J40t6xME=", @@ -13482,24 +13572,6 @@ "id": "afbdb701-e59b-4398-967c-b0db2394d003", "last_modified": 1616745549953 }, - { - "schema": 1616205449736, - "derHash": "0tfUvuj/G33rpCd0AIHAf3sYai8poSNg1T+MINRVU40=", - "subject": "CN=TrustAsia RSA OV SSL Server CA,O=TrustAsia Technologies\, Inc.,ST=Shanghai,C=CN", - "subjectDN": "MHAxCzAJBgNVBAYTAkNOMREwDwYDVQQIEwhTaGFuZ2hhaTElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEnMCUGA1UEAxMeVHJ1c3RBc2lhIFJTQSBPViBTU0wgU2VydmVyIENB", - "whitelist": false, - "attachment": { - "hash": "cef0257132e6443d4fa6a6f012339e0c0a90ba4eb8ce5d8083038ca1f5461393", - "size": 2133, - "filename": "ZyqPojkZzOKu3M2n4NkoNEh6f1YBTiJm2DtfHJroAWA=.pem", - "location": "security-state-staging/intermediates/f5b72560-0bb5-40bd-b68b-381a9e82b9e3.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "ZyqPojkZzOKu3M2n4NkoNEh6f1YBTiJm2DtfHJroAWA=", - "crlite_enrolled": true, - "id": "e944087f-76e7-41f9-a1bb-8ef5a2cd787a", - "last_modified": 1616248690156 - }, { "schema": 1616075883477, "derHash": "WSKFNdEU6NKfm5LUIlGLxj3ctXCXQo2MyYd32QfG7v4=",
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit 5e7702180a7e072925799b236a2424169163aa7f Author: Henrik Skupin mail@hskupin.info AuthorDate: Fri Apr 1 07:06:19 2022 +0000
Bug 1762505 - [firefox-ui] Disable test_ssl_status_after_restart.py because badssl.com is not reachable. r=webdriver-reviewers,jdescottes a=test-only DONTBUILD
Differential Revision: https://phabricator.services.mozilla.com/D142654 --- testing/firefox-ui/tests/functional/security/manifest.ini | 1 + 1 file changed, 1 insertion(+)
diff --git a/testing/firefox-ui/tests/functional/security/manifest.ini b/testing/firefox-ui/tests/functional/security/manifest.ini index e0993b122a8cc..b2c442396fe24 100644 --- a/testing/firefox-ui/tests/functional/security/manifest.ini +++ b/testing/firefox-ui/tests/functional/security/manifest.ini @@ -2,3 +2,4 @@ tags = remote
[test_ssl_status_after_restart.py] +skip-if = true # Bug 1762505: badssl.com not reachable and expired certificate
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit a4c0548a4d64a51efac7fd851516dae742e7af86 Author: Mozilla Releng Treescript release+treescript@mozilla.org AuthorDate: Mon Apr 4 16:28:04 2022 +0000
Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release --- CLOBBER | 2 +- browser/config/version.txt | 2 +- browser/config/version_display.txt | 2 +- config/milestone.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CLOBBER b/CLOBBER index d4cdfaff33de3..92d152a067d58 100644 --- a/CLOBBER +++ b/CLOBBER @@ -22,4 +22,4 @@ # changes to stick? As of bug 928195, this shouldn't be necessary! Please # don't change CLOBBER for WebIDL changes any more.
-Merge day clobber \ No newline at end of file +Merge day clobber 2022-04-04 \ No newline at end of file diff --git a/browser/config/version.txt b/browser/config/version.txt index 264681cf67de4..2f7ed6f2dbf52 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -91.8.0 +91.9.0 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt index 5ef3ddeb7f3c9..70babeaffeb47 100644 --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1 +1 @@ -91.8.0esr +91.9.0esr diff --git a/config/milestone.txt b/config/milestone.txt index d1d6e7707e9fe..b88eee6f74a56 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #--------------------------------------------------------
-91.8.0 +91.9.0
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit df951fd359661df33d08d66d6bae713c0b3e6c6e Author: ffxbld ffxbld@mozilla.com AuthorDate: Mon Apr 4 10:55:27 2022 +0000
No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings tld-suffixes - a=repo-update r=RyanVM
Differential Revision: https://phabricator.services.mozilla.com/D142810 --- netwerk/dns/effective_tld_names.dat | 15 +- security/manager/ssl/StaticHPKPins.h | 2 +- security/manager/ssl/nsSTSPreloadList.inc | 491 ++++++++------------- .../dumps/security-state/intermediates.json | 216 +++++---- 4 files changed, 313 insertions(+), 411 deletions(-)
diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat index c235f2754f45e..4e88dbaee658e 100644 --- a/netwerk/dns/effective_tld_names.dat +++ b/netwerk/dns/effective_tld_names.dat @@ -13618,19 +13618,20 @@ syncloud.it
// Synology, Inc. : https://www.synology.com/ // Submitted by Rony Weng ronyweng@synology.com -diskstation.me dscloud.biz -dscloud.me -dscloud.mobi +direct.quickconnect.cn dsmynas.com -dsmynas.net -dsmynas.org familyds.com -familyds.net -familyds.org +diskstation.me +dscloud.me i234.me myds.me synology.me +dscloud.mobi +dsmynas.net +familyds.net +dsmynas.org +familyds.org vpnplus.to direct.quickconnect.to
diff --git a/security/manager/ssl/StaticHPKPins.h b/security/manager/ssl/StaticHPKPins.h index b84437b374247..0fe94fcae5228 100644 --- a/security/manager/ssl/StaticHPKPins.h +++ b/security/manager/ssl/StaticHPKPins.h @@ -1149,4 +1149,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
static const int32_t kUnknownId = -1;
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1656931854455000); +static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1657536621758000); diff --git a/security/manager/ssl/nsSTSPreloadList.inc b/security/manager/ssl/nsSTSPreloadList.inc index 8262c577cc6ae..67b74590f094f 100644 --- a/security/manager/ssl/nsSTSPreloadList.inc +++ b/security/manager/ssl/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/
#include <stdint.h> -const PRTime gPreloadListExpirationTime = INT64_C(1659351047098000); +const PRTime gPreloadListExpirationTime = INT64_C(1659955813539000); %% 0--1.de, 1 0-1.party, 1 @@ -374,6 +374,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1659351047098000); 1-2-3bounce.co.uk, 1 1-pujcky-uvery.tk, 1 1-weightloss.com, 1 +100-downloads.com, 1 100-referencement.com, 1 10000hits.tk, 1 10000lab.net, 1 @@ -433,7 +434,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1659351047098000); 101.qa, 1 10101.io, 1 101010.pl, 1 -1014.xyz, 1 101gen.com, 1 101st-airborne.tk, 1 101st.tk, 1 @@ -1536,7 +1536,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1659351047098000); 200201.xyz, 1 2007-g8.tk, 1 20071019780415.com, 1 -2007gp.com, 1 2007nea.tk, 1 200aaaa.com, 1 200bbbb.com, 1 @@ -2337,6 +2336,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1659351047098000); 360videoshare.com, 1 360vrs.com, 1 361116.com, 1 +3615jacky.fr, 1 363331.com, 1 364553.com, 1 365.asia, 1 @@ -2503,7 +2503,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1659351047098000); 375ks.com, 1 377625.com, 1 377632.com, 1 -3778vip.com, 0 377ks.com, 1 377zzz.com, 1 37879.com, 0 @@ -2875,6 +2874,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1659351047098000); 426773.com, 1 427552.com, 1 428northampton.com, 1 +42ch.com, 1 42day.info, 1 42entrepreneurs.fr, 0 42l.fr, 1 @@ -4297,6 +4297,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1659351047098000); 731433.com, 1 732365.com, 1 732433.com, 1 +733575.com, 0 73365365.com, 0 7337app.com, 1 734365.com, 1 @@ -4501,6 +4502,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1659351047098000); 798sss.com, 1 799ks.com, 1 799z6.com, 1 +79ch.com, 1 7akawyna.tk, 1 7azarfazar.com, 1 7bet86.com, 1 @@ -5748,7 +5750,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1659351047098000); 9to5notes.in, 1 9uelle.jp, 1 9ungnir.xyz, 1 -9vdy.com, 1 9vnd.com, 1 9vx.org, 1 9wsodl.com, 1 @@ -5934,7 +5935,6 @@ aaronburrows.com, 1 aaronfurtado.com, 1 aaronhorler.com, 1 aaronkimmig.de, 1 -aaronmaar.de, 1 aaronosmani.com, 1 aaronqueen.com, 1 aaronroyle.com, 1 @@ -6349,7 +6349,6 @@ academy-awards.ml, 1 academylawreview.ac.in, 1 academyonlinetoyou.tk, 1 academytv.com.au, 1 -acadianteas.ca, 1 acadiate.com, 1 acahaymarket.com.ec, 1 acalcio.ga, 1 @@ -6385,7 +6384,6 @@ accelerator.tk, 1 accelsnow.com, 1 accentchair.net, 1 accentthailand.com, 1 -acceptancerecoverycenter.com, 1 acces-elevation.fr, 1 accesloges.com, 1 access-board.gov, 1 @@ -6480,6 +6478,7 @@ acetudy.com, 1 aceweb.ga, 1 acftienda.tk, 1 acfun.eu.org, 1 +acg.codes, 1 acg.mn, 1 acg.sb, 0 acgaudio.com, 1 @@ -6935,7 +6934,6 @@ adingenierie.fr, 1 adinternational.com.au, 1 adiprospero.it, 1 adiraku.co.id, 1 -adiscorduser.com, 1 aditro.com, 1 adityatelange.in, 1 adiyamanhaberleri.tk, 1 @@ -7045,7 +7043,6 @@ adrianajewelry.my, 1 adrianasantos.me, 1 adrianbechtold.de, 1 adriancitu.com, 1 -adriancostin.ro, 1 adrianfeliciano.com, 1 adrianhardy.com, 1 adrianjensen.com, 1 @@ -7232,7 +7229,6 @@ advokat-dtp.gq, 1 advokat-dtp.ml, 1 advokat-dtp.tk, 1 advokat-malinovskii.ml, 1 -advokat-romanov.com, 1 advokat-vvp.com.ua, 1 advokat73.gq, 1 advokati-ceva.cz, 1 @@ -7635,6 +7631,7 @@ ag918.co, 1 ag918.top, 1 ag96.win, 1 ag961.com, 1 +ag98.tv, 0 ag9800.com, 1 ag983.com, 1 ag98ks.com, 1 @@ -8328,6 +8325,7 @@ airportal.cn, 1 airportcoc.cf, 1 airportcoc.ga, 1 airportcoc.ml, 1 +airportlimototoronto.com, 1 airportstuttgart.com, 1 airpurifierproductsonline.com, 1 airquestion.org, 1 @@ -8519,7 +8517,6 @@ akp.photos, 1 akplates.org, 1 akpwebdesign.com, 1 akr.io, 1 -akr.services, 1 akracing.se, 1 akramvet.tk, 1 akrep.com, 1 @@ -8794,7 +8791,6 @@ aldersgateumc.ml, 1 aldersgateumc.tk, 1 aldevadigital.com, 1 aldiabcs.com, 1 -aldiafl.com, 1 aldien.com.br, 1 aldipresscentre.co.uk, 1 aldiwan-mobile.com, 1 @@ -9415,7 +9411,6 @@ allthingsfpl.com, 1 allthingshealthy.org, 1 allthingsroyal.nl, 1 allthingssquared.com, 1 -allthingswatersports.com, 1 allthingswild.co.uk, 1 alltourism.tk, 1 alltrade.ga, 1 @@ -9442,7 +9437,6 @@ allworld.ga, 1 allwrestling.ga, 1 allyachts.cf, 1 allyachts.gq, 1 -alma365.it, 1 almaarkansas.gov, 1 almaascosmetics.com, 1 almaatlantica.com, 1 @@ -9671,6 +9665,7 @@ alternative-e-energy.tk, 1 alternative-kultur.tk, 1 alternative-reussite.org, 1 alternative.hosting, 1 +alternativebit.fr, 1 alternativedev.ca, 1 alternativeenergy.tk, 1 alternativefacts.cf, 1 @@ -10774,7 +10769,6 @@ animelily.com, 1 animelody.net, 1 animelolipop.com, 1 animemotivation.com, 1 -animepahe.com, 1 animeplus1.tk, 1 animepower.gq, 1 animepower.tk, 1 @@ -10929,7 +10923,6 @@ annuncisesso.tk, 1 annyaurora.net, 1 annynantasiri.com, 1 anodas.lt, 1 -anohana.org, 1 anojan.com, 1 anomalous.eu, 1 anomaly.tk, 1 @@ -11214,7 +11207,6 @@ anvilcargotrailers.com, 1 anvilmetal.tk, 1 anvilsales.tk, 1 anvilsecure.com, 1 -anvimpex.com, 1 anvish.in, 1 anwalt.us, 1 anwarverdict.ml, 1 @@ -11957,6 +11949,7 @@ areallyneatwebsite.com, 1 areanet.tk, 1 areata.tk, 1 areatrend.com, 1 +areavipbrasil.com.br, 1 areavoipers.ga, 1 areavoipest.ga, 1 areege.tk, 1 @@ -12124,7 +12117,6 @@ arkulagunak.com, 0 arlaperu.com, 1 arlatools.com, 1 arlecchinobuongustaio.it, 1 -arlen.tv, 1 arlenarmageddon.com, 1 arlenitas.com, 1 arletalibrary.com, 0 @@ -12244,7 +12236,6 @@ aros.pl, 1 arose.io, 1 around-cms.de, 1 arouparia.com, 1 -arouzing.xyz, 1 arowsoft.tk, 1 arox.eu, 1 arp-arena.ml, 1 @@ -12791,6 +12782,7 @@ asphaltsolutionsnc.com, 1 asphy.me, 1 asphyxia.su, 1 aspiechattr.me, 1 +aspiescentral.com, 1 aspiradorasbaratas.net, 1 aspirantum.com, 1 aspiraplasticsurgery.com, 1 @@ -12867,7 +12859,7 @@ assurancesmons.be, 0 assured.se, 0 assuredspc.com, 1 asta-bar.de, 0 -astacreative.nl, 1 +astacreative.nl, 0 astal.rs, 1 astana.cf, 1 astanainform.tk, 1 @@ -13274,6 +13266,7 @@ auburn-housekeeper.com, 1 auburnperio.com, 1 aucarresainteloi.com, 1 aucielrose.com, 1 +auckland-lawyer.co.nz, 1 auckland-painter.co.nz, 1 aucklandcastles.co.uk, 1 auctionbv.tk, 1 @@ -13434,7 +13427,6 @@ aussieparrotlets.com.au, 1 aussieseoadelaide.com.au, 1 aussieservicedown.com, 1 aussiestoresonline.com, 0 -aussiestories.dk, 1 austenplumbing.com, 1 austercita.tk, 1 austin-pearce.com, 1 @@ -14245,6 +14237,7 @@ aymerick-dupouey.fr, 1 aymericlagier.com, 1 aymhome.top, 1 ayon-games.tk, 1 +ayothemes.com, 1 ayresalpine.com, 1 ayresanaheim.com, 1 ayresapline.com, 1 @@ -14504,9 +14497,6 @@ b5909.com, 1 b5910.com, 1 b5dev.com, 1 b61688.com, 1 -b62102.com, 1 -b62103.com, 1 -b62105.com, 1 b62a.com, 1 b62aa.com, 1 b62b.com, 1 @@ -14682,7 +14672,7 @@ baatar.idv.hk, 1 baazee.de, 1 babacasino.net, 1 babacloud.ddns.net, 1 -babacsalogato.hu, 1 +babacsalogato.hu, 0 babacuhocica.tk, 1 babadag.tk, 1 babaei.net, 1 @@ -14841,7 +14831,6 @@ bacom1.com, 1 bacon-monitoring.org, 1 baconismagic.ca, 0 bacoux.com, 1 -bacq.pro, 1 bacsmegye.hu, 1 bacteriakit.com, 1 bactrim-antibiotic.gq, 1 @@ -15105,6 +15094,7 @@ balkoni.gq, 1 balkonien.org, 1 balkonov.com.ua, 1 ball-bizarr.de, 1 +ball3d.es, 1 ball4training.com, 1 ballaratcapital.com, 1 ballaratcapital.com.au, 1 @@ -15230,7 +15220,6 @@ bangdream.ga, 1 bangkok-dark-night.com, 1 bangkok-thailand.org, 0 bangkok.dating, 1 -bangkokcity.de, 1 bangkokcookingclass.com, 1 bangkokthailandescorts.com, 1 bangku.tk, 1 @@ -15418,7 +15407,6 @@ bariseau-mottrie.be, 0 barisi.me, 1 baristabetter.com, 1 baristador.com, 1 -baristanetwork.co.uk, 1 baritoday.it, 1 barkerjr.xyz, 1 barkingspidersaspets.com, 1 @@ -15754,6 +15742,7 @@ bazari.com.pl, 1 bazarotehijos.com, 1 bazdell.com, 0 bazhan.me, 1 +bazinga-events.nl, 1 bazos.at, 1 bazos.cz, 1 bazos.pl, 1 @@ -15838,7 +15827,6 @@ bcdonadio.org, 1 bceventhire.co.uk, 1 bch7al.ma, 0 bchep.com, 1 -bchnews.info, 1 bck-koethen.de, 1 bck-lelystad.nl, 1 bckaccompressoroz.com, 1 @@ -16031,7 +16019,6 @@ beautyby.tv, 1 beautycarepack.com.ng, 1 beautycom.club, 1 beautycon.ir, 1 -beautyest.net, 1 beautyeyewear.ga, 1 beautyforceacademy.bg, 1 beautyinfos.de, 1 @@ -16101,12 +16088,10 @@ bedtimeflirt.com, 1 bedum-blues.tk, 1 bedwettingyoungsters.tk, 1 bee-creative.nl, 1 -bee-kart.com, 1 bee-line.org.uk, 1 bee-removal-dublin.com, 1 bee.supply, 1 bee.tools, 1 -beeapro.com, 1 beebeads.ga, 1 beecare.ch, 1 beedsolyjas.tk, 1 @@ -16426,6 +16411,7 @@ benefitz.ml, 1 benekill.tk, 1 benepiscinas.com.br, 1 benepla.com, 1 +beneri.se, 1 benetcasablancas.tk, 1 benevisim.com, 1 benevita.bio, 1 @@ -16635,7 +16621,7 @@ berndartmueller.com, 1 bernerland.cf, 1 bernerland.tk, 1 bernersennen.tk, 1 -bernexskiclub.ch, 1 +bernexskiclub.ch, 0 bernhard-eicher.ch, 1 bernhard-seidenspinner.de, 1 bernhardkau.de, 1 @@ -17686,7 +17672,6 @@ bigprintinglasvegas.com, 1 bigpurse.tk, 1 bigrapidstownshipmi.gov, 1 bigrender.tk, 1 -bigsaleclub.com, 1 bigsam.us, 1 bigseo.ml, 1 bigseo.tk, 1 @@ -17790,7 +17775,6 @@ billcomparison.ga, 1 billets-avion.tk, 1 billfazz.com, 1 billgatos.tk, 1 -billgoldstein.name, 1 billgradywebdesign.com, 1 billhartzer.com, 1 billiardmaster.com.ua, 1 @@ -18495,7 +18479,6 @@ blablacar.pl, 1 blablacar.pt, 1 blablacar.ro, 1 blablacar.rs, 1 -blablacar.ru, 1 black-air-rpg.com, 1 black-blog.com, 1 black-diamonds.cf, 1 @@ -19040,7 +19023,6 @@ bluex.net, 1 bluex.org, 1 blueyonder.com, 1 bluffcitytn.gov, 1 -bluffelectrician.co.za, 1 bluffplumber.co.za, 1 bluheron.ca, 1 blui.cf, 0 @@ -19404,6 +19386,7 @@ bonnevillecountyidaho.gov, 1 bonniecoloring.com, 1 bonniedraw.com, 1 bonniekitchen.com, 1 +bonnieradvocaten.nl, 1 bonniestylez.net, 1 bonnsustainabilityportal.de, 1 bonnydevil.com, 1 @@ -19648,7 +19631,6 @@ botcore.ai, 1 botdiril.com, 1 botealis.ch, 0 botelegram.tk, 1 -botezdepoveste.ro, 0 botguard.net, 1 bothive.io, 1 boticadiservicio.com, 1 @@ -19709,7 +19691,6 @@ bouncea-bout.com, 1 bounceaboutnewark.co.uk, 1 bounceaboutsussex.co.uk, 1 bouncealotnorthwest.co.uk, 1 -bounceandwobble.co.uk, 1 bounceapp.com, 1 bouncearoundevents.co.uk, 1 bouncearoundinflatable.com, 1 @@ -19830,6 +19811,7 @@ boxbuttecountyne.gov, 1 boxcritters.wiki, 1 boxcryptor.com, 0 boxdevigneron.fr, 1 +boxdropcc.com, 1 boxeomexicano.tk, 1 boxerdogdiaries.com, 1 boxerdogsaspets.com, 1 @@ -20200,7 +20182,6 @@ brellich.eu, 1 bremen-restaurants.de, 1 bremensaki.com, 1 bremerfriedensforum.de, 1 -bremink.nl, 1 brenbarnes.com, 1 brenbarnes.com.au, 0 brendabecker.com, 1 @@ -20224,6 +20205,7 @@ brest24.tk, 1 brestnews.tk, 1 brestradio.tk, 1 brestshop.tk, 1 +bret-mcgee.me.uk, 0 bretcarmichael.com, 1 bretech.net, 1 breteuilcommerceartisanat.com, 1 @@ -20610,6 +20592,7 @@ brunner.ninja, 1 bruno-hoenel.de, 1 bruno-pelletier.tk, 1 brunoamaral.eu, 1 +brunobeauvoir.com, 1 brunocesarlima.com.br, 1 brunodomingos.com, 1 brunolt.nl, 1 @@ -20717,7 +20700,6 @@ bsurfcr.com, 1 bsuru.xyz, 1 bsvfincorp.com, 1 bsw-solution.de, 1 -bsystem.net, 1 bszoft.hu, 1 bt-kc.de, 1 bt121.com, 1 @@ -21589,7 +21571,7 @@ buzzconcert.com, 1 buzzcontent.com, 1 buzzfeast.com, 1 buzzhub.tk, 1 -buzzkuri.com, 0 +buzzkuri.com, 1 buzzman.ga, 1 buzzmedianetworks.com, 1 buzzpop.tv, 0 @@ -21699,7 +21681,6 @@ byprata.com.br, 1 byraje.com, 1 byrddogpaving.com, 1 byrest.com, 1 -byriderfranchise.com, 1 byrko.sk, 1 byrnesagency.com, 1 byronkg.us, 1 @@ -22100,7 +22081,6 @@ calendriergratuit.fr, 1 calendum.ru, 1 calenfil.com, 1 caletka.cz, 1 -caletka.nl, 1 calgarydermatologisters.ga, 1 calgraf.com, 1 calhoun.tk, 1 @@ -23061,7 +23041,6 @@ casael.com, 1 casaessencias.com.br, 1 casafina.tk, 1 casagami.ga, 1 -casagyn.com.br, 1 casajeannine.tk, 1 casalacabra.com, 1 casalborgo.it, 1 @@ -23636,7 +23615,9 @@ cctvlaw.ga, 1 cctvsecurityjohannesburg.co.za, 1 cctvview.info, 0 ccu.plus, 1 +ccv-deutschland.de, 0 ccv.eu, 0 +ccv.nl, 0 ccwallet.io, 1 ccwebdevelopment.com, 1 ccxperience.com, 1 @@ -23694,6 +23675,7 @@ cdscsuc.gq, 1 cdseditora.com.br, 1 cdsf.tk, 1 cdshining.com, 0 +cdsportal.uk, 1 cdt.org, 0 cdu-gebhardshain.de, 1 cduckett.net, 1 @@ -24773,7 +24755,6 @@ chinafree.site, 1 chinahealthcareblog.cf, 1 chinaicpower.org, 0 chinalosers.com, 1 -chinamextrading.com, 1 chinasa.net, 1 chinasearch.tk, 1 chinaspaceflight.com, 1 @@ -25003,6 +24984,7 @@ christianconcepts.ga, 1 christianconcepts.gq, 1 christiandiscourse.net, 1 christianfaq.org, 1 +christianforums.com, 1 christiangaro.com, 1 christiangaro.email, 1 christiangaro.info, 1 @@ -25236,6 +25218,7 @@ ciclista.roma.it, 1 ciclodekrebs.com, 1 ciclodelcarbono.com, 1 ciclohidrologico.com, 1 +cidadedossonhos.org, 1 cidbot.com, 1 cidcca.com, 1 cidersus.com.ec, 1 @@ -25473,7 +25456,6 @@ city-nn.com, 1 city-online.tk, 1 city-walks.info, 1 cityacademyslc.org, 1 -citybeat.de, 1 citybusexpress.com, 0 citycalculator.ml, 1 citycardgand.com, 1 @@ -25797,7 +25779,6 @@ cleangreen.tech, 1 cleangroup.in.ua, 1 cleanhouse2000.us, 1 cleaningcarpet.ga, 1 -cleaningdepot.co.za, 1 cleaningservicejulai.com, 1 cleaningsquad.ca, 0 cleankey.jp, 0 @@ -25807,6 +25788,7 @@ cleanshield99.com, 1 cleansweepaa.com, 1 cleanway.dk, 1 clear-concise.com, 1 +clear.ml, 1 clearance365.co.uk, 1 clearbooks.co.uk, 1 clearbookscdn.uk, 1 @@ -26348,6 +26330,7 @@ cncollege.tk, 1 cncr.ga, 1 cncrans.ch, 0 cncs.gob.do, 1 +cncs.gov.pt, 1 cnet-hosting.com, 1 cnetw.xyz, 1 cnexchange.com, 1 @@ -26381,7 +26364,6 @@ coachapp-ipass.herokuapp.com, 1 coachbakery.com, 1 coachezmoi.ch, 0 coachinfopreneur.com, 1 -coaching-harmonique.fr, 1 coaching-impulse.ch, 0 coachingbyelena.com, 1 coachingforleaders.com, 1 @@ -26578,8 +26560,6 @@ codetipi.com, 1 codetrack.se, 1 codetripping.net, 1 codeux.com, 1 -codeux.info, 1 -codeux.net, 1 codevat.com, 1 codewild.de, 1 codewitchbella.com, 1 @@ -26718,7 +26698,6 @@ colbonews.co.il, 1 colchesterglobal.com, 1 colcomm.com, 1 colcompany.com, 1 -coldaddy.com, 1 coldcardwallet.com, 1 coldecan.edu.co, 1 coldfff.com, 1 @@ -26915,6 +26894,8 @@ combidesk.com, 1 combigo.com, 1 combineconquer.com, 1 combron.be, 1 +combron.co.uk, 1 +combron.com, 1 combron.nl, 1 combustibilaspen.ro, 1 comcenter.com, 1 @@ -26929,7 +26910,6 @@ comeals.com, 1 comebookmark.cf, 1 comebookmark.ga, 1 comebookmark.ml, 1 -comedicgrouperu.com, 1 comedimagrire.it, 1 comedyhuis.nl, 1 comefollowme2016.com, 0 @@ -27122,6 +27102,7 @@ complexart.ro, 1 complexcoral.ro, 1 complexorganization.com, 1 complexorganizations.com, 1 +complexsystems.fail, 1 compliance-management.ch, 0 compliance-risk.com, 1 compliance-systeme.de, 1 @@ -27339,7 +27320,7 @@ congenio.de, 0 congineer.com, 1 congnghe.so, 1 congoproject.tk, 1 -congregacionmitacol.org, 1 +congregacionmitacol.org, 0 congresistas-ap.tk, 1 congresodermatologia2019.com, 1 congressmankirk.com, 1 @@ -28025,6 +28006,7 @@ couchscreen.de, 1 cougar-bordeaux.fr, 1 cougar.dating, 1 cougarlyon.fr, 1 +coughlan.de, 1 could.jp, 1 couleursorgue.tk, 1 coumoul.fr, 1 @@ -28455,7 +28437,6 @@ credentsys.cloud, 1 credex.bg, 1 credit-10.com, 1 credit-default-swaps.tk, 1 -creditandfinancialmanagement.com, 1 creditcard.run, 1 creditcardgenerator.money, 1 creditdigital.uk, 1 @@ -28514,7 +28495,6 @@ cribcore.com, 1 cricketnmore.com, 1 crickey.eu, 1 cricklewood.condos, 1 -cricoff.com, 1 criena.com, 1 criena.net, 1 criktrik.com, 1 @@ -29029,7 +29009,6 @@ cuatroymedia.com, 1 cubaal.com, 1 cuban.wiki, 1 cubanchino.tk, 1 -cubash.host, 1 cubatel.com, 1 cubazineers.ga, 1 cubazineest.ga, 1 @@ -29210,7 +29189,6 @@ cursoalia.com, 0 cursocatolico.com, 1 cursodehipnosis.tk, 1 cursodememorizacao.ml, 1 -cursoderecepcionistadehotel.es, 1 cursointeractivo.com, 1 cursomente.online, 1 cursorcam.tk, 1 @@ -29219,6 +29197,7 @@ cursos.com, 1 cursosdeinglesmexico.com, 1 cursosemmaus.es, 1 cursosforex.com, 1 +cursosgratuitos.pe, 1 cursosingles.com, 1 cursosprogramacion.online, 1 cursossena.co, 1 @@ -29562,8 +29541,6 @@ cypherbot.org, 1 cypherpunk.observer, 1 cypherpunk.ws, 1 cypressca.gov, 1 -cypressinheritancesaga.com, 1 -cypresslegacy.com, 1 cyprus-company-for.gr, 1 cyprus-company-service.com, 1 cyptechost.co.ke, 1 @@ -29617,7 +29594,6 @@ d-day.tk, 1 d-eisenbahn.com, 1 d-ku.de, 1 d-loop.de, 1 -d-macindustries.com, 1 d-parts.de, 1 d-parts24.de, 1 d-shed.tk, 1 @@ -29801,6 +29777,7 @@ dag-hebergement.fr, 1 dag-konsult.com, 1 dag-ogni.tk, 1 daganzo.tk, 1 +dagbestedingwarrie.nl, 1 dagensannonser.se, 1 dagestan.cf, 1 dagestanci.tk, 1 @@ -29856,6 +29833,7 @@ dailysomething.site, 1 dailysuperheroes.com, 1 dailytrip.de, 1 dailyusbusiness.tk, 1 +dailyw88.com, 1 dailywarteg.com, 1 dailywork.ga, 1 dailyxenang.com, 1 @@ -30162,7 +30140,6 @@ dansa.com.co, 1 dansage.co, 0 dansaunders.me, 1 dansdiscounttools.com, 1 -dansedesalonsaintave.fr, 1 danselibre.net, 1 danselibre.org, 1 danseressen.nl, 1 @@ -30797,7 +30774,6 @@ dcdestetica.it, 1 dcepler.net, 1 dchatelain.ch, 0 dchest.org, 1 -dchublist.ru, 1 dci.com.br, 1 dcimpianti.it, 1 dckd.nl, 1 @@ -30813,7 +30789,6 @@ dcpower.eu, 1 dcpudwa.gov, 1 dcrdev.com, 1 dctrl.ch, 1 -dcw.io, 1 dcyph.de, 1 dd-groupinc.com, 1 dd.art.pl, 1 @@ -30848,7 +30823,6 @@ ddiaz.tk, 1 ddjia.com, 0 ddjlawtampa.com, 1 ddk.dn.ua, 1 -ddkkitchens.com, 1 ddlcmods.com, 1 ddmeportal.com, 1 ddns-anbieter.de, 1 @@ -30907,6 +30881,7 @@ deagle.chat, 1 deaktualisierung.org, 0 deal-runners.cf, 1 deal45.ga, 1 +dealandgo.co.il, 1 dealapp.nl, 1 dealbanana.no, 1 dealbenzbkk.com, 1 @@ -30920,7 +30895,6 @@ dealerwriter.com, 1 dealinflatables.co.uk, 1 dealproject.org.au, 1 dealroom.co, 1 -dealsemperor.com, 1 dealsfromheaven.com, 1 dealsmagnet.com, 1 dealspotr.com, 1 @@ -31048,6 +31022,7 @@ decorativecosmetics.tk, 1 decorativeflooring.com, 1 decorator.uk, 1 decoratore.roma.it, 1 +decorauvent.ca, 1 decorestilo.com.br, 1 decorlux.bg, 1 decormiernissanparts.com, 1 @@ -31071,7 +31046,7 @@ dedg3.com, 1 dedge.org, 1 dedicatedservers.cf, 1 dedicatedtowomenobgyn.com, 1 -dedirten.com, 1 +dedirten.com, 0 dedmoroz.ga, 1 dedmoroz.gq, 1 dedmorozrzn.ru, 0 @@ -31108,7 +31083,6 @@ deeonix.eu, 1 deep-chess.com, 0 deep-labs.com, 1 deep-wave-hair-extensions.tk, 1 -deep.club, 1 deepaero.com, 1 deeparamaraj.com, 1 deepbluecrafting.co.uk, 1 @@ -31236,7 +31210,6 @@ degrootenslot.nl, 1 degroupage.info, 1 dehaanadvocatenkantoor.nl, 1 dehkade3.ml, 1 -dehnermd.com, 1 dehoga-reisen.de, 1 dehopre.com, 1 deidee.nl, 1 @@ -31888,7 +31861,6 @@ detelefoonboer.nl, 1 detenterprise.com, 1 determapp.de, 1 determinatie.tk, 1 -dethoi.com, 1 deti-online.com, 1 deti-vse.ml, 1 deti.ga, 1 @@ -32108,7 +32080,6 @@ dezet-ev.de, 1 dezevenster.com, 1 dezintranet.com, 1 dezmembrariromania.ro, 1 -dezzoroofing.co.za, 1 df-clan.tk, 1 df-team.tk, 1 df1nif.de, 1 @@ -32403,6 +32374,7 @@ diegoisla.ga, 1 diegomeza.tk, 1 diegosalgado.tk, 1 diegovisual.tk, 1 +diehildebrands.de, 1 diekperaiwseis.gr, 1 diemattels.at, 1 diemperu.com, 1 @@ -32703,7 +32675,6 @@ dillewijnzwapak.nl, 1 dillonco.gov, 1 dillonm.io, 1 dilmarames.com, 1 -dima-v.ru, 1 dima.pm, 1 dimagrimentoincorso.it, 1 dimanss47.net, 1 @@ -33233,7 +33204,6 @@ djalberto.tk, 1 djalessandrobrain.tk, 1 djamiroquai.tk, 1 djang.tk, 1 -django-lessons.com, 1 django.city, 1 djangobirthday.com, 0 djangogolf.com, 1 @@ -34863,7 +34833,6 @@ drosophila.tk, 1 drost.la, 1 drown.photography, 1 drpa.ca, 1 -drpadawan.io, 1 drpetersenobgynal.com, 1 drpetervoigt.ddns.net, 1 drpetervoigt.de, 1 @@ -34929,7 +34898,6 @@ druznek.rocks, 1 druznek.xyz, 1 druzya.store, 1 drvaidyas.com, 0 -drvondawright.com, 1 drwang.group, 0 drweissbrot.net, 1 dry-cleaning.tk, 1 @@ -35355,6 +35323,7 @@ dvorek-karlin.cz, 1 dvorekkarlin.cz, 1 dvorupotocnych.sk, 1 dvotx.org, 1 +dvprogram.us, 1 dvwc.org, 1 dvx.cloud, 1 dw-loewe.de, 0 @@ -35474,7 +35443,6 @@ dyneco.io, 1 dynet.ru, 1 dynhost.co.uk, 1 dynn.be, 0 -dynocc.xyz, 1 dynorphin.com, 1 dynorphins.com, 1 dynsoundmax.tk, 1 @@ -35553,7 +35521,6 @@ e-diasporan.ga, 1 e-diasporan.gq, 1 e-diasporan.ml, 1 e-dv.eu, 1 -e-emploi.be, 1 e-enterprise.gov, 1 e-estonia.com, 1 e-facture.net, 1 @@ -36187,7 +36154,7 @@ eatinglinks.tk, 1 eatingonions.com, 1 eatmebudapest.hu, 1 eatmportal.eu, 1 -eaton-daitron.jp, 1 +eaton-daitron.jp, 0 eaton-works.com, 1 eatry.io, 1 eats.soy, 1 @@ -36464,6 +36431,7 @@ ecos-eguilles.com, 1 ecos-ev.de, 1 ecos.srl, 1 ecosas.org, 1 +ecosdanoticia.net.br, 1 ecosdesociedad.tk, 1 ecosfti.tk, 1 ecoshare.info, 1 @@ -36902,7 +36870,6 @@ egipet-tiz.tk, 1 egiptwakacje.tk, 1 egittophilia.tk, 1 egles.eu, 1 -eglisedenantes.fr, 1 egm-sakura.com, 1 ego4u.com, 1 ego4u.de, 1 @@ -37074,7 +37041,6 @@ ekcrags.ru, 1 ekd.de, 1 ekdoseis.gr, 1 ekeblock.com, 1 -ekedc.com, 1 ekedp.com, 1 ekhabar.ml, 1 ekho.tk, 1 @@ -37425,7 +37391,6 @@ elephantbasslab.tk, 1 elephantia.cf, 1 elephants.net, 1 elephants.tk, 1 -elephantstone.net, 1 elepover.com, 1 eletesstilus.hu, 1 eletminosegert.ro, 1 @@ -37684,7 +37649,7 @@ elreportero.tk, 1 elri.blog, 1 elrincondelotaku.tk, 1 elrincondeltrabajo.com, 0 -elrinconderovica.com, 0 +elrinconderovica.com, 1 elrubio.tk, 1 elsadonaire.tk, 1 elsas.tk, 1 @@ -38486,6 +38451,7 @@ eoskoch.com, 1 eosol.de, 1 eosol.net, 1 eosol.services, 1 +eosolutions.co, 0 ep-cortex.com, 1 ep-plus.jp, 1 epa.com.es, 1 @@ -38870,7 +38836,6 @@ es-sicherheit.ch, 1 es-tools.at, 1 es-tools.com, 1 es-tools.de, 1 -es-trade.biz, 1 es-vps.eu, 1 es.ax, 1 es.search.yahoo.com, 0 @@ -38980,6 +38945,7 @@ escortlistings.eu, 1 escortlistings.fr, 1 escortlistings.ph, 1 escortlistingsuk.co.uk, 1 +escorts.works, 1 escortsontop.co.uk, 1 escortz.gq, 1 escoteiros.tk, 1 @@ -39525,6 +39491,7 @@ europeancupinline.eu, 1 europeanpreppers.com, 1 europeanstudies-chemnitz.de, 1 europeantransportmanagement.com, 1 +europeanwineresource.com, 1 europeluxuryweddings.com, 1 europeonline.tk, 1 europeos.es, 1 @@ -39639,7 +39606,6 @@ eveningtaxservices.com, 1 evenstar-gaming.com, 1 evenstargames.com, 1 event-blick.de, 1 -event-fullyyours.com, 1 event-reisen.tk, 1 event4fun.no, 1 eventact.com, 0 @@ -39746,6 +39712,7 @@ eviadc.com, 1 eviction.cf, 1 evidecor.com.br, 1 evidence-based.review, 1 +evidencebased.net, 1 evidenceusa.com.br, 1 evidenciamidiasdigitais.com.br, 1 evidencija.ba, 1 @@ -39886,6 +39853,8 @@ exambot.tk, 1 examedge.com, 1 examika.ru, 1 examlab.tk, 1 +example.sc, 1 +example.wf, 1 exampleessays.com, 1 examroll.com, 1 examroll.fr, 1 @@ -40334,7 +40303,6 @@ f1tv-streams.live, 1 f1worldwide.tk, 1 f2h.io, 1 f36533.com, 1 -f3b.de, 1 f3r.xyz, 1 f42.net, 1 f43.me, 1 @@ -40536,7 +40504,6 @@ fach-journalist.de, 1 fachfusspflege-exner.de, 1 fachim.tk, 1 fachiri.tk, 1 -fachmann-umzuege.de, 1 fachowisko.pl, 1 fachschaften.org, 0 fachschaftslisten.at, 1 @@ -40544,7 +40511,6 @@ fachschaftslisten.org, 1 fachversand-hennes.de, 1 facialcare.tk, 1 facialexercising.com, 1 -facialflex.com, 1 facialparalysisnetwork.ga, 1 facialplasticsurgeryofaustin.com, 1 facil.services, 0 @@ -40816,7 +40782,6 @@ familiereimann.com, 0 familievisscher.tk, 1 familjenm.se, 1 familledessaint.fr, 1 -familleseux.net, 1 familleshilton.com, 1 family-clinic.tk, 1 familyclinicstl.com, 1 @@ -40844,7 +40809,6 @@ famoushostels.com, 1 famousit.nl, 1 famousmodels.tk, 1 famouspdf.gq, 1 -famousstages.com, 1 famvsomeren.nl, 1 fan.gov, 1 fan4all.de, 1 @@ -40871,6 +40835,7 @@ fanfareokselaar.tk, 1 fanfareunion.ch, 0 fanfiction.tk, 1 fangbing.me, 1 +fangkehou.eu.org, 1 fangkehou.tk, 1 fangs.ink, 1 fanidrakopoulou.tk, 1 @@ -41246,6 +41211,7 @@ fbi.gov, 1 fbigame.com, 1 fbihr.gov, 1 fbiic.gov, 1 +fbijobs.gov, 1 fbo.gov, 1 fbo.network, 1 fboerman.nl, 1 @@ -41566,7 +41532,6 @@ fennet.rentals, 1 fennydewit.nl, 1 fenom.ga, 1 fenotipo.com, 1 -fenriragic.com, 1 fenschui.ru, 1 fenster-bank.at, 1 fenster-bank.de, 1 @@ -41665,6 +41630,7 @@ festar.tk, 1 festesuniversitaries.tk, 1 festin.tk, 1 festival-tipps.com, 1 +festival-transform.com, 1 festival365.ml, 1 festivaldays.tk, 1 festivaldelumieresgand.be, 1 @@ -42145,7 +42111,6 @@ finion.com, 1 finishingpasteers.ga, 1 finishingpasteest.ga, 1 finisron.in, 1 -finisterre1994.com, 1 finkelstein.fr, 1 finlandcook.online, 1 finlandcook.top, 1 @@ -42224,7 +42189,6 @@ firefense.com, 1 firefighters.dating, 1 firefish.com.au, 1 fireflywellnesscounseling.com, 1 -firegeisha.com, 1 fireglow.de, 1 fireintheholevideos.tk, 1 fireleadership.gov, 1 @@ -42517,7 +42481,7 @@ flagpedia.asia, 1 flagpedia.net, 1 flagriculture.gov, 1 flagspot.net, 0 -flagstone-magazin.ro, 1 +flagstone-magazin.ro, 0 flagyl-500-mg.ga, 1 flairfindr.com, 1 flam.io, 1 @@ -43102,7 +43066,6 @@ followlearning.com, 1 followme.com, 1 followmystaff.com, 1 followthatpage.com, 1 -followthepin.com, 1 folszyb.pl, 1 foluomeng.net, 1 folwark.krakow.pl, 1 @@ -43151,6 +43114,7 @@ foodarrow.ga, 1 foodatlantic.ga, 1 foodattitude.ch, 0 foodauthority.ga, 1 +foodavatar.ga, 1 foodbad.ga, 1 foodbeast.ga, 1 foodblod.ga, 1 @@ -43493,7 +43457,7 @@ forojovensanfernando.tk, 1 forokd.com, 1 forologikidilosi.com.gr, 1 foromasters.tk, 1 -foropl.com, 1 +foropl.com, 0 forosdelmisterio.tk, 1 forourselves.com, 1 forowarhammer.tk, 1 @@ -43656,7 +43620,6 @@ foto-roma.ru, 1 foto-znakomstva.ml, 1 foto.by, 1 fotoallerlei.com, 1 -fotoars.pl, 1 fotoblog.nrw, 1 fotobodyart.nl, 1 fotoboxvysocina.cz, 1 @@ -43668,7 +43631,6 @@ fotoflits.net, 1 fotofon.tk, 1 fotografechristha.nl, 1 fotografiadellalucerossa.com, 1 -fotografiamakro.pl, 1 fotografies.tk, 1 fotografija.tk, 1 fotografoivanalmeida.com.br, 1 @@ -43726,6 +43688,7 @@ fourbrothers.tk, 1 fourcask.com, 1 fourchetteverte.ch, 1 fourcornerscb.com, 1 +fourdesignstudio.com, 1 fourfivecbd.co.za, 1 fourfourcrew.com, 1 fourfri.es, 1 @@ -44231,7 +44194,6 @@ freepatternsarea.com, 1 freepedia.cf, 1 freephonefinder.cf, 1 freepik.com, 1 -freepik.es, 1 freeplace.tk, 1 freepnglogos.com, 1 freepoints.us, 1 @@ -44585,6 +44547,7 @@ fruityloop.tk, 1 fruityten.co.uk, 1 frutasyvejetales.com, 1 frutidump.tk, 1 +frutuozo.com.br, 1 fruturaproduce.com, 1 fruxh.moe, 1 fruxnux.net, 1 @@ -45114,7 +45077,6 @@ fxtrade-lab.com, 1 fxwebstudio.com.au, 0 fydjbsd.cn, 1 fyfywka.com, 1 -fyksen.me, 0 fyllehack.se, 1 fylm.ai, 1 fyn.nl, 1 @@ -45633,7 +45595,6 @@ gammabrossfrance.fr, 1 gammaphibeta.tk, 1 gamster.tv, 1 gan.wtf, 1 -ganaderosdeceres.com.ar, 1 ganapati.fr, 1 ganardinerillo.tk, 1 ganardineroporinternett.com, 1 @@ -45819,7 +45780,7 @@ gatilhoarmas.com.br, 1 gatlink.tk, 1 gatomix.net, 1 gatoslivres.org, 1 -gatot.id, 1 +gatot.id, 0 gattomatto.tk, 1 gattschan.tk, 1 gauche.com, 1 @@ -45941,7 +45902,6 @@ ge1.me, 0 ge3k.net, 0 gealot.com, 1 gear-acquisition-syndrome.community, 1 -gear4you.shop, 1 gearallnews.com, 1 gearbot.rocks, 1 gearboxhero.com, 1 @@ -47372,6 +47332,7 @@ globemilk.com, 1 globemilk.nl, 1 globemusic.es, 1 globereservationsest.ga, 1 +globetalent.nl, 1 globologic.com, 1 globotech.be, 1 globotur.de, 1 @@ -47542,6 +47503,7 @@ goalie1998.duckdns.org, 1 goalsaj.com, 1 goanalyse.co.uk, 1 goand.run, 1 +goapunks.net, 0 goarmy.eu, 1 goatbot.xyz, 1 goatcloud.com, 1 @@ -47867,7 +47829,6 @@ goodtrip.kr, 1 goodvibesblog.com, 1 goodway.tv, 1 goodwin43.ru, 0 -goodwincasinos.com, 1 goodyearsotn.co.uk, 1 goofy.gr, 1 google, 1 @@ -47933,6 +47894,7 @@ gordon-reid.com, 1 gordonbeeming.xyz, 1 gordonhamilton.com, 1 gordvorets.tk, 1 +gordyf.com, 1 gordyforty.com, 1 gorepriest.tk, 1 gorf.club, 1 @@ -47948,6 +47910,7 @@ gorki.tk, 1 gorky.media, 1 gorlani.com, 1 gorlani.net, 1 +gorn.ch, 1 gorod74.ru, 0 gorodabakan.cf, 1 gorodabakan.ga, 1 @@ -48150,6 +48113,7 @@ gpwmd-portal.org, 1 gpz500s.tk, 1 gq-magazine.co.uk, 1 gqmstore.com.br, 1 +gqyyingshi.com, 0 gqyyy.cc, 0 gr.search.yahoo.com, 0 gr8engineer2b.com, 1 @@ -48370,6 +48334,7 @@ gratiz.nl, 1 grattan.co.uk, 1 gratuitweb.tk, 1 graumeier.de, 1 +grauwasser-blog.de, 1 gravedigger.tk, 1 gravelshooters.com, 1 gravelshooters.net, 1 @@ -48624,7 +48589,6 @@ grevenagreece.gr, 1 grevesgarten.de, 1 grexx.today, 1 grey-cat.tk, 1 -greybazar.com, 1 greybeards.ca, 1 greycentre.com, 1 greycrane.net, 1 @@ -48671,7 +48635,7 @@ griffinli.com, 0 griffinsrfc.tk, 1 griffioenconsulting.com, 1 griffophotography.tk, 1 -grifomarchetti.com, 1 +grifomarchetti.com, 0 grifone.tk, 1 grigo.ga, 1 grigo.tk, 1 @@ -48882,7 +48846,6 @@ grupodecoroinhaspnsa.tk, 1 grupodepasajeros.tk, 1 grupoellatu.tk, 1 grupoenelcolombia.com, 1 -grupofurlan.com, 1 grupogrande.com.co, 1 grupoharbour.com, 1 grupoiwana.tk, 1 @@ -49183,7 +49146,6 @@ guolaw.ca, 1 guoliang.me, 1 guoliangwu.com, 1 guomai.com, 1 -guozeyu.com, 1 gupfen.ch, 1 gura.moe, 1 gurbetilan.com, 1 @@ -49284,7 +49246,6 @@ gw.lu, 1 gw2efficiency.com, 1 gw2zone.net, 0 gw66.cc, 0 -gwandalancobras.com.au, 1 gwbet99.cc, 1 gwennyeeckels.com, 1 gwenolakaigre.tk, 1 @@ -49433,7 +49394,6 @@ habbstars.org, 1 habbzohotel.tk, 1 habeeba.tk, 1 haberer.me, 1 -haberkotherapy.com, 1 haberlandconsulting.com, 1 haberlanddesign.com, 1 haberlanddigital.com, 1 @@ -49495,7 +49455,6 @@ hackendoz.com, 1 hackengine.ga, 1 hackenkunjeleren.nl, 1 hackenturet.dk, 1 -hacker.club, 1 hacker.deals, 1 hacker.holiday, 1 hacker.im, 1 @@ -49709,7 +49668,6 @@ halilyagcioglu.tk, 1 halkyon.net, 1 hallaminternet.com, 1 hallcopainting.com, 1 -hallcouture.com, 1 hallelujahsoftware.com, 1 hallettxn.com, 1 hallhireforevents.co.uk, 1 @@ -49812,7 +49770,6 @@ handhockeyest.ga, 1 handicappingsportsers.ga, 1 handicappingsportsest.ga, 1 handicraftsman.tk, 1 -handigehannie.nl, 1 handleidingkwijt.com, 1 handlekrypto.com, 1 handlingcosters.ga, 1 @@ -49868,7 +49825,6 @@ hanky2.com, 1 hannah.link, 1 hannahbarrettyoga.com, 1 hannaljungberg.tk, 1 -hannasecret.de, 1 hannde.com, 1 hannehovi.fi, 1 hannes.paris, 1 @@ -49917,6 +49873,7 @@ hao-zhang.com, 1 hao.gay, 1 haogoodair.ca, 1 haorenka.co, 1 +haorenka.me, 1 haorenka.org, 1 haosygt.com, 1 haotown.cn, 0 @@ -49967,7 +49924,6 @@ happydoghosting.net, 1 happydoq.ch, 0 happydota.ga, 1 happydreamsz.com, 1 -happydyes.co.uk, 1 happyexwife.ga, 1 happyfun.tk, 1 happyfuture.tk, 1 @@ -50072,6 +50028,7 @@ hardweb.it, 1 hardworm.tk, 1 hardy.bz, 1 hardyhaberland.com, 1 +harelmallac.com, 0 harelmallacglobal.com, 1 harem.tk, 1 harery.com, 1 @@ -50172,7 +50129,6 @@ harvard-ma.gov, 1 harvestapp.com, 1 harvester.fr, 1 harvestfellowshipchurch.net, 1 -harvestgospelministries.org, 1 harvestmoon.ga, 1 harvestmoon.ml, 1 harveyauzorst.com, 1 @@ -50269,7 +50225,6 @@ haus-henne.de, 1 haus-momo.ch, 1 haus.bio, 1 hausarzt-stader-str.de, 0 -hausarztpraxis-weilheim.de, 1 hausfrauficken.com, 1 haushaltsaufloesung-vor-ort.de, 1 haushaltsaufloesung-zentrum.de, 1 @@ -50307,7 +50262,6 @@ haverstack.com, 1 havetherelationshipyouwant.com, 1 havohravo.com, 1 hawaiiafro.tk, 1 -hawaiianchoice.com, 1 hawaiianlion.cf, 1 hawaiianlion.ga, 1 hawaiianlion.gq, 1 @@ -51389,7 +51343,6 @@ heutger.net, 1 hevrishut.cf, 1 hewavitharanamv.tk, 1 hex.nl, 1 -hexacon.io, 1 hexagon-e.com, 1 hexagon.io, 1 hexapt.com, 1 @@ -51409,6 +51362,7 @@ hexo.ink, 0 hexo.io, 0 hexobind.com, 1 hexony.com, 1 +hexr.org, 1 hexsafe.io, 1 hexstream.net, 1 hexstream.xyz, 1 @@ -51813,6 +51767,7 @@ hitchens.tk, 1 hitchpin.com, 1 hitchunion.org, 1 hitech-news.ml, 1 +hitech-zone.com, 0 hitechgr.eu, 1 hiteco.com, 1 hitekcomputing.net, 1 @@ -52133,7 +52088,6 @@ holiy.jp, 1 hollabanken.cf, 1 holland-sailing.de, 1 hollandco.com, 1 -hollander.com, 1 hollanderclub.tk, 1 hollandersleepproducts.com, 1 hollandhouse.info, 1 @@ -52782,7 +52736,6 @@ hotel-kronjuwel.de, 1 hotel-le-vaisseau.ch, 0 hotel-promyk.pl, 1 hotel-rosner.at, 1 -hotel-villaelaia.fr, 1 hotelamgarnmarkt.at, 0 hotelarevalo.com, 1 hotelastor.com, 1 @@ -52818,6 +52771,7 @@ hotelreis.com.br, 1 hotels-insolites.com, 1 hotels-resorts-in-crimea.tk, 1 hotels3d.com, 1 +hotels4teams.com, 1 hotelsalzberg.ga, 1 hotelsalzberg.gq, 1 hotelsalzberg.ml, 1 @@ -52951,12 +52905,12 @@ howardhannava.com, 1 howardscholars.org, 1 howarh.com, 1 howbehealthy.com, 1 -howbigismybuilding.com, 1 howdybikes.com, 1 howellaccounts.co.uk, 1 howesky.com, 1 howgoodwasmysex.com, 1 howieisawesome.com, 1 +howinsider.com, 1 howlers.tk, 1 howlettmartin.com, 1 howlingbasset.co.uk, 1 @@ -53025,14 +52979,12 @@ hpkp-faq.de, 1 hplace.com.br, 1 hpneo-conseil.com, 1 hps.digital, 1 -hps.hu, 1 hpsdigital.hu, 1 hpvtimmerwerken.nl, 1 hq.marketing, 1 hq77.ru, 1 hqblog.cn, 0 hqmovies.club, 1 -hqq.tv, 1 hqteas.com, 1 hquest.pro.br, 1 hqwebhosting.tk, 0 @@ -53075,6 +53027,7 @@ hrmn.xyz, 1 hrndz.io, 1 hro.to, 1 hrobert.hu, 1 +hroling.nl, 1 hromaticworld.tk, 1 hroschyk.cz, 1 hrpage.ml, 1 @@ -53487,7 +53440,6 @@ hussam.eu.org, 1 hustl.nl, 1 hustle.com, 1 hustlerstate.tk, 1 -hutchh.com, 1 hutchinsonmn.gov, 1 huthacks.com, 1 huto.ml, 1 @@ -53536,7 +53488,6 @@ hwvv.nl, 1 hwx8.com, 0 hx-sun.com, 1 hx36.net, 1 -hx56.cc, 1 hx678.cc, 1 hx77.cc, 0 hxkvm.com, 1 @@ -53634,7 +53585,6 @@ hyperstack.org, 1 hypertensionexplained.com, 1 hypertesto.me, 1 hyperthymia.com, 1 -hyperverge.co, 1 hypevents.net, 1 hypexstore.tk, 1 hyphen.co.za, 1 @@ -53681,7 +53631,6 @@ hyy.chat, 1 hyychat.com, 1 hyyen.com, 1 hyyperchat.com, 1 -hyza.sk, 1 hzbk.org, 0 hztgzz.com, 1 hzwc.nl, 1 @@ -53738,6 +53687,7 @@ i36533.com, 1 i365365.com, 1 i36588.com, 1 i3o.me, 1 +i4cu.uk, 1 i4net.eu, 1 i51365.com, 1 i5197.co, 1 @@ -53772,7 +53722,6 @@ iadttaveras.com, 1 iaeste.no, 1 iaeste.or.jp, 1 iaf.gov, 1 -iahemobile.net, 1 iain.tech, 1 iainsimms.co.uk, 1 iainsimms.com, 1 @@ -53949,7 +53898,6 @@ icesemulator.com, 1 iceshadow.tk, 1 icetiger.eu, 1 icetravellers.com, 0 -icetwister.com, 1 icewoman.net, 1 icewood-bois.com, 1 ich-finde-wikipedia-toll.tk, 1 @@ -53985,7 +53933,6 @@ icloudlogin.com, 1 icmarket.com, 1 icmfortaleza.tk, 1 icmhd.ch, 0 -icmp2018.org, 1 icnc.ga, 1 icnsoft.org, 1 ico.wf, 1 @@ -53999,7 +53946,6 @@ icon-art.nl, 1 icon-programming.tk, 1 iconintegration.com.au, 1 iconoarte.tk, 1 -iconomi.net, 1 icons4free.tk, 1 iconworld.ml, 1 iconx.ml, 1 @@ -54107,6 +54053,7 @@ idee-lq.de, 1 idee-lq.net, 1 ideeaanzee.tv, 1 ideefactory.de, 1 +idegrafico.com, 0 idehvector.com, 1 ideiasefinancas.com.br, 1 ideice.gob.do, 1 @@ -54202,6 +54149,7 @@ ie-blog.net, 1 ie.edu, 1 ie.search.yahoo.com, 0 iechistore.com, 1 +ieeeaast.org, 1 ieeedeis.org, 1 ieeespmb.org, 1 iegat.com, 1 @@ -54245,6 +54193,7 @@ iffeurope.fr, 1 ifgcdn.com, 1 ifibe.com, 1 ifisher.xyz, 1 +ifitko.cz, 1 ifleurs.com, 1 iflixtv.ga, 1 iflyi.me, 1 @@ -54283,7 +54232,6 @@ ig.com, 1 ig.me, 1 iga-semi.jp, 1 igamingaffiliateprograms.com, 1 -igamingdirectory.com, 1 igamingnews.com, 1 igamingpocketdirectory.com, 1 igamingsuppliers.com, 1 @@ -54725,7 +54673,6 @@ imck.ml, 1 imcreative.ro, 1 imcsi.cn, 1 imdb.com, 1 -imdhd.org, 1 ime-a-tolerancia-eredmenye.club, 1 ime.moe, 1 imed.com.pt, 1 @@ -54745,6 +54692,7 @@ imexmed.com.gt, 1 imfacademy.com, 1 imforza.com, 1 img.mg, 1 +img.ovh, 1 imgaa.com, 1 imgbb.com, 1 imgbu.com, 1 @@ -54933,6 +54881,7 @@ imprezzor.com, 1 imprimante-3d-store.fr, 1 improfestival.ee, 1 improklinikken.dk, 1 +improv.ee, 1 improvebusinessonline.info, 1 improved-madness.de, 1 improvenerg.com, 1 @@ -54970,6 +54919,7 @@ in-crypto.tk, 1 in-depthoutdoors.com, 1 in-flames.com, 1 in-love.tk, 1 +in-ua.com, 1 in.search.yahoo.com, 0 in.xero.com, 0 in10tion.com, 0 @@ -55327,7 +55277,6 @@ infocusvr.net, 1 infodesigners.eu, 1 infodesk.at, 1 infoduv.fr, 1 -infofamouspeople.com, 1 infofp.tk, 1 infogai.tk, 1 infogamesports.tk, 1 @@ -55407,7 +55356,6 @@ infosecchicago.com, 1 infosecdecompress.com, 1 infosecmates.com, 1 infosecsw.ca, 1 -infosectalks.com, 1 infosectekniques.com, 1 infosective.org, 1 infosenior.ch, 0 @@ -55996,7 +55944,6 @@ interallied.org, 1 interasistmen.se, 1 interbec.com, 1 interc0der.tk, 1 -interchangeillawarra.org, 1 interchanges.io, 1 intercom-attachments-1.com, 1 intercom-attachments-5.com, 1 @@ -56194,7 +56141,6 @@ intxt.net, 1 inu.nl, 1 inuevostiempos.es, 1 inumcoeli.com.br, 1 -inup.jp, 1 inusasha.de, 1 inuyasha-petition.tk, 1 invadecafe.tk, 1 @@ -56388,7 +56334,6 @@ iotmu.com, 1 iotportal.tk, 1 iotsms.io, 1 iowacolonytx.gov, 1 -iowaent.com, 1 iowaintex.gov, 1 iowamissingpersons.gov, 1 iowaschoolofbeauty.com, 1 @@ -56452,6 +56397,7 @@ ipid.me, 1 ipigri.tk, 1 ipinfo.tw, 1 ipioneer.ga, 1 +iplaycraft.ru, 1 iplayradio.net, 0 ipleak.net, 1 ipledgeonline.org, 0 @@ -56512,7 +56458,7 @@ ipv6.cool, 1 ipv6.jetzt, 0 ipv6ioffentligsektor.se, 1 ipv6vpn.net, 1 -ipvbook.com, 1 +ipvbook.com, 0 ipwho.site, 1 iqos.com.ua, 1 iqos.ml, 1 @@ -57337,6 +57283,7 @@ iwp.ch, 1 iwtsd.gov, 1 iww.me, 1 iww.mx, 1 +iwyc.cn, 0 ix8.ru, 0 ixaris.com, 1 ixiatiao.com, 1 @@ -57543,7 +57490,6 @@ jacksball.com, 1 jacksfeestverhuur.nl, 1 jackson-quon.com, 1 jacksoncountyfl.gov, 1 -jacksonhu.com, 1 jacksonville.gov, 1 jacksonvilleal.gov, 1 jacksorrell.com, 1 @@ -57874,7 +57820,6 @@ jarmatys.pl, 1 jarmix.fi, 1 jarniashop.se, 1 jarno.rocks, 1 -jarnob.xyz, 1 jarnobogaert.com, 0 jarnobogaert.xyz, 1 jarnskog.tk, 1 @@ -58271,7 +58216,6 @@ jem.gov, 1 jembatankarir.com, 1 jemefaisdesamis.com, 1 jemezsprings-nm.gov, 1 -jemianna.com, 1 jemnezymy.com, 1 jemore.it, 1 jemoreng.tk, 1 @@ -58436,6 +58380,7 @@ jetsadabetchoke77.com, 1 jetsieswerda.nl, 1 jetson.tk, 1 jetstreampro.com, 1 +jetstudio.ch, 0 jetswhiteout.com, 1 jettenbommelaer.nl, 1 jettenjachtbouw.eu, 1 @@ -58635,7 +58580,6 @@ jj9397.com, 0 jj9721.com, 0 jj9728.co, 1 jjhampton.com, 1 -jjhof.com, 1 jjj.blog, 1 jjsguitarpickups.com, 1 jjspartyhire.co.uk, 1 @@ -58993,7 +58937,6 @@ jollausers.de, 1 jolle.io, 1 jollyfun.tk, 1 jollygoodspudz.ca, 1 -jollyjoker.de, 1 jollykidswobbleworld.co.uk, 1 jollytotschildminder.com, 1 jolo.software, 1 @@ -59105,7 +59048,6 @@ joona.pw, 1 joorshin.ir, 1 joostbovee.nl, 1 joostmaglev.nl, 1 -joostrijneveld.nl, 1 joostvanderlaan.nl, 1 jootshop.ga, 1 jophson.tk, 1 @@ -59315,6 +59257,7 @@ jpshop.ru, 1 jpsinflatables.co.uk, 1 jpslconsulting.ca, 1 jpst.it, 1 +jpvermogensregie.com, 1 jqlin.com, 1 jqlsql.com, 1 jquery.wtf, 1 @@ -59501,6 +59444,7 @@ julian-uphoff.de, 1 julian-weigle.de, 1 julian.tech, 1 julianaedouglas.ga, 1 +julianaferrari.com.br, 1 julianbroadway.com, 1 juliangonggrijp.com, 1 juliangramajo.tk, 1 @@ -59570,7 +59514,6 @@ jumpeasy.com.au, 1 jumperke.be, 1 jumperoos.co.uk, 1 jumperweb.tk, 1 -jumpgc.com, 1 jumping4all.com, 1 jumping4all.info, 1 jumping4all.nl, 1 @@ -61107,7 +61050,6 @@ kevincox.ca, 1 kevincoynepage.tk, 1 kevincramer.net, 1 kevindienst.blog, 0 -kevindustries.com, 1 kevinfigueroamusic.tk, 1 kevinfoley.org, 1 kevinfumbles.com, 1 @@ -61121,7 +61063,6 @@ kevinmeijer.nl, 1 kevinmo.com, 0 kevinmoreland.com, 1 kevinn.nl, 1 -kevinpatel.com, 1 kevinperrow.com, 1 kevinpirnie.com, 1 kevinrandles.com, 0 @@ -61263,7 +61204,6 @@ khdestiny.tk, 1 khebranet.tk, 1 khedmatazma.com, 1 kheshtar.pl, 1 -khetibuddy.com, 1 khetzal.info, 1 khey-tv.fr, 1 khg-orchester.de, 1 @@ -61507,7 +61447,6 @@ kinesiologiskolen-syd.dk, 1 kinesiologiuddannelsen.dk, 1 kinetikos.com.au, 1 kinetiq.com, 1 -kineto.space, 1 king-of-the-castles.com, 1 kingant.net, 1 kinganywhere.eu, 1 @@ -61939,7 +61878,6 @@ klev.su, 1 klev.tk, 1 klever.com.mk, 1 kleverltd.ru, 1 -klexhub.com, 1 kli.is, 1 klickinvite.com, 1 klickstdu.com, 1 @@ -61996,7 +61934,6 @@ kloop.kg, 1 klop.info, 1 klose.family, 1 klosko.net, 1 -klothsfrance.com, 1 kloudboy.com, 1 kloza.tk, 1 klpiano.my, 1 @@ -62228,6 +62165,7 @@ kohlpharma.com, 1 kohoutsautomotive.com, 1 kohparadise.com, 1 kohsandra.com, 0 +kohu.nz, 1 koi-lexikon.de, 1 koidulag.edu.ee, 1 koifish.org, 1 @@ -62235,7 +62173,6 @@ koing.de, 1 koirala.email, 1 koiro.fi, 1 koishi.pro, 1 -koizumidesign.com, 1 koj.co, 1 koji-tsujitani.net, 1 kojiishikawa.com, 1 @@ -62304,6 +62241,7 @@ koluke.co, 1 koluke.com, 1 kolyapetrov.tk, 1 kom.pe, 1 +komall.net, 1 komarex.pl, 1 komarh.tk, 1 komehyo.co.jp, 1 @@ -62526,7 +62464,6 @@ koroleva.ml, 1 korolevstvo-movie.ml, 1 koroli.tk, 1 koroshkabir.tk, 1 -korporativnabezbednost.rs, 1 korrelzout.nl, 1 korsanparti.net, 1 korst.tk, 1 @@ -62773,6 +62710,7 @@ krenstetter.at, 1 kreolis.net, 1 kresimir-blazevic.tk, 1 kreslorotang.com.ua, 1 +krestanskydarek.cz, 1 kretaforum.dk, 1 kretschmann.consulting, 1 kreuzbergflieger.de, 1 @@ -63221,6 +63159,7 @@ kunsthandel-augustus-rex.de, 1 kunstundkulturradioschoepfwerk.tk, 1 kunstundunrat.de, 1 kunvarji.com, 1 +kunze-medien.de, 0 kuon.me, 1 kuoruan.com, 1 kuotiva.com, 1 @@ -63806,7 +63745,6 @@ lakesherwoodlighting.com, 1 lakesherwoodoutdoorlighting.com, 1 lakeshiremo.gov, 1 lakeshowlife.com, 1 -lakestclairguide.com, 1 lakestreetministorage.com, 1 lakevotes.gov, 1 lakewinnipegdatastream.ca, 1 @@ -63940,7 +63878,6 @@ landforsale.co.il, 1 landfrauen-hermetschwil.ch, 1 landhaus-christmann.de, 0 landhof-scout.de, 1 -landifer.cz, 1 landinfo.no, 1 landing-phillipferreira.herokuapp.com, 1 landingear.com, 1 @@ -64864,7 +64801,6 @@ leaseourthings.com, 1 leaseplanbank.de, 1 leaseplanbank.nl, 1 leasit.de, 1 -leaskoupartners.com, 1 leastern.net, 1 leastsignificantbit.de, 1 leatam.fr, 1 @@ -65222,7 +65158,6 @@ lelux.site, 1 lemagauto.fr, 1 lemans.com.gt, 1 lemarcheelagrandeguerra.it, 1 -lemarquier.com, 1 lemasdupalus.com, 1 lemat.de, 1 lemazol.fr, 1 @@ -65243,6 +65178,7 @@ lemonparty.co, 1 lemonpool.com.tr, 1 lemonrockbiketours.com, 1 lemonrotools.com, 1 +lemuslimpost.com, 1 lena-klein.de, 1 lena-klein.eu, 1 lena-nitro.org, 1 @@ -65385,7 +65321,7 @@ leptotrichia.tk, 1 lequerceagriturismo.com, 1 lequest.dk, 1 lequocthai.com, 1 -lereporter.ma, 1 +lereporter.ma, 0 leretour.ch, 0 lerika.tk, 1 lerku.com, 1 @@ -65732,7 +65668,6 @@ lib64.net, 1 libbitcoin.org, 1 libble.eu, 1 libbysbooks.com, 1 -libbywinberginteriors.com.au, 1 libcip.org, 1 libcmodbus.org, 1 libcrc.org, 1 @@ -66134,7 +66069,6 @@ lillyfox.de, 1 lillylove.net, 1 lillypornokatze.net, 1 lilomatrixcorner.fr, 1 -lilosaludable.com, 1 lilou-sportswear.com, 1 lilov.com.ua, 1 lilpwny.com, 1 @@ -66182,6 +66116,7 @@ limo.pl, 1 limoairporttoronto.net, 1 limoforsale.com, 1 limoshka.ru, 1 +limousineservicezurich.com, 0 limouzines.cf, 1 limouzy-combi.com, 1 limpiadordeporos.online, 1 @@ -66406,7 +66341,6 @@ linux.pizza, 1 linux.study, 1 linux3.org, 1 linux4all.tk, 1 -linux4tw.de, 1 linuxadictos.com, 1 linuxarequipa.tk, 1 linuxbabe.com, 1 @@ -66440,7 +66374,6 @@ linuxwerkstatt.net, 1 linuz.it, 1 linxmind.eu, 1 linzyjx.com, 1 -lioe.net, 1 lionchita.tk, 1 lionhosting.nl, 1 lionland.tk, 1 @@ -66577,7 +66510,6 @@ literature-schools.com, 1 literaturka.ga, 1 literaturtage-recklinghausen.de, 1 literie06.com, 1 -literiedupantheon.fr, 1 litespeed-webserver.de, 1 litespeedwebserver.com, 1 litespeedwebserver.de, 1 @@ -66945,10 +66877,8 @@ localbouncycastle.com, 1 localcleann.uk, 1 localcrew.eu, 0 localcryptopremium.com, 1 -localcryptos.com, 1 locald.at, 1 localegroup.com, 0 -localethereum.com, 1 localexpert.realestate, 1 localhorst.duckdns.org, 1 localhost.cat, 1 @@ -67979,7 +67909,6 @@ ludwig.im, 1 ludwiggrill.de, 1 ludwigjohnson.se, 1 ludwigpro.net, 1 -lueck-bertram.de, 1 luedeke-bremen.eu, 1 lueersen.homedns.org, 1 luehne.de, 1 @@ -68268,7 +68197,7 @@ luxusnyvoucher.sk, 1 luxvacuos.net, 1 luxwatch.com, 1 luyckx.net, 1 -luyungterd.com, 1 +luyungterd.com, 0 luzat.com, 1 luzfaltex.com, 1 luzi-type.ch, 1 @@ -68281,6 +68210,7 @@ lvcshu.com, 1 lvee.org, 1 lvfc.co, 1 lvftw.com, 1 +lvguitars.com, 1 lvmoo.com, 1 lvna.capital, 1 lvnacapital.com, 1 @@ -68860,7 +68790,6 @@ mahalux.com, 1 mahalux.cz, 1 mahanpt.com, 1 mahaskacountyia.gov, 1 -mahatmayoga.org, 1 mahawi.sk, 1 mahayana.tk, 1 mahbobmax.tk, 1 @@ -69165,11 +69094,9 @@ malibumodas.com.br, 1 maliciousdeath.tk, 1 malicis.com, 1 malie.it, 1 -malik.holdings, 1 malik.id, 1 malikcomputers.tk, 1 malikdeenarislamicacademy.tk, 1 -malikussa.id, 1 malikussaid.com, 1 malimusavirler.tk, 1 malinaclub.com, 1 @@ -69271,7 +69198,6 @@ man-stuff.co.uk, 1 man-trailer.com, 1 man3s.jp, 0 mana.ee, 1 -manach.net, 1 manageathome.co.uk, 1 managed-it.co.za, 1 managedhosting.de, 1 @@ -69924,6 +69850,7 @@ marocmail.ma, 1 marocnews.tk, 1 marocweb.tk, 1 maroebeni.tk, 1 +marokkaansearganolie.nl, 1 marolu.one, 1 maroquineriepirlot.be, 0 maroshionline.tk, 1 @@ -69978,7 +69905,6 @@ martemeo-wetterau.de, 1 marten-buer.de, 1 martensmxservice.nl, 1 martensson.io, 1 -martex.pro, 1 marthakenney.com, 1 marthasvillemo.gov, 1 marthus.com.br, 1 @@ -70153,7 +70079,6 @@ masqueradecostumes.tk, 1 masrilanguage.tk, 1 masrur.org, 1 mass.pt, 1 -massa.net, 1 massaboutique.com, 1 massaer.tk, 1 massage-colleges.com, 1 @@ -70200,20 +70125,15 @@ mastercareplus-staging.com, 1 mastercareplus-uat.com, 1 mastercareplus.com, 1 mastercheat.net, 1 -masterclasses.online, 1 masterdan.net, 1 masterdemolitioninc.com, 1 masterdesingweb.tk, 1 masterdigitale.com, 1 masterdrilling.com, 1 -masterenciberseguridadonline.es, 1 -masterenenologiaonline.es, 1 -masterenmarketingdigitaldq.es, 1 masterglasses.ru, 1 masterhelenaroma.com, 1 masterhoteis.com.br, 1 masterin.it, 1 -masteringenieriadelfuego.es, 1 masterjuantex-projects.tk, 1 masterkitchen.com.br, 1 masterminer.tk, 1 @@ -70274,6 +70194,7 @@ matchday.cz, 1 matchmadeinstubton.com, 1 matchpointusa.com, 1 matchupmagic.com, 1 +matdesign-prod.com, 1 mate.software, 1 matebalazs.hu, 1 matega.hu, 1 @@ -70776,7 +70697,6 @@ mccommando.tk, 1 mcconciergerie.com, 1 mccoolesredlioninn.com, 1 mccordscvs.com, 1 -mccordsvillelocksmith.com, 1 mcculloughjchris.com, 0 mcculloughsgolf.com, 1 mccurtainems.gov, 1 @@ -70851,6 +70771,7 @@ mco.am, 1 mcon.se, 1 mconline.sg, 1 mcoutinho.pt, 0 +mcpa.top, 0 mcpaoffice.com, 1 mcpart.land, 1 mcpat.com, 1 @@ -70872,6 +70793,7 @@ mcsoneca.tk, 1 mcsports.es, 1 mcsrvstat.us, 1 mcstaralliance.com, 1 +mctea.tk, 1 mctherealm.net, 1 mctitan.net, 1 mctools.org, 1 @@ -71569,7 +71491,6 @@ mega.co.nz, 1 mega.nz, 1 megaar.tk, 1 megabike.tk, 1 -megablogging.org, 1 megabook.ml, 1 megabounce.co.uk, 1 megabouncingcastles.com, 1 @@ -71832,6 +71753,7 @@ memepasmal.org, 1 memetrash.co.uk, 1 memind.net, 1 memiux.com, 1 +memo-linux.com, 1 memo.ee, 1 memoire-resistance-ariege.fr, 1 memoirmedie.dk, 1 @@ -71857,7 +71779,7 @@ menchez.me, 1 menddie.com, 1 mendekuitxua.tk, 1 mendel.tk, 1 -mendelsphotography.com, 1 +mendelsphotography.com, 0 mendelsphotography.tk, 1 menden.com, 1 mendipbouncycastles.co.uk, 1 @@ -71891,7 +71813,7 @@ menielias.com, 1 menlosecurity.com, 1 menn.tk, 1 mennace.com, 1 -menno.cloud, 1 +menno.cloud, 0 menno.me, 1 menole.com, 1 menole.de, 1 @@ -72055,6 +71977,7 @@ merryxmas2015.tk, 1 merson.org, 1 merson.tv, 1 mertak.cz, 1 +mertarauh.com, 0 mertcangokgoz.com, 1 meruri.com, 1 mervart.co.uk, 1 @@ -72086,7 +72009,6 @@ meskdeals.com, 1 meskimonos.fr, 1 meskiukas.tk, 1 meslekifikir.com, 1 -meslekkursu.com, 1 mesmer.tk, 1 mesomeds.com, 1 mesonandino.tk, 1 @@ -73216,7 +73138,6 @@ mironet.cz, 1 mironi.ml, 1 mironized.com, 1 mironov.tk, 1 -mirror.ua, 1 mirrordream.net, 1 mirrormirror.tk, 1 mirrorsedgearchive.de, 1 @@ -73411,7 +73332,6 @@ mix-recruit.jp, 1 mix.my, 1 mixandplay.tk, 1 mixedbagashley.com, 1 -mixedmenus.com, 1 mixedrecipe.com, 1 mixes.cloud, 1 mixescloud.com, 1 @@ -73456,7 +73376,6 @@ mjanja.ch, 1 mjasm.org, 1 mjhs.org, 1 mjhsfoundation.org, 1 -mjjlab.com, 1 mjkholding.nl, 1 mjmedia.co.za, 1 mjniessen.com, 1 @@ -73769,6 +73688,7 @@ mobizat.com, 1 mobizma.com, 1 moblkar.com, 1 mobmp4.info, 1 +mobobe.com, 1 mobolight.ml, 1 mobot.sg, 1 mobsitin.tk, 1 @@ -73798,7 +73718,6 @@ modacruz.com, 1 modaexecutiva.com.br, 1 modafinilici.com, 1 modafo.com, 1 -modahouse.co, 1 modalogi.com, 1 modalrakyat.com, 1 modamoom.com.br, 1 @@ -73975,7 +73894,6 @@ moje-communication.de, 1 mojeco2.cz, 1 mojefedora.cz, 1 mojefilmy.xyz, 1 -mojezegarki.pl, 1 mojilitygroup.com, 1 mojitoparty-articlespara.website, 1 mojizuri.jp, 1 @@ -74471,7 +74389,6 @@ morozko.gq, 1 morozstudio.tk, 1 morozyaka.tk, 1 morph3d.tk, 1 -morphose.io, 1 morrellllc.com, 0 morris.computer, 1 morrowind-finland.tk, 1 @@ -74936,7 +74853,6 @@ msize48.ch, 1 msl.org, 1 mslivros.com.br, 1 msm-data.com, 1 -msmae-ou.com, 1 msmails.de, 1 msmetana.cz, 1 msn.com, 1 @@ -75124,7 +75040,9 @@ muhcow.dk, 1 muhibbulislam.tk, 1 muhlenbergtwppa.gov, 1 muhrielle.org, 1 +mui.fitness, 1 mui.kitchen, 1 +mui.pet, 1 mui.today, 1 muii.com.br, 1 muii.in, 1 @@ -75300,7 +75218,6 @@ murdercube.com, 1 murfy.kiwi, 1 murfy.nz, 1 murgi.de, 1 -murielfrenchcouture.fr, 1 murksbreider.tk, 1 murmansk.cf, 1 murmanskforum24x7.tk, 1 @@ -75310,7 +75227,6 @@ murof.com.br, 1 murphy-law.net.ru, 1 murray.xyz, 1 murraya.cn, 1 -murraycoin.org, 1 murraycountymn.gov, 1 mursa.tk, 1 mursatov.tk, 1 @@ -76486,6 +76402,7 @@ nadomna-rabota.tk, 1 nadoske.info, 1 nadsandgams.com, 1 naduvilathu.tk, 1 +nadyaolcer.fr, 1 naehkurshamburg.de, 1 naemnuk.tk, 1 nafod.net, 1 @@ -76560,7 +76477,6 @@ nakamastudios.com, 1 nakanishi-paint.com, 1 nakarkhana.com, 1 nakayama.industries, 1 -nakayama.systems, 1 nakayamaresearch.com, 1 nakazanie.ga, 1 nakazato-shika.com, 1 @@ -76599,6 +76515,7 @@ namalelaki.com, 1 namamala.com, 1 namaperempuan.com, 1 namazon.org, 1 +namazvakitleri.com.tr, 0 namdak.com, 1 namecoin.org, 1 namegen.jp, 1 @@ -76883,7 +76800,6 @@ nathanielsigal.com, 1 nathankonopinski.com, 0 nathanmfarrugia.com, 1 nathanphoenix.com, 1 -nathans.com.au, 1 nathansmetana.com, 1 nathenmaxwell.tk, 1 nathumarket.com.br, 1 @@ -76943,7 +76859,6 @@ naturalezafengshui.com, 1 naturalfit.co.uk, 1 naturalflowerpower.com, 1 naturalkitchen.co.uk, 1 -naturallyvegan.de, 1 naturalspacesdomes.com, 1 naturalstyle.tk, 1 naturana.news, 1 @@ -77696,7 +77611,6 @@ nettiruletti.tk, 1 netto-service.ch, 0 nettools.link, 1 nettoyage.email, 1 -nettx.co.uk, 1 nettype.ca, 1 netube.org, 1 netvizura.co.uk, 1 @@ -77729,7 +77643,6 @@ networkersdiary.com, 1 networking-groups.co.uk, 1 networking4all.com, 1 networkingnexus.net, 1 -networkingphoenix.com, 1 networkinternetmonitor.com, 1 networkmas.com, 1 networkmidlands.co.uk, 1 @@ -77760,6 +77673,7 @@ netzklad.de, 1 netzona.org, 1 netzspielplatz.de, 0 netzsv.website, 1 +netztest.at, 1 netzvieh.de, 1 netzwerk-lq.com, 1 netzwerk-sozialliberal.de, 1 @@ -78554,6 +78468,7 @@ niket.site, 1 nikhilnimiya.love, 1 nikhilramakrishnan.tk, 1 nikimix.com, 0 +nikitacartes.xyz, 0 nikitenko.tk, 1 nikitin.photo, 1 nikitina.ml, 1 @@ -78575,6 +78490,7 @@ nikolasbradshaw.com, 1 nikomo.fi, 0 nikonlibrary.co.uk, 1 nikonnps.co.uk, 1 +nikonschool.co.uk, 1 nikosoikonomopoulos.tk, 1 nikosverths.tk, 1 nikscloud.eu, 1 @@ -78587,7 +78503,6 @@ niles-simmons.de, 1 niles.xyz, 1 nilgirispice.co.uk, 1 nilianwo.com, 1 -nilmaracursos.com.br, 1 nilosoft.com, 1 niloxy.com, 1 nilpointer.com, 1 @@ -78902,6 +78817,7 @@ noedidacticos.com, 1 noel.wf, 1 noel.yt, 1 noelblog.ga, 1 +noelclaremont.com, 1 noellabo.jp, 1 noellimpag.me, 0 noematic.space, 1 @@ -78991,7 +78907,6 @@ nomik.xyz, 1 nomio.com, 1 nomoondev.azurewebsites.net, 1 nomsing.tk, 1 -nomsy.net, 1 nomzamo.spdns.org, 1 noname-ev.de, 1 nonametheme.com, 1 @@ -79351,7 +79266,7 @@ novaintegra.co, 1 novaintegra.com, 1 novak.cf, 1 novalite.rs, 1 -novanetnettoyage.fr, 1 +novanetnettoyage.fr, 0 novanetwork.ml, 1 novanice.net, 1 novapur.pl, 1 @@ -80061,7 +79976,6 @@ observer.name, 1 obsessedwithknives.ru, 1 obsessharness.com, 1 obsessivecompulsiveexplained.com, 1 -obsidian.net, 1 obsidianirc.net, 1 obsproject.com, 1 obsuzhday.com, 1 @@ -80250,7 +80164,6 @@ odtu.lu, 1 oduachambers.com, 1 oducs.org, 1 odvps.com, 0 -odxin.com, 1 odysea.cat, 1 odyssee-animation.tk, 1 odyssey44.com, 1 @@ -80564,7 +80477,6 @@ olaradio.tk, 1 olasderisa.tk, 1 olasouris.com, 0 olastrafford.org, 1 -olasverdeshotel.com, 1 olatiferreira.com, 1 olax.tk, 1 olbat.net, 1 @@ -81006,6 +80918,7 @@ onidesign.tk, 1 oninpresento.ga, 1 onionbot.ga, 1 onionbot.me, 1 +onionflix.net, 1 onionplay.eu, 1 onionscan.org, 1 onionshare.org, 1 @@ -81187,7 +81100,6 @@ onpreise.de, 1 onrealt.ru, 0 onsenlaichelesdoigts.be, 1 onsetfacilities.com, 1 -onsgenoegen-waz.nl, 1 onsinscrit.com, 1 onsite4u.de, 1 onsitedoc.com, 1 @@ -81310,7 +81222,6 @@ openai.community, 1 openalgeria.org, 1 openarch.nl, 1 openarchivaris.nl, 1 -openbayes.com, 1 openbayesstatus.com, 1 openbeecloud.com, 1 openblox.org, 1 @@ -81339,7 +81250,7 @@ opendata.cz, 1 opendataincubator.eu, 1 opendecide.com, 1 opendolls.com, 1 -opendor.me, 1 +opendoorcounselingpa.com, 1 openevic.info, 1 openfir.st, 1 openfitapi-falke.azurewebsites.net, 1 @@ -81577,7 +81488,6 @@ oralight.ml, 1 orang-utans.com, 1 orangeacademy.cz, 1 orangecityfl.gov, 1 -orangecomputers.com, 1 orangefab.asia, 1 orangefinanse.com.pl, 1 orangehome.ga, 1 @@ -81626,6 +81536,7 @@ orchideenettoyage.com, 1 orchidhouse.sk, 0 orchidlive.com, 1 orchids.ua, 1 +orchidsforum.com, 1 orcomsilver.tk, 1 orcsnet.com, 1 orcz.cz, 1 @@ -81692,7 +81603,7 @@ organicstraw.vn, 1 organictanningest.ga, 1 organisatieteam.nl, 1 organisation-mariage.net, 1 -organise.earth, 1 +organise.earth, 0 organizacasa.com.br, 1 organizasyon.tk, 1 organization-of-holidays.tk, 1 @@ -81829,7 +81740,6 @@ osagenation-nsn.gov, 1 osagokasko.ga, 1 osaka-hero-project.com, 0 osakaevoce.com.br, 1 -osakeannit.fi, 1 osakerekisteri.fi, 1 osaki.fr, 1 osamabook.tk, 1 @@ -82168,7 +82078,6 @@ overdrive-usedcars.be, 0 overener.com, 1 overframe.gg, 1 overheek.tk, 1 -overlandliberty.be, 1 overlevers.tk, 1 overlord.network, 1 overmorgen.nl, 1 @@ -82576,7 +82485,6 @@ paidsurveys.tk, 1 paidtocode.com, 1 paidtodesign.com, 1 paidtodev.com, 1 -paidtohavesex.com, 1 paiementdp.com, 1 paig.pl, 1 paige.ai, 1 @@ -82700,7 +82608,6 @@ palletflow.com, 1 palli.ch, 0 palmaprop.com, 1 palmarinaestrada.com.br, 1 -palmas.lk, 1 palmavile.us, 0 palmaville.com, 0 palmbeachcounty-fl.gov, 1 @@ -83238,7 +83145,6 @@ passionatefoodie.co.uk, 1 passionatehorsemanship.com, 1 passionatelife.com.au, 1 passionateracers.com, 1 -passionbyd.com, 0 passiondesigns.web.id, 1 passionebenessere.com, 1 passionegriglia.com, 1 @@ -83558,7 +83464,6 @@ paylessmealsers.ga, 1 paylessmealsest.ga, 1 paylike.io, 1 paylike.se, 1 -paymaster.link, 1 payme.plus, 1 payme.uz, 1 payment-express.net, 1 @@ -83829,6 +83734,7 @@ pedrazanoticias.tk, 1 pedro.com.es, 1 pedrobotias.tk, 1 pedrolamas.com, 1 +pedrollo-ua.com, 1 pedroministro.pt, 1 pedromunoz.tk, 1 pedrooliveira.tk, 1 @@ -84552,7 +84458,6 @@ pgmsp.net, 1 pgmtechnologies.com, 1 pgnetwork.net, 1 pgp.lol, 1 -pgp.network, 1 pgpaintanddesign.com, 1 pgpmail.cc, 1 pgprosupplies.com, 1 @@ -84965,7 +84870,7 @@ piavonpadberg.com, 1 piboston.org, 1 piboubes.me, 1 pic.gov, 1 -pic.pm, 1 +pic.pm, 0 pic.sr, 1 pic2map.com, 1 pic2pat.com, 1 @@ -85202,6 +85107,7 @@ pinkerton.io, 1 pinkitalia.tk, 1 pinklecfest.org, 1 pinklittlenotebook.com, 1 +pinkmango.travel, 0 pinkoi.com, 1 pinkpearl.tk, 1 pinkplay.com.br, 1 @@ -85666,7 +85572,6 @@ platform161.com, 0 platform2020prague.com, 1 platforma2020praha.cz, 1 platformadmin.com, 1 -platformlms.org, 1 platiniumvapes.com, 1 platinmods.my.id, 1 platinumalertsers.ga, 1 @@ -85686,7 +85591,6 @@ platter.gq, 1 platter.tk, 1 platterlauncher.com, 1 platypiduses.com, 1 -plaut.sk, 1 plavdoma.com.ua, 1 plavormind.tk, 1 play, 1 @@ -86122,7 +86026,6 @@ podo-podo.com, 1 podolskaya.tk, 1 podparkers.ga, 1 podparkest.ga, 1 -podpravkite.bg, 1 podprotectionest.ga, 1 podroof.com, 1 podroof.com.au, 1 @@ -86450,6 +86353,7 @@ poolsonline.tk, 1 poolspa.es, 1 pooltest.co.uk, 1 pooltools.net, 1 +poolvilla-margarita.net, 1 poopjournal.rocks, 1 poopr.ru, 1 poopthereitisla.com, 1 @@ -86732,7 +86636,6 @@ postal.dk, 1 postal3.es, 1 postandfly.com, 1 postat.com, 1 -postawnasiebie.pl, 1 postback.io, 0 postblue.info, 1 postbox.life, 1 @@ -87142,7 +87045,6 @@ prefabrik-ev.com, 1 preference.ga, 1 preferredreverse.com, 1 prefix.eu, 1 -preflighttest.com, 1 prefontaine.name, 1 pregen.tk, 1 pregnancytips.tk, 1 @@ -87475,6 +87377,7 @@ prismacloud.green, 1 prismacloud.xyz, 1 prismalite.com.br, 1 prismaot.tk, 1 +prismapixel.studio, 1 prismosystems.com, 0 prisonerresource.com, 1 pristal.eu, 1 @@ -87596,7 +87499,6 @@ pro-taucher.de, 1 pro-web-design.tk, 1 pro-wiert.pl, 1 pro.co.il, 1 -pro100blogger.com, 1 pro3ozonio.com.br, 1 pro4all.be, 1 pro4all.nl, 1 @@ -88401,6 +88303,7 @@ pt-d.ru, 1 pt-server.de, 1 pt.im, 1 pt4.tech, 1 +pta-security.nl, 1 pta.world, 1 ptab2pt.ga, 1 ptal.eu, 1 @@ -88560,7 +88463,7 @@ puntacananetwork.com, 1 puntacanavapor.com, 1 puntaprop.com, 1 puntcunts.com, 1 -punte-juwelier.nl, 0 +punte-juwelier.nl, 1 puntocroce.tk, 1 puntoestadodemexico.com, 1 puntogommevenegono.it, 1 @@ -88694,7 +88597,6 @@ putney.io, 1 putnik.tk, 1 putre.io, 1 putrock.be, 1 -putstrategii.ru, 1 putty.org, 1 puttymonos.club, 1 puttymonos.work, 1 @@ -88760,7 +88662,7 @@ pxio.de, 0 pxl-mailtracker.com, 1 pxl.cl, 1 pxld.sh, 1 -pxstart.cz, 1 +pxstart.cz, 0 pxventures.com.au, 1 pxx.io, 1 py-amf.org, 1 @@ -88943,6 +88845,7 @@ qis.fr, 1 qiscience.tk, 1 qitarabutrans.com, 1 qitzune.com, 1 +qiu.moe, 1 qivonline.pt, 1 qiwi.be, 1 qixi.biz, 1 @@ -89024,6 +88927,7 @@ qrlab.net, 1 qrlfinancial.com, 0 qrpatrol.com, 1 qrpth.eu, 1 +qrsecuriteanimal.com, 1 qruiser.com, 1 qrz.one, 1 qscco.com, 1 @@ -89066,7 +88970,7 @@ quadcityjuggalos.tk, 1 quadomania.tk, 1 quadrantrd.com, 1 quadratimkreis.tk, 1 -quadron.hu, 0 +quadron.hu, 1 quaedam.org, 1 quafe.tech, 1 quaketips.ga, 1 @@ -89081,7 +88985,6 @@ quality-life.gr, 1 qualitycarbonfiber.com, 1 qualitycommerical.com, 1 qualityconcreteleveling.com, 1 -qualityconcreteraising.com, 1 qualityconcreterepair.com, 1 qualitydns.net, 1 qualityfireproofing.com, 1 @@ -89097,7 +89000,6 @@ qualitypiering.com, 1 qualitypolyjacking.com, 1 qualitypropertycare.co.uk, 1 qualitytools.com, 1 -qualitywaterproofing.com, 1 qualitywaterproofingco.com, 1 qualityworks.tk, 1 qualpay.com, 1 @@ -89192,7 +89094,7 @@ quelle.at, 1 quelle.ch, 1 quelle.de, 1 quelleformation.net, 1 -quellenwiese.ski, 1 +quellenwiese.ski, 0 quemadoresdegrasa.org, 1 queminventou.com.br, 0 quemmeliga.com, 1 @@ -89330,7 +89232,6 @@ quirkytravelguy.com, 1 quisildenafil.gq, 1 quitri.tk, 1 quiwy.ninja, 1 -quixxi.com, 1 quixxisecurity.com, 1 quiz.biz, 1 quiz4math.gr, 1 @@ -89432,7 +89333,6 @@ r00tsolutions.ca, 1 r0t.co, 1 r0uzic.net, 1 r102.ch, 1 -r14.io, 1 r15cookie.com, 1 r18.moe, 1 r1a.eu, 1 @@ -90103,7 +90003,6 @@ raquelmolinacases.tk, 1 rar.moe, 1 rarbgmirror.com, 1 rarbgproxy.com, 1 -rarebridal.com, 1 rarece.cf, 1 rarefish.tk, 1 rarename.tk, 1 @@ -90199,6 +90098,7 @@ ravihotel.com, 0 ravijuhend.ee, 1 ravik.tk, 1 ravimiamet.ee, 1 +ravindran.me, 1 raviparekh.co.uk, 1 ravis.org, 1 ravkr.duckdns.org, 1 @@ -90969,7 +90869,7 @@ regiosalland.nl, 1 regiovertrieb.de, 0 regis.tech, 1 regisearch.co.uk, 1 -register.to, 0 +register.to, 1 registerex.me, 1 registerforevent.co.uk, 1 registerforhappywellth.com, 1 @@ -91006,6 +90906,7 @@ rehabphilippines.com, 1 rehabreviews.com, 1 rehabthailand.com, 1 rehabthailand.org, 1 +rehau-ua.com, 1 reher.pro, 1 rehobothma.gov, 1 rei.ki, 1 @@ -91157,7 +91058,6 @@ remaimodern.org, 1 remain.london, 1 remake-projects.tk, 1 remambo.jp, 1 -remapmijnauto.nl, 1 remateszarate.cl, 0 remax.at, 1 remeb.de, 1 @@ -91348,7 +91248,6 @@ reparatiecrm.nl, 1 reparatii-injectoare-buzau.com, 1 reparation-traceur.com, 1 reparaturcafe-pfullendorf.de, 1 -reparizy.com, 1 repat.de, 1 repauto.com.ua, 1 repaxan.com, 1 @@ -91405,7 +91304,6 @@ repugnantconclusion.com, 1 reputatiedesigners.nl, 1 reputationweaver.com, 1 requesthymn.com, 1 -requestr.co.uk, 1 requeue.ga, 1 requin.tk, 1 requirements.ga, 1 @@ -91944,6 +91842,7 @@ ricksdailytips.com, 1 ricksfamilycarpetcleaning.com, 1 rickvanderzwet.nl, 1 rickweijers.nl, 1 +rickyg.live, 1 rickyromero.com, 1 rickysgames.tk, 1 rico-brase.de, 0 @@ -92110,6 +92009,7 @@ rise-technologies.com, 1 rise.africa, 1 rise.com, 1 rise.global, 1 +riseandrank.com, 1 risecomedy.com, 1 risecstate.gov, 1 riselab.com.ua, 1 @@ -92117,9 +92017,9 @@ riseofmiddle-earth.tk, 1 riseofthewildwoman.com, 1 riseshost.ml, 1 riseup.net, 1 +riseupelectrical.com.au, 1 rishabh.me, 1 risheriffs.gov, 1 -rishikeshyoga.in, 1 risi-china.com, 1 rising-cubers.tk, 1 riskmitigation.ch, 1 @@ -92183,7 +92083,6 @@ riverrun.tk, 1 rivers.gov, 1 riversandoceans.com, 1 riverschool.net, 1 -riversidebaptistchurch.net, 1 riversideiowa.gov, 1 riversidemo.gov, 1 riversideradio.nl, 1 @@ -92407,7 +92306,6 @@ robtex.com, 1 robu.in, 1 robust.ga, 1 robustac.com, 1 -robustevents.in, 1 robuststory.com, 1 robuxemporium.com, 1 robuxkingz.ml, 1 @@ -92625,6 +92523,7 @@ romainlapoux.com, 1 romainlapoux.fr, 1 roman-pavlik.cz, 1 roman.systems, 1 +romancloud.com, 1 romancoinsforsale.org, 0 romancy.tk, 1 romania-film.ml, 1 @@ -93187,7 +93086,6 @@ rteplayer.ie, 1 rteplayer.org, 1 rtesport.eu, 1 rtestore.eu, 1 -rteworld.com, 1 rtgame.co.uk, 1 rtgnews.cf, 1 rtho.me, 1 @@ -93328,6 +93226,7 @@ ruhnke.cloud, 0 ruhproject.kz, 1 ruhrmobil-e.de, 1 ruhrnalist.de, 1 +ruicore.cn, 1 ruifu.tech, 1 ruiming.me, 1 ruimoreira.co.uk, 1 @@ -93934,7 +93833,6 @@ sagan.tk, 1 sagarawat.in, 1 sagargandecha.com.au, 0 sageclinic.org, 1 -sagedocumentmanager.com, 1 sagefalab.com, 1 sagegardens.ca, 1 sagehane.com, 1 @@ -94265,7 +94163,6 @@ samar-leyte.tk, 1 samara-avia.ru, 1 samara-hosting.tk, 1 samaritainsmeyrin.ch, 0 -samatva-yogalaya.com, 1 samba.org, 1 sambaash.com, 1 sambeso.net, 1 @@ -94307,7 +94204,6 @@ saml-gateway.org, 1 samlam.ddns.net, 1 samlamac.com, 1 samlaw.co.nz, 0 -sammamish--locksmith.com, 1 sammichscripts.com, 1 sammyservers.com, 1 sammyservers.net, 1 @@ -94513,7 +94409,6 @@ sanqinyinshi.com.cn, 1 sans-hotel.com, 1 sanskrit.pub, 1 sanskrit.site, 1 -sanskritiyoga.com, 1 sansonehowell.com, 1 santa-fell-from.space, 1 santabarbaraca.gov, 1 @@ -94549,7 +94444,6 @@ santevie.ch, 0 santhoshveer.com, 1 santi-club.de, 1 santiagogarza.co, 1 -santiagomartinez.net, 1 santibanezdetera.tk, 1 santimb.photos, 1 santing.net, 1 @@ -94912,6 +94806,7 @@ sbblog.cn, 1 sbbz-bad-wurzach.de, 1 sbcalitagtag.edu.ph, 1 sbcargo.com, 1 +sbconstrucciones.com, 1 sbcountyatc.gov, 1 sbequineevac.org, 1 sber-solutions.ru, 1 @@ -95591,6 +95486,7 @@ sea-airinternational.tk, 1 sea-godzilla.com, 1 sea-man.org, 1 sea.zapto.org, 1 +seabehind.me, 0 seabooty.com, 1 seabrooklocksmith.com, 1 seachef.it, 1 @@ -95699,6 +95595,7 @@ sebastianjaworecki.tk, 1 sebastiantroncoso.tk, 1 sebastianungureanu.com, 1 sebastiaperis.com, 1 +sebastien-meric.com, 1 sebasveeke.nl, 1 sebba.tk, 1 sebeobrana.ml, 1 @@ -95825,7 +95722,6 @@ securehugs.com, 1 secureideas.com, 0 secureim.de, 1 secureinfo.pl, 1 -securelect-inspection.com, 1 securemailbox.com, 1 securemantra.net, 1 securemy.website, 1 @@ -95965,7 +95861,6 @@ segaretro.org, 1 segdomedia.com, 1 segenstore.com, 1 segmentify.com, 1 -segnalabullo.com, 1 segnalabullo.it, 1 segnidisegni.eu, 1 segtronix.com, 1 @@ -96259,7 +96154,6 @@ sentry.io, 1 sentry.nu, 1 sentrybay.com, 1 sentworks.com, 1 -senu.pro, 1 senzaparole.de, 1 senzei.tk, 1 seo-analyse.com, 1 @@ -96381,6 +96275,7 @@ sepakbola.id, 1 sepalasaude.com.br, 1 separacioniglesiaestado.tk, 1 sepenggal.info, 1 +seppelec.com, 1 seproco.com, 0 septakkordeon.de, 1 septam-orchestra.fr, 1 @@ -96638,6 +96533,7 @@ setuid.io, 1 setuid0.kr, 1 setun.tk, 1 setuplog.io, 1 +setxrm.com, 1 seu.edu.sa, 1 seutens.be, 1 seutens.eu, 1 @@ -96809,6 +96705,7 @@ sh4y.cn, 1 sh4y.com, 1 sh68.cc, 0 sha.bi, 1 +sha2017.org, 1 sha512.online, 1 shaadithailand.com, 1 shabashka.ml, 1 @@ -97419,7 +97316,6 @@ shopkini.com, 1 shoplandia.co, 1 shopless.co.nz, 1 shoplogcap.com, 1 -shopmaksu.com, 1 shopmalinka.cf, 1 shopminut.com, 1 shopocratic.com, 1 @@ -97674,7 +97570,6 @@ shred.ch, 0 shredder.tk, 1 shredoptics.ch, 0 shreyansh26.me, 1 -shrglobal.com, 1 shrike.me, 0 shrimpcam.pw, 1 shrimpnews.tk, 1 @@ -97912,7 +97807,6 @@ signaturecityllc.com, 1 signaturecountertops.com, 1 signaturedallas.com, 1 signatureresolution.com, 1 -signcatch.com, 1 signere.com, 1 signicat.io, 1 significado.origem.nom.br, 1 @@ -97990,6 +97884,7 @@ silicon-vision.com, 1 silina.tk, 1 silindir-taslama.tk, 1 silken-madame.tk, 1 +silkon.net, 1 silkproducts.tk, 1 sillisalaatti.fi, 1 sillysnapz.co.uk, 1 @@ -98268,7 +98163,6 @@ simplybrave.net, 1 simplycateringequipment.co.uk, 1 simplycharlottemason.com, 1 simplycloud.de, 1 -simplydigitalspace.ca, 1 simplyfitperth.com.au, 1 simplyfixit.co.uk, 1 simplyheadwear.com.au, 1 @@ -98532,7 +98426,6 @@ sitecreator.tk, 1 sitecrew.cf, 1 sitecuatui.com, 1 sitedebelezaemoda.com.br, 1 -sitedrive.fi, 1 siteintelstage.com, 1 sitekatalog.tk, 1 sitelinks.ga, 1 @@ -98594,7 +98487,6 @@ sixpackholubice.cz, 1 sixstrings.tk, 1 sixt.com.tr, 1 sixteenweb.in, 1 -sixth.tube, 1 siyuan.com, 1 sizeunknown.com, 1 sizeunknown.net, 1 @@ -98693,7 +98585,7 @@ skiingproperty.com, 1 skiinstructor.services, 1 skile.ru, 0 skiley.net, 1 -skilift-quellenwiese.at, 1 +skilift-quellenwiese.at, 0 skill.moe, 1 skill.tk, 1 skillablers.com, 1 @@ -98846,6 +98738,8 @@ skybound.link, 0 skybrary.aero, 1 skybrary.eu, 1 skycmd.net, 1 +skyder.com.mx, 0 +skyder.mx, 0 skyderby.ru, 1 skydiverapp.com, 1 skydiverecuador.com, 1 @@ -98880,6 +98774,7 @@ skyltmax.se, 1 skyminds.net, 1 skymonk.tk, 1 skyn.ai, 1 +skynet-research.us, 0 skynet233.ch, 0 skynet800.goip.de, 1 skynetcloud.site, 1 @@ -98956,7 +98851,6 @@ slashcrypto.org, 1 slashorg.net, 1 slate.to, 1 slated.ie, 1 -slatemc.com, 1 slatemc.fun, 1 slathering.cf, 1 slaughter.com, 1 @@ -99180,7 +99074,6 @@ smartart.tk, 1 smartass.space, 1 smartass0027.com, 1 smartassembly.tk, 1 -smartb2balgeria.com, 1 smartbiz.vn, 1 smartblock.cloud, 1 smartcar.com, 1 @@ -99601,6 +99494,7 @@ sobaya-gohei.com, 1 sobchak.ga, 1 sobczakdesign.de, 1 sobersys.com, 1 +sobie.ch, 1 sobieray.dyndns.org, 1 soblaznenie.ru, 1 soblaznenie2.ru, 1 @@ -99840,7 +99734,6 @@ sointelcom.com.co, 1 soinvett.com, 0 soji.io, 1 sokak-sanati.tk, 1 -sokakfotografi.com, 1 sokenconstruction.com, 1 soket.ee, 1 soko.nl, 1 @@ -100110,7 +100003,7 @@ sonix.dk, 1 sonixonline.com, 1 sonja-daniels.com, 1 sonja-kowa.de, 1 -sonjoux.com, 1 +sonjoux.com, 0 sonkamusic.tk, 1 sonmark.ru, 1 sonnenbergharrison.law, 1 @@ -100443,7 +100336,6 @@ soychef.today, 1 soydemac.com, 1 soydoula.com, 1 soydxn.com, 1 -soygorrion.com.ar, 1 soyjak.party, 0 soyka.by, 1 soykaf.eu, 1 @@ -100603,6 +100495,7 @@ spartancoin.ooo, 1 spartanis.tk, 1 spartankids.in, 1 spartantheatre.org, 1 +sparumzuege.de, 1 sparvagn.tk, 1 spasem-park.tk, 1 spasicilia.it, 1 @@ -100984,7 +100877,7 @@ spotlabs.uk, 1 spotlessohio.com, 1 spotlightsrule.com, 1 spotonlive.dk, 1 -spotpetins.com, 1 +spotpetins.com, 0 spotrebitelskecentrum.sk, 1 spotsee.io, 0 spotswoodvet.com, 1 @@ -101112,6 +101005,7 @@ sqmin.tk, 1 sqprod.co, 1 sqr-training.com, 1 sqreemtech.com, 1 +sqroot.eu, 1 sqsd.xyz, 1 sqshq.de, 1 squad.fr, 1 @@ -101569,8 +101463,6 @@ starking.net.cn, 1 starking.tk, 1 starkvilleurgentcareclinic.com, 1 starlabs.bio, 1 -starlim.co.in, 1 -starlim.org, 1 starlincuesta.gq, 1 starlinks.tk, 1 starlinkz.tk, 1 @@ -102072,7 +101964,6 @@ stichtingsticky.nl, 0 stichtingwwtoegankelijk.nl, 1 stick2bike.de, 1 stickandpoketattookit.com, 1 -stickeramoi.com, 1 stickerparadise.me, 1 stickers-garage.com, 1 stickertrade.me, 1 @@ -102145,6 +102036,7 @@ stirblaut.de, 1 stirling.co, 1 stisidores.org, 1 stitch.money, 1 +stitchfiddle.com, 1 stitchinprogress.com, 1 stjohncamden.com, 1 stjohnin.com, 1 @@ -102191,7 +102083,6 @@ stmarkseagirt.com, 1 stmarthachurch.com, 1 stmaryextra.uk, 1 stmarysnutley.org, 1 -stmaryswestwarwick.org, 1 stmatthewri.org, 1 stmattsparish.com, 1 stmattsucc.org, 1 @@ -103644,6 +103535,7 @@ sverlo.cf, 1 svet.tk, 1 svetandroida.cz, 1 svetapublic.com, 1 +svetbank.cz, 1 svetila.com, 1 svetlanamamedova.tk, 1 svetlilo.com, 1 @@ -104179,7 +104071,6 @@ t39.com, 1 t3hty.fr, 1 t3rror.net, 1 t404.de, 1 -t449.com, 1 t47.io, 1 t4c.link, 1 t4cc0.re, 1 @@ -104211,6 +104102,7 @@ t88nn.com, 0 t88oo.com, 0 t88ss.com, 0 t88vip0.com, 1 +t88vip1.com, 1 t88vip2.com, 1 t88vip3.com, 1 t88vip4.com, 1 @@ -104691,6 +104583,7 @@ tappezzeria.roma.it, 1 tappezziere.milano.it, 0 tappyshop.com.br, 1 tapquad.com, 1 +taprix.org, 1 tapsnapp.co, 1 taqeemi.com, 1 taquilla.com, 1 @@ -104886,7 +104779,7 @@ taxlab.co.nz, 1 taxly.kr, 1 taxmadras.com, 1 taxo.fi, 1 -taxpackagesupport.com, 0 +taxpackagesupport.com, 1 taxprocpa.com, 1 taxteam.co.il, 1 tayar2u.my, 1 @@ -104998,7 +104891,6 @@ tcvonline.vic.gov.au, 1 tcvvip.com, 1 tcwis.com, 1 tcyoung.co.uk, 1 -td-bambini.com, 1 td-bambini.ru, 1 td-olymp.ru, 1 tdchrom.com, 0 @@ -105429,7 +105321,6 @@ techzjc.com, 0 tecit.ch, 1 tecke.tk, 1 teckgeekz.com, 1 -tecknobox.fr, 1 tecknologg.website, 1 tecmarkdig.com, 1 tecne.ws, 1 @@ -105549,7 +105440,7 @@ tekniksnack.se, 1 teknisetdemarit.fi, 1 tekniskakustik.se, 1 teknodaim.com, 1 -teknofara.com, 1 +teknofara.com, 0 teknoforums.com, 1 teknogeek.id, 1 teknoharekat.com, 1 @@ -105655,7 +105546,7 @@ teleworkouts.com, 1 teleyal.blog, 1 telford.codes, 1 telhatelite.com.br, 1 -telite.com.br, 1 +telite.com.br, 0 telka-online.tk, 1 telkomuniversity.ac.id, 0 tellerify.com, 1 @@ -105735,7 +105626,6 @@ tendinite.org, 1 tendiris.ga, 1 tendmed.com.br, 1 tendomag.com, 1 -tendoryu-aikido.org, 1 tendure.tk, 1 tenelco.net, 1 tenens.ru, 1 @@ -105814,7 +105704,6 @@ teq-automotive.com, 1 teqip-pms.gov.in, 1 tequilazor.com, 1 terabyte-computing.com, 1 -terabyte.services, 1 terabyteharddrive.net, 1 terabyteit.co.uk, 1 teracloud.at, 1 @@ -106074,7 +105963,6 @@ textpages.tk, 1 textpattern.com, 1 textprotocol.org, 1 textsite.tk, 1 -textualapp.com, 1 textundblog.de, 1 texus.me, 1 texy.info, 1 @@ -106198,14 +106086,12 @@ that.host, 1 thatdaria.com, 1 thatdarkplace.com, 1 thatdirtyd.com, 1 -thatlooksreallygood.com, 1 thatshayini-sivananthan.fr, 1 thatssodee.com, 1 thaumaturgian-national-university.tk, 1 thavmacode.gr, 1 thc-stadvdzon.nl, 1 thca.ca, 1 -thcdev.de, 1 thconsulting.co.uk, 1 thcpbees.co.uk, 1 thda.org, 1 @@ -106884,7 +106770,6 @@ theo.me, 1 theobg.co, 1 theobora.fr, 1 theobromos.fr, 0 -theoc.co, 1 theoc4ever.tk, 1 theocharis.org, 1 theocjournal.tk, 1 @@ -107190,7 +107075,6 @@ thetoto.tk, 1 thetownehub.com, 1 thetradinghall.com, 0 thetrafficgeek.com, 1 -thetransformingchurch.org, 1 thetravel.com, 1 thetravelczar.com, 1 thetravelhack.com, 0 @@ -107414,7 +107298,6 @@ thistom.de, 1 thisuniverse.tk, 1 thmail.ml, 1 thmnia.com, 1 -thmpartners.com, 1 thn.la, 1 thoe.xyz, 1 thoitrangsikimanh.com, 1 @@ -107563,6 +107446,7 @@ thvideo.tv, 1 thw-bernburg.de, 1 thw-jugend-muenchen-west.de, 1 thwebdesigns.com, 1 +thwiki.cc, 1 thxandbye.de, 1 thycotic.ru, 1 thynx.io, 1 @@ -107705,6 +107589,7 @@ tierra-indomables.tk, 1 tierracenter.com, 1 tierradeayala.com, 1 tierrahost.com, 1 +tierraprohibida.net, 1 tierschutz-niederrhein.de, 1 tiestofan.tk, 1 tietotori.fi, 1 @@ -108092,7 +107977,6 @@ tkirch.de, 1 tkmr-gyouseishosi.com, 1 tkn.me, 1 tkonstantopoulos.tk, 1 -tkrn.de, 1 tksainc.com, 1 tkts.cl, 1 tkusano.jp, 1 @@ -109166,7 +109050,6 @@ toysperiod.com, 1 toysplace.ml, 1 toystory3.ga, 1 tozdev.com, 1 -tp-kyouyufudousan.com, 1 tp-law.jp, 1 tpark.jp, 1 tpbunblocked.org, 1 @@ -109735,7 +109618,6 @@ treinonerd.com, 1 treinonline.tk, 1 treintijden.com, 1 trek-planet.ru, 1 -treker.us, 1 trekfriend.com, 1 trekintel.com, 1 trekkertrek.tk, 1 @@ -110533,6 +110415,7 @@ turbinaonline.tk, 1 turbinelectricity.ga, 1 turbo.az, 1 turbo24.com, 1 +turbohost.co.mz, 0 turbohostingcolombia.com, 1 turbomag.pl, 1 turbosim.de, 1 @@ -111262,6 +111145,7 @@ uinvest.ml, 1 uinvest.tk, 1 uiop.link, 1 uiterwijk.org, 1 +uitgeverij-deviant.nl, 1 uitingent.be, 1 uitliefde.shop, 1 uitvaartvrouwenfriesland.nl, 1 @@ -111728,7 +111612,6 @@ univate.berlin, 1 univercite.ch, 0 univeril.com, 0 univerkeys.com, 1 -univerpack.net, 1 universal-happiness.com, 1 universal-mail.ml, 1 universal-techno.com, 1 @@ -111809,9 +111692,7 @@ unmutegreetings.dk, 1 unn-edu.info, 1 unnamed.download, 1 unnas.ca, 1 -uno.fi, 1 uno.uk, 1 -unobet-partners.com, 1 unobrindes.com.br, 1 unoccupyabq.org, 1 unofficialbpb.tk, 1 @@ -111864,7 +111745,6 @@ untethereddog.com, 1 unti.me, 1 unti.tk, 1 untro.xyz, 1 -unts.xyz, 1 untvweb.com, 1 unusedrooms.com, 1 unusualhatclub.com, 1 @@ -112330,6 +112210,7 @@ uteasybooki.com, 1 utensil.org, 1 utevai.tk, 1 utiars.com, 1 +uticagravel.com, 1 utilbot.co, 1 utilia.tools, 1 utilidad.tk, 1 @@ -112756,7 +112637,7 @@ van-assen.com, 1 van-brandevoort.tk, 1 van11y.net, 1 vanadrighem.eu, 1 -vanarok.xyz, 1 +vanarok.xyz, 0 vanasperenschoenen.nl, 1 vanbalen.be, 1 vanbarel.tk, 1 @@ -113021,7 +112902,6 @@ vdbongard.com, 1 vdcomp.cz, 0 vddruckwerk.de, 1 vdemuzere.be, 1 -vdesc.com, 1 vdheyden.net, 1 vdim.shop, 1 vdisk24.de, 1 @@ -113060,7 +112940,6 @@ vectormagnetics.com, 1 vectorsiriushockeyclub.com, 1 vectortrack.com.au, 1 vectorwish.com, 1 -vectro.me, 1 vectrum.cf, 1 vedeneev.tk, 1 vedev.io, 1 @@ -113542,7 +113421,6 @@ vichiya.com, 1 vician.cz, 1 vicicode.com, 1 vicioanimal.pt, 1 -vicious.space, 1 viciousflora.com, 1 vicjuwelen-annelore.be, 1 vickyflipfloptravels.com, 0 @@ -113885,8 +113763,6 @@ viltsu.net, 1 vim.cx, 1 vim.ge, 1 vima.ch, 0 -vimar.com, 1 -vimeo.com, 1 vimeosucks.nyc, 1 vimium.com, 1 vimka.gq, 1 @@ -114431,7 +114307,6 @@ vloggerfaire.com, 1 vloggerspace.tk, 1 vlovgr.se, 1 vltonline.org, 1 -vlvvl.com, 1 vlzbazar.ru, 1 vm-0.com, 1 vm-co.ch, 0 @@ -114747,7 +114622,6 @@ votockova.cz, 0 votoot.com, 1 votre-agence-web.com, 1 votre-avenir.com, 0 -votre-hotel.com, 1 votrepolice.ch, 0 votresiteweb.ch, 0 votrespace.ca, 1 @@ -114887,6 +114761,7 @@ vsamsonov.com, 1 vsaratove.tk, 1 vsatke.tk, 1 vsc-don-stocksport.de, 1 +vscale.io, 0 vscm888.com, 1 vscredconsultoria.online, 1 vsd.sk, 1 @@ -114919,7 +114794,6 @@ vshop.ir, 1 vsl-defi.ch, 0 vsl.de, 1 vsolovev.com, 1 -vsonline.blog, 1 vsoy.co.th, 1 vspin.cz, 1 vsportage.com, 1 @@ -116000,6 +115874,7 @@ webfoersterei.de, 1 webforce.pt, 1 webformula.in, 1 webforthemasses.tk, 1 +webfronten.dk, 0 webfun.tk, 1 webgadgets.tk, 1 webgaku.net, 1 @@ -116553,7 +116428,6 @@ werxa.cz, 1 werxus.eu, 1 weryfikacjapodatnika.pl, 1 weschool.id, 1 -wesell.asia, 1 weserv.nl, 1 wesleycabus.be, 0 wesleywarnell.com, 1 @@ -116750,7 +116624,6 @@ whatissflow.com, 1 whatisthe.cloud, 1 whatisthisapp.com, 1 whatnot.ai, 1 -whatsahoy.com, 1 whatsapp.com, 1 whatsapp.net, 1 whatsapp.ru, 1 @@ -116894,7 +116767,6 @@ whitlockconstruction.ca, 1 whittle.in, 1 whittome.com, 1 whitworth.nyc, 1 -whizz.ie, 1 whizzzbang.co.uk, 1 whm.gc.ca, 1 whnpa.org, 1 @@ -117254,6 +117126,7 @@ wilk.tech, 0 wilkebouwer.nl, 1 wilkipedia.org, 1 wilkushka.com, 1 +wilkushka.net, 1 will-lash.com, 1 willalex.com, 1 willberg.bayern, 1 @@ -117397,6 +117270,7 @@ wineforhelp.cz, 1 winek.tk, 1 wineparis.com, 1 winerytoursanfrancisco.com, 1 +wineworksonline.com, 1 winfar.co.za, 1 winfieldchen.me, 1 winfilestorage.tk, 1 @@ -117480,6 +117354,7 @@ wippie.se, 1 wippy.tk, 1 wir-do.de, 1 wir-jugendhilfe.de, 1 +wir-machen-druck.de, 1 wirbsinglereview.com, 1 wircon-int.net, 1 wire.com, 1 @@ -117852,7 +117727,6 @@ woodbridgegrp.com, 1 woodbury.io, 1 woodcat.net, 1 woodcock.cloud, 1 -woodcoin.org, 1 woodconditioningonline.com, 1 woodcountywi.gov, 1 woodcraftind.com, 1 @@ -117865,7 +117739,6 @@ woodfordcountyky.gov, 1 woodinvillesepticservice.net, 1 woodlandboys.com, 1 woodlandexterior.com, 1 -woodlandhillselectrical.com, 1 woodlandsiding.com, 1 woodlandsunrooms.com, 1 woodlandsunroomsandenclosures.com, 1 @@ -118249,7 +118122,6 @@ wphosting.ovh, 1 wphostingblog.nl, 1 wpinabox.de, 1 wpinfos.de, 0 -wpjakarta.com, 1 wpldn.uk, 1 wpletter.de, 1 wplibrary.net, 1 @@ -118403,7 +118275,6 @@ wuerfelmail.de, 1 wuergler-consulting.ch, 1 wuermlitaucher.ch, 1 wuestenbergs.tk, 1 -wufupay.com, 1 wug.fun, 0 wug.jp, 1 wug.news, 1 @@ -119318,6 +119189,7 @@ xn--80acubre5k.tk, 1 xn--80adb4aeode.xn--p1ai, 1 xn--80adbevek3air0ee9b8d.com, 1 xn--80adbvdjzhptl1be6j.com, 1 +xn--80adianadstvnice3evh.xn--90ais, 1 xn--80ae7bafe4d.tk, 1 xn--80aebbkaqx6at.xn--p1ai, 1 xn--80aejhvi0at.xn--90ais, 1 @@ -119530,6 +119402,7 @@ xn--mllerhesszimmerli-22b.ch, 1 xn--mntsamling-0cb.dk, 1 xn--myrepubic-wub.net, 1 xn--myrepublc-x5a.net, 1 +xn--n1aeexs.net, 0 xn--nicieri-b4a.ro, 1 xn--nidar-tib.org, 1 xn--nide-loa.ee, 1 @@ -120487,7 +120360,6 @@ yilanju.com, 1 yilconstruction.ca, 1 yiluup.com, 0 yimgo.fr, 0 -yin8888.tv, 0 yinduyy.com, 0 yinfor.com, 1 ying.gift, 1 @@ -120563,7 +120435,6 @@ yocoboard.com, 1 yodababy.com.tw, 1 yodalef3.tk, 1 yodaremote.tk, 1 -yoga-alliance-teacher-training.com, 1 yoga-bien-etre.com, 1 yoga-good.fr, 1 yoga-prive.de, 1 @@ -120579,11 +120450,9 @@ yogahome.com, 1 yogaillustrations.ga, 1 yogaillustrations.tk, 1 yogamarlene.ch, 1 -yogamea.school, 1 yogananda-roma.org, 1 yogaovelser.dk, 1 yogaprague.com, 1 -yogaschoolrishikesh.com, 1 yogaschule-herzraum.de, 1 yogasolution.tk, 1 yogatherapykosha.com, 1 @@ -120596,7 +120465,6 @@ yogunet.de, 1 yohanesmario.com, 1 yoitoko.city, 1 yoitsu.moe, 1 -yojnaa.com, 1 yokocho373.com, 1 yokoda.okinawa, 1 yokohama-legaloffice.jp, 1 @@ -120827,7 +120695,6 @@ yourtech.ir, 1 yourtests.tk, 1 yourticketbooking.com, 1 yourtime.tv, 1 -yourtopia.fr, 1 yourtwojugs.com, 1 youruseragent.info, 1 yourwatchdesign.co.uk, 1 @@ -121726,7 +121593,6 @@ zdrowebodomowe.pl, 1 zdrowezywienie.edu.pl, 1 zdymak.by, 1 ze.delivery, 1 -ze3kr.com, 1 zeadaniel.com, 1 zeal-and.jp, 1 zeal-interior.com, 1 @@ -121970,7 +121836,7 @@ zhangfangzhou.com, 1 zhangge.net, 1 zhanghao.me, 1 zhanghao.org, 1 -zhangjet.com, 1 +zhangjet.com, 0 zhanglizhi.ml, 1 zhangpeng.ai, 1 zhangshuqiao.org, 1 @@ -122605,7 +122471,6 @@ zydu4.com, 1 zyex.vip, 1 zygfrydadamski.tk, 1 zygozoon.com, 1 -zylai.com, 1 zylai.net, 1 zymmm.com, 1 zypern-firma.com, 1 diff --git a/services/settings/dumps/security-state/intermediates.json b/services/settings/dumps/security-state/intermediates.json index c479dd77fbbc6..e21cdea75b5ec 100644 --- a/services/settings/dumps/security-state/intermediates.json +++ b/services/settings/dumps/security-state/intermediates.json @@ -1,5 +1,131 @@ { "data": [ + { + "schema": 1648997868644, + "derHash": "02gLTj+I2x9bud3b+2v/MZx4Dj2fRO4k7BmVq0LWkU8=", + "subject": "CN=GIAG4x,O=Google Trust Services LLC,C=US", + "subjectDN": "MEIxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMQ8wDQYDVQQDEwZHSUFHNHg=", + "whitelist": false, + "attachment": { + "hash": "7863677df584a77841650e5ad47e7ef8f7c42807c9d69969881133b275b19a50", + "size": 1991, + "filename": "AAGolo0N1iZa5uuvm02csZnkuZs8hvI-HRLhAHtNhqk=.pem", + "location": "security-state-staging/intermediates/d7339913-5a00-4ca1-8efa-d57dac665d41.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "AAGolo0N1iZa5uuvm02csZnkuZs8hvI+HRLhAHtNhqk=", + "crlite_enrolled": false, + "id": "339940cb-d4d8-4caa-88ba-b807e82edbbc", + "last_modified": 1649041064889 + }, + { + "schema": 1648802913684, + "derHash": "Q6cONiC8RSM52HiqaPLlNYrEYHrHIsTXfTxNLCBPf3E=", + "subject": "CN=DigiCert Assured ID G2 TLS RSA4096 SHA256 2022 CA1,O=DigiCert\, Inc.,C=US", + "subjectDN": "MGMxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgQXNzdXJlZCBJRCBHMiBUTFMgUlNBNDA5NiBTSEEyNTYgMjAyMiBDQTE=", + "whitelist": false, + "attachment": { + "hash": "fce800188289208c71c42766d767c63249b981ca723bba46e543fa2f5d87596c", + "size": 2093, + "filename": "Ld64SpoeXjpLjc-_7Wahk6p5-KVyzVSUptciuWsyxeY=.pem", + "location": "security-state-staging/intermediates/df08562c-f117-43d1-a40a-3997497594ad.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "Ld64SpoeXjpLjc+/7Wahk6p5+KVyzVSUptciuWsyxeY=", + "crlite_enrolled": false, + "id": "55420fa1-1fcf-457c-ae91-dd6b8197e62b", + "last_modified": 1648803454399 + }, + { + "schema": 1648781338374, + "derHash": "XLnp3jKxh+QLoU/fIA/aYse0+/iNZPd84C3W6+a8wbA=", + "subject": "CN=Hongkong Post e-Cert CA 1 - 15,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK", + "subjectDN": "MHYxCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtvbmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDEnMCUGA1UEAxMeSG9uZ2tvbmcgUG9zdCBlLUNlcnQgQ0EgMSAtIDE1", + "whitelist": false, + "attachment": { + "hash": "b1dec54f97f654e9b417aea0e0d23a22852001ddaf0a4b9b7a4c8d05cb468de6", + "size": 1743, + "filename": "nJWwmV0E5pEw1Pt8yzqltuQOo94m9iy9I53BzzbPaqE=.pem", + "location": "security-state-staging/intermediates/6388fa41-6293-4a28-b765-3fe9a3137870.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "nJWwmV0E5pEw1Pt8yzqltuQOo94m9iy9I53BzzbPaqE=", + "crlite_enrolled": false, + "id": "136210c9-de18-49a4-bbd8-4b85d01b0cfc", + "last_modified": 1648781849023 + }, + { + "schema": 1648781342329, + "derHash": "aezbwxR/WB39y1Itne+yYLJnhK1JVcdOalJSLMxMRAg=", + "subject": "CN=Hongkong Post e-Cert SSL CA 3 - 17,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK", + "subjectDN": "MHoxCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtvbmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDErMCkGA1UEAxMiSG9uZ2tvbmcgUG9zdCBlLUNlcnQgU1NMIENBIDMgLSAxNw==", + "whitelist": false, + "attachment": { + "hash": "d819d0da20d45c8f93a0efb0d37fd86e274107134845bf5480d9b3697bb0711d", + "size": 2093, + "filename": "SUe0dPoWC5QKoJyXReRB3haevgxOd9ZVd5sn7N65_DY=.pem", + "location": "security-state-staging/intermediates/bfa15d55-724f-433e-8e8c-57f115fe9319.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "SUe0dPoWC5QKoJyXReRB3haevgxOd9ZVd5sn7N65/DY=", + "crlite_enrolled": false, + "id": "e04bc9de-e9d2-45e5-a6d5-3e29309132df", + "last_modified": 1648781849014 + }, + { + "schema": 1648781341350, + "derHash": "wY1Tv5hk3Qm8vKz9Zy4lZtTIH2iJ42313UJcBCEdB2M=", + "subject": "CN=Hongkong Post e-Cert EV SSL CA 3 - 17,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK", + "subjectDN": "MH0xCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtvbmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDEuMCwGA1UEAxMlSG9uZ2tvbmcgUG9zdCBlLUNlcnQgRVYgU1NMIENBIDMgLSAxNw==", + "whitelist": false, + "attachment": { + "hash": "e4408c6b03e1deb0777ad20ea8b3466779565bcb2d92a17de6ac350bdaa5de18", + "size": 2097, + "filename": "shxxZc44F1hF3pjKzr0Oaoq-CwRFBKIr0_noGHUYkjA=.pem", + "location": "security-state-staging/intermediates/bdeda58e-1628-4e55-87fb-0b68db6affa9.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "shxxZc44F1hF3pjKzr0Oaoq+CwRFBKIr0/noGHUYkjA=", + "crlite_enrolled": false, + "id": "88070242-b7b9-4c79-870e-7b137524b1dc", + "last_modified": 1648781849004 + }, + { + "schema": 1648781340337, + "derHash": "F2rr8pcr1vRxee3j3mOEixVDtFrilUvqRRhbFSU3ucQ=", + "subject": "CN=Hongkong Post Root CA 3,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK", + "subjectDN": "MG8xCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtvbmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDEgMB4GA1UEAxMXSG9uZ2tvbmcgUG9zdCBSb290IENBIDM=", + "whitelist": false, + "attachment": { + "hash": "b4ba7c31c249eb874c39b6a3e78147e6623a6ccbab1429cce2313067069229b7", + "size": 2020, + "filename": "JUHlO6WzsHrL5wl6xKA-BAwRz3ptSmfLIT1Vi1AWegY=.pem", + "location": "security-state-staging/intermediates/39b3dcba-a7a7-4969-9493-b50803c7a8a2.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "JUHlO6WzsHrL5wl6xKA+BAwRz3ptSmfLIT1Vi1AWegY=", + "crlite_enrolled": false, + "id": "842fdd33-8665-48df-a734-9fa716c62edb", + "last_modified": 1648781848995 + }, + { + "schema": 1648781339361, + "derHash": "FEIqG9WpHtunOXuGmJIjabavaYT/h6z2E52qkZ55WhQ=", + "subject": "CN=Hongkong Post e-Cert CA 1 - 14,O=Hongkong Post,C=HK", + "subjectDN": "ME4xCzAJBgNVBAYTAkhLMRYwFAYDVQQKEw1Ib25na29uZyBQb3N0MScwJQYDVQQDEx5Ib25na29uZyBQb3N0IGUtQ2VydCBDQSAxIC0gMTQ=", + "whitelist": false, + "attachment": { + "hash": "5a4d38e1effb5367e3fd8c4536f7e3be9e065be0cb93778e4484d32658a3c99c", + "size": 1626, + "filename": "vSKE_tMDVyGX2f0WYoCAXCvfnFi2nosboVhJtpmvc10=.pem", + "location": "security-state-staging/intermediates/85cc6392-76ad-4ab9-8327-9f8d7cbb9b9a.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "vSKE/tMDVyGX2f0WYoCAXCvfnFi2nosboVhJtpmvc10=", + "crlite_enrolled": false, + "id": "a4269288-d28d-456b-84f5-cdd8b22a22d5", + "last_modified": 1648781848986 + }, { "schema": 1648667430650, "derHash": "XScMtO/1h61s0Xyytg2QhKFT130qp5oss9sd25BGhPU=", @@ -2772,24 +2898,6 @@ "id": "97c50b5c-b8db-4d7e-9a48-a00cfe50809d", "last_modified": 1645579198344 }, - { - "schema": 1645578798430, - "derHash": "02gLTj+I2x9bud3b+2v/MZx4Dj2fRO4k7BmVq0LWkU8=", - "subject": "CN=GIAG4x,O=Google Trust Services LLC,C=US", - "subjectDN": "MEIxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMQ8wDQYDVQQDEwZHSUFHNHg=", - "whitelist": false, - "attachment": { - "hash": "7863677df584a77841650e5ad47e7ef8f7c42807c9d69969881133b275b19a50", - "size": 1991, - "filename": "AAGolo0N1iZa5uuvm02csZnkuZs8hvI-HRLhAHtNhqk=.pem", - "location": "security-state-staging/intermediates/d7339913-5a00-4ca1-8efa-d57dac665d41.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "AAGolo0N1iZa5uuvm02csZnkuZs8hvI+HRLhAHtNhqk=", - "crlite_enrolled": true, - "id": "339940cb-d4d8-4caa-88ba-b807e82edbbc", - "last_modified": 1645579198330 - }, { "schema": 1645578812086, "derHash": "8Z1VzQij6kK9kVCAc4IxdN2SNwITwXf4JTF1badQilE=", @@ -16524,24 +16632,6 @@ "id": "00a2f6a9-b608-4e1c-87f2-7a5cfea1b7f1", "last_modified": 1580831371623 }, - { - "schema": 1580831333485, - "derHash": "Ies3q0z274ll7BdmQJyna4suA/LRo4jfc0II6G3u5nk=", - "subject": "CN=DigiCert High Assurance CA-3,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENBLTM=", - "whitelist": false, - "attachment": { - "hash": "d90539ef3ff76bf2ac792ae9bbc21d751d2ce841eab7781e291ab04fd791d950", - "size": 2259, - "filename": "emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm-jrFQ=.pem", - "location": "security-state-staging/intermediates/3211ad63-2e73-4235-916c-6b7f2a4c67d9.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm+jrFQ=", - "crlite_enrolled": false, - "id": "d468c05a-c173-4f74-855c-1e3eba3d2298", - "last_modified": 1580831371587 - }, { "schema": 1580831339070, "derHash": "LarG/frBbFSMU/8RmCVNfpN3YdIqHnzFwalGLpcUYfU=", @@ -16614,60 +16704,6 @@ "id": "293e0ccd-71f9-42a4-ac96-f21584cc8fa2", "last_modified": 1580831371521 }, - { - "schema": 1580831338677, - "derHash": "V9jVuDJha3gjRmoMNydw0WpdzyRlgfD1g3PlHH4eUxY=", - "subject": "CN=DigiCert High Assurance CA-3,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENBLTM=", - "whitelist": false, - "attachment": { - "hash": "80d4bb692e396cf3ccf6595d18d123459107363391f6c0e030d16cefc85308ba", - "size": 2255, - "filename": "emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm-jrFQ=.pem", - "location": "security-state-staging/intermediates/e98dee35-7b84-4d8f-9f01-3021b3339da7.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm+jrFQ=", - "crlite_enrolled": false, - "id": "2a5f71dc-243b-43b6-918e-b6e20ae381aa", - "last_modified": 1580831371512 - }, - { - "schema": 1580831338274, - "derHash": "wKShrAXgMJajsquKOFArOeJhThE5e+5z0KZris73ooM=", - "subject": "CN=DigiCert High Assurance CA-3,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENBLTM=", - "whitelist": false, - "attachment": { - "hash": "e3909fbaebb8ef6af7bbffe333d52eafa063b31f216ab25a26f98adacb9b51f6", - "size": 2349, - "filename": "emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm-jrFQ=.pem", - "location": "security-state-staging/intermediates/202293f2-84fb-4a8c-b939-35ceaeb78a8d.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm+jrFQ=", - "crlite_enrolled": false, - "id": "4495c40e-442c-4744-bcea-962e2b93bfd0", - "last_modified": 1580831371491 - }, - { - "schema": 1580831331243, - "derHash": "3LQArMJJ+4SDQV/CZQvJBIjKlmQxGMsOT0Qkshw6paQ=", - "subject": "CN=DigiCert High Assurance CA-3,OU=www.digicert.com,O=DigiCert Inc,C=US", - "subjectDN": "MGYxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xJTAjBgNVBAMTHERpZ2lDZXJ0IEhpZ2ggQXNzdXJhbmNlIENBLTM=", - "whitelist": false, - "attachment": { - "hash": "7b2bb2e718615878d60921325a6b6a79bfcdb0076c093323e35de7dc5ccb5e1e", - "size": 2259, - "filename": "emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm-jrFQ=.pem", - "location": "security-state-staging/intermediates/dc2adf52-a65a-47f4-98df-90d1bc2795c0.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "emrYgpjLplsXa6OnqyXuj5BgQDPaapisB5WfVm+jrFQ=", - "crlite_enrolled": false, - "id": "b1fa8b2a-9240-4c89-a31e-bbedfe18d2c1", - "last_modified": 1580831371478 - }, { "schema": 1579028933319, "derHash": "0QEGJDi/sK8Fq6ed8A9N1J54uM79XtkpVlwjNhExAZE=",
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit c9d2874a0aa1e0e2dd50ba053aac2581be78bfd8 Author: Mozilla Releng Treescript release+treescript@mozilla.org AuthorDate: Tue Apr 5 12:56:21 2022 +0000
No bug - Tagging 3b54d6b5407fca03efdb2e2f57a9838498e0d038 with FIREFOX_91_8_0esr_RELEASE a=release CLOSED TREE DONTBUILD --- .hgtags | 1 + 1 file changed, 1 insertion(+)
diff --git a/.hgtags b/.hgtags index 2470f7057f9fc..10ae7711797b7 100644 --- a/.hgtags +++ b/.hgtags @@ -3165,3 +3165,4 @@ a9d3c0f4732a9a62428089fff64ae8ff3d608918 FIREFOX_91_7_0esr_RELEASE 9ed28ee4263d289b30e236fc520c8254fb65e764 FIREFOX_91_7_1esr_BUILD2 9ed28ee4263d289b30e236fc520c8254fb65e764 FIREFOX_91_7_1esr_RELEASE 3b54d6b5407fca03efdb2e2f57a9838498e0d038 FIREFOX_91_8_0esr_BUILD1 +3b54d6b5407fca03efdb2e2f57a9838498e0d038 FIREFOX_91_8_0esr_RELEASE
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit e2311d000ac023afabe25b3a292f6a4be69d4d17 Author: ffxbld ffxbld@mozilla.com AuthorDate: Thu Apr 7 10:57:32 2022 +0000
No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings tld-suffixes - a=repo-update r=RyanVM
Differential Revision: https://phabricator.services.mozilla.com/D143150 --- netwerk/dns/effective_tld_names.dat | 31 +++- security/manager/ssl/StaticHPKPins.h | 2 +- security/manager/ssl/nsSTSPreloadList.inc | 153 +++++++---------- .../dumps/blocklists/addons-bloomfilters.json | 37 ++++ .../dumps/security-state/intermediates.json | 186 +++++++-------------- 5 files changed, 180 insertions(+), 229 deletions(-)
diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat index 4e88dbaee658e..237e159cb005b 100644 --- a/netwerk/dns/effective_tld_names.dat +++ b/netwerk/dns/effective_tld_names.dat @@ -22,8 +22,7 @@ org.ac ad nom.ad
-// ae : https://en.wikipedia.org/wiki/.ae -// see also: "Domain Name Eligibility Policy" at http://www.aeda.ae/eng/aepolicy.php +// ae : https://tdra.gov.ae/en/aeda/ae-policies ae co.ae net.ae @@ -13398,6 +13397,34 @@ sandcats.io logoip.de logoip.com
+// Scaleway : https://www.scaleway.com/ +// Submitted by Rémy Léone rleone@scaleway.com +fr-par-1.baremetal.scw.cloud +fr-par-2.baremetal.scw.cloud +nl-ams-1.baremetal.scw.cloud +fnc.fr-par.scw.cloud +functions.fnc.fr-par.scw.cloud +k8s.fr-par.scw.cloud +nodes.k8s.fr-par.scw.cloud +s3.fr-par.scw.cloud +s3-website.fr-par.scw.cloud +whm.fr-par.scw.cloud +priv.instances.scw.cloud +pub.instances.scw.cloud +k8s.scw.cloud +k8s.nl-ams.scw.cloud +nodes.k8s.nl-ams.scw.cloud +s3.nl-ams.scw.cloud +s3-website.nl-ams.scw.cloud +whm.nl-ams.scw.cloud +k8s.pl-waw.scw.cloud +nodes.k8s.pl-waw.scw.cloud +s3.pl-waw.scw.cloud +s3-website.pl-waw.scw.cloud +scalebook.scw.cloud +smartlabeling.scw.cloud +dedibox.fr + // schokokeks.org GbR : https://schokokeks.org/ // Submitted by Hanno Böck hanno@schokokeks.org schokokeks.net diff --git a/security/manager/ssl/StaticHPKPins.h b/security/manager/ssl/StaticHPKPins.h index 0fe94fcae5228..1b4b7df31e447 100644 --- a/security/manager/ssl/StaticHPKPins.h +++ b/security/manager/ssl/StaticHPKPins.h @@ -1149,4 +1149,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
static const int32_t kUnknownId = -1;
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1657536621758000); +static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1657795861343000); diff --git a/security/manager/ssl/nsSTSPreloadList.inc b/security/manager/ssl/nsSTSPreloadList.inc index 67b74590f094f..cae499e400f8a 100644 --- a/security/manager/ssl/nsSTSPreloadList.inc +++ b/security/manager/ssl/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/
#include <stdint.h> -const PRTime gPreloadListExpirationTime = INT64_C(1659955813539000); +const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); %% 0--1.de, 1 0-1.party, 1 @@ -1864,7 +1864,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1659955813539000); 254vc.ml, 1 2555z6.com, 1 255k8.com, 1 -2566335.xyz, 1 256ac.com, 1 256be.com, 1 256bf.com, 1 @@ -2503,6 +2502,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1659955813539000); 375ks.com, 1 377625.com, 1 377632.com, 1 +3778vip.com, 0 377ks.com, 1 377zzz.com, 1 37879.com, 0 @@ -5123,7 +5123,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1659955813539000); 901543.com, 1 903422.com, 1 905422.com, 1 -906vv.com, 1 908vv.com, 1 90920.cn, 1 90r.jp, 1 @@ -6338,7 +6337,6 @@ academiaeureka.tk, 1 academiaoposicionescorreos.com, 1 academiasdemodelos.com, 1 academica.nl, 1 -academichealthscience.net, 1 academichelp.gq, 1 academicperks.org, 1 academie-de-police.ch, 0 @@ -6486,6 +6484,7 @@ acgc.nl, 1 acgmoon.com, 1 acgpiano.club, 1 acgqwq.gq, 1 +acgtalktw.com, 1 acgxi.tk, 1 achalay.org, 0 achat-de-lead.com, 1 @@ -7229,6 +7228,7 @@ advokat-dtp.gq, 1 advokat-dtp.ml, 1 advokat-dtp.tk, 1 advokat-malinovskii.ml, 1 +advokat-romanov.com, 1 advokat-vvp.com.ua, 1 advokat73.gq, 1 advokati-ceva.cz, 1 @@ -7957,7 +7957,6 @@ agwin9.com, 1 agworkers.com, 1 agzlapp.com, 1 ahanet.tk, 1 -ahawkesrealtors.com, 1 ahc.fyi, 1 ahccorleone.tk, 1 ahcpr.gov, 1 @@ -8325,7 +8324,6 @@ airportal.cn, 1 airportcoc.cf, 1 airportcoc.ga, 1 airportcoc.ml, 1 -airportlimototoronto.com, 1 airportstuttgart.com, 1 airpurifierproductsonline.com, 1 airquestion.org, 1 @@ -8517,6 +8515,7 @@ akp.photos, 1 akplates.org, 1 akpwebdesign.com, 1 akr.io, 1 +akr.services, 1 akracing.se, 1 akramvet.tk, 1 akrep.com, 1 @@ -9932,7 +9931,6 @@ amcs.website, 1 amdelisi.tk, 1 amdm.ru, 1 amdouglas.com, 1 -amdouglas.uk, 1 amdrumors.com, 1 amdukis-bordercollies.tk, 1 ameba-capital.com, 1 @@ -10923,6 +10921,7 @@ annuncisesso.tk, 1 annyaurora.net, 1 annynantasiri.com, 1 anodas.lt, 1 +anohana.org, 1 anojan.com, 1 anomalous.eu, 1 anomaly.tk, 1 @@ -13025,7 +13024,6 @@ atelierdefrancais.ch, 0 atelierdeloulou.fr, 1 atelierdesflammesnoires.fr, 1 atelierfantazie.sk, 1 -atelierhsn.com, 1 atelierjs.com, 1 atelierlk.art, 1 ateliernaruby.cz, 1 @@ -13250,7 +13248,6 @@ atypicom.pt, 1 atyuan.me, 1 atzenchefin.de, 1 atzeneta.tk, 1 -atzzz.com, 1 au-be.net, 1 au-inter.net, 1 au.by, 1 @@ -13947,6 +13944,7 @@ ave.zone, 1 aveapps.com, 0 aveclunettesoleil.fr, 1 avedesk.org, 0 +avelinodiaz.gal, 1 avellinno.com, 1 avellinotoday.it, 1 avelux.ru, 1 @@ -14090,7 +14088,6 @@ avtoucheba.tk, 1 avtours.gr, 1 avtoveles.by, 1 avtovikup.ml, 1 -avtovokzaly.ru, 1 avtoyurist.cf, 1 avtoyurist.ga, 1 avtoyurist.gq, 1 @@ -15354,6 +15351,7 @@ barbe-n-blues.fr, 1 barberheatingandair.com, 1 barberscorner.tk, 1 barbershop-harmony.org, 0 +barbershop-lasvillas.com, 0 barbiecollectorjapan.cf, 1 barbiecollectorjapan.ga, 1 barbiecollectorjapan.gq, 1 @@ -15742,7 +15740,6 @@ bazari.com.pl, 1 bazarotehijos.com, 1 bazdell.com, 0 bazhan.me, 1 -bazinga-events.nl, 1 bazos.at, 1 bazos.cz, 1 bazos.pl, 1 @@ -17755,7 +17752,6 @@ biletturk.tk, 1 biletvkrym.ga, 1 biletyplus.by, 1 biletyplus.com, 1 -biletyplus.ru, 1 biletyplus.ua, 1 bilgehan.net, 1 bilgiliksel.com, 1 @@ -18435,7 +18431,6 @@ bkamp.de, 1 bkentertainments.co.uk, 1 bkgatl.com, 1 bkhpilates.co.uk, 1 -bkkf.at, 1 bkkposn.com, 1 bkl-ca-qa-employeeapp.azurewebsites.net, 1 bklaindia.com, 1 @@ -19631,6 +19626,7 @@ botcore.ai, 1 botdiril.com, 1 botealis.ch, 0 botelegram.tk, 1 +botezdepoveste.ro, 0 botguard.net, 1 bothive.io, 1 boticadiservicio.com, 1 @@ -20700,6 +20696,7 @@ bsurfcr.com, 1 bsuru.xyz, 1 bsvfincorp.com, 1 bsw-solution.de, 1 +bsystem.net, 0 bszoft.hu, 1 bt-kc.de, 1 bt121.com, 1 @@ -22434,7 +22431,6 @@ canhazip.com, 1 canhq.tk, 1 cani-compostelle.fr, 1 canihavesome.coffee, 0 -canine-mobility.com, 0 caniuse.email, 1 canker.org, 1 cankhon.tk, 1 @@ -24193,6 +24189,7 @@ change-coaching-gmbh.ch, 0 change10000lives.com.ph, 1 changeactivation.com, 1 changeanalytics.us, 1 +changecopyright.ru, 1 changeforfuture.cf, 1 changemywifipassword.com, 1 changes.jp, 1 @@ -24979,6 +24976,7 @@ christianblog.ml, 1 christianbro.gq, 1 christianbsl.com, 1 christianchat.ml, 1 +christiancoleman.info, 1 christianconcepts.cf, 1 christianconcepts.ga, 1 christianconcepts.gq, 1 @@ -26364,6 +26362,7 @@ coachapp-ipass.herokuapp.com, 1 coachbakery.com, 1 coachezmoi.ch, 0 coachinfopreneur.com, 1 +coaching-harmonique.fr, 1 coaching-impulse.ch, 0 coachingbyelena.com, 1 coachingforleaders.com, 1 @@ -26382,11 +26381,7 @@ coast.tk, 1 coastaleyesurgeons.com.au, 1 coastalphysie.com, 1 coastalpowder.com.au, 1 -coastalurgentcarebatonrouge.com, 1 -coastalurgentcarebossier.com, 1 -coastalurgentcaregonzales.com, 1 coastalurgentcarehouma.com, 1 -coastalurgentcareruston.com, 1 coastalurgentcarethibodaux.com, 1 coastline.net.au, 1 coastmedicalservice.com, 1 @@ -26560,6 +26555,8 @@ codetipi.com, 1 codetrack.se, 1 codetripping.net, 1 codeux.com, 1 +codeux.info, 1 +codeux.net, 1 codevat.com, 1 codewild.de, 1 codewitchbella.com, 1 @@ -26874,7 +26871,6 @@ columbushydroxide.com, 1 columbushydroxide.net, 1 columbushydroxide.org, 1 columbusks.gov, 1 -columbuswines.com, 1 colwichks.gov, 1 colyakoomusic.com, 1 com-news.io, 1 @@ -29051,6 +29047,7 @@ cucek.tk, 1 cuchichi.es, 1 cuckoo.ee, 1 cuddlecat.io, 1 +cuddlecomfort.com, 1 cuddlingyaks.com, 1 cuddlybeardaycare.com.au, 1 cudesa.gq, 1 @@ -29541,6 +29538,8 @@ cypherbot.org, 1 cypherpunk.observer, 1 cypherpunk.ws, 1 cypressca.gov, 1 +cypressinheritancesaga.com, 1 +cypresslegacy.com, 1 cyprus-company-for.gr, 1 cyprus-company-service.com, 1 cyptechost.co.ke, 1 @@ -29555,7 +29554,6 @@ cyriletsophie.fr, 1 cyrilstoll.ch, 1 cyrix-systems.tk, 1 cyrusdaily.tk, 1 -cysec.biz, 1 cysmo.de, 1 cyson.tech, 1 cytat.tk, 1 @@ -29632,7 +29630,6 @@ d3lab.net, 1 d3xt3r01.tk, 1 d42.no, 1 d4done.com, 1 -d4fx.de, 1 d4h.live, 1 d4wson.com, 1 d4x.de, 1 @@ -30140,6 +30137,7 @@ dansa.com.co, 1 dansage.co, 0 dansaunders.me, 1 dansdiscounttools.com, 1 +dansedesalonsaintave.fr, 1 danselibre.net, 1 danselibre.org, 1 danseressen.nl, 1 @@ -30208,6 +30206,7 @@ dariela.tk, 1 dario.gq, 1 darioackermann.ch, 0 darioclip.com, 1 +dariosirangelo.me, 1 darioturchetti.me, 1 dariusheghbali.tk, 1 dark-ages.tk, 1 @@ -31022,7 +31021,6 @@ decorativecosmetics.tk, 1 decorativeflooring.com, 1 decorator.uk, 1 decoratore.roma.it, 1 -decorauvent.ca, 1 decorestilo.com.br, 1 decorlux.bg, 1 decormiernissanparts.com, 1 @@ -34199,7 +34197,6 @@ doswo-design.at, 1 dosyaa.tk, 1 dosyanet.cf, 1 dosyanet.tk, 1 -dosyauzantisi.com, 1 dot.sb, 1 dot42.no, 1 dota2free.tk, 1 @@ -34306,7 +34303,6 @@ downfreak.tk, 1 downgratis.tk, 1 download-image.ga, 1 download-knigi.gq, 1 -download.dk, 1 downloadabc.cf, 1 downloadapk.co.id, 1 downloadapkpokemongo.ga, 1 @@ -34419,7 +34415,6 @@ drach.xyz, 1 dracheisolation.tk, 1 drachenleder.de, 1 dracisvet.cz, 1 -dracoon.team, 1 dracox.com, 0 dracula.city, 1 draft.cards, 1 @@ -34804,7 +34799,6 @@ dronesquadcoptersales.ga, 1 droneways.tech, 1 droni.cz, 1 dronix.tk, 1 -dronova-art.ru, 1 droomhuis-in-zuid-holland-kopen.nl, 1 drop-zone.tk, 1 drop.com, 1 @@ -35300,7 +35294,7 @@ duysondang.name.vn, 1 duzavo.cz, 1 duzcehaberleri.tk, 1 duzcesondakika.tk, 1 -dv189.com, 0 +dv189.com, 1 dvbris.co.uk, 1 dvbris.com, 1 dvclub.tk, 1 @@ -35521,6 +35515,7 @@ e-diasporan.ga, 1 e-diasporan.gq, 1 e-diasporan.ml, 1 e-dv.eu, 1 +e-emploi.be, 1 e-enterprise.gov, 1 e-estonia.com, 1 e-facture.net, 1 @@ -36228,6 +36223,7 @@ ebjork.se, 1 ebki-nsn.gov, 1 eblan.gq, 1 eblog.cf, 1 +eblog.ink, 1 ebola-hosting.cz, 1 ebolacharts.ga, 1 ebolavirus.tk, 1 @@ -36473,7 +36469,6 @@ ecsupplyinc.com, 1 ectivepro.com, 1 ectora.com, 1 ectpro.co.th, 1 -ecuadorbienesraices.com, 1 ecuadorextremo.com, 1 ecuadorlibrered.tk, 1 ecubr.com, 1 @@ -36518,7 +36513,6 @@ edelveiys.tk, 1 edelweiskapel.tk, 1 edelweiss-pinzolo.com, 1 eden-project-insight.tk, 1 -eden.bz, 1 eden.co.uk, 1 edenaya.com, 0 edenfactory.tk, 1 @@ -36870,6 +36864,7 @@ egipet-tiz.tk, 1 egiptwakacje.tk, 1 egittophilia.tk, 1 egles.eu, 1 +eglisedenantes.fr, 1 egm-sakura.com, 1 ego4u.com, 1 ego4u.de, 1 @@ -37041,6 +37036,7 @@ ekcrags.ru, 1 ekd.de, 1 ekdoseis.gr, 1 ekeblock.com, 1 +ekedc.com, 1 ekedp.com, 1 ekhabar.ml, 1 ekho.tk, 1 @@ -38352,7 +38348,6 @@ entegrations.io, 1 entelgy.com.br, 1 enter.eco, 1 enteratesoria.tk, 1 -entercenter.ru, 1 enterdown.com, 1 enteronline.tk, 1 enterprisenetworksecurity.net, 1 @@ -38589,6 +38584,7 @@ equalone.co.jp, 1 equasea.com, 0 equate.net.au, 1 equatetechnologies.com.au, 0 +equeim.ru, 0 equi.ac, 1 equiac.com, 1 equidam.com, 1 @@ -39491,7 +39487,6 @@ europeancupinline.eu, 1 europeanpreppers.com, 1 europeanstudies-chemnitz.de, 1 europeantransportmanagement.com, 1 -europeanwineresource.com, 1 europeluxuryweddings.com, 1 europeonline.tk, 1 europeos.es, 1 @@ -39655,7 +39650,6 @@ everly.market, 1 evermade.fi, 1 evermarkstudios.com, 1 evernaut.com, 1 -everpcpc.com, 1 everready.tk, 1 everseo.tk, 1 evertonarentwe.com, 1 @@ -39712,7 +39706,6 @@ eviadc.com, 1 eviction.cf, 1 evidecor.com.br, 1 evidence-based.review, 1 -evidencebased.net, 1 evidenceusa.com.br, 1 evidenciamidiasdigitais.com.br, 1 evidencija.ba, 1 @@ -41211,7 +41204,6 @@ fbi.gov, 1 fbigame.com, 1 fbihr.gov, 1 fbiic.gov, 1 -fbijobs.gov, 1 fbo.gov, 1 fbo.network, 1 fboerman.nl, 1 @@ -41805,7 +41797,6 @@ fierce-escarpment-59441.herokuapp.com, 1 fierman.eu, 0 fierman.net, 0 fierman.us, 0 -fierscleaning.nl, 1 fierykitchen.pl, 1 fiestasalquezar.tk, 1 fietsambassade.be, 1 @@ -44682,6 +44673,7 @@ fujikochan.tk, 1 fujiwarashinzo.com, 1 fujiyakimono.com, 1 fukabori-kaidora.com, 1 +fukakukeiba.com, 1 fukase-seed.com, 1 fukikaeru.com, 1 fukn.jp, 1 @@ -46567,7 +46559,6 @@ getgeek.io, 1 getgeek.no, 1 getgeek.nu, 1 getgeek.pl, 1 -getgeek.se, 1 gethome.ru, 1 gethost.co.zw, 1 gethttpsforfree.com, 1 @@ -46893,6 +46884,7 @@ gigawa.lt, 1 gigawattz.com, 1 giggletotz.co.uk, 1 gigharborwa.gov, 1 +gigis-pizzeria.de, 1 gigiscloud.servebeer.com, 1 giglink.club, 1 gigloog.tk, 1 @@ -47166,7 +47158,6 @@ glassofdirt.tk, 1 glassofgrape.com, 1 glassrainbowtrust.org.je, 1 glassrom.org, 1 -glassrom.pw, 1 glasstechnics.be, 1 glassweb.com.mx, 0 glassworld.tk, 1 @@ -47509,6 +47500,7 @@ goatbot.xyz, 1 goatcloud.com, 1 goatstore.ca, 1 goatstudio.sg, 1 +goaudits.com, 1 gobarrelroll.com, 1 gobi.tk, 1 gobiernousa.gov, 1 @@ -49668,6 +49660,7 @@ halilyagcioglu.tk, 1 halkyon.net, 1 hallaminternet.com, 1 hallcopainting.com, 1 +hallcouture.com, 1 hallelujahsoftware.com, 1 hallettxn.com, 1 hallhireforevents.co.uk, 1 @@ -50029,7 +50022,6 @@ hardworm.tk, 1 hardy.bz, 1 hardyhaberland.com, 1 harelmallac.com, 0 -harelmallacglobal.com, 1 harem.tk, 1 harery.com, 1 hargaindo.com, 1 @@ -50262,6 +50254,7 @@ haverstack.com, 1 havetherelationshipyouwant.com, 1 havohravo.com, 1 hawaiiafro.tk, 1 +hawaiianchoice.com, 1 hawaiianlion.cf, 1 hawaiianlion.ga, 1 hawaiianlion.gq, 1 @@ -51382,7 +51375,6 @@ heyjournal.com, 1 heymoney.de, 1 heyomg.com, 1 heyplay.eu.org, 1 -heyrockerproductions.com, 1 heysora.net, 1 heytrade.com, 1 heyvilleers.ga, 1 @@ -52117,7 +52109,6 @@ holostyak.tk, 1 holowaty.me, 1 holoxplor.space, 1 holstein.tk, 1 -holstphoto.com, 1 holtcountyne.gov, 1 holtslander.ca, 1 holubowski.com, 1 @@ -52145,7 +52136,6 @@ holytransaction.com, 1 holyubofficial.net, 1 holywhite.com, 1 holywr.it, 1 -holz.nu, 1 holzed.com, 1 holzschutz-holzbearbeitung.de, 1 holzspielzeug-shop.ch, 1 @@ -53027,7 +53017,6 @@ hrmn.xyz, 1 hrndz.io, 1 hro.to, 1 hrobert.hu, 1 -hroling.nl, 1 hromaticworld.tk, 1 hroschyk.cz, 1 hrpage.ml, 1 @@ -53722,6 +53711,7 @@ iadttaveras.com, 1 iaeste.no, 1 iaeste.or.jp, 1 iaf.gov, 1 +iahemobile.net, 1 iain.tech, 1 iainsimms.co.uk, 1 iainsimms.com, 1 @@ -53962,7 +53952,6 @@ icruise.com, 1 ics.edu.hn, 1 icst.tk, 1 ict-concept.nl, 1 -ict-crew.nl, 1 ict-radar.com, 1 ict-radar.nl, 1 ict.govt.nz, 1 @@ -59045,6 +59034,7 @@ joomladeveloper.ru, 1 joomlon.com, 0 joompress.biz, 1 joona.pw, 1 +joonatoona.me, 1 joorshin.ir, 1 joostbovee.nl, 1 joostmaglev.nl, 1 @@ -59828,6 +59818,7 @@ k87073.com, 0 k87100.com, 0 k87120.com, 0 k87178.com, 1 +k87183.com, 0 k87210.com, 0 k873.co, 1 k873.com, 1 @@ -60477,6 +60468,7 @@ kasparovru.ml, 1 kasparovru.tk, 1 kasper-team.tk, 1 kasperstad.dk, 1 +kassa.at, 1 kassa.com, 1 kassa.expert, 1 kassola.tk, 1 @@ -61592,6 +61584,7 @@ kirgistan.tk, 1 kirie-photos.tk, 1 kirig.ph, 1 kirikira.moe, 1 +kirill.ws, 1 kirillaristov.com, 1 kirillpokrovsky.de, 1 kirina.nl, 1 @@ -62773,7 +62766,6 @@ kriston.tk, 1 kriswauters.tk, 1 kritical.es, 1 kritikawebu.cz, 1 -kritikos.io, 1 kriyayoga.fr, 1 krizevci.info, 1 krizialim.tk, 1 @@ -63069,7 +63061,6 @@ kubeico.com, 1 kubica.ch, 1 kubierecki.pl, 1 kubik-rubik.de, 1 -kubkprf.ru, 1 kublis.ch, 1 kubopro.com, 1 kubopro.cyou, 1 @@ -63944,7 +63935,6 @@ langlois-chateau.fr, 1 langly.fr, 1 langotie.com.br, 1 langrock.info, 0 -langstreckensaufen.de, 1 languageatplay.de, 1 languagecourse.net, 1 languageio.com, 1 @@ -65093,7 +65083,6 @@ legowerewolf.net, 0 legrandvtc.fr, 1 legro.tk, 1 legterm.cz, 1 -legumeinfo.org, 1 legyenkianegykereked.hu, 1 lehighvalleypeds.com, 1 lehmitz-weinstuben.de, 1 @@ -65597,7 +65586,6 @@ lfrconseil.com, 1 lfyhokk.tk, 1 lg-obchod.cz, 1 lg-store.sk, 1 -lg-waps.go.jp, 1 lg-world.cz, 1 lg.gz.cn, 1 lg0.site, 1 @@ -65660,7 +65648,6 @@ liandongyoupin.com, 1 liangbi.ml, 1 lianglongcredit.com, 1 liangxingai.com, 1 -liangyichen.net, 1 lianwen.kim, 1 liaozheqi.cn, 1 liaronce.com, 1 @@ -66513,6 +66500,7 @@ literie06.com, 1 litespeed-webserver.de, 1 litespeedwebserver.com, 1 litespeedwebserver.de, 1 +litfin.name, 1 litfl.com, 1 lithan.com, 1 lithesalar.se, 1 @@ -67728,7 +67716,6 @@ lrumeq.com, 1 lrv-grobbendonk.tk, 1 ls-alarm.de, 1 ls-mapping-team.de, 1 -ls-rp.es, 1 lsal.me, 1 lsbricks.com, 1 lsc-dillingen.de, 1 @@ -67774,7 +67761,6 @@ ltmw.xyz, 1 ltn-tom-morel.fr, 1 ltonlinestore.in, 0 ltransferts.com, 1 -lts-tec.de, 1 ltservers.net, 1 lty.space, 1 lu-rp.es, 1 @@ -68298,7 +68284,7 @@ lyubov-sovmestimost.cf, 1 lyuda.tk, 1 lyukaacom.ru, 1 lyuks-parfyum.tk, 1 -lyuly.com, 0 +lyuly.com, 1 lyx.dk, 1 lz.sb, 1 lz898.com, 1 @@ -69097,6 +69083,7 @@ malie.it, 1 malik.id, 1 malikcomputers.tk, 1 malikdeenarislamicacademy.tk, 1 +malikussa.id, 1 malikussaid.com, 1 malimusavirler.tk, 1 malinaclub.com, 1 @@ -69198,6 +69185,7 @@ man-stuff.co.uk, 1 man-trailer.com, 1 man3s.jp, 0 mana.ee, 1 +manach.net, 1 manageathome.co.uk, 1 managed-it.co.za, 1 managedhosting.de, 1 @@ -71497,7 +71485,6 @@ megabouncingcastles.com, 1 megadrol.com, 1 megaelettrostimolatore.com, 1 megafilez.tk, 1 -megaflix.nl, 1 megaflowers.ru, 1 megagifs.de, 1 megaherz.tk, 1 @@ -73254,7 +73241,6 @@ mit-uns.org, 1 mit.gg, 0 mita-beutel.tk, 1 mita.me, 1 -mitarbeiter-pc.de, 1 mitarbeiterbefragungen.com, 1 mitarbeitermotivation-anleitungen.de, 1 mitchell.id, 1 @@ -74304,7 +74290,6 @@ morata.tk, 1 moratilla.ml, 1 morawiecki.pl, 1 morbatex.com, 1 -morbiceramicindustry.com, 1 morbitiles.org, 1 morbius.cz, 1 morbotron.com, 1 @@ -74536,7 +74521,6 @@ motorbiketourhanoi.com, 1 motorcyclesafer.com, 1 motorialab.com, 0 motoridiricerca.tk, 1 -motoroilinfo.com, 0 motorpointarenacardiff.co.uk, 1 motorring.ru, 1 motorslopers.tk, 1 @@ -76345,6 +76329,7 @@ nab-services.ml, 1 nabaleka.com, 1 nabeer.ga, 1 nabeez.cf, 1 +naberiusmedia.com, 0 nabidkydnes.cz, 1 nabiev.tk, 1 nabitrix.tk, 1 @@ -76604,7 +76589,7 @@ nanovolt.nl, 1 nanowallet.io, 1 nanpuyue.com, 1 nansa.ch, 1 -nanshy.com, 0 +nanshy.com, 1 nanubo.com, 1 nanubo.de, 1 nanwan.info, 1 @@ -77592,7 +77577,6 @@ netsoftit.com, 1 netsoins.org, 1 netsparker.com.tr, 1 netspeedia.net, 1 -netsphere.cloud, 1 netsphere.cz, 1 netsyms.com, 1 netsys.com.tr, 1 @@ -77673,7 +77657,6 @@ netzklad.de, 1 netzona.org, 1 netzspielplatz.de, 0 netzsv.website, 1 -netztest.at, 1 netzvieh.de, 1 netzwerk-lq.com, 1 netzwerk-sozialliberal.de, 1 @@ -79858,7 +79841,6 @@ oakcreekwi.gov, 1 oaken.duckdns.org, 1 oakesfam.net, 1 oakface.com.au, 1 -oaklands.co.za, 1 oakparkelectrical.com, 1 oakparkexteriorlighting.com, 1 oakparklandscapelighting.com, 1 @@ -79892,7 +79874,6 @@ obalky-obaly.sk, 1 obamalibrary.gov, 1 obamawhitehouse.gov, 1 obamed.com, 1 -obasigeorge.com, 1 obatjantungrematik.tk, 1 obbr.tk, 1 obcevents.co.uk, 1 @@ -80683,7 +80664,6 @@ omayn.com, 1 ombregialle.it, 1 omdesign.cz, 0 omega-intranet.com, 1 -omega-marijuana.com, 1 omegachess.tk, 1 omegahosting.net, 1 omegalan.tk, 1 @@ -81285,7 +81265,6 @@ openrainbow.org, 1 openre.site, 1 openrealestate.co, 1 openreel.com, 0 -openresearch.amsterdam, 1 openreview.net, 1 openroademail.com, 1 openrtm.org, 1 @@ -81488,7 +81467,6 @@ oralight.ml, 1 orang-utans.com, 1 orangeacademy.cz, 1 orangecityfl.gov, 1 -orangefab.asia, 1 orangefinanse.com.pl, 1 orangehome.ga, 1 orangejetpack.com, 1 @@ -83534,7 +83512,6 @@ pc-soft.tk, 1 pc-taskal.net, 1 pc-tech.ga, 1 pc-tweak.de, 1 -pc-warriors.com, 1 pc28yc.com, 1 pcast.gov, 1 pcbarchitect.com, 1 @@ -84130,7 +84107,6 @@ persey.tk, 1 persiandating.tk, 1 persiart.shop, 1 persiennexperten.se, 1 -persiennkompaniet.se, 1 persistshields.org, 1 persjrp.ca, 1 persoform.ch, 1 @@ -84458,6 +84434,7 @@ pgmsp.net, 1 pgmtechnologies.com, 1 pgnetwork.net, 1 pgp.lol, 1 +pgp.network, 1 pgpaintanddesign.com, 1 pgpmail.cc, 1 pgprosupplies.com, 1 @@ -84862,7 +84839,6 @@ piata-imobiliara.tk, 1 piata.com.br, 1 piataborrachas.com.br, 1 piatabrasil.com.br, 1 -piatatem.com.br, 1 piatenko.ml, 1 piatika.com, 1 piatika.in, 1 @@ -86064,7 +86040,6 @@ pogljad-brest.tk, 1 pogodavolgograd.tk, 1 pogodok.tk, 1 pogomate.com, 1 -pogoswine.com, 1 pogotowie-komputerowe.tk, 1 pogotowiekomputeroweolsztyn.pl, 1 pogrebisky.net, 1 @@ -86271,9 +86246,9 @@ poly-fast.com, 0 polybius.io, 1 polycoise.com, 1 polycraftual.co.uk, 1 +polyfill.io, 1 polyfluoroltd.com, 0 polygamer.net, 0 -polygraphi.ae, 1 polymake.org, 1 polymathian.com, 1 polymerclay.de, 1 @@ -88021,6 +87996,7 @@ prototyping-computer.ml, 1 protoxin.net, 0 protrainerbrasil.com.br, 1 protrolley.cf, 1 +proudplus.com, 1 proust.ch, 0 proust.media, 0 proustmedia.de, 0 @@ -88864,7 +88840,6 @@ qldcarwreckers.com.au, 1 qldconservation.org.au, 1 qldformulaford.org, 1 qliving.com, 1 -qlix.pl, 1 qlrace.com, 0 qm-marzahnnordwest.de, 1 qmarket.tk, 1 @@ -89651,7 +89626,6 @@ radnas.com, 1 radnickapartija.tk, 1 radnicki-nis.tk, 1 radon.tk, 1 -radondetectionandcontrol.com, 1 radopsec.net, 1 radopsec.org, 1 radost-crikvenica.hr, 1 @@ -89962,6 +89936,7 @@ rantanda.com, 1 ranters.nl, 1 rantevou.eu, 1 ranyeh.co, 1 +ranyeh.com, 1 ranzbak.nl, 1 raoliveoil.ga, 1 raomed.com.ar, 1 @@ -90353,7 +90328,6 @@ real360show.com, 1 realbiographies.cf, 1 realbiz.ml, 1 realcanada.com.gt, 1 -realcapoeira.ru, 1 realclinic.jp, 1 realestate-in-uruguay.com, 1 realestate-lidl.at, 1 @@ -90642,7 +90616,6 @@ reddyai.com, 1 rede-reim.de, 1 rede-t.com, 1 redearsliderturtles.com, 1 -redecsirt.pt, 1 redeemingbeautyminerals.com, 1 redefineyounow.com, 1 redelectrical.co.uk, 0 @@ -91248,6 +91221,7 @@ reparatiecrm.nl, 1 reparatii-injectoare-buzau.com, 1 reparation-traceur.com, 1 reparaturcafe-pfullendorf.de, 1 +reparizy.com, 1 repat.de, 1 repauto.com.ua, 1 repaxan.com, 1 @@ -91649,7 +91623,6 @@ rexburgid.gov, 1 rexcutty.com, 1 rexdf.net, 1 rexeroofing.com, 1 -rexfinland.fi, 1 rexled.fi, 1 rexograph.com, 1 rexskz.info, 1 @@ -93404,6 +93377,7 @@ russianrandom.ru, 1 russiantranslation.tk, 1 russisch.tk, 1 russograffix.tk, 1 +russt.me, 1 rust.cf, 1 rust.mn, 1 rust.pm, 1 @@ -94203,7 +94177,6 @@ samkoandmikotoywarehouse.com, 1 saml-gateway.org, 1 samlam.ddns.net, 1 samlamac.com, 1 -samlaw.co.nz, 0 sammichscripts.com, 1 sammyservers.com, 1 sammyservers.net, 1 @@ -95861,6 +95834,7 @@ segaretro.org, 1 segdomedia.com, 1 segenstore.com, 1 segmentify.com, 1 +segnalabullo.com, 1 segnalabullo.it, 1 segnidisegni.eu, 1 segtronix.com, 1 @@ -96848,7 +96822,6 @@ shaoxia.xyz, 0 shape.pink, 1 shapediver.com, 1 shapesouthcarolina.gov, 1 -shapin.tv, 1 shapingthebay.com.au, 1 sharanyamunsi.net, 1 share.la, 1 @@ -96922,7 +96895,6 @@ shaunallen.co.uk, 1 shaunandamyswedding.com, 1 shaunc.com, 1 shaundanielz.com, 1 -shavegazette.com, 0 shavingks.com, 1 shavit.space, 1 shavitech.com, 1 @@ -98313,7 +98285,6 @@ sinusbot.online, 1 sinusitis-bronchitis.ch, 1 sinusitisexplained.com, 1 sinvideovault.com, 1 -sioeckes.hu, 1 siogyumolcs.hu, 1 sion-colony.tk, 1 sion.info, 1 @@ -98802,7 +98773,6 @@ skyscapecanopies.com, 1 skyscnr.com, 1 skyseo.cf, 1 skysoftbg.com, 1 -skysuite.nl, 1 skytec.host, 1 skyterraathome.com, 1 skyterraembrace.com, 1 @@ -99007,7 +98977,6 @@ sma-dev.de, 1 sma-gift.com, 1 smackhappy.com, 1 smadav.ml, 1 -smakoszwegrzynka.pl, 1 smaksbanken.no, 1 smalandscountryclub.tk, 1 small-blog.cf, 1 @@ -99134,7 +99103,6 @@ smartpolicingplatform.com, 1 smartpos.net.br, 1 smartproductguide.com, 1 smartpti.net, 1 -smartrecruit.ro, 1 smartrentacar.ro, 1 smartriotour.com.br, 0 smartrise.us, 1 @@ -100495,7 +100463,6 @@ spartancoin.ooo, 1 spartanis.tk, 1 spartankids.in, 1 spartantheatre.org, 1 -sparumzuege.de, 1 sparvagn.tk, 1 spasem-park.tk, 1 spasicilia.it, 1 @@ -100785,7 +100752,6 @@ spookyinternet.com, 1 spoorcam.nl, 1 sporeshore.co.uk, 1 sporki.fun, 1 -spornkuller.de, 1 sport-51.ru, 1 sport-in-sundern.de, 1 sport-news.ml, 1 @@ -101449,7 +101415,6 @@ starfm.ml, 1 starfriend.ru, 1 stargarder-jungs.de, 1 stargate.gq, 1 -stargatelrp.co.uk, 1 stargazer.de, 1 stargift.ch, 1 stari.co, 1 @@ -102422,7 +102387,6 @@ streamlineaudio.co.za, 1 streamodz.com, 1 streamonline.fi, 1 streampanel.net, 1 -streampleasure.xyz, 1 streams.dyndns.org, 1 streamside.tk, 1 streamspouredout.com, 1 @@ -105321,6 +105285,7 @@ techzjc.com, 0 tecit.ch, 1 tecke.tk, 1 teckgeekz.com, 1 +tecknobox.fr, 1 tecknologg.website, 1 tecmarkdig.com, 1 tecne.ws, 1 @@ -105907,7 +105872,6 @@ teutonia-grossenlueder.de, 1 teutonia08.de, 1 tevi.uk, 0 tewarilab.co.uk, 1 -tewkesburybouncycastles.co.uk, 1 tewkesburyyoga.com, 1 texarkanatherapycenter.com, 1 texasbluesalley.com, 1 @@ -105963,6 +105927,7 @@ textpages.tk, 1 textpattern.com, 1 textprotocol.org, 1 textsite.tk, 1 +textualapp.com, 1 textundblog.de, 1 texus.me, 1 texy.info, 1 @@ -106206,7 +106171,6 @@ theatresuite.tk, 1 theatresydney.com, 1 theaus.xyz, 1 theaustinsevenworkshop.com, 1 -theaviationagency.com, 1 theawesomemuse.com, 1 thebaa.tk, 1 thebabelog.cf, 1 @@ -110286,7 +110250,6 @@ tuckhayward.art, 1 tuckmeintebo.com, 1 tucnak.eu, 1 tucny.com, 1 -tucsonfcu.com, 1 tucsonpcrepair.com, 1 tucuatro.com, 1 tucuxi.org, 1 @@ -110921,7 +110884,6 @@ u4mh-dev-portal.azurewebsites.net, 1 u5.re, 1 u51365.com, 1 u5197.co, 1 -u5r.nl, 1 u6729.co, 1 u6729.com, 0 u6957.co, 1 @@ -111648,7 +111610,6 @@ universocaballo.top, 1 universogay.com, 1 universoscuola.it, 1 universovalve.net, 1 -universrumbacongolaise.com, 1 universus.tk, 1 univet-veterinaire.com, 0 univitale.fr, 0 @@ -112287,7 +112248,6 @@ uwfreelanceopticien.nl, 1 uwsalonboot.nl, 1 uwu.lgbt, 1 uwu.nu, 1 -uwvloereruit.nl, 1 uwwsb.com, 1 ux-designers.nl, 1 ux-solution.de, 1 @@ -113763,6 +113723,7 @@ viltsu.net, 1 vim.cx, 1 vim.ge, 1 vima.ch, 0 +vimeo.com, 1 vimeosucks.nyc, 1 vimium.com, 1 vimka.gq, 1 @@ -114235,7 +114196,6 @@ vizitnik.tk, 1 vizmart.ml, 1 vjeff.com, 1 vjeff.net, 1 -vjhfoundation.org, 1 vjshi.xyz, 1 vk-agent.ru, 1 vk-k.com, 1 @@ -114427,6 +114387,7 @@ voidge.cf, 1 voidi.ca, 1 voidma.in, 1 voidnet.tech, 1 +voidnya.com, 1 voidpay.net, 1 voidpay.org, 1 voidptr.eu, 1 @@ -114622,6 +114583,7 @@ votockova.cz, 0 votoot.com, 1 votre-agence-web.com, 1 votre-avenir.com, 0 +votre-hotel.com, 1 votrepolice.ch, 0 votresiteweb.ch, 0 votrespace.ca, 1 @@ -114661,7 +114623,6 @@ vozhatik.cf, 1 vozhuo.cf, 1 vparilke.su, 1 vpetkov.tk, 1 -vpn.black, 1 vpn.ht, 1 vpn4free.ga, 1 vpnboss.com.au, 1 @@ -116223,7 +116184,6 @@ wegner.no, 1 wego.ca, 1 wegonnagetsued.org, 1 wegotcookies.com, 1 -wegrzynek.org, 1 wegrzynek.pl, 1 wegvielfalt.de, 1 wehealasone.gov.ph, 1 @@ -116428,6 +116388,7 @@ werxa.cz, 1 werxus.eu, 1 weryfikacjapodatnika.pl, 1 weschool.id, 1 +wesell.asia, 1 weserv.nl, 1 wesleycabus.be, 0 wesleywarnell.com, 1 @@ -117270,7 +117231,6 @@ wineforhelp.cz, 1 winek.tk, 1 wineparis.com, 1 winerytoursanfrancisco.com, 1 -wineworksonline.com, 1 winfar.co.za, 1 winfieldchen.me, 1 winfilestorage.tk, 1 @@ -119722,7 +119682,6 @@ xujan.com, 0 xuming.studio, 1 xumm.community, 1 xumm.me, 1 -xun3708855.com, 1 xunmengdu.com, 1 xunn.io, 1 xuntaosms.com, 1 @@ -121978,7 +121937,6 @@ zinglix.xyz, 1 zingpetfood.com, 1 zings.eu, 1 zinhar.tk, 1 -zinniazorgverlening.nl, 1 zinnowitzer-ferienwohnung.de, 1 zinoui.com, 1 zion-craft.tk, 1 @@ -122471,6 +122429,7 @@ zydu4.com, 1 zyex.vip, 1 zygfrydadamski.tk, 1 zygozoon.com, 1 +zylai.com, 1 zylai.net, 1 zymmm.com, 1 zypern-firma.com, 1 diff --git a/services/settings/dumps/blocklists/addons-bloomfilters.json b/services/settings/dumps/blocklists/addons-bloomfilters.json index bddd053990781..25f7893eef2e3 100644 --- a/services/settings/dumps/blocklists/addons-bloomfilters.json +++ b/services/settings/dumps/blocklists/addons-bloomfilters.json @@ -1,5 +1,42 @@ { "data": [ + { + "stash": { + "blocked": [ + "webpki@lacunasoftware.com:2.14.2", + "webpki@lacunasoftware.com:2.9.1", + "webpki@lacunasoftware.com:2.14.1", + "webpki@lacunasoftware.com:2.11.9", + "webpki@lacunasoftware.com:2.7.1", + "webpki@lacunasoftware.com:2.15.0", + "webpki@lacunasoftware.com:2.7.2", + "webpki@lacunasoftware.com:2.13.0", + "webpki@lacunasoftware.com:2.8.0", + "webpki@lacunasoftware.com:2.10.1", + "webpki@lacunasoftware.com:2.7.5", + "webpki@lacunasoftware.com:2.13.6", + "webpki@lacunasoftware.com:2.7.0", + "webpki@lacunasoftware.com:2.12.1", + "webpki@lacunasoftware.com:2.7.4", + "webpki@lacunasoftware.com:2.11.10", + "webpki@lacunasoftware.com:2.13.4", + "webpki@lacunasoftware.com:2.13.5", + "webpki@lacunasoftware.com:2.11.7", + "webpki@lacunasoftware.com:2.13.2", + "webpki@lacunasoftware.com:2.11.8", + "webpki@lacunasoftware.com:2.7.3", + "webpki@lacunasoftware.com:2.15.1", + "webpki@lacunasoftware.com:2.13.3", + "webpki@lacunasoftware.com:2.13.1" + ], + "unblocked": [] + }, + "schema": 1648744604332, + "key_format": "{guid}:{version}", + "stash_time": 1649248507608, + "id": "d68f1e69-715e-417a-8c74-25a70d6299d9", + "last_modified": 1649248709738 + }, { "stash": { "blocked": [ diff --git a/services/settings/dumps/security-state/intermediates.json b/services/settings/dumps/security-state/intermediates.json index e21cdea75b5ec..8e3da1240d656 100644 --- a/services/settings/dumps/security-state/intermediates.json +++ b/services/settings/dumps/security-state/intermediates.json @@ -1,43 +1,25 @@ { "data": [ { - "schema": 1648997868644, - "derHash": "02gLTj+I2x9bud3b+2v/MZx4Dj2fRO4k7BmVq0LWkU8=", - "subject": "CN=GIAG4x,O=Google Trust Services LLC,C=US", - "subjectDN": "MEIxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMQ8wDQYDVQQDEwZHSUFHNHg=", - "whitelist": false, - "attachment": { - "hash": "7863677df584a77841650e5ad47e7ef8f7c42807c9d69969881133b275b19a50", - "size": 1991, - "filename": "AAGolo0N1iZa5uuvm02csZnkuZs8hvI-HRLhAHtNhqk=.pem", - "location": "security-state-staging/intermediates/d7339913-5a00-4ca1-8efa-d57dac665d41.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "AAGolo0N1iZa5uuvm02csZnkuZs8hvI+HRLhAHtNhqk=", - "crlite_enrolled": false, - "id": "339940cb-d4d8-4caa-88ba-b807e82edbbc", - "last_modified": 1649041064889 - }, - { - "schema": 1648802913684, - "derHash": "Q6cONiC8RSM52HiqaPLlNYrEYHrHIsTXfTxNLCBPf3E=", - "subject": "CN=DigiCert Assured ID G2 TLS RSA4096 SHA256 2022 CA1,O=DigiCert\, Inc.,C=US", - "subjectDN": "MGMxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgQXNzdXJlZCBJRCBHMiBUTFMgUlNBNDA5NiBTSEEyNTYgMjAyMiBDQTE=", + "schema": 1649292517069, + "derHash": "AYGythcxeVYudWMjRAN8pSMBhhin9xaCaaPrhTZ/91w=", + "subject": "CN=DigiCert Assured ID Grid TLS RSA2048 SHA256 2022 CA1,O=DigiCert\, Inc.,C=US", + "subjectDN": "MGUxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE9MDsGA1UEAxM0RGlnaUNlcnQgQXNzdXJlZCBJRCBHcmlkIFRMUyBSU0EyMDQ4IFNIQTI1NiAyMDIyIENBMQ==", "whitelist": false, "attachment": { - "hash": "fce800188289208c71c42766d767c63249b981ca723bba46e543fa2f5d87596c", - "size": 2093, - "filename": "Ld64SpoeXjpLjc-_7Wahk6p5-KVyzVSUptciuWsyxeY=.pem", - "location": "security-state-staging/intermediates/df08562c-f117-43d1-a40a-3997497594ad.pem", + "hash": "7f8f0eacf04c02686bfe08a2ccff1727606d8cbdee3d30408f7ee475b68600a3", + "size": 1804, + "filename": "_SfSGxeP1MQb2mpICOc8KzfYSH77KMzIMbCgylDKpPc=.pem", + "location": "security-state-staging/intermediates/4e91bcaa-5473-4b40-8c61-3bb878424076.pem", "mimetype": "application/x-pem-file" }, - "pubKeyHash": "Ld64SpoeXjpLjc+/7Wahk6p5+KVyzVSUptciuWsyxeY=", - "crlite_enrolled": false, - "id": "55420fa1-1fcf-457c-ae91-dd6b8197e62b", - "last_modified": 1648803454399 + "pubKeyHash": "/SfSGxeP1MQb2mpICOc8KzfYSH77KMzIMbCgylDKpPc=", + "crlite_enrolled": true, + "id": "a5acb099-b5f7-485c-a851-34cf19a7efc6", + "last_modified": 1649300241949 }, { - "schema": 1648781338374, + "schema": 1649235469232, "derHash": "XLnp3jKxh+QLoU/fIA/aYse0+/iNZPd84C3W6+a8wbA=", "subject": "CN=Hongkong Post e-Cert CA 1 - 15,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK", "subjectDN": "MHYxCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtvbmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDEnMCUGA1UEAxMeSG9uZ2tvbmcgUG9zdCBlLUNlcnQgQ0EgMSAtIDE1", @@ -50,12 +32,12 @@ "mimetype": "application/x-pem-file" }, "pubKeyHash": "nJWwmV0E5pEw1Pt8yzqltuQOo94m9iy9I53BzzbPaqE=", - "crlite_enrolled": false, + "crlite_enrolled": true, "id": "136210c9-de18-49a4-bbd8-4b85d01b0cfc", - "last_modified": 1648781849023 + "last_modified": 1649300241929 }, { - "schema": 1648781342329, + "schema": 1649292517278, "derHash": "aezbwxR/WB39y1Itne+yYLJnhK1JVcdOalJSLMxMRAg=", "subject": "CN=Hongkong Post e-Cert SSL CA 3 - 17,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK", "subjectDN": "MHoxCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtvbmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDErMCkGA1UEAxMiSG9uZ2tvbmcgUG9zdCBlLUNlcnQgU1NMIENBIDMgLSAxNw==", @@ -68,12 +50,12 @@ "mimetype": "application/x-pem-file" }, "pubKeyHash": "SUe0dPoWC5QKoJyXReRB3haevgxOd9ZVd5sn7N65/DY=", - "crlite_enrolled": false, + "crlite_enrolled": true, "id": "e04bc9de-e9d2-45e5-a6d5-3e29309132df", - "last_modified": 1648781849014 + "last_modified": 1649300241917 }, { - "schema": 1648781341350, + "schema": 1649292517458, "derHash": "wY1Tv5hk3Qm8vKz9Zy4lZtTIH2iJ42313UJcBCEdB2M=", "subject": "CN=Hongkong Post e-Cert EV SSL CA 3 - 17,O=Hongkong Post,L=Hong Kong,ST=Hong Kong,C=HK", "subjectDN": "MH0xCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtvbmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDEuMCwGA1UEAxMlSG9uZ2tvbmcgUG9zdCBlLUNlcnQgRVYgU1NMIENBIDMgLSAxNw==", @@ -86,9 +68,45 @@ "mimetype": "application/x-pem-file" }, "pubKeyHash": "shxxZc44F1hF3pjKzr0Oaoq+CwRFBKIr0/noGHUYkjA=", - "crlite_enrolled": false, + "crlite_enrolled": true, "id": "88070242-b7b9-4c79-870e-7b137524b1dc", - "last_modified": 1648781849004 + "last_modified": 1649300241905 + }, + { + "schema": 1648997868644, + "derHash": "02gLTj+I2x9bud3b+2v/MZx4Dj2fRO4k7BmVq0LWkU8=", + "subject": "CN=GIAG4x,O=Google Trust Services LLC,C=US", + "subjectDN": "MEIxCzAJBgNVBAYTAlVTMSIwIAYDVQQKExlHb29nbGUgVHJ1c3QgU2VydmljZXMgTExDMQ8wDQYDVQQDEwZHSUFHNHg=", + "whitelist": false, + "attachment": { + "hash": "7863677df584a77841650e5ad47e7ef8f7c42807c9d69969881133b275b19a50", + "size": 1991, + "filename": "AAGolo0N1iZa5uuvm02csZnkuZs8hvI-HRLhAHtNhqk=.pem", + "location": "security-state-staging/intermediates/d7339913-5a00-4ca1-8efa-d57dac665d41.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "AAGolo0N1iZa5uuvm02csZnkuZs8hvI+HRLhAHtNhqk=", + "crlite_enrolled": false, + "id": "339940cb-d4d8-4caa-88ba-b807e82edbbc", + "last_modified": 1649041064889 + }, + { + "schema": 1648802913684, + "derHash": "Q6cONiC8RSM52HiqaPLlNYrEYHrHIsTXfTxNLCBPf3E=", + "subject": "CN=DigiCert Assured ID G2 TLS RSA4096 SHA256 2022 CA1,O=DigiCert\, Inc.,C=US", + "subjectDN": "MGMxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgQXNzdXJlZCBJRCBHMiBUTFMgUlNBNDA5NiBTSEEyNTYgMjAyMiBDQTE=", + "whitelist": false, + "attachment": { + "hash": "fce800188289208c71c42766d767c63249b981ca723bba46e543fa2f5d87596c", + "size": 2093, + "filename": "Ld64SpoeXjpLjc-_7Wahk6p5-KVyzVSUptciuWsyxeY=.pem", + "location": "security-state-staging/intermediates/df08562c-f117-43d1-a40a-3997497594ad.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "Ld64SpoeXjpLjc+/7Wahk6p5+KVyzVSUptciuWsyxeY=", + "crlite_enrolled": false, + "id": "55420fa1-1fcf-457c-ae91-dd6b8197e62b", + "last_modified": 1648803454399 }, { "schema": 1648781340337, @@ -1404,24 +1422,6 @@ "id": "0cbd2855-9acf-477f-a083-016847b4753a", "last_modified": 1647053840388 }, - { - "schema": 1646966924057, - "derHash": "AYGythcxeVYudWMjRAN8pSMBhhin9xaCaaPrhTZ/91w=", - "subject": "CN=DigiCert Assured ID Grid TLS RSA2048 SHA256 2022 CA1,O=DigiCert\, Inc.,C=US", - "subjectDN": "MGUxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE9MDsGA1UEAxM0RGlnaUNlcnQgQXNzdXJlZCBJRCBHcmlkIFRMUyBSU0EyMDQ4IFNIQTI1NiAyMDIyIENBMQ==", - "whitelist": false, - "attachment": { - "hash": "7f8f0eacf04c02686bfe08a2ccff1727606d8cbdee3d30408f7ee475b68600a3", - "size": 1804, - "filename": "_SfSGxeP1MQb2mpICOc8KzfYSH77KMzIMbCgylDKpPc=.pem", - "location": "security-state-staging/intermediates/4e91bcaa-5473-4b40-8c61-3bb878424076.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "/SfSGxeP1MQb2mpICOc8KzfYSH77KMzIMbCgylDKpPc=", - "crlite_enrolled": false, - "id": "a5acb099-b5f7-485c-a851-34cf19a7efc6", - "last_modified": 1646967480339 - }, { "schema": 1646449055023, "derHash": "YO9BLqvnw/xjme7RtjO3d3R1FbKdchuWPdJYvEmKspI=", @@ -1764,24 +1764,6 @@ "id": "b518e048-6e12-426b-b992-c10e5ef0272c", "last_modified": 1645579199231 }, - { - "schema": 1645578764942, - "derHash": "V94Fg+/Ssm4DYdqZ2p30ZI3vfuhEHDtyivqbzeD5smo=", - "subject": "CN=Autoridad de Certificacion Firmaprofesional CIF A62634068,C=ES", - "subjectDN": "MFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjg=", - "whitelist": false, - "attachment": { - "hash": "6d84cf680e962beda938e61164d5227272b5f42dc698ba20d2daf9fa5b01e5a4", - "size": 2166, - "filename": "Ow1ztL5KhUrcPlHX75-kiu-7LN2CTWe9x9fQmiq8LUM=.pem", - "location": "security-state-staging/intermediates/db0d57a0-e293-40b4-ac35-c505d0b77f4c.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "Ow1ztL5KhUrcPlHX75+kiu+7LN2CTWe9x9fQmiq8LUM=", - "crlite_enrolled": true, - "id": "19461103-183f-4856-b2fe-be344c1f63e1", - "last_modified": 1645579199217 - }, { "schema": 1645578818095, "derHash": "qq/pPjWbFJpMngtXLVG/N/2jin6aNZv5A1m6nKqWqt8=", @@ -13032,24 +13014,6 @@ "id": "cf6c1713-2260-42d1-b0f5-620ff1a5b92f", "last_modified": 1625126256032 }, - { - "schema": 1624978190848, - "derHash": "UsCaLKF5NocDoYVwBM1aPIfTvaw6VY4UPvNQj77rEDI=", - "subject": "CN=VTB BANK GCC R6 EV CA 2021,O=VTB BANK (PJSC),C=RU", - "subjectDN": "MEwxCzAJBgNVBAYTAlJVMRgwFgYDVQQKEw9WVEIgQkFOSyAoUEpTQykxIzAhBgNVBAMTGlZUQiBCQU5LIEdDQyBSNiBFViBDQSAyMDIx", - "whitelist": false, - "attachment": { - "hash": "75dc13be98517e35b11cfb3d466e7babe6240e9ec480752d55cf763bfccf4cf3", - "size": 2389, - "filename": "XFbaj2K7SX_8Lbb_N5o8z-DwCDiYKyc2ZsRYCFYweAY=.pem", - "location": "security-state-staging/intermediates/1afbe1af-f8e7-46a2-af62-d860d9a88f52.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "XFbaj2K7SX/8Lbb/N5o8z+DwCDiYKyc2ZsRYCFYweAY=", - "crlite_enrolled": true, - "id": "7f60c9b6-2fbc-4a44-a104-18b30f5ed0a8", - "last_modified": 1624978716106 - }, { "schema": 1624978190351, "derHash": "x/FF1HT13CCyemThaWF5UiRpB4szP+j/iHuXzngF42I=", @@ -13068,24 +13032,6 @@ "id": "90d490c9-4f55-4511-92c3-af9d041f1998", "last_modified": 1624978716085 }, - { - "schema": 1624978187811, - "derHash": "MSqwEnRPhZ7viuD6JdAlnonar1G5T6xn38YQYPDbIgc=", - "subject": "CN=VTB BANK GCC R6 OV CA 2021,O=VTB BANK (PJSC),C=RU", - "subjectDN": "MEwxCzAJBgNVBAYTAlJVMRgwFgYDVQQKEw9WVEIgQkFOSyAoUEpTQykxIzAhBgNVBAMTGlZUQiBCQU5LIEdDQyBSNiBPViBDQSAyMDIx", - "whitelist": false, - "attachment": { - "hash": "8aeafa0e77fe21899b8d6fec6a9d28910d10a874856375b9043010f048407bae", - "size": 2389, - "filename": "1NDMrvPgEIgVf_T0x1FbpvAfsQQ32xZnSYEqeQ6nzD4=.pem", - "location": "security-state-staging/intermediates/a3d2b25d-bf3f-4eb2-b373-fd42fa9733a4.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "1NDMrvPgEIgVf/T0x1FbpvAfsQQ32xZnSYEqeQ6nzD4=", - "crlite_enrolled": true, - "id": "340ef00d-96c5-47c2-908d-d9eaa69779f1", - "last_modified": 1624978716064 - }, { "schema": 1624976027068, "derHash": "aS/huLommVMd5M0vUq44+hGasB9LMat4/m2z/fA6cDE=", @@ -13122,24 +13068,6 @@ "id": "657d3530-54d0-4905-8819-2c4ed441e0b6", "last_modified": 1624978716023 }, - { - "schema": 1624978189829, - "derHash": "lbqW9yyzFOzQXOD9ddiGOBo2jI9YafBL3TAkiT9OOTs=", - "subject": "CN=VTB BANK GCC R6 DV CA 2021,O=VTB BANK (PJSC),C=RU", - "subjectDN": "MEwxCzAJBgNVBAYTAlJVMRgwFgYDVQQKEw9WVEIgQkFOSyAoUEpTQykxIzAhBgNVBAMTGlZUQiBCQU5LIEdDQyBSNiBEViBDQSAyMDIx", - "whitelist": false, - "attachment": { - "hash": "f807d756c8fb3d76c22571a72a26bb72e8c7b73ef52d98b439358f790f5a1df4", - "size": 2389, - "filename": "olnee8t8xOsYWGNSkIcYUCYeNenyhxG6R_lLRa2yMI0=.pem", - "location": "security-state-staging/intermediates/a19ddf6a-3fa5-4ca1-9514-0de02dfba270.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "olnee8t8xOsYWGNSkIcYUCYeNenyhxG6R/lLRa2yMI0=", - "crlite_enrolled": true, - "id": "a9491b45-dfaf-47ef-8f30-073c2220bb90", - "last_modified": 1624978716000 - }, { "schema": 1624913392136, "derHash": "00GZhqSHZYJdE7MBVHsn3Fag7NMJGYr+mn1/qtZJaao=",
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit 2441d0fa27c06e94d55c283e2848dde15ccc4f6d Author: Yury Delendik ydelendik@mozilla.com AuthorDate: Tue Mar 29 19:52:46 2022 +0000
Bug 1761850 - Fix wasm select on ARM64. r=jseward, a=RyanVM
JSOpToCondition is applicable only to integer types. JSOpToDoubleCondition and ConditionFromDoubleCondition sequence has to be used for float types.
Differential Revision: https://phabricator.services.mozilla.com/D142288 --- .../jit-test/tests/wasm/binop-arm64-ion-codegen.js | 2 +- js/src/jit-test/tests/wasm/regress/bug1761850.js | 96 ++++++++++++++++++++++ js/src/jit/arm64/CodeGenerator-arm64.cpp | 9 +- 3 files changed, 105 insertions(+), 2 deletions(-)
diff --git a/js/src/jit-test/tests/wasm/binop-arm64-ion-codegen.js b/js/src/jit-test/tests/wasm/binop-arm64-ion-codegen.js index 36b26b1350ce3..acb9e7d6c7ab6 100644 --- a/js/src/jit-test/tests/wasm/binop-arm64-ion-codegen.js +++ b/js/src/jit-test/tests/wasm/binop-arm64-ion-codegen.js @@ -300,7 +300,7 @@ codegenTestARM64_adhoc( 'f', `9e6703e0 fmov d0, xzr 1e622000 fcmp d0, d2 - 1e63bc20 fcsel d0, d1, d3, lt`) + 1e633c20 fcsel d0, d1, d3, lo`)
// FP ABS should not tie its input to its output.
diff --git a/js/src/jit-test/tests/wasm/regress/bug1761850.js b/js/src/jit-test/tests/wasm/regress/bug1761850.js new file mode 100644 index 0000000000000..159db484019dc --- /dev/null +++ b/js/src/jit-test/tests/wasm/regress/bug1761850.js @@ -0,0 +1,96 @@ +// Testing runtime execution of select + comparison operations. +// Normally they are folded into shorter/faster sequence than select alone. + +function cross(xs) { + let results = []; + for ( let x of xs ) + for ( let y of xs ) + results.push([x,y]); + return results; +} + +const floatOps = { + lt(a, b) { return a < b ? 0 : 1; }, + le(a, b) { return a <= b ? 0 : 1; }, + gt(a, b) { return a > b ? 0 : 1; }, + ge(a, b) { return a >= b ? 0 : 1; }, + eq(a, b) { return a === b ? 0 : 1; }, + ne(a, b) { return a !== b ? 0 : 1; }, +} + +for (let ty of ['f32', 'f64']) { + for (let op of ['lt', 'le', 'gt', 'ge', 'eq', 'ne']) { + const module = new WebAssembly.Module(wasmTextToBinary(`(module + (memory (export "memory") 1 1) + (func (export "test") (result i32) + i32.const 128 + i32.load8_u + i32.const 129 + i32.load8_u + i32.const 0 + ${ty}.load + i32.const ${ty == 'f32' ? 4 : 8} + ${ty}.load + ${ty}.${op} + select + ) + (data (i32.const 128) "\00\01"))`)); + const instance = new WebAssembly.Instance(module); + const arr = new (ty == 'f32' ? Float32Array : Float64Array)(instance.exports.memory.buffer); + for (let [a, b] of cross( + [0, 1, -1e100, Infinity, -Infinity, 1e100, -1e-10, 1/-Infinity, NaN] + )) { + arr[0] = a; arr[1] = b; + assertEq(instance.exports.test(), floatOps[op](arr[0], arr[1])) + } + } +} + +const intOps = { + lt(a, b) { return a < b ? 0 : 1; }, + le(a, b) { return a <= b ? 0 : 1; }, + gt(a, b) { return a > b ? 0 : 1; }, + ge(a, b) { return a >= b ? 0 : 1; }, + eq(a, b) { return a === b ? 0 : 1; }, + ne(a, b) { return a !== b ? 0 : 1; }, +} + +for (let [ty, signed] of [['i32', true], ['i32', false], ['i64', true], ['i64', false]]) { + for (let op of ['lt', 'le', 'gt', 'ge', 'eq', 'ne']) { + const module = new WebAssembly.Module(wasmTextToBinary(`(module + (memory (export "memory") 1 1) + (func (export "test") (result i32) + i32.const 128 + i32.load8_u + i32.const 129 + i32.load8_u + i32.const 0 + ${ty}.load + i32.const ${ty == 'i32' ? 4 : 8} + ${ty}.load + ${ty}.${op}${op[0] == 'l' || op[0] == 'g' ? (signed ? '_s' : '_u') : ''} + select + ) + (data (i32.const 128) "\00\01"))`)); + const instance = new WebAssembly.Instance(module); + const arr = new (ty == 'i32' ? (signed ? Int32Array : Uint32Array) : + (signed ? BigInt64Array : BigUint64Array)) + (instance.exports.memory.buffer); + const c = ty == 'i32' ? (a => a|0) : BigInt; + for (let [a, b] of cross( + [c(0), ~c(0), c(1), ~c(1), c(1) << c(8), ~c(1) << c(12)] + )) { + arr[0] = a; arr[1] = b; + assertEq(instance.exports.test(), intOps[op](arr[0], arr[1])) + } + } +} + + +function cross(xs) { + let results = []; + for ( let x of xs ) + for ( let y of xs ) + results.push([x,y]); + return results; +} diff --git a/js/src/jit/arm64/CodeGenerator-arm64.cpp b/js/src/jit/arm64/CodeGenerator-arm64.cpp index f179f052961de..7c02fe103f34b 100644 --- a/js/src/jit/arm64/CodeGenerator-arm64.cpp +++ b/js/src/jit/arm64/CodeGenerator-arm64.cpp @@ -2489,7 +2489,14 @@ void CodeGenerator::visitWasmCompareAndSelect(LWasmCompareAndSelect* ins) { }
// Act on flag. - Assembler::Condition cond = JSOpToCondition(ins->compareType(), ins->jsop()); + Assembler::Condition cond; + if (compTy == MCompare::Compare_Float32 || + compTy == MCompare::Compare_Double) { + cond = Assembler::ConditionFromDoubleCondition( + JSOpToDoubleCondition(ins->jsop())); + } else { + cond = JSOpToCondition(compTy, ins->jsop()); + } MIRType insTy = ins->mir()->type(); if (insTy == MIRType::Int32) { Register outReg = ToRegister(ins->output());
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit aeb147b24efe70cc53eceec2b2ca96e9d7db7d78 Author: Yury Delendik ydelendik@mozilla.com AuthorDate: Wed Apr 6 18:42:42 2022 +0000
Bug 1762899 - Fix {f32,f64}.copysign for Aarch64. r=lth, a=RyanVM
Using defineReuseInput in LIRGenerator to prevents rhs == output && lhs != output, which is the case that would clobber the rhs in copySignDouble().
Differential Revision: https://phabricator.services.mozilla.com/D142994 --- js/src/jit-test/tests/wasm/regress/bug1762899.js | 19 +++++++++++++++++++ js/src/jit/arm64/Lowering-arm64.cpp | 4 +++- 2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/js/src/jit-test/tests/wasm/regress/bug1762899.js b/js/src/jit-test/tests/wasm/regress/bug1762899.js new file mode 100644 index 0000000000000..5df2a53404fcd --- /dev/null +++ b/js/src/jit-test/tests/wasm/regress/bug1762899.js @@ -0,0 +1,19 @@ +var ins = wasmEvalText(` +(module + (func (export "copysign_f64") (param f64 f64) (result f64) + f64.const 0x1.921fb54442d18p+0 (;=1.5708;) + local.get 0 + f64.copysign + ) + (func (export "copysign_f32") (param f32 f32) (result f32) + f32.const 0x1.921fb54442d18p+0 (;=1.5708;) + local.get 0 + f32.copysign + ) +) +`); + +assertEq(ins.exports.copysign_f64(1, 0), 1.5707963267948966); +assertEq(ins.exports.copysign_f64(-1, 0), -1.5707963267948966); +assertEq(ins.exports.copysign_f32(1, 0), 1.5707963705062866); +assertEq(ins.exports.copysign_f32(-1, 0), -1.5707963705062866); diff --git a/js/src/jit/arm64/Lowering-arm64.cpp b/js/src/jit/arm64/Lowering-arm64.cpp index 5ad0f60e35b28..1e1a4d78e6369 100644 --- a/js/src/jit/arm64/Lowering-arm64.cpp +++ b/js/src/jit/arm64/Lowering-arm64.cpp @@ -961,7 +961,9 @@ void LIRGenerator::visitCopySign(MCopySign* ins) {
lir->setOperand(0, useRegisterAtStart(lhs)); lir->setOperand(1, useRegisterAtStart(rhs)); - define(lir, ins); + // The copySignDouble and copySignFloat32 are optimized for lhs == output. + // It also prevents rhs == output when lhs != output, avoids clobbering. + defineReuseInput(lir, ins, 0); }
void LIRGenerator::visitExtendInt32ToInt64(MExtendInt32ToInt64* ins) {
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit 62893846ebb1ae64b0474ab4de6500f5f120f89f Author: Gabriel Bustamante gbustamante@mozilla.com AuthorDate: Tue Mar 29 16:36:48 2022 +0000
No bug - Bump gecko_decision to 4.0.0 r=ahal,aki a=release --- .taskcluster.yml | 2 +- taskcluster/docker/decision/HASH | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.taskcluster.yml b/.taskcluster.yml index f9a6c01e3c8c3..1d2f4b431f6c6 100644 --- a/.taskcluster.yml +++ b/.taskcluster.yml @@ -222,7 +222,7 @@ tasks:
# Note: This task is built server side without the context or tooling that # exist in tree so we must hard code the hash - image: 'mozillareleases/gecko_decision:3.0.1@sha256:9964730ed951584e65032bd1d6a2b7ede6d880a8b7aefb72d0d7f82346d834e3' + image: 'mozillareleases/gecko_decision:4.0.0@sha256:9f69fe08c28e3cb3cc296451f0a2735df6e25d0e3c877ea735ef1b7f0b345b06'
maxRunTime: 1800
diff --git a/taskcluster/docker/decision/HASH b/taskcluster/docker/decision/HASH index 9fdbc3a6897ec..b854e10d0f443 100644 --- a/taskcluster/docker/decision/HASH +++ b/taskcluster/docker/decision/HASH @@ -1 +1 @@ -sha256:9964730ed951584e65032bd1d6a2b7ede6d880a8b7aefb72d0d7f82346d834e3 +sha256:9f69fe08c28e3cb3cc296451f0a2735df6e25d0e3c877ea735ef1b7f0b345b06
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit 52cc1bd557983ee9401feed29fe9f0d0b57b3288 Author: Julien Cristau jcristau@mozilla.com AuthorDate: Wed Mar 30 14:54:03 2022 +0200
Bug 1762128 - bump the cache name for decision images to stop interfering with other trees. r=releng-reviewers,ahal a=release
hg 4.8 (e.g. from the v3.0.1 decision image) seems to choke on cached repos created with 5.8 (from v4.0.0).
Differential Revision: https://phabricator.services.mozilla.com/D142455 --- .taskcluster.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.taskcluster.yml b/.taskcluster.yml index 1d2f4b431f6c6..57ff39593f7ac 100644 --- a/.taskcluster.yml +++ b/.taskcluster.yml @@ -214,7 +214,7 @@ tasks: ACTION_CALLBACK: '${action.cb_name}'
cache: - "${trustDomain}-level-${repository.level}-checkouts-sparse-v2": /builds/worker/checkouts + "${trustDomain}-level-${repository.level}-checkouts-sparse-v3": /builds/worker/checkouts
features: taskclusterProxy: true
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit 4310d0d6dd4644c82d0d64b2a5b36ecec34bb131 Author: ffxbld ffxbld@mozilla.com AuthorDate: Mon Apr 11 11:00:12 2022 +0000
No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings - a=repo-update, r=dsmith
Differential Revision: https://phabricator.services.mozilla.com/D143359 --- security/manager/ssl/StaticHPKPins.h | 2 +- security/manager/ssl/nsSTSPreloadList.inc | 280 +++++++++------------ .../dumps/security-state/intermediates.json | 108 +++----- 3 files changed, 161 insertions(+), 229 deletions(-)
diff --git a/security/manager/ssl/StaticHPKPins.h b/security/manager/ssl/StaticHPKPins.h index 1b4b7df31e447..7b2c16429acae 100644 --- a/security/manager/ssl/StaticHPKPins.h +++ b/security/manager/ssl/StaticHPKPins.h @@ -1149,4 +1149,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
static const int32_t kUnknownId = -1;
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1657795861343000); +static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1658141514846000); diff --git a/security/manager/ssl/nsSTSPreloadList.inc b/security/manager/ssl/nsSTSPreloadList.inc index cae499e400f8a..2552edefef23d 100644 --- a/security/manager/ssl/nsSTSPreloadList.inc +++ b/security/manager/ssl/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/
#include <stdint.h> -const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); +const PRTime gPreloadListExpirationTime = INT64_C(1660560706484000); %% 0--1.de, 1 0-1.party, 1 @@ -310,7 +310,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 0dev.cc, 1 0i0.nl, 1 0ii0.cf, 1 -0ik.de, 1 0iz.net, 1 0knowledge.de, 0 0o0.edu.pl, 1 @@ -728,11 +727,13 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 11jjqq.com, 1 11jjrr.com, 1 11jjtt.com, 1 +11jjyy.com, 1 11jjzz.com, 1 11kkee.com, 1 11kkff.com, 1 11kkss.com, 1 11men.tk, 1 +11ppbb.com, 1 11ppcc.com, 1 11ppdd.com, 1 11ppee.com, 1 @@ -798,6 +799,8 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 11yykk.com, 1 11yypp.com, 1 11yyqq.com, 1 +11yyrr.com, 1 +11yytt.com, 1 11yyxx.com, 1 11zzbb.com, 1 11zzdd.com, 1 @@ -850,9 +853,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 123365t.com, 1 1234.link, 1 123410.xyz, 1 -1234365a.com, 1 -1234365k.com, 1 -1234365y.com, 1 1234365z.com, 0 12345.lv, 1 12345678365.com, 1 @@ -1039,6 +1039,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 156k66.com, 1 156z6.com, 1 157z6.com, 1 +158bg.com, 1 158fb.com, 1 158ia.com, 1 158in.com, 1 @@ -1313,7 +1314,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 188cn-sb.com, 1 188da.com, 1 188wei.com, 1 -189dv.com, 1 189fc.com, 1 18f.gov, 1 18f.gsa.gov, 0 @@ -1680,6 +1680,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 22bet.ng, 1 22bet86.com, 1 22betglobal.com, 1 +22ccaa.com, 1 22ccbb.com, 1 22ccpp.com, 1 22ccxx.com, 1 @@ -1719,6 +1720,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 22kkpp.com, 1 22kkyy.com, 1 22lc8.com, 0 +22momo.com, 1 22ppdd.com, 1 22ppgg.com, 1 22ppss.com, 1 @@ -1735,6 +1737,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 22ssjj.com, 1 22sskk.com, 1 22sstt.com, 1 +22tete.com, 1 22times.com, 1 22ttgg.com, 1 22vetter.st, 1 @@ -1870,6 +1873,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 256bl.com, 1 256bp.com, 1 256bq.com, 1 +256br.com, 1 256bt.com, 1 256bx.com, 1 256hh.com, 1 @@ -1891,7 +1895,9 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 262569.com, 1 269196.com, 1 2698pacificave.com, 1 +26bbc.com, 1 26ce.com, 1 +26ck.com, 1 26gt.com, 1 26ja.com, 1 26nc.com, 1 @@ -1902,6 +1908,8 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 26sr.com, 1 26ssb.com, 1 26uuu.info, 1 +26uuu.mobi, 1 +26uuu.us, 1 27000.best, 1 2718282.net, 1 272live.com, 1 @@ -2034,6 +2042,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 300cccc.com, 1 300dddd.com, 1 300hhhh.com, 1 +300jjjj.com, 1 300kkkk.com, 1 300llll.com, 1 300mmmm.com, 1 @@ -2229,6 +2238,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 349533.com, 1 34ac.com, 1 34ax.com, 1 +34bg.com, 1 34bk.com, 1 34da.com, 1 34fc.com, 1 @@ -2241,11 +2251,13 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 34iu.com, 1 34iv.com, 1 34ix.com, 1 +34ja.com, 1 34jb.com, 1 34jg.com, 1 34ji.com, 1 34jm.com, 1 34jn.com, 1 +34jw.com, 1 34kr.com, 1 34lb.com, 1 34ld.com, 1 @@ -2254,6 +2266,8 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 34lr.com, 1 34metiza.ru, 1 34nd.com, 1 +34nh.com, 1 +34nj.com, 1 34nv.com, 1 34nw.com, 1 34oa.com, 1 @@ -2318,6 +2332,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 35jq.com, 1 35ud.com, 1 35ue.com, 1 +35uj.com, 1 35vn.com, 1 360-ot.de, 1 360365.com, 1 @@ -2358,7 +2373,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 36533d.com, 1 36533e.com, 1 36533f.com, 1 -36533g.com, 1 36533h.com, 1 36533i.com, 1 36533j.com, 1 @@ -2461,11 +2475,14 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 369ck.com, 1 369cr.com, 1 369cu.com, 1 +369dp.com, 1 369dr.com, 1 369ec.com, 1 369eh.com, 1 369em.com, 1 369ep.com, 1 +369eq.com, 1 +369ex.com, 1 369fj.com, 1 369fn.com, 1 369ft.com, 1 @@ -2478,6 +2495,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 369pb.com, 1 369qb.com, 1 369ra.com, 1 +369rr.com, 1 369ve.com, 1 369wt.com, 1 36ag8.com, 1 @@ -2502,7 +2520,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 375ks.com, 1 377625.com, 1 377632.com, 1 -3778vip.com, 0 377ks.com, 1 377zzz.com, 1 37879.com, 0 @@ -2933,8 +2950,10 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 46ap.com, 1 46ay.com, 1 46az.com, 1 +46bf.com, 1 46bg.com, 1 46bh.com, 1 +46bl.com, 1 46bn.com, 1 46bp.com, 1 46bq.com, 1 @@ -2957,6 +2976,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 46eq.com, 1 46et.com, 1 46ey.com, 1 +46fn.com, 1 46fp.com, 1 46fq.com, 1 46gc.com, 1 @@ -3134,7 +3154,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 4best.tk, 1 4bet86.com, 1 4budget.ga, 1 -4c-haircare.com, 1 4car.site, 1 4cavaleiros.com.br, 1 4cut.tk, 1 @@ -4239,7 +4258,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 6lo.zgora.pl, 1 6meter.tk, 1 6play.fr, 1 -6qubedirectory.com, 1 6t-montjoye.org, 1 6thmarch.com, 1 6wbz.com, 1 @@ -4314,13 +4332,16 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 73ea.com, 1 73eb.com, 1 73ef.com, 1 +73eg.com, 1 73eh.com, 1 73ei.com, 1 73ej.com, 1 73ek.com, 1 73en.com, 1 +73eq.com, 1 73es.com, 1 73ex.com, 1 +73ez.com, 1 73fd.com, 1 73fg.com, 1 73fl.com, 1 @@ -4407,6 +4428,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 73xm.com, 1 73xv.com, 1 73yj.com, 1 +73yp.com, 1 73yr.com, 1 73yu.com, 1 73za.com, 1 @@ -4518,6 +4540,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 7geese.com, 1 7graus.pt, 1 7in0.me, 1 +7it-latam.com, 1 7ki.photography, 1 7kicks.com, 1 7kovrikov.ru, 1 @@ -4951,6 +4974,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 886k8.com, 1 886k8.net, 1 886z6.com, 1 +887.ag, 1 8871d.com, 1 8872d.com, 1 88740b.com, 1 @@ -5143,7 +5167,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660215053592000); 9137365.com, 0 914122.com, 1 918-siteinfo.com, 1 -918.com, 1 9180nn.com, 1 9180tt.com, 1 9180vv.com, 1 @@ -6348,6 +6371,7 @@ academylawreview.ac.in, 1 academyonlinetoyou.tk, 1 academytv.com.au, 1 acadiate.com, 1 +acaeum.com, 0 acahaymarket.com.ec, 1 acalcio.ga, 1 acallawayroofing.com, 1 @@ -6412,7 +6436,7 @@ acclivity.pro, 1 accme.co, 1 accn.uk, 1 accniitmash.ru, 1 -accolade.com.br, 1 +accolade.com.br, 0 accoladescreens.com.au, 1 accomexicana.com.mx, 1 accomexico.com, 1 @@ -6524,7 +6548,6 @@ acinq.co, 1 ackadia.com, 1 ackermann.ch, 1 acklandstainless.com.au, 1 -aclasskids.ru, 1 aclfurniture.com, 1 aclipt.com, 1 acloud.one, 1 @@ -6973,7 +6996,7 @@ adminlinux.pl, 1 admino.cz, 1 adminova.tk, 1 adminresurs.tk, 1 -adminrezo.fr, 1 +adminrezo.fr, 0 adminton.eu, 1 admirable.pro, 0 admiralshipsupplier.com, 0 @@ -7407,8 +7430,6 @@ afbrtv.com, 1 afbrunswick.com, 1 afbryt.com, 1 afc-capital.mx, 1 -afcmrs.org, 0 -afcmrsfeedback.org, 0 afcmrstest.org, 1 afcurgentcarelyndhurst.com, 0 afdah.se, 1 @@ -7568,7 +7589,6 @@ ag660.com, 1 ag66321.com, 1 ag66567.com, 1 ag666.vip, 1 -ag66668.com, 1 ag68ks.com, 1 ag69000.com, 1 ag72.vip, 1 @@ -7838,7 +7858,6 @@ agnosia.tk, 1 agnosticism.tk, 1 agnusbostel.tk, 1 agonpro.ch, 1 -agonswim.com, 1 agonworks.com, 0 agora-soft.cf, 1 agora.ru, 1 @@ -7965,6 +7984,7 @@ ahealthyjourney.ca, 1 ahegaoroulette.com, 1 ahelos.tk, 1 ahenkerp.com, 1 +ahero4all.org, 1 ahg-offices.fr, 1 ahhcomfortshoes.com, 1 ahidta.gov, 1 @@ -8497,7 +8517,6 @@ akita-boutique.com, 1 akita-stream.com, 1 akiym.com, 1 akj.io, 1 -akkbouncycastles.co.uk, 1 akkerwinde.tk, 1 akkordy-skachat.ga, 1 aklagare.se, 1 @@ -8930,7 +8949,6 @@ alexismeza.com.mx, 1 alexismeza.dk, 1 alexismeza.es, 1 alexispoficial.tk, 1 -alexitor.com, 1 alexlambertz.de, 1 alexlombardo.tk, 1 alexlouden.com, 1 @@ -9143,7 +9161,6 @@ aljweb.com, 1 alkacoin.net, 1 alkamitech.com, 1 alkel.info, 1 -alkemi-si.fr, 1 alko-centr.ru, 1 alko-stop.cf, 1 alko-stop.ml, 1 @@ -9323,7 +9340,6 @@ alllaboutchickens.tk, 1 allladyboys.com, 1 allline.shop, 1 allmagic.tk, 1 -allmajestic.com, 1 allmandlaw.com, 1 allmaps.tk, 1 allmaster.ga, 1 @@ -9427,7 +9443,6 @@ allvideofoot.tk, 1 allvips.ru, 0 allvitalconstruction.com, 1 allways.tk, 1 -allweatherlandscaping.net, 1 allwebsites.tk, 1 allwebtuts.com, 1 allwiki.tk, 1 @@ -10006,7 +10021,6 @@ americathebeautifulquarters.gov, 1 americavip.tk, 1 americawiki.tk, 1 americkykongres.cz, 1 -americoadvogados.com.br, 1 americolorcorp.com, 1 americorpsoig.gov, 1 amerigrouphealthyliving.com, 1 @@ -10596,7 +10610,6 @@ angelcastellanos.tk, 1 angelcorpus.tk, 1 angeldjmix.tk, 1 angelefloramendy.org, 1 -angelesverdes.org, 1 angelesydemonios.es, 1 angeletakis.net, 1 angelhammer.tk, 1 @@ -10767,6 +10780,7 @@ animelily.com, 1 animelody.net, 1 animelolipop.com, 1 animemotivation.com, 1 +animepahe.com, 1 animeplus1.tk, 1 animepower.gq, 1 animepower.tk, 1 @@ -10921,7 +10935,6 @@ annuncisesso.tk, 1 annyaurora.net, 1 annynantasiri.com, 1 anodas.lt, 1 -anohana.org, 1 anojan.com, 1 anomalous.eu, 1 anomaly.tk, 1 @@ -11244,7 +11257,6 @@ anytimeoffices.ga, 1 anytimesewerrepair.com, 1 anyuta-mebel.tk, 1 anyval.com, 1 -anyways.at, 1 anywhereworks.com, 1 anzalikala.com, 1 anzeiger.ag, 1 @@ -12150,7 +12162,6 @@ armcar.ga, 1 armchess.tk, 1 armdirectoryers.ga, 1 armdirectoryest.ga, 1 -armedpoet.com, 1 armenians.online, 1 armeniaweb.tk, 1 armeo.top, 1 @@ -13024,6 +13035,7 @@ atelierdefrancais.ch, 0 atelierdeloulou.fr, 1 atelierdesflammesnoires.fr, 1 atelierfantazie.sk, 1 +atelierhsn.com, 1 atelierjs.com, 1 atelierlk.art, 1 ateliernaruby.cz, 1 @@ -13248,6 +13260,7 @@ atypicom.pt, 1 atyuan.me, 1 atzenchefin.de, 1 atzeneta.tk, 1 +atzzz.com, 1 au-be.net, 1 au-inter.net, 1 au.by, 1 @@ -13950,6 +13963,7 @@ avellinotoday.it, 1 avelux.ru, 1 avengersonline.ml, 1 avengersonlinemovie.ga, 1 +aventurasnorowa.com, 0 avenuedesbebes.com, 1 avepol.cz, 1 avepol.eu, 1 @@ -14088,6 +14102,7 @@ avtoucheba.tk, 1 avtours.gr, 1 avtoveles.by, 1 avtovikup.ml, 1 +avtovokzaly.ru, 1 avtoyurist.cf, 1 avtoyurist.ga, 1 avtoyurist.gq, 1 @@ -14401,7 +14416,6 @@ azulimparcial.pt, 1 azulweb.tk, 1 azur.ovh, 1 azurecraft.ga, 1 -azurecrimson.com, 1 azurecup.cz, 1 azurecup.online, 1 azurefabric.com, 1 @@ -14761,7 +14775,6 @@ bach-frederiksen.dk, 1 bachata.info, 1 bachelorampel.de, 1 baches-piscines.com, 1 -bachkhoa.net.vn, 1 bachlongbeach.com, 1 bachmannyachts.com, 1 bachmatt-baar.ch, 1 @@ -15740,6 +15753,7 @@ bazari.com.pl, 1 bazarotehijos.com, 1 bazdell.com, 0 bazhan.me, 1 +bazinga-events.nl, 1 bazos.at, 1 bazos.cz, 1 bazos.pl, 1 @@ -16100,7 +16114,6 @@ beehive42.eu, 1 beehive42.net, 1 beehive42.nl, 1 beehive42.org, 1 -beehosting.pro, 1 beekbier.nl, 1 beekeeper.blog, 1 beekeeper.clothing, 1 @@ -17771,6 +17784,7 @@ billcomparison.ga, 1 billets-avion.tk, 1 billfazz.com, 1 billgatos.tk, 1 +billgoldstein.name, 1 billgradywebdesign.com, 1 billhartzer.com, 1 billiardmaster.com.ua, 1 @@ -18052,7 +18066,6 @@ bipolargeek.org, 1 bipolarworld.us, 1 bipyo.com, 0 birahugo.tk, 1 -birbaumer.li, 0 birchbarkfurniture.ch, 1 birchbarkfurniture.com, 0 birchbarkfurniture.fr, 0 @@ -18431,6 +18444,7 @@ bkamp.de, 1 bkentertainments.co.uk, 1 bkgatl.com, 1 bkhpilates.co.uk, 1 +bkkf.at, 1 bkkposn.com, 1 bkl-ca-qa-employeeapp.azurewebsites.net, 1 bklaindia.com, 1 @@ -18971,7 +18985,6 @@ bluenailsstudio.nl, 1 bluenet-26.com, 1 blueneuron.tk, 1 blueoakart.com, 1 -blueoceantech.us, 0 blueparrotpainting.com, 1 bluepearl.tk, 1 blueperil.de, 1 @@ -19236,13 +19249,11 @@ boizeau.fr, 1 bojan.tk, 1 bojanowskiszkolka.pl, 1 bojiu99.cc, 1 -bokadoktorn-test.net, 1 bokadoktorn.se, 1 bokatas.tk, 1 boke112.com, 1 bokehandbows.ca, 1 bokhylle.eu, 1 -bokka.com, 1 bokkeriders.com, 1 bokov.gq, 1 boksburgplumber24-7.co.za, 1 @@ -19419,7 +19430,6 @@ book-in-hotel.com, 1 book-online.tk, 1 book-sites.cf, 1 bookameeting.se, 1 -bookaway.com, 1 bookbazar.co.in, 1 booker.ly, 1 bookingready.com, 1 @@ -19501,7 +19511,6 @@ boost.ink, 1 boostdesign.tk, 1 boostgame.win, 1 boostplm.com, 1 -boostrpro.pl, 1 booths.cyou, 1 bootlesshacker.com, 1 boots-shop.tk, 1 @@ -19715,7 +19724,6 @@ bouncingbuddiesleicester.co.uk, 1 bouncingbuzzybees.co.uk, 1 bouncinghigher.co.uk, 1 bouncingscotland.com, 1 -bouncourseplanner.net, 1 bouncy-castles-surrey.co.uk, 1 bouncy-tots.co.uk, 1 bouncybaileys.co.uk, 1 @@ -20243,7 +20251,6 @@ brianfanzo.com, 1 brianfoshee.com, 1 briangarcia.ga, 1 briangosnell.com, 1 -brianjohnson.co.za, 1 brianjosephdavis.tk, 1 brianlachapelle.tk, 1 brianlanders.us, 1 @@ -20733,7 +20740,6 @@ btraviswright.com, 1 btraviswrightmps.com, 1 btrb.ml, 1 btrfs.no, 1 -btsapem.com, 1 btshe.net, 1 btsline.co.id, 1 btslr.co, 1 @@ -20834,7 +20840,6 @@ budgetlovers.nl, 1 budgetrf.tk, 1 budgetwebsites.com.au, 1 budilnik.ml, 1 -budntod.com, 1 budofjoy.com, 1 budolangnau.ch, 1 budolfs.de, 1 @@ -21816,7 +21821,6 @@ caaps.org.au, 1 caarecord.org, 1 caasd.org, 1 caasda.tk, 1 -cabaal.net, 1 cabaladada.org, 1 cabale.fr, 1 cabalistic.tk, 1 @@ -22806,7 +22810,6 @@ carlili.fr, 1 carlingfordapartments.com.au, 1 carlingforddental.com.au, 1 carlinmack.com, 1 -carlislepassionplay.org, 1 carlitoxxpro.com, 1 carlmjohnson.net, 0 carloancalculator.tk, 1 @@ -24638,10 +24641,8 @@ chezbernard.tk, 1 cheztitine.tk, 1 chfr.search.yahoo.com, 0 chhlayban.tk, 1 -chhlin.com, 1 chhory.com, 1 chhy.at, 1 -chiakhoakhoinghiep.vn, 1 chiamami.online, 1 chiamatehot.com, 1 chiangdao.com, 1 @@ -26321,14 +26322,12 @@ cnaprograms.online, 1 cnatraining.network, 1 cnbs.ch, 1 cnc-lehrgang.de, 1 -cncado.net, 1 cncfraises.fr, 1 cncn3.cn, 1 cncollege.tk, 1 cncr.ga, 1 cncrans.ch, 0 cncs.gob.do, 1 -cncs.gov.pt, 1 cnet-hosting.com, 1 cnetw.xyz, 1 cnexchange.com, 1 @@ -26450,7 +26449,6 @@ cocyou.ooo, 1 cocytus.services, 1 cod-ggw.ml, 1 cod88.cc, 1 -coda.io, 1 coda.moe, 1 coda.today, 1 coda.world, 1 @@ -26686,6 +26684,7 @@ col-head.com, 1 col.la, 1 cola-host.tk, 1 colaborativa.tv, 1 +colabug.com, 0 colah.com.au, 1 colapsys.net, 0 colarelli.ch, 1 @@ -26842,7 +26841,6 @@ colorguni.com, 1 colorhexa.com, 1 colorideas.net, 1 coloringnotebook.com, 0 -coloristcafe.com, 1 colorlib.com, 0 colorpalette.org, 1 colorpicker.fr, 1 @@ -26919,7 +26917,6 @@ comercialroxana.com, 1 comercialtech.cl, 1 comercialtpv.com, 1 comercialtrading.eu, 1 -comerford.net, 1 comeros.be, 1 comestoarra.com, 1 cometbot.cf, 1 @@ -27697,7 +27694,6 @@ copypoison.com, 1 copyright-watch.org, 1 copyrightcoins.com, 1 copyrightcoins.help, 1 -copyrightcoinsnews.com, 1 copyrighter.tk, 1 copyrightflow.com, 1 copyrightforabout.tk, 1 @@ -29072,6 +29068,7 @@ cuio.net, 1 cuir-lipari.fr, 1 cuisine-ultime.fr, 1 cuitrau.tk, 1 +cujanovic.com, 1 cukrinelape.com, 1 cukurbag.ml, 1 culan.dk, 0 @@ -29229,7 +29226,6 @@ custer.tk, 1 custercounty-co.gov, 1 custercountyne.gov, 1 custodiamobili.roma.it, 1 -custodian.nl, 1 custodyxchange.com, 1 custom-funky.co.uk, 1 custom-wear.ua, 1 @@ -29630,6 +29626,7 @@ d3lab.net, 1 d3xt3r01.tk, 1 d42.no, 1 d4done.com, 1 +d4fx.de, 1 d4h.live, 1 d4wson.com, 1 d4x.de, 1 @@ -29945,6 +29942,7 @@ dana-hilliot.tk, 1 danadameson.tk, 1 danads.com, 1 danaglennsmith.com, 1 +danajamin.com, 0 danalina.by, 1 danalytics.com.pe, 1 danamica.dk, 1 @@ -30713,7 +30711,6 @@ db-buddy.com, 1 db-sanity.com, 1 db-works.nl, 1 db.ci, 1 -db.fyi, 1 dbapress.org, 1 dbaron.org, 1 dbas.cz, 1 @@ -34415,6 +34412,7 @@ drach.xyz, 1 dracheisolation.tk, 1 drachenleder.de, 1 dracisvet.cz, 1 +dracoon.team, 1 dracox.com, 0 dracula.city, 1 draft.cards, 1 @@ -34857,6 +34855,7 @@ drtimothysteel.com.au, 1 drtimothysteeljournal.com, 1 drtimothysteelnetwork.com, 1 drtimothysteelresults.com, 1 +drtimothysteelscholarship.com.au, 1 drtimothysteelvideos.com, 1 drtti.io, 1 drturner.com.au, 1 @@ -35590,7 +35589,6 @@ e-standardstore.org, 1 e-streams.tv, 1 e-student.tk, 1 e-styling.tk, 1 -e-surety.net, 1 e-sushi.net, 1 e-sweaters.tk, 1 e-tables.tk, 1 @@ -36172,6 +36170,7 @@ eazyproject.net, 1 eazytailors.ga, 1 eazzy.tk, 1 eb-net.de, 1 +eb7.jp, 1 ebabis.cz, 1 ebagroup.tk, 1 ebaifzf.com.br, 1 @@ -36223,7 +36222,6 @@ ebjork.se, 1 ebki-nsn.gov, 1 eblan.gq, 1 eblog.cf, 1 -eblog.ink, 1 ebola-hosting.cz, 1 ebolacharts.ga, 1 ebolavirus.tk, 1 @@ -36469,6 +36467,7 @@ ecsupplyinc.com, 1 ectivepro.com, 1 ectora.com, 1 ectpro.co.th, 1 +ecuadorbienesraices.com, 1 ecuadorextremo.com, 1 ecuadorlibrered.tk, 1 ecubr.com, 1 @@ -36505,6 +36504,7 @@ edeals.com.co, 1 edeca.net, 1 ededdeddy.tk, 1 edefrutos.me, 1 +edefrutos2020.com, 1 edegembicycleclub.tk, 1 edegulkoyu.tk, 1 edehsa.com, 1 @@ -36513,6 +36513,7 @@ edelveiys.tk, 1 edelweiskapel.tk, 1 edelweiss-pinzolo.com, 1 eden-project-insight.tk, 1 +eden.bz, 1 eden.co.uk, 1 edenaya.com, 0 edenfactory.tk, 1 @@ -36966,7 +36967,6 @@ eihaikyo.com, 1 eiji.fr, 1 eikenskaden.tk, 1 eikentafels.nl, 1 -eikerposten.no, 0 eikones.tk, 1 eikounoayumi.jp, 1 eilhan.com, 1 @@ -37949,6 +37949,7 @@ emporiopurochile.com.br, 1 empowerdb.com, 1 empoweren.com, 1 empowernation.org, 1 +empowersimcoe.ca, 0 empoweryou.ca, 1 emprechtinger.com, 1 emprego.pt, 1 @@ -39601,6 +39602,7 @@ eveningtaxservices.com, 1 evenstar-gaming.com, 1 evenstargames.com, 1 event-blick.de, 1 +event-fullyyours.com, 1 event-reisen.tk, 1 event4fun.no, 1 eventact.com, 0 @@ -39980,7 +39982,6 @@ expandtheroom.com, 1 expansion-lidl.es, 1 expatads.com, 1 expatfinancial.com.hk, 1 -expatfire.com, 1 expatmortgage.uk, 1 expatriate.pl, 0 expe.voyage, 1 @@ -41098,7 +41099,6 @@ fastos.de, 1 fastpeoplesearch.com, 1 fastpresence.com, 1 fastproxyforfree.gq, 1 -fastrack.co.mz, 1 fastserv.pl, 1 faststage.ch, 1 fasturl.ml, 1 @@ -41261,7 +41261,6 @@ fdnsc.net, 1 fdp-alsdorf.de, 1 fdp-heinsberg.de, 1 fdpbrig.ch, 1 -fdremodelingatlanta.com, 0 fdresearch.ca, 1 fdsl.eu, 1 feac.us, 1 @@ -41483,7 +41482,6 @@ femiluna.com, 1 feminina.eu, 1 feminina.pt, 1 feminique.tk, 1 -feminism.lgbt, 0 feministreview.cf, 1 feministreview.ga, 1 feministreview.gq, 1 @@ -41763,7 +41761,6 @@ fiataldivat.hu, 1 fiberoptikz.tk, 1 fibery.io, 1 fibo-forex.org, 1 -fibra.click, 1 fibrasynormasdecolombia.com, 1 fibretv.co.nz, 1 fibretv.tv, 1 @@ -41797,6 +41794,7 @@ fierce-escarpment-59441.herokuapp.com, 1 fierman.eu, 0 fierman.net, 0 fierman.us, 0 +fierscleaning.nl, 1 fierykitchen.pl, 1 fiestasalquezar.tk, 1 fietsambassade.be, 1 @@ -42088,7 +42086,6 @@ finestinfo.com, 1 finestrabatalera.tk, 1 finestreview.cf, 1 finestrina.net, 1 -finestroom.ru, 1 finex.by, 1 finexo.ch, 1 finfleet.id, 1 @@ -42164,7 +42161,7 @@ firebaseio.com, 1 firebirdrangecookers.com, 1 firebounty.com, 1 fireboxfood.com, 1 -firebrandchurch.com, 1 +firebugmusic.com, 1 firecask.com, 1 firechip.cc, 1 firechip.srl, 1 @@ -42624,7 +42621,6 @@ flexi-dance.pl, 1 flexiblenetflow.com, 1 flexibsd.com, 1 flexicurity.tk, 1 -fleximaal.com, 1 fleximus.org, 0 flexinvesting.fi, 0 flexitanq.es, 1 @@ -43681,7 +43677,6 @@ fourchetteverte.ch, 1 fourcornerscb.com, 1 fourdesignstudio.com, 1 fourfivecbd.co.za, 1 -fourfourcrew.com, 1 fourfri.es, 1 fourie.ca, 1 fouriemc.com, 1 @@ -44542,7 +44537,6 @@ frutuozo.com.br, 1 fruturaproduce.com, 1 fruxh.moe, 1 fruxnux.net, 1 -fruxprivatebank.net, 1 frydrychit.cz, 1 fryergroup.com, 1 fs-d.org, 1 @@ -44673,7 +44667,6 @@ fujikochan.tk, 1 fujiwarashinzo.com, 1 fujiyakimono.com, 1 fukabori-kaidora.com, 1 -fukakukeiba.com, 1 fukase-seed.com, 1 fukikaeru.com, 1 fukn.jp, 1 @@ -44691,7 +44684,6 @@ fulfillmentcostsest.ga, 1 fulgenzis.com, 1 fuliwang.info, 1 fuliwang.us, 1 -full-stack.ninja, 1 full.eu.org, 1 fullalt.com, 1 fullautomotivo.com.br, 1 @@ -45369,7 +45361,6 @@ galpaoap.com.br, 1 galpsafetytalks-portal-preprod.azurewebsites.net, 1 galpsafetytalks-portal-production.azurewebsites.net, 1 galtelligence.com, 1 -galvingao.com, 1 galvinism.ink, 1 galwew.ga, 1 gamagam.gq, 1 @@ -45999,6 +45990,7 @@ gefire.com, 1 gefolge.org, 1 gegeco.ch, 0 geh.li, 1 +gehaowu.com, 1 gehas-wein-shop.de, 0 gehirn.co.jp, 1 gehirn.jp, 1 @@ -46870,6 +46862,7 @@ gig40.com, 1 giga.is, 1 giga.nl, 1 gigabitz.pw, 1 +gigacloud.org, 1 gigagroup.cf, 1 giganet.tk, 1 gigantar.com, 1 @@ -47158,6 +47151,7 @@ glassofdirt.tk, 1 glassofgrape.com, 1 glassrainbowtrust.org.je, 1 glassrom.org, 1 +glassrom.pw, 1 glasstechnics.be, 1 glassweb.com.mx, 0 glassworld.tk, 1 @@ -48080,6 +48074,7 @@ gplintegratedit.com, 1 gpltimes.club, 1 gplvilla.com, 1 gpm.ltd, 1 +gpna.org, 1 gpodev.gov, 1 gpolanco.com, 1 gpony.fr, 1 @@ -48255,6 +48250,7 @@ grantashqg.com, 1 grantcooper.com, 1 grantdb.ca, 1 grantmorrison.net, 1 +grantpark.org, 1 grantsmasters.com, 1 graonatural.com.br, 0 grapee.jp, 1 @@ -48361,7 +48357,6 @@ grayslakeadvisors.com, 1 grayson.sh, 1 graysonsmith.co.uk, 1 graysquare.com, 1 -grazetech.com, 1 grazhdanskij-advokat.tk, 1 grc.com, 0 grceurope.eu, 1 @@ -51363,6 +51358,7 @@ hexstreamsoft.com, 1 hexxagon.com, 1 hey.pw, 1 heybaker.com.au, 1 +heyboldface.com, 1 heybookmark.ga, 1 heybookmark.gq, 1 heybritney.tk, 1 @@ -53936,6 +53932,7 @@ icon-art.nl, 1 icon-programming.tk, 1 iconintegration.com.au, 1 iconoarte.tk, 1 +iconomi.net, 1 icons4free.tk, 1 iconworld.ml, 1 iconx.ml, 1 @@ -53947,7 +53944,7 @@ icpc.pp.ua, 1 icpc2016.in.th, 1 icq-project.net, 1 icq-world.tk, 1 -icreative.nl, 0 +icreative.nl, 1 icruise.com, 1 ics.edu.hn, 1 icst.tk, 1 @@ -54072,7 +54069,6 @@ idesoft.com, 1 idesoft.eu, 1 idesoft.net, 1 idesoft.org, 1 -idesoftinnovacion.com, 1 idesoftinnovacion.es, 1 idev-hub.com, 1 idevicesinc.com, 1 @@ -54442,10 +54438,8 @@ ila.fi, 1 ilab.health, 1 ilacrehberi.com, 1 ilag.gov, 1 -ilamparas.at, 1 ilamparas.co.uk, 1 ilamparas.com, 1 -ilamparas.com.co, 1 ilamparas.com.ve, 1 ilamparas.mx, 1 ilaphone.com.ua, 1 @@ -54684,7 +54678,6 @@ img.mg, 1 img.ovh, 1 imgaa.com, 1 imgbb.com, 1 -imgbu.com, 1 imgencrypt.com, 1 imgg.es, 1 imgo.ga, 1 @@ -55559,7 +55552,6 @@ inmaaa.cf, 1 inmamaskitchen.com, 1 inmaps.xyz, 1 inmatefinancial.com, 1 -inmateintake.com, 1 inmedic.pl, 1 inmemorium.tk, 1 inmemoryofdaniella.com, 1 @@ -55687,7 +55679,6 @@ insideastronomy.tk, 1 insideaudit.com, 1 insidebeach.com.br, 1 insidebedroom.com, 0 -insidebitcoins.de, 1 insideevs.com, 1 insideevs.com.tr, 1 insideevs.de, 1 @@ -57985,7 +57976,6 @@ jcadg.com, 1 jcaicedo.com, 1 jcaicedo.tk, 1 jcb.com, 1 -jcbgolfandcountryclub.com, 1 jccars-occasions.be, 1 jccrew.org, 1 jcde.xyz, 0 @@ -58272,6 +58262,7 @@ jericamacmillan.com, 1 jerichoproject.org, 1 jering.tech, 1 jerisandoval.tk, 1 +jermann.biz, 1 jerodslay.com, 1 jeroendeneef.com, 1 jeroendev.one, 1 @@ -59247,7 +59238,6 @@ jpshop.ru, 1 jpsinflatables.co.uk, 1 jpslconsulting.ca, 1 jpst.it, 1 -jpvermogensregie.com, 1 jqlin.com, 1 jqlsql.com, 1 jquery.wtf, 1 @@ -59428,6 +59418,7 @@ julia-pink.org, 1 julia.school, 1 juliaexclusiv.com, 1 juliajuice.net, 1 +juliakhairaton.com, 0 julian-miller.de, 1 julian-post.de, 0 julian-uphoff.de, 1 @@ -60176,7 +60167,6 @@ kamppailusali.fi, 1 kampunginggris-ue.com, 1 kamrad.tk, 1 kamranmirhazar.com, 1 -kamui.co.uk, 1 kamuniang.org, 1 kan-ken.fr, 1 kan3.de, 1 @@ -60300,7 +60290,6 @@ karachi.dating, 1 karacommagere.com, 1 karadenizhaberleri.tk, 1 karajonline.tk, 1 -karalane.com, 0 karamel69.ru, 1 karamomo.net, 1 karanastic.com, 0 @@ -60468,7 +60457,6 @@ kasparovru.ml, 1 kasparovru.tk, 1 kasper-team.tk, 1 kasperstad.dk, 1 -kassa.at, 1 kassa.com, 1 kassa.expert, 1 kassola.tk, 1 @@ -60706,6 +60694,7 @@ kcsonline.biz, 1 kcsordparticipation.org, 1 kcsprayfoam.com, 1 kd.net.nz, 1 +kd3.in, 1 kdcinfo.com, 1 kde-je-skladem.cz, 1 kdex.de, 1 @@ -60959,6 +60948,7 @@ keramed.ga, 1 keramed.gq, 1 keramikaopava.cz, 1 kerb-grossauheim.de, 1 +kerbin.org, 1 kercovaparty.tk, 1 kerebro.com, 1 kerijacoby.com, 1 @@ -61227,7 +61217,6 @@ khwezifinancialservices.co.za, 1 ki-management.ch, 1 kiadoapartman.hu, 1 kiahalchemy.com, 1 -kiahoriane.com, 1 kialo-edu.com, 1 kialo-pro.com, 1 kialo.com, 1 @@ -62171,6 +62160,7 @@ koji-tsujitani.net, 1 kojiishikawa.com, 1 kojipkgs.fedoraproject.org, 1 koka-shop.de, 1 +kokankart.com, 1 kokensupport.com, 1 koketteriet.se, 1 kokica.si, 1 @@ -62760,7 +62750,7 @@ kristina-lari.ru, 1 kristineskitchenblog.com, 1 kristjanrang.eu, 0 kristofba.ch, 1 -kristofdv.be, 1 +kristofdv.be, 0 kristoffer.is, 1 kriston.tk, 1 kriswauters.tk, 1 @@ -62788,6 +62778,7 @@ kronopolo.com, 1 kronos-crm.com, 1 kronos-web.com, 1 kronosproject.tk, 1 +krony.de, 1 kronych.cz, 1 kroon.email, 1 kropkait.pl, 1 @@ -63061,6 +63052,7 @@ kubeico.com, 1 kubica.ch, 1 kubierecki.pl, 1 kubik-rubik.de, 1 +kubkprf.ru, 1 kublis.ch, 1 kubopro.com, 1 kubopro.cyou, 1 @@ -63344,7 +63336,6 @@ kylebaldw.in, 0 kyledrake.net, 1 kyleggiero.me, 1 kylegutschow.com, 1 -kylehaka.la, 1 kylehakala.com, 1 kylejohnson.io, 1 kylelaker.com, 1 @@ -64609,11 +64600,7 @@ lc8916.com, 1 lc8917.com, 1 lc8918.com, 1 lc892.com, 1 -lc8924.com, 1 -lc8925.com, 1 -lc8926.com, 1 lc8928.com, 1 -lc8929.com, 1 lc893.com, 1 lc8930.com, 1 lc8931.com, 1 @@ -65185,7 +65172,6 @@ lendahandmissionteams.org, 1 lendingmate.ca, 1 lenemes.tk, 1 lenergietoutcompris.fr, 1 -lenget.com, 1 lengow.com, 1 lengua-alemana.tk, 1 lenguajecoloquial.com, 1 @@ -65592,7 +65578,6 @@ lg0.site, 1 lg2.com, 1 lgam.com, 1 lgbt-colleges.com, 1 -lgbt.io, 1 lgbt.ventures, 1 lgbtventures.com, 1 lgbusiness.es, 0 @@ -66359,6 +66344,7 @@ linuxos.org, 1 linuxsecurity.expert, 1 linuxwerkstatt.net, 1 linuz.it, 1 +linx.net, 1 linxmind.eu, 1 linzyjx.com, 1 lionchita.tk, 1 @@ -67651,7 +67637,6 @@ loveysa.ch, 0 lovg.ren, 1 lovin.ga, 1 lovin.tk, 1 -lovingearth.co, 0 lovink.net, 1 lovizaim.ru, 1 lovlyhorses.tk, 1 @@ -68512,7 +68497,6 @@ madeincanarias.net, 1 madeinolive.com, 0 madeinrussia.com, 1 madeinstudio3.com, 1 -madeintucson.org, 1 madeinua.com, 1 madeira.link, 1 mademoe.com, 1 @@ -68905,6 +68889,7 @@ mairimcosmetics.com, 1 maisallianz.com, 1 maisapanama.com, 1 maiscelular.com.br, 1 +maiscuidar.com, 1 maisempregonet.com, 1 maisgasolina.com, 1 maisie.nl, 1 @@ -68937,6 +68922,7 @@ majisign.co.uk, 1 majkassab.com, 1 majkassab.net, 1 majkassab.org, 1 +majkl.me, 1 majkl578.cz, 1 majkyto.cz, 1 majlovesreg.one, 1 @@ -69080,6 +69066,7 @@ malibumodas.com.br, 1 maliciousdeath.tk, 1 malicis.com, 1 malie.it, 1 +malik.holdings, 1 malik.id, 1 malikcomputers.tk, 1 malikdeenarislamicacademy.tk, 1 @@ -70088,6 +70075,7 @@ massdesigners.net, 1 masse.org, 1 massflix.com, 1 massfone.com, 1 +masshiro.blog, 1 masshost.tk, 1 massive.tk, 1 massiveanalyser.com, 1 @@ -70500,7 +70488,6 @@ maxico.tk, 1 maxiglobal.net, 1 maxihide.tk, 1 maximanet.tk, 1 -maximarket.info, 1 maximbaz.com, 1 maximdeboiserie.be, 1 maximdens.be, 1 @@ -70824,6 +70811,7 @@ mdma.net, 1 mdmbat.com, 1 mdmed.clinic, 1 mdns.eu, 1 +mdoering.de, 0 mdosch.de, 1 mdpp.com.br, 1 mdpparish.com, 1 @@ -72605,7 +72593,6 @@ mijnstembureau.nl, 1 mijntelefoonboek.com, 1 mijntransacties.nl, 0 mijnwefact.nl, 1 -mika.cat, 1 mika.moe, 1 mikadoe.nl, 1 mikaelf.com, 1 @@ -72677,8 +72664,7 @@ mikkohuupponen.com, 1 mikkonen.bio, 1 miklagard.dk, 1 miklcct.com, 1 -mikmik.co.il, 1 -miknight.com, 1 +miknight.com, 0 mikonmaa.fi, 1 mikori.sk, 1 mikos.tk, 1 @@ -72944,7 +72930,7 @@ minhng99.eu, 1 minhyukpark.com, 1 mini-igra.tk, 1 mini-piraten.de, 1 -mini2.fi, 1 +mini2.fi, 0 minialbums.ga, 1 miniatomium.tk, 1 minibackpackgirls.cf, 1 @@ -73550,7 +73536,6 @@ mnguyen.io, 1 mnhc.gov, 1 mnienamel.com, 1 mniopenresearch.org, 1 -mnitro.com, 1 mnium.de, 1 mnjg123.de, 1 mnlfnet.com, 1 @@ -74002,7 +73987,6 @@ mondonet.org, 0 mondpo.pro, 1 mondzorgaanzee.nl, 1 monelephantapois.com, 1 -moneni.com, 1 moneoci.com.br, 1 monerogamez.com, 1 moneromerch.com, 1 @@ -74943,7 +74927,6 @@ mtran.co, 1 mtravelers.net, 1 mtredistricting.gov, 1 mtrip.com, 0 -mtrock.ru, 1 mtrx.tech, 1 mts-energia.eu, 1 mtsoftware.com.au, 1 @@ -75492,7 +75475,6 @@ my-montenegro.tk, 1 my-new-bikini.de, 1 my-nextcloud.at, 1 my-pawnshop.com.ua, 0 -my-photo.me, 1 my-profile.org, 1 my-road.de, 1 my-salesforce-communities.com, 1 @@ -75542,7 +75524,6 @@ myanimo.ml, 1 myanmar-responsiblebusiness.org, 1 myapexcard.com, 1 myaquaterra.tk, 1 -myarcade.org, 0 myartsjournal.com, 1 myasb.club, 1 myathena.ai, 1 @@ -77478,7 +77459,6 @@ neteraser.de, 1 netexem.com, 1 netexpatcommunity.com, 0 netfabb.com, 1 -netface.com.br, 1 netfeeds.eu, 1 netferie.de, 1 netferie.dk, 1 @@ -77657,6 +77637,7 @@ netzklad.de, 1 netzona.org, 1 netzspielplatz.de, 0 netzsv.website, 1 +netztest.at, 1 netzvieh.de, 1 netzwerk-lq.com, 1 netzwerk-sozialliberal.de, 1 @@ -77845,6 +77826,7 @@ neworiflame.tk, 1 newparadigmventures.net, 0 newparrot.tk, 1 newphysics.fi, 1 +newpoke.net, 0 newportbus.co.uk, 1 newposts.ru, 1 newpress24.tk, 1 @@ -79449,7 +79431,6 @@ nsu.pw, 1 nsure.us, 1 nsworks.com, 0 nszero.tk, 1 -ntags.org, 1 ntcoss.org.au, 1 ntcp.ph, 1 nte.email, 1 @@ -79815,7 +79796,6 @@ o2ss.com, 1 o3-staging.herokuapp.com, 1 o3.wf, 1 o36533.com, 1 -o3c.com.br, 1 o3ptitschats.fr, 1 o3wallet.com, 1 o5.cx, 0 @@ -80648,7 +80628,6 @@ omandatapark.com, 1 omangrid.com, 1 omanhr.cf, 1 omanko.porn, 0 -omaosurveys.org, 0 omarans.com, 1 omarbaba.shop, 1 omarh.net, 1 @@ -81196,7 +81175,6 @@ open-to-repair.fr, 0 open-trip.id, 1 open.film, 0 open.my.id, 1 -open.ru, 1 openacte.ch, 0 openai.community, 1 openalgeria.org, 1 @@ -81265,6 +81243,7 @@ openrainbow.org, 1 openre.site, 1 openrealestate.co, 1 openreel.com, 0 +openresearch.amsterdam, 1 openreview.net, 1 openroademail.com, 1 openrtm.org, 1 @@ -82196,7 +82175,6 @@ oyunmadeni.tk, 1 oyunoynuyalim.tk, 1 oz-artfocus.com, 1 oz-style.com, 1 -ozalp.dk, 1 ozarkinspected.com, 1 ozcreatives.tech, 1 ozel-ders.tk, 1 @@ -83123,6 +83101,7 @@ passionatefoodie.co.uk, 1 passionatehorsemanship.com, 1 passionatelife.com.au, 1 passionateracers.com, 1 +passionbyd.com, 0 passiondesigns.web.id, 1 passionebenessere.com, 1 passionegriglia.com, 1 @@ -83512,6 +83491,7 @@ pc-soft.tk, 1 pc-taskal.net, 1 pc-tech.ga, 1 pc-tweak.de, 1 +pc-warriors.com, 1 pc28yc.com, 1 pcast.gov, 1 pcbarchitect.com, 1 @@ -84434,7 +84414,6 @@ pgmsp.net, 1 pgmtechnologies.com, 1 pgnetwork.net, 1 pgp.lol, 1 -pgp.network, 1 pgpaintanddesign.com, 1 pgpmail.cc, 1 pgprosupplies.com, 1 @@ -84702,6 +84681,7 @@ photographersdaydream.com, 1 photography-workshops.net, 1 photographyforchange.com, 1 photographyforchange.org, 1 +photographymof.com, 1 photolakeview.com, 1 photolessya.by, 1 photomaniastore.com, 1 @@ -85179,7 +85159,6 @@ pirateproxy.cloud, 1 pirateproxy.earth, 1 pirateproxy.gdn, 1 pirateproxy.how, 1 -pirateproxy.id, 1 pirateproxy.ltda, 1 pirateproxy.name, 1 pirateproxy.onl, 1 @@ -86246,9 +86225,9 @@ poly-fast.com, 0 polybius.io, 1 polycoise.com, 1 polycraftual.co.uk, 1 -polyfill.io, 1 polyfluoroltd.com, 0 polygamer.net, 0 +polygraphi.ae, 1 polymake.org, 1 polymathian.com, 1 polymerclay.de, 1 @@ -86493,6 +86472,7 @@ pors-sw.cz, 1 porschen.fr, 1 porsiaedenora.it, 1 porsolt.com, 1 +port.gdynia.pl, 0 port.social, 1 port443.hamburg, 0 port443.se, 1 @@ -86569,7 +86549,6 @@ posaunenchor-senden.de, 1 posbank.co.uk, 1 posbich.net, 1 posbis.de, 1 -poseidonwaterproofing.com, 1 poshcastles.co.uk, 1 poshe.tk, 1 poshlashes.se, 1 @@ -86961,7 +86940,7 @@ praxino.de, 0 praxis-dingeldey.de, 1 praxis-familienglueck.de, 1 praxis-kobiella.de, 1 -praxis-liebner.de, 0 +praxis-liebner.de, 1 praxis-waedicity.ch, 1 praxisfilms.org, 1 praxistipp24.com, 1 @@ -87964,6 +87943,7 @@ protection.ga, 1 protectionformula.com.ua, 1 protectwrap.ml, 1 protege.moi, 1 +protegetudescanso.com, 1 proteh.com.ua, 1 protein-riegel-test.de, 1 proteinreport.org, 1 @@ -88043,7 +88023,6 @@ proxirealtime.com, 1 proxmox-airsonic.tk, 1 proxy-bay.co, 1 proxy-bay.com, 1 -proxybay.bet, 1 proxybay.buzz, 1 proxybay.bz, 1 proxybay.cc, 1 @@ -88279,7 +88258,6 @@ pt-d.ru, 1 pt-server.de, 1 pt.im, 1 pt4.tech, 1 -pta-security.nl, 1 pta.world, 1 ptab2pt.ga, 1 ptal.eu, 1 @@ -90073,7 +90051,6 @@ ravihotel.com, 0 ravijuhend.ee, 1 ravik.tk, 1 ravimiamet.ee, 1 -ravindran.me, 1 raviparekh.co.uk, 1 ravis.org, 1 ravkr.duckdns.org, 1 @@ -90328,6 +90305,7 @@ real360show.com, 1 realbiographies.cf, 1 realbiz.ml, 1 realcanada.com.gt, 1 +realcapoeira.ru, 1 realclinic.jp, 1 realestate-in-uruguay.com, 1 realestate-lidl.at, 1 @@ -90616,6 +90594,7 @@ reddyai.com, 1 rede-reim.de, 1 rede-t.com, 1 redearsliderturtles.com, 1 +redecsirt.pt, 1 redeemingbeautyminerals.com, 1 redefineyounow.com, 1 redelectrical.co.uk, 0 @@ -90842,7 +90821,7 @@ regiosalland.nl, 1 regiovertrieb.de, 0 regis.tech, 1 regisearch.co.uk, 1 -register.to, 1 +register.to, 0 registerex.me, 1 registerforevent.co.uk, 1 registerforhappywellth.com, 1 @@ -91623,6 +91602,7 @@ rexburgid.gov, 1 rexcutty.com, 1 rexdf.net, 1 rexeroofing.com, 1 +rexfinland.fi, 1 rexled.fi, 1 rexograph.com, 1 rexskz.info, 1 @@ -91874,7 +91854,6 @@ riggosrag.com, 1 riggsmarkham.com, 1 righettod.eu, 1 righini.ch, 0 -right-to-love.name, 1 rightblog.tk, 1 rightducks.com, 1 rightfold.io, 1 @@ -92056,6 +92035,7 @@ riverrun.tk, 1 rivers.gov, 1 riversandoceans.com, 1 riverschool.net, 1 +riversidebaptistchurch.net, 1 riversideiowa.gov, 1 riversidemo.gov, 1 riversideradio.nl, 1 @@ -92184,6 +92164,7 @@ robdavidson.network, 1 robersonaudio.tk, 1 robert-ewert.tk, 1 robert-flynn.de, 1 +robert-foster.com, 1 robert-reisemobil.de, 1 robert-victor.co.uk, 1 robert-wiek-transporte.de, 1 @@ -92491,12 +92472,10 @@ romab.com, 1 romacoffee.co.nz, 1 romagnaoggi.it, 1 romail.ml, 1 -romaindepeigne.fr, 1 romainlapoux.com, 1 romainlapoux.fr, 1 roman-pavlik.cz, 1 roman.systems, 1 -romancloud.com, 1 romancoinsforsale.org, 0 romancy.tk, 1 romania-film.ml, 1 @@ -93115,6 +93094,7 @@ rubenbrito.net, 1 rubenfelix.tk, 1 rubengees.de, 1 rubengutierrez.tk, 1 +rubenjromo.com, 0 rubenkruisselbrink.nl, 1 rubenmamo.com, 1 rubenpeeters.ml, 1 @@ -93377,7 +93357,6 @@ russianrandom.ru, 1 russiantranslation.tk, 1 russisch.tk, 1 russograffix.tk, 1 -russt.me, 1 rust.cf, 1 rust.mn, 1 rust.pm, 1 @@ -93427,7 +93406,6 @@ ruya.com, 1 ruyana.tk, 1 ruyatabirleri.com, 1 ruzaevka.tk, 1 -ruzzll.com, 1 rv-jpshop.com, 1 rva-asbestgroep.nl, 1 rva.gov, 1 @@ -94033,6 +94011,7 @@ sally-secret.com, 1 sallyandruss.ca, 1 sallyangeli.tk, 1 sallycooke.co.uk, 1 +sallydowns.name, 1 sallyjo.tk, 1 sallyman.de, 1 sallysubs.com, 0 @@ -94111,7 +94090,6 @@ salvaalocombia.com, 1 salvadoralevin.tk, 1 salvadorcorriols.tk, 1 salvadorinfantil.tk, 1 -salvagedfurnitureparlour.com, 1 salvameblog.tk, 1 salverainha.org, 1 salvia-sinensis.nl, 1 @@ -94177,6 +94155,7 @@ samkoandmikotoywarehouse.com, 1 saml-gateway.org, 1 samlam.ddns.net, 1 samlamac.com, 1 +samlaw.co.nz, 0 sammichscripts.com, 1 sammyservers.com, 1 sammyservers.net, 1 @@ -94458,6 +94437,7 @@ sapienz.tk, 1 sapienza-eclipse.com, 1 sapienzaconsulting.com, 1 sapik.hu, 1 +sapindus.pl, 1 sapiperelining.com.au, 1 sapk.fr, 1 saplumbers.com.au, 1 @@ -95017,6 +94997,7 @@ schnuckenhof-wesseloh.de, 1 schnyder-werbung.ch, 0 schody-rozycki.pl, 1 schoenstatt-fathers.link, 1 +schoenstatt-fathers.us, 1 schoenstatt.link, 1 schoepski.de, 1 schoffelcountry.com, 1 @@ -95504,7 +95485,6 @@ searchfox.org, 1 searchmore.dk, 1 searchpartners.dk, 1 searchperfumes.ga, 1 -searchshops.com, 1 searchtechnology.tk, 1 searchunify.com, 1 searchwork.tk, 1 @@ -95531,6 +95511,7 @@ seasons.nu, 0 seaspiration.com, 1 seatbeltpledge.com, 1 seatinglane2u.com, 1 +seats2meet.com, 1 seatsurfing.de, 1 seattle-life.net, 1 seattlebasementwaterproofers.com, 1 @@ -95695,6 +95676,7 @@ securehugs.com, 1 secureideas.com, 0 secureim.de, 1 secureinfo.pl, 1 +securelect-inspection.com, 1 securemailbox.com, 1 securemantra.net, 1 securemy.website, 1 @@ -95875,7 +95857,6 @@ seishinan.xyz, 1 seishinchuo-lawoffice.com, 1 seishuncollection.com, 1 seismas1.com, 1 -seitai-nabejun.jp, 1 seitai-taiyou.com, 1 seitanic-cookbook.de, 1 seitenwaelzer.de, 1 @@ -97124,7 +97105,6 @@ shipnak.com, 1 shippercenter.info, 1 shippexx.com, 1 shipping-trade.ga, 1 -shippingbo.com, 1 shippinglabel.de, 1 shiptek.co, 1 shiptron.com, 1 @@ -97445,7 +97425,6 @@ shoppingturbo.ga, 1 shoppingunique.ga, 1 shoppingurban.ga, 1 shoppingvariety.ga, 1 -shoppingvrimini.ru, 1 shoppingwaterfront.ga, 1 shoppingwinner.ga, 1 shoppingworth.ga, 1 @@ -97518,7 +97497,6 @@ showfom.sb, 1 showgirls.ga, 1 showmax.com, 1 showmeengland.co.uk, 1 -showmethegadgets.com, 0 shown.io, 1 shownet.tk, 1 showpassword.net, 0 @@ -98773,6 +98751,7 @@ skyscapecanopies.com, 1 skyscnr.com, 1 skyseo.cf, 1 skysoftbg.com, 1 +skysuite.nl, 1 skytec.host, 1 skyterraathome.com, 1 skyterraembrace.com, 1 @@ -98786,6 +98765,7 @@ skywalkersa.ga, 1 skywindowsnj.com, 1 skyworldlinktravels.com, 1 skyworldserver.ddns.net, 1 +skywt.cn, 1 skyynet.de, 1 skyzimba.com.br, 1 sl-alarm.ru, 1 @@ -99250,6 +99230,7 @@ sms1.ro, 1 sms72.tk, 1 smsalvand.tk, 1 smsappointment.com, 0 +smsben.com, 0 smsbrana.cz, 0 smsfa.ir, 1 smsg-dev.ch, 0 @@ -102963,7 +102944,6 @@ sumbur.ga, 1 sumcrevillent.tk, 1 sumguy.com, 1 sumhost.ml, 1 -sumiko.moe, 1 sumisa.cf, 1 sumit.blog, 1 sumit.me, 1 @@ -104031,7 +104011,6 @@ t2data.com, 1 t2i.nl, 1 t2kc.com, 1 t36533.com, 1 -t39.com, 1 t3hty.fr, 1 t3rror.net, 1 t404.de, 1 @@ -104344,7 +104323,6 @@ talis-bs.com, 1 talisman-amulet.ga, 1 talk.google.com, 1 talk.vg, 1 -talk.xyz, 1 talkaboutdesign.com, 1 talkbasket.net, 1 talkgadget.google.com, 1 @@ -104836,7 +104814,6 @@ tci-style.pl, 1 tciit.pl, 1 tcit.fr, 0 tcj.ir, 1 -tcksolutions.com, 1 tcl.sh, 1 tcmk-tomsk.ru, 1 tcnapplications.com, 1 @@ -105027,7 +105004,6 @@ teb-akademia.pl, 1 tebebo.com, 1 tebian.tk, 1 tebieer.com, 1 -tebis-consulting.my-router.de, 1 tebodental.com, 1 tebodentalgroup.com, 1 tebodentistryatlanta.com, 1 @@ -105288,12 +105264,14 @@ teckgeekz.com, 1 tecknobox.fr, 1 tecknologg.website, 1 tecmarkdig.com, 1 +tecnaa.com, 1 tecne.ws, 1 tecnewsnow.com, 1 tecnicapotiguar.com.br, 0 tecnick.com, 1 tecnicoelettrodomestici.roma.it, 1 tecnikan.com.ar, 1 +tecnimas.com.mx, 0 tecnimotos.com, 1 tecnipuntoseguridad.com, 1 tecno-block.ru, 1 @@ -105316,7 +105294,6 @@ tecnoticiasdigitales.tk, 1 tecnyal.com, 1 tecon.co.at, 1 tecorrs.tk, 1 -tecparsnet.ir, 1 tecroxy.com, 1 tecscipro.de, 1 tecta-stag-225720.appspot.com, 1 @@ -105669,6 +105646,7 @@ teq-automotive.com, 1 teqip-pms.gov.in, 1 tequilazor.com, 1 terabyte-computing.com, 1 +terabyte.services, 1 terabyteharddrive.net, 1 terabyteit.co.uk, 1 teracloud.at, 1 @@ -106171,6 +106149,7 @@ theatresuite.tk, 1 theatresydney.com, 1 theaus.xyz, 1 theaustinsevenworkshop.com, 1 +theaviationagency.com, 1 theawesomemuse.com, 1 thebaa.tk, 1 thebabelog.cf, 1 @@ -106361,7 +106340,7 @@ thedawningofdarkness.tk, 1 thedeathmachine.tk, 1 thedeathofannakarina.tk, 1 thedebug.life, 1 -thedentalstudiomiami.com, 1 +thedentalstudiomiami.com, 0 thederminstitute.com, 1 thedev.id, 1 thedevastatedrealm.tk, 1 @@ -107165,7 +107144,6 @@ thibautcharles.net, 1 thiepcuoidep.com, 1 thiepxinh.net, 1 thierryhayoz.ch, 1 -thierrymazue.fr, 1 thiesketelsen.de, 1 thietbithoathiem.net, 1 thietkegianhangtttm.com, 1 @@ -108480,7 +108458,6 @@ toolroomrecords.com, 1 tools.pro, 1 toolsbit.com, 1 toolsense.io, 1 -toolset.com, 1 toolsforbiblestudy.com, 1 toolspain.tk, 1 toolsu.com, 1 @@ -109715,7 +109692,7 @@ tricolortotal.tk, 1 tricordmedia.ca, 1 tricountyathome.com, 1 tricountyheatingcooling.com, 1 -triddi.com, 1 +triddi.com, 0 tridena.com, 1 trident-online.de, 1 trident1000logoi.gr, 1 @@ -109810,7 +109787,6 @@ trish-mcevoy.ru, 1 trisha.tk, 1 trissiethehusky.rocks, 1 tristanfarkas.one, 1 -tristanhager.i234.me, 1 trit.pro, 1 tritium.cf, 1 tritiumdisposal.com, 1 @@ -110250,6 +110226,7 @@ tuckhayward.art, 1 tuckmeintebo.com, 1 tucnak.eu, 1 tucny.com, 1 +tucsonfcu.com, 1 tucsonpcrepair.com, 1 tucuatro.com, 1 tucuxi.org, 1 @@ -110458,7 +110435,6 @@ turnover.cf, 1 turobot.casa, 1 turoktv.org, 1 turpinpesage.fr, 1 -tursiae.org, 1 turteka.com, 1 turtle.ai, 0 turtleduckstudios.com, 1 @@ -110838,7 +110814,6 @@ tyroremotes.no, 1 tyroremotes.pt, 1 tyroremotes.se, 1 tyrulez.tk, 1 -tysox.de, 1 tysukakorrekt.ga, 1 tysye.ca, 1 tytixazo.tk, 1 @@ -112133,7 +112108,7 @@ ussst.org, 1 ussst.org.in, 1 ustaywell.com, 1 ustensiles-cuisine.boutique, 1 -ustr.gov, 0 +ustr.gov, 1 ustugov.kiev.ua, 1 ustugova.kiev.ua, 1 ustyj.tk, 1 @@ -112207,7 +112182,6 @@ utterberry.io, 1 uttkarsh.net, 1 uttnetgroup.fr, 0 utural.tk, 1 -utvbloggen.se, 1 utw.me, 1 utzon.net, 1 uu5197.co, 1 @@ -112378,7 +112352,6 @@ va11hal.la, 1 va11halla.ddns.net, 1 vaabogados.legal, 1 vaaddress.co, 1 -vaaes.org, 0 vaan-arbeidsrecht.nl, 1 vaartjesboten.nl, 1 vaat.io, 1 @@ -112910,7 +112883,7 @@ veegish.com, 1 veerleklinge.nl, 1 veessen.tk, 1 veg-leiden.nl, 1 -veg.lv, 1 +veg.lv, 0 vega-diva.com, 1 vega-rumia.com.pl, 1 vega-rumia.pl, 0 @@ -114371,7 +114344,6 @@ vogue.co.uk, 1 vogue.cz, 1 voguefrontier.tk, 1 voice-of-design.com, 1 -voicebrew.com, 1 voicedata.tk, 1 voiceofcricket.tk, 1 voiceofserbia.tk, 1 @@ -114707,7 +114679,6 @@ vs1177.com, 0 vs1717.com, 0 vs2277.com, 0 vs2828.com, 0 -vs303.com, 1 vs5050.com, 0 vs5151.com, 0 vs603.com, 1 @@ -114917,7 +114888,6 @@ w1n73r.de, 1 w1nter.xyz, 1 w2929w.com, 1 w2design.eu, 1 -w2me.ru, 1 w2n.me, 1 w3330.com, 1 w365.vip, 0 @@ -115791,7 +115761,6 @@ webdesignagency.cf, 1 webdesignersinchennai.tk, 1 webdesignfenua.tk, 1 webdesignforum.it, 1 -webdesigngc.com, 1 webdesignplay.com, 1 webdesignplayground.io, 1 webdesignrodgau.de, 1 @@ -116184,7 +116153,6 @@ wegner.no, 1 wego.ca, 1 wegonnagetsued.org, 1 wegotcookies.com, 1 -wegrzynek.pl, 1 wegvielfalt.de, 1 wehealasone.gov.ph, 1 weho.gov, 1 @@ -116194,7 +116162,6 @@ weibomiaopai.com, 1 weideheuvel.org, 1 weidmannfibertechnology.com, 0 weien.org, 1 -weigelia.nl, 1 weighed.ga, 1 weightlift.ml, 1 weightlosseasy.cf, 1 @@ -116736,6 +116703,7 @@ who.pm, 0 whoagirls.com, 1 whoagirls.net, 0 whoagirls.org, 1 +whoami.eu.org, 1 whoami.io, 1 whocalld.com, 1 whocalled.us, 1 @@ -117085,6 +117053,7 @@ wili.li, 1 wiliquet.net, 0 wilk.tech, 0 wilkebouwer.nl, 1 +wilkinsondigital.com, 1 wilkipedia.org, 1 wilkushka.com, 1 wilkushka.net, 1 @@ -117647,7 +117616,6 @@ wonderbox.gq, 1 wonderbox.ml, 1 wonderchat.tk, 1 wondercorner.ca, 1 -wondercris.com, 1 wondereur.com, 1 wonderfall.space, 1 wonderfuleducation.eu, 1 @@ -119497,7 +119465,6 @@ xpenology-fr.net, 1 xperiacode.com, 1 xperidia.com, 1 xpert-designs.com, 1 -xpertairctx.com, 1 xpertairtx.com, 1 xpertairwaco.com, 1 xpertcenter.ch, 1 @@ -120319,6 +120286,7 @@ yilanju.com, 1 yilconstruction.ca, 1 yiluup.com, 0 yimgo.fr, 0 +yin8888.tv, 0 yinduyy.com, 0 yinfor.com, 1 ying.gift, 1 @@ -121757,7 +121725,7 @@ zety.es, 1 zety.fr, 1 zeus.gent, 1 zeuscorp.ga, 1 -zeusec.co.jp, 0 +zeusec.co.jp, 1 zeusindia.tk, 1 zevelev.net, 1 zevenbergenbos.tk, 1 @@ -122359,6 +122327,7 @@ zumba-oostende.be, 1 zumba.com, 1 zumberak.tk, 1 zumtaedanceschool.co.za, 1 +zumub.com, 1 zumwildenaffen.com, 1 zund-app.com, 1 zundapp.one, 1 @@ -122447,7 +122416,6 @@ zz017.com, 1 zz204.com, 1 zz342.com, 1 zz5197.co, 1 -zz606.com, 1 zz6729.co, 1 zz6729.com, 0 zz6957.co, 1 diff --git a/services/settings/dumps/security-state/intermediates.json b/services/settings/dumps/security-state/intermediates.json index 8e3da1240d656..12a7dd66ed404 100644 --- a/services/settings/dumps/security-state/intermediates.json +++ b/services/settings/dumps/security-state/intermediates.json @@ -1,5 +1,41 @@ { "data": [ + { + "schema": 1649450920946, + "derHash": "Bp3y+JGdkgnQxSSla6EYHfbRu/xKphyfAdCS4tXDof0=", + "subject": "CN=MSFT BALT RS256 CA,O=Microsoft Corporation,C=US", + "subjectDN": "MEoxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xGzAZBgNVBAMTEk1TRlQgQkFMVCBSUzI1NiBDQQ==", + "whitelist": false, + "attachment": { + "hash": "b68175bda43c438ac536ee134774227b69c8479a249c97fc24ebcdc2efe126fa", + "size": 2028, + "filename": "pDM-S2FkRzB_xtTd9uAioSOPn-QW1bRg8ecQtY4-I1A=.pem", + "location": "security-state-staging/intermediates/ca4850cd-a81e-479d-ba75-2a7072c7f60d.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "pDM+S2FkRzB/xtTd9uAioSOPn+QW1bRg8ecQtY4+I1A=", + "crlite_enrolled": false, + "id": "f18528dd-6f56-46ab-942c-d0660c571a8d", + "last_modified": 1649451442396 + }, + { + "schema": 1649450922017, + "derHash": "lqfvtj/KOZPHS/dk03WWlX+Q8gja2p5J5iKCK6D3qIk=", + "subject": "CN=MSFT RS256 CA,O=Microsoft Corporation,C=US", + "subjectDN": "MEUxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xFjAUBgNVBAMTDU1TRlQgUlMyNTYgQ0E=", + "whitelist": false, + "attachment": { + "hash": "0ad1afa5ac81806337e8934b453f7be96f50b2b7f9902f221d3058e3b5a1e8d2", + "size": 1691, + "filename": "DVuHcZgkQqkhxPzJMWPUVFl_ert052u59FvlX8Dx6wA=.pem", + "location": "security-state-staging/intermediates/ec5f15c1-eda9-4f57-8dd0-e7114043d070.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "DVuHcZgkQqkhxPzJMWPUVFl/ert052u59FvlX8Dx6wA=", + "crlite_enrolled": false, + "id": "95d2060f-85ec-4509-bdcd-889a005b79d0", + "last_modified": 1649451442386 + }, { "schema": 1649292517069, "derHash": "AYGythcxeVYudWMjRAN8pSMBhhin9xaCaaPrhTZ/91w=", @@ -14544,24 +14580,6 @@ "id": "db10a85d-fae6-4776-b901-d09000033eca", "last_modified": 1601517444423 }, - { - "schema": 1601376755442, - "derHash": "axQ8IAXVU5zCLqtfdy2yqf6HRn/v+gf88Kn30oJ0yno=", - "subject": "CN=Entrust Root Certification Authority - G2,OU=See www.entrust.net/legal-terms+OU=(c) 2009 Entrust\, Inc. - for authorized use only,O=Entrust\, Inc.,C=US", - "subjectDN": "MIG+MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMDkgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MTIwMAYDVQQDEylFbnRydXN0IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMg==", - "whitelist": false, - "attachment": { - "hash": "d1674b1f7b1aef60543ae1256c7298ed99b5016d5a49c8ba8b9745c679003a0f", - "size": 1792, - "filename": "du6FkDdMcVQ3u8prumAo6t3i3G27uMP2EOhR8R0at_U=.pem", - "location": "security-state-staging/intermediates/90532b3e-aeb1-42ae-b53d-9b0794e82506.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "du6FkDdMcVQ3u8prumAo6t3i3G27uMP2EOhR8R0at/U=", - "crlite_enrolled": false, - "id": "512e1df0-26cc-48dd-9524-3c1d7aaf422b", - "last_modified": 1601517444299 - }, { "schema": 1601376733088, "derHash": "ZHFyUK+LAo3Y5cC65MkULIsQNTJhK8SHCF/Twxn5wGc=", @@ -14580,24 +14598,6 @@ "id": "ee033ab1-7bfc-4f08-b26a-b3b2bce86767", "last_modified": 1601517444135 }, - { - "schema": 1601376743119, - "derHash": "P94NNuAmtujr4sKIg2B8hlHeEL1sH8rTZeVg9OovOwM=", - "subject": "CN=Entrust Root Certification Authority - EC1,OU=See www.entrust.net/legal-terms+OU=(c) 2012 Entrust\, Inc. - for authorized use only,O=Entrust\, Inc.,C=US", - "subjectDN": "MIG/MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTIgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MTMwMQYDVQQDEypFbnRydXN0IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBFQzE=", - "whitelist": false, - "attachment": { - "hash": "fa84991015956f299a21164f4a77c8da26802bb7bac4207eb696cc086ce715b0", - "size": 1577, - "filename": "_qK31kX7pz11PB7Jp4cMQOH3sMVh6Se5hb9xGGbjbyI=.pem", - "location": "security-state-staging/intermediates/2827fb47-01de-4cf9-88b5-faa3f7464bf6.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "/qK31kX7pz11PB7Jp4cMQOH3sMVh6Se5hb9xGGbjbyI=", - "crlite_enrolled": false, - "id": "10eb04ab-95e7-45a1-94b3-40bc33bad469", - "last_modified": 1601517444117 - }, { "schema": 1601376774088, "derHash": "BTHIb3hZWJOf3FOZJNOV0e+kCTZOaCfTq5h2MR/7J7A=", @@ -16452,24 +16452,6 @@ "id": "78e81458-dc94-491e-9bbd-82c797f01706", "last_modified": 1591199861316 }, - { - "schema": 1591167131032, - "derHash": "Iy9jZ89WHgDIPhgKn8qFRrN3H7RQ68tKBSb4NJyMoTk=", - "subject": "CN=Entrust Certification Authority - L1E,OU=www.entrust.net/rpa is incorporated by reference+OU=(c) 2009 Entrust\, Inc.,O=Entrust\, Inc.,C=US", - "subjectDN": "MIGxMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L3JwYSBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAwOSBFbnRydXN0LCBJbmMuMS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFF", - "whitelist": false, - "attachment": { - "hash": "fb13e64f68c20f1be87aefb4a955348c9604a4103426723d49f8029f9fbcc797", - "size": 1833, - "filename": "HeMEDmta9acr_zmjHkdP_dKlW5RaqBlmADFOqTG56eA=.pem", - "location": "security-state-staging/intermediates/703534c7-f828-4ce3-86b8-8655d652362c.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "HeMEDmta9acr/zmjHkdP/dKlW5RaqBlmADFOqTG56eA=", - "crlite_enrolled": true, - "id": "4afefd58-c2fb-4ede-9f24-7a133bc67e03", - "last_modified": 1591199861291 - }, { "schema": 1591167097159, "derHash": "vMOlTXCDEWMWzgO5pAyjbzNvSDmsWBhi1DEahPcBUU0=", @@ -17352,24 +17334,6 @@ "id": "6878d4f8-2f0a-4abe-ae4b-6e1572598927", "last_modified": 1576536533821 }, - { - "schema": 1576535909746, - "derHash": "yikDieDYxipAg/Yoo59S/j84tzGZz/r3wDcjeKRA+2o=", - "subject": "CN=Entrust Certification Authority - L1M,OU=See www.entrust.net/legal-terms+OU=(c) 2014 Entrust\, Inc. - for authorized use only,O=Entrust\, Inc.,C=US", - "subjectDN": "MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTQgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFN", - "whitelist": false, - "attachment": { - "hash": "02e23f9b06e438417e4e71c8b9fb42a8e2da31ad266ad1ca50792fd36d7251b9", - "size": 1829, - "filename": "VYZwGiJkq3NNo1YRI2RGiSTI1mqTWG8zDcRf1_KAN6I=.pem", - "location": "security-state-staging/intermediates/3aae7952-dcc2-4419-b53f-9eac4094c51b.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "VYZwGiJkq3NNo1YRI2RGiSTI1mqTWG8zDcRf1/KAN6I=", - "crlite_enrolled": true, - "id": "d9a71e99-a2ad-4f36-b975-79dca9dd44f0", - "last_modified": 1576536533809 - }, { "schema": 1576535908358, "derHash": "peM8KOMBOnH192CuOxZZUJAEPS7FIJ7FKQPE+60lja0=",
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit 2459a021c91ab7aede399254ee073a39bad382fe Author: ffxbld ffxbld@mozilla.com AuthorDate: Thu Apr 14 10:59:16 2022 +0000
No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings tld-suffixes - a=repo-update,a=dsmith
Differential Revision: https://phabricator.services.mozilla.com/D143702 --- netwerk/dns/effective_tld_names.dat | 3 +- security/manager/ssl/StaticHPKPins.h | 2 +- security/manager/ssl/nsSTSPreloadList.inc | 115 +++++++++------------ .../dumps/blocklists/addons-bloomfilters.json | 31 ++++++ .../dumps/security-state/intermediates.json | 108 ------------------- 5 files changed, 84 insertions(+), 175 deletions(-)
diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat index 237e159cb005b..a53985ed4897c 100644 --- a/netwerk/dns/effective_tld_names.dat +++ b/netwerk/dns/effective_tld_names.dat @@ -12798,12 +12798,13 @@ eu.meteorapp.com co.pl
// Microsoft Corporation : http://microsoft.com -// Submitted by Mitch Webster miwebst@microsoft.com +// Submitted by Public Suffix List Admin msftpsladmin@microsoft.com *.azurecontainer.io azurewebsites.net azure-mobile.net cloudapp.net azurestaticapps.net +1.azurestaticapps.net centralus.azurestaticapps.net eastasia.azurestaticapps.net eastus2.azurestaticapps.net diff --git a/security/manager/ssl/StaticHPKPins.h b/security/manager/ssl/StaticHPKPins.h index 7b2c16429acae..b78ddc9d2faa9 100644 --- a/security/manager/ssl/StaticHPKPins.h +++ b/security/manager/ssl/StaticHPKPins.h @@ -1149,4 +1149,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
static const int32_t kUnknownId = -1;
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1658141514846000); +static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1658400641057000); diff --git a/security/manager/ssl/nsSTSPreloadList.inc b/security/manager/ssl/nsSTSPreloadList.inc index 2552edefef23d..8ff11b8c8cc2e 100644 --- a/security/manager/ssl/nsSTSPreloadList.inc +++ b/security/manager/ssl/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/
#include <stdint.h> -const PRTime gPreloadListExpirationTime = INT64_C(1660560706484000); +const PRTime gPreloadListExpirationTime = INT64_C(1660819833605000); %% 0--1.de, 1 0-1.party, 1 @@ -1934,7 +1934,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660560706484000); 291167.xyz, 1 2912.nl, 1 29227.com, 1 -2948.ca, 1 297computers.com, 1 2991236.com, 1 299ks.com, 1 @@ -2160,7 +2159,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660560706484000); 33138app.com, 1 33138vip.com, 1 33168365.com, 1 -33321365.com, 0 333321365.com, 1 3333365t.com, 1 333365t.com, 1 @@ -7065,6 +7063,7 @@ adrianajewelry.my, 1 adrianasantos.me, 1 adrianbechtold.de, 1 adriancitu.com, 1 +adriancostin.ro, 1 adrianfeliciano.com, 1 adrianhardy.com, 1 adrianjensen.com, 1 @@ -7984,7 +7983,6 @@ ahealthyjourney.ca, 1 ahegaoroulette.com, 1 ahelos.tk, 1 ahenkerp.com, 1 -ahero4all.org, 1 ahg-offices.fr, 1 ahhcomfortshoes.com, 1 ahidta.gov, 1 @@ -10325,6 +10323,7 @@ ananiev.ml, 1 anankecosmetics.com, 1 anantshri.info, 1 ananyagupta.tk, 1 +ananyoo.com, 0 anapsi.tk, 1 anarajaoui.ma, 1 anarcasmetalicos.tk, 1 @@ -11623,7 +11622,6 @@ appson.co.uk, 1 appsren.com, 1 appt.ch, 0 apptesters.com, 1 -apptomics.com, 1 apptoutou.com, 1 appuals.com, 1 appub.co.jp, 1 @@ -12831,7 +12829,6 @@ assemblage.gq, 1 assemble-together.org, 1 assemblee-copropriete.fr, 1 assemblywithoutthewalls.org, 1 -assempsaibiza.com, 1 assentooriginal.com.br, 1 assertion.de, 1 assessoriati.com.br, 1 @@ -15753,7 +15750,6 @@ bazari.com.pl, 1 bazarotehijos.com, 1 bazdell.com, 0 bazhan.me, 1 -bazinga-events.nl, 1 bazos.at, 1 bazos.cz, 1 bazos.pl, 1 @@ -17087,7 +17083,7 @@ bet333v.com, 1 bet333w.com, 1 bet333x.com, 1 bet333y.com, 1 -bet333z.com, 1 +bet333z.com, 0 bet338c.com, 1 bet33app.com, 0 bet3639.com, 0 @@ -18086,7 +18082,7 @@ birgitandmerlin.com, 1 birjdid.tk, 1 birkengarten.ch, 1 birkenstab.de, 1 -birkhoff.me, 0 +birkhoff.me, 1 birkilise.com, 1 birkilise.net, 1 birkilise.org, 1 @@ -19724,6 +19720,7 @@ bouncingbuddiesleicester.co.uk, 1 bouncingbuzzybees.co.uk, 1 bouncinghigher.co.uk, 1 bouncingscotland.com, 1 +bouncourseplanner.net, 1 bouncy-castles-surrey.co.uk, 1 bouncy-tots.co.uk, 1 bouncybaileys.co.uk, 1 @@ -20251,6 +20248,7 @@ brianfanzo.com, 1 brianfoshee.com, 1 briangarcia.ga, 1 briangosnell.com, 1 +brianjohnson.co.za, 1 brianjosephdavis.tk, 1 brianlachapelle.tk, 1 brianlanders.us, 1 @@ -20638,7 +20636,6 @@ bryantluk.com, 1 bryggebladet.dk, 1 bryte-rp.tk, 1 brztec.com, 1 -brzy-svoji.cz, 1 bs-network.net, 1 bs-security.com, 1 bs.sb, 1 @@ -22201,7 +22198,6 @@ cambridgetutors.com, 1 cambuslangharriers.org, 1 camcapital.com, 1 camconn.cc, 1 -camdesign.pl, 1 camel2243.com, 1 camelcrush.cf, 1 camelflight.tk, 1 @@ -23537,7 +23533,6 @@ cbncuritiba.com, 1 cboard.ml, 1 cbproject.co.za, 1 cbr-rcb.ca, 1 -cbr-xml-daily.ru, 1 cbrtrainer.com, 1 cbt.tj, 1 cbw.sh, 1 @@ -25386,7 +25381,7 @@ cisa.gov, 1 cisamexico.com, 1 ciscoasanetflow.com, 1 ciscocyberthreatdefense.com, 1 -ciscodude.net, 0 +ciscodude.net, 1 ciscom.tk, 1 cisconetflowleader.com, 1 cisconetflowpartners.com, 1 @@ -26449,6 +26444,7 @@ cocyou.ooo, 1 cocytus.services, 1 cod-ggw.ml, 1 cod88.cc, 1 +coda.io, 1 coda.moe, 1 coda.today, 1 coda.world, 1 @@ -26841,6 +26837,7 @@ colorguni.com, 1 colorhexa.com, 1 colorideas.net, 1 coloringnotebook.com, 0 +coloristcafe.com, 1 colorlib.com, 0 colorpalette.org, 1 colorpicker.fr, 1 @@ -29312,6 +29309,7 @@ cvl.ch, 0 cvlibrary.co.uk, 1 cvmatch.me, 1 cvmu.jp, 1 +cvninja.pl, 1 cvps.top, 0 cvr.dk, 1 cvsmash.io, 1 @@ -30668,7 +30666,6 @@ daxpatterns.com, 1 daxperience.eu, 1 daxrunbase.com, 1 day, 1 -day-peak.com, 1 daycontactlens.com, 1 daycubrem.com, 1 daydream.team, 1 @@ -31018,6 +31015,7 @@ decorativecosmetics.tk, 1 decorativeflooring.com, 1 decorator.uk, 1 decoratore.roma.it, 1 +decorauvent.ca, 1 decorestilo.com.br, 1 decorlux.bg, 1 decormiernissanparts.com, 1 @@ -31422,6 +31420,7 @@ demonmassacre.tk, 1 demonologyfieldguide.com, 1 demonstrably.live, 1 demontage.tk, 1 +demonwav.com, 1 demonwithin.tk, 1 demonwolfdev.com, 1 demopanel.tk, 1 @@ -32823,7 +32822,7 @@ dirkdoering.de, 1 dirki.tk, 1 dirkjonker.nl, 1 dirko.net, 0 -dirkwolf.de, 1 +dirkwolf.de, 0 dirtcraft.ca, 1 dirtinmyshoes.com, 1 dirty-tina.net, 1 @@ -34412,7 +34411,6 @@ drach.xyz, 1 dracheisolation.tk, 1 drachenleder.de, 1 dracisvet.cz, 1 -dracoon.team, 1 dracox.com, 0 dracula.city, 1 draft.cards, 1 @@ -34969,7 +34967,6 @@ dsreal.de, 1 dsswise.org, 1 dstamou.de, 1 dsteiner.at, 1 -dstvinstallkemptonpark.co.za, 1 dstvsouthafrica.com, 1 dsuinnovation.com, 1 dsv-salesmanager.de, 1 @@ -35380,7 +35377,6 @@ dylanknoll.ca, 1 dylanlogan.xyz, 1 dylanscott.com.au, 1 dylansevier.com, 1 -dylanspcrepairs.com, 1 dylanuwr.pl, 1 dylanwise.net, 1 dylanwolff.com, 1 @@ -40705,7 +40701,6 @@ falconelectric.co.uk, 1 falconerny.gov, 1 falconfrag.com, 1 falconstap.tk, 1 -falconvintners.com, 0 falcoz.co, 1 faldoria.de, 1 fale.io, 1 @@ -41204,6 +41199,7 @@ fbi.gov, 1 fbigame.com, 1 fbihr.gov, 1 fbiic.gov, 1 +fbijobs.gov, 1 fbo.gov, 1 fbo.network, 1 fboerman.nl, 1 @@ -41714,6 +41710,7 @@ fffdm.com, 1 ffg.berlin, 1 ffiec.gov, 1 ffis.me, 0 +ffl123.com, 1 fflone.com, 1 ffmradio.de, 1 ffmv.de, 1 @@ -42161,7 +42158,6 @@ firebaseio.com, 1 firebirdrangecookers.com, 1 firebounty.com, 1 fireboxfood.com, 1 -firebugmusic.com, 1 firecask.com, 1 firechip.cc, 1 firechip.srl, 1 @@ -43947,7 +43943,6 @@ frasesdodia.com, 1 frasesparaface.com.br, 1 frasestop.com.br, 1 frasesytarjetas.com, 1 -frasys.net, 1 fratelliscarrone.com, 1 fratellistomboli.it, 1 fraterbolivia.tk, 1 @@ -44189,7 +44184,6 @@ freepornovideos.me, 1 freepornvideos.life, 1 freepornxxxvids.com, 1 freepron.xyz, 1 -freepublicprofile.com, 1 freeradical.zone, 1 freereal.ml, 1 freerealincest.com, 1 @@ -44667,6 +44661,7 @@ fujikochan.tk, 1 fujiwarashinzo.com, 1 fujiyakimono.com, 1 fukabori-kaidora.com, 1 +fukakukeiba.com, 1 fukase-seed.com, 1 fukikaeru.com, 1 fukn.jp, 1 @@ -44684,6 +44679,7 @@ fulfillmentcostsest.ga, 1 fulgenzis.com, 1 fuliwang.info, 1 fuliwang.us, 1 +full-stack.ninja, 1 full.eu.org, 1 fullalt.com, 1 fullautomotivo.com.br, 1 @@ -46127,7 +46123,6 @@ generic-plavix.ga, 1 generic-sildenafil-citrate.cf, 1 generic-tadalafil.cf, 1 generic-tenormin.gq, 1 -generic.cx, 1 genericabana.gq, 1 genericaccutaneonline.ml, 1 genericaceon.tk, 1 @@ -46831,6 +46826,7 @@ gieoduyentinhdo.com, 1 gierds.de, 1 gieschke.de, 1 giethoorn.com, 1 +gietvloer-wand.nl, 0 gietvloergarant.nl, 1 gif.tips, 1 giff.com.mx, 1 @@ -48242,7 +48238,7 @@ granit-capital.ga, 1 graniteind.com, 1 granitestateproductions.tk, 1 grannys-stats.com, 1 -grannyshouse.de, 1 +grannyshouse.de, 0 granool.ga, 1 granpoder-islacristina.tk, 1 granstrom.tk, 1 @@ -48357,6 +48353,7 @@ grayslakeadvisors.com, 1 grayson.sh, 1 graysonsmith.co.uk, 1 graysquare.com, 1 +grazetech.com, 1 grazhdanskij-advokat.tk, 1 grc.com, 0 grceurope.eu, 1 @@ -48660,7 +48657,6 @@ gripwenab.cf, 1 grishavirus.cf, 1 griswoldia.gov, 1 grit3.com, 1 -gritte.ch, 1 grittherapeutic.com, 1 griyo.online, 1 grizz.gdn, 1 @@ -49133,6 +49129,7 @@ guolaw.ca, 1 guoliang.me, 1 guoliangwu.com, 1 guomai.com, 1 +guozeyu.com, 1 gupfen.ch, 1 gura.moe, 1 gurbetilan.com, 1 @@ -53525,6 +53522,7 @@ hydronium.ga, 1 hydronium.ml, 1 hydronium.tk, 1 hydroponicglobal.com.au, 1 +hydrosight.com, 1 hydroturbine.info, 0 hydrozone.fr, 1 hyec.jp, 1 @@ -53797,6 +53795,7 @@ ibericarreicomsa.es, 1 ibericartechnik.es, 1 iberion.pl, 1 ibertel.eu, 1 +ibestproduct.com, 0 ibetora.com, 1 ibexcore.com, 1 ibexmultiday.com, 1 @@ -54438,8 +54437,10 @@ ila.fi, 1 ilab.health, 1 ilacrehberi.com, 1 ilag.gov, 1 +ilamparas.at, 1 ilamparas.co.uk, 1 ilamparas.com, 1 +ilamparas.com.co, 1 ilamparas.com.ve, 1 ilamparas.mx, 1 ilaphone.com.ua, 1 @@ -54917,7 +54918,6 @@ inanan.cf, 1 inanec.gq, 1 inaned.ga, 1 inantrantung.com, 1 -inanyevent.london, 1 inares.org, 1 inarizona.tk, 1 inazuma7.jp, 1 @@ -55639,7 +55639,7 @@ inprint.id, 1 inprosy.com, 1 inprotec.com.co, 1 input.club, 1 -input.pt, 0 +input.pt, 1 input.sh, 1 inputclub.com, 1 inputmodes.com, 1 @@ -56246,7 +56246,6 @@ inwao.com, 1 inwit.tk, 1 inwonderofit.com, 1 inyourcornerinsurance.com, 1 -inyourowntime.info, 1 inyourowntime.zone, 1 inzdr.com, 1 inzeitinteractive.tk, 1 @@ -56663,7 +56662,6 @@ isaropiping.fr, 1 isastylish.com, 1 isavings.com, 1 isbaseballstillon.com, 1 -isbengrumpy.com, 1 isc2estoniachapter.ee, 1 iscert.org, 1 ischool.co.jp, 1 @@ -56925,7 +56923,6 @@ it-stack.de, 1 it-support-stockholm.se, 1 it-tainment.de, 1 it-tekniker.nu, 1 -it-ti.me, 1 it-uws.com, 0 it-volgograd.tk, 1 it-web-entwicklung.de, 1 @@ -57976,6 +57973,7 @@ jcadg.com, 1 jcaicedo.com, 1 jcaicedo.tk, 1 jcb.com, 1 +jcbgolfandcountryclub.com, 1 jccars-occasions.be, 1 jccrew.org, 1 jcde.xyz, 0 @@ -59487,7 +59485,6 @@ jummedia.com.au, 1 jump4funinflatables.co.uk, 1 jumpalitan.tk, 1 jumpandbounce.co.uk, 1 -jumpandjivechildrensparties.co.uk, 1 jumparoundbouncycastles.co.uk, 1 jumparty.co.uk, 1 jumpbuttonnorth.com, 1 @@ -60167,6 +60164,7 @@ kamppailusali.fi, 1 kampunginggris-ue.com, 1 kamrad.tk, 1 kamranmirhazar.com, 1 +kamui.co.uk, 1 kamuniang.org, 1 kan-ken.fr, 1 kan3.de, 1 @@ -60497,7 +60495,6 @@ kateduggan.net, 1 katekligys.com, 1 katemihalikova.cz, 1 katenka.tk, 1 -katericke.com, 1 katerinastudio.com, 1 katerinaverbovskaya.com, 1 katerman.cf, 1 @@ -65677,7 +65674,6 @@ libget.com, 1 libhttp.org, 1 libishe.top, 1 libmpq.org, 1 -libnull.com, 1 libpdf.org, 1 libportal.cf, 1 libra.com, 1 @@ -66817,6 +66813,7 @@ loadwallet.com, 1 loafhead.me, 1 loan-lenders.co.za, 1 loanfreeze.ga, 1 +loanmatch.sg, 1 loanpad.com, 1 loanreadycredit.com, 1 loansharkpro.com, 1 @@ -68545,7 +68542,6 @@ madrespect.com, 1 madridagency.com, 1 madridartcollection.com, 1 madride.tk, 1 -madscientistwebdesign.com, 1 madsgencydemo.com, 1 madskauts.tk, 1 madskills.tk, 1 @@ -68623,6 +68619,7 @@ magenbrot.net, 0 magenda.sk, 1 magenkompass.de, 1 magentaize.net, 1 +magenx.com, 1 magepro.fr, 1 magescobd.com, 1 magesy.blog, 1 @@ -71513,7 +71510,6 @@ megatyumen.ru, 0 megauction.tk, 1 megavasoc.com.ar, 1 megaviews.tk, 1 -megawarez.org, 1 megawebsite.tk, 1 megawhat.energy, 1 megaxchange.cash, 1 @@ -73007,7 +73003,6 @@ minohtaurov.cf, 1 minor.news, 1 minorisa.tk, 1 minoritywhip.gov, 1 -minorshadows.net, 1 minotauro.com.ar, 1 minoxbahia.com.br, 1 minpingvin.dk, 1 @@ -73987,6 +73982,7 @@ mondonet.org, 0 mondpo.pro, 1 mondzorgaanzee.nl, 1 monelephantapois.com, 1 +moneni.com, 1 moneoci.com.br, 1 monerogamez.com, 1 moneromerch.com, 1 @@ -75265,7 +75261,6 @@ musicgivesmelife.com, 1 musichiphop.ga, 1 musichome.tk, 1 musician.dating, 1 -musicindustrydb.org, 1 musicinsiderdigest.com, 1 musickhouseleveling.com, 1 musickorea.tk, 1 @@ -78370,7 +78365,6 @@ nightbura.biz, 1 nightcitynews.info, 1 nightclassifieds.com, 1 nightdreamer.me, 1 -nightfirec.at, 1 nightfirecat.com, 1 nighthawks.tk, 1 nighthawkstrategies.com, 1 @@ -78961,7 +78955,6 @@ nordlandverliebt.de, 1 nordlichter-brv.de, 1 nordlocker.com, 1 nordmoregatebilklubb.com, 1 -nordnetz-hamburg.de, 1 nordor.homeip.net, 1 nordpass.asia, 1 nordpass.com, 1 @@ -79431,6 +79424,7 @@ nsu.pw, 1 nsure.us, 1 nsworks.com, 0 nszero.tk, 1 +ntags.org, 1 ntcoss.org.au, 1 ntcp.ph, 1 nte.email, 1 @@ -81243,7 +81237,6 @@ openrainbow.org, 1 openre.site, 1 openrealestate.co, 1 openreel.com, 0 -openresearch.amsterdam, 1 openreview.net, 1 openroademail.com, 1 openrtm.org, 1 @@ -83020,7 +83013,6 @@ party-time-inflatables-durham.co.uk, 1 partyaccommodationsers.ga, 1 partyaccommodationsest.ga, 1 partyausstatter24.de, 1 -partybounceplay.co.uk, 1 partyclub.tk, 1 partycoin.ga, 1 partydj.be, 1 @@ -83235,6 +83227,7 @@ patriciaroy.co, 1 patrick-braun.tk, 1 patrick-omland.de, 1 patrick-omland.eu, 1 +patrick-othmer.de, 1 patrick-robrecht.de, 1 patrick.my-gateway.de, 1 patrick21.ch, 1 @@ -83457,6 +83450,7 @@ paystarkagency.com, 1 paytm.in, 1 payupay.ru, 1 paywait.com, 1 +payzang.com, 1 pazyarmonia.tk, 1 pb-design.ch, 1 pb-eatz.com, 1 @@ -84414,6 +84408,7 @@ pgmsp.net, 1 pgmtechnologies.com, 1 pgnetwork.net, 1 pgp.lol, 1 +pgp.network, 1 pgpaintanddesign.com, 1 pgpmail.cc, 1 pgprosupplies.com, 1 @@ -84696,6 +84691,7 @@ photops.fr, 1 photoreal.tk, 1 photosafari.com.my, 1 photosafaribg.com, 1 +photosaloncontest.com, 0 photoscheduleers.ga, 1 photoscheduleest.ga, 1 photosgaia.ch, 1 @@ -85163,7 +85159,6 @@ pirateproxy.ltda, 1 pirateproxy.name, 1 pirateproxy.onl, 1 pirateproxy.tube, 1 -pirateproxy.tv, 1 pirateproxy.uno, 1 pirates-comic.com, 1 piratesbrewcoffee.net, 1 @@ -85279,7 +85274,6 @@ pixeon.com, 1 pixie.ga, 1 pixifi.space, 1 pixiin.com, 1 -pixiv.cat, 1 pixiv.moe, 1 pixlfox.com, 1 pixloc.fr, 1 @@ -86714,7 +86708,6 @@ pourout.org, 0 pouwels-oss.nl, 1 povar.ru, 1 povarenok.cf, 1 -povareschka.ru, 1 povareshka.tk, 1 povmacrostabiliteit.nl, 1 pow.jp, 1 @@ -86862,7 +86855,6 @@ prac.to, 1 pracevjihlave.cz, 1 practicalbytes.de, 1 practicalhomes.com.au, 1 -practicalprogrammer.tech, 1 practicepanther.com, 1 practisforms.com, 1 practitest.com, 1 @@ -87057,6 +87049,7 @@ premiumdesign.hr, 1 premiumlegalsupport.ga, 1 premiumplusiptv.com, 1 premiumturkey.ml, 1 +premiumweb.co.id, 1 premiumwebdesign.it, 1 premkumar.net, 1 premsarswat.me, 1 @@ -88958,6 +88951,7 @@ qualityworks.tk, 1 qualpay.com, 1 qualtrics.com, 1 qualyven.com, 1 +quangngaimedia.com, 1 quanquan.cyou, 1 quanquan.space, 1 quant-labs.de, 0 @@ -90594,7 +90588,6 @@ reddyai.com, 1 rede-reim.de, 1 rede-t.com, 1 redearsliderturtles.com, 1 -redecsirt.pt, 1 redeemingbeautyminerals.com, 1 redefineyounow.com, 1 redelectrical.co.uk, 0 @@ -91813,6 +91806,7 @@ ricozienke.de, 1 ricreare.com, 1 ridayu.jp, 1 riddickthemovie.tk, 1 +riddims.co, 1 riddimsworld.com, 1 riddler.com.ar, 1 rideapart.com, 1 @@ -91854,6 +91848,7 @@ riggosrag.com, 1 riggsmarkham.com, 1 righettod.eu, 1 righini.ch, 0 +right-to-love.name, 1 rightblog.tk, 1 rightducks.com, 1 rightfold.io, 1 @@ -92562,6 +92557,7 @@ roofer.cf, 1 rooferindallas.com, 1 roofingandconstructionllc.com, 1 roofingmaterials.tk, 1 +roofingomaha.com, 1 roofingpioneers.com, 1 roofpost.gq, 1 roofsandbasements.com, 1 @@ -93477,6 +93473,7 @@ rydi.org, 1 ryejuice.sytes.net, 1 rygh.no, 1 rygy.com.br, 1 +rylin.net, 1 rylore.com, 1 rymanow.tk, 1 rymedi.com, 1 @@ -94251,8 +94248,6 @@ sandelduggal.com, 1 sander.sh, 1 sanderdesign.tk, 1 sanderdorigo.nl, 1 -sanderkoenders.eu, 1 -sanderkoenders.nl, 1 sanderpoppe.com, 1 sanderstech.solutions, 1 sandervanderstap.nl, 1 @@ -94997,7 +94992,6 @@ schnuckenhof-wesseloh.de, 1 schnyder-werbung.ch, 0 schody-rozycki.pl, 1 schoenstatt-fathers.link, 1 -schoenstatt-fathers.us, 1 schoenstatt.link, 1 schoepski.de, 1 schoffelcountry.com, 1 @@ -95485,6 +95479,7 @@ searchfox.org, 1 searchmore.dk, 1 searchpartners.dk, 1 searchperfumes.ga, 1 +searchshops.com, 1 searchtechnology.tk, 1 searchunify.com, 1 searchwork.tk, 1 @@ -97628,7 +97623,6 @@ sibertakvim.com, 0 sibfk.org, 1 sibirium-red.ga, 1 sibnerpartie.tk, 1 -sibrenvasse.nl, 1 siccardisport.it, 1 sice-si.org, 1 sich-fight.club, 1 @@ -98544,6 +98538,7 @@ skilldetector.com, 1 skillled.com, 1 skillmoe.at, 1 skills2serve.org, 1 +skills2services.com, 1 skillsenhancementtexas.gov, 1 skillsenhancementtx.gov, 1 skillshare.com, 1 @@ -98751,7 +98746,6 @@ skyscapecanopies.com, 1 skyscnr.com, 1 skyseo.cf, 1 skysoftbg.com, 1 -skysuite.nl, 1 skytec.host, 1 skyterraathome.com, 1 skyterraembrace.com, 1 @@ -98812,7 +98806,6 @@ slavblog.ru, 1 slaws.io, 1 slayingqueen.com, 1 slbknives.com, 1 -sld08.com, 1 sldev.ovh, 1 sldlcdn.com, 1 sledgeroofing.com, 1 @@ -100551,7 +100544,6 @@ speerpunt.info, 1 speets.ca, 1 spegeltankar.tk, 1 speich.net, 1 -speights-law.com, 1 spek.tech, 1 spelaspelautomater.ga, 1 speleo-explo.fr, 1 @@ -101909,7 +101901,6 @@ stichtingscholierenvervoerzeeland.nl, 1 stichtingsticky.nl, 0 stichtingwwtoegankelijk.nl, 1 stick2bike.de, 1 -stickandpoketattookit.com, 1 stickerparadise.me, 1 stickers-garage.com, 1 stickertrade.me, 1 @@ -102894,7 +102885,7 @@ sujiao.de, 1 sujoydhar.in, 1 sukamusik.tk, 1 suke3.jp, 1 -sukherchador.org, 1 +sukherchador.org, 0 suki.moe, 1 sukiu.net, 1 sukker-oaxaca.com, 1 @@ -105264,7 +105255,6 @@ teckgeekz.com, 1 tecknobox.fr, 1 tecknologg.website, 1 tecmarkdig.com, 1 -tecnaa.com, 1 tecne.ws, 1 tecnewsnow.com, 1 tecnicapotiguar.com.br, 0 @@ -105338,7 +105328,6 @@ teeqq.com, 1 teerer.tk, 1 teeshirtspace.com, 1 teesurprise.com, 1 -teesypeesy.com, 1 teeters.in, 1 teetje-doko.de, 1 teetoptens.com, 1 @@ -105761,7 +105750,6 @@ test-my.tk, 1 test-na-beremennost.tk, 1 test-online.tk, 1 test-school.ml, 1 -test-sev-web.pantheonsite.io, 1 test-textbooks.com, 1 test.de, 1 testadministrators.net, 1 @@ -108993,7 +108981,6 @@ toystory3.ga, 1 tozdev.com, 1 tp-law.jp, 1 tpark.jp, 1 -tpbunblocked.org, 1 tpci.biz, 1 tpiada.tk, 1 tpk-parma.ru, 1 @@ -110435,6 +110422,7 @@ turnover.cf, 1 turobot.casa, 1 turoktv.org, 1 turpinpesage.fr, 1 +tursiae.org, 1 turteka.com, 1 turtle.ai, 0 turtleduckstudios.com, 1 @@ -111589,7 +111577,6 @@ universus.tk, 1 univet-veterinaire.com, 0 univitale.fr, 0 unix.lu, 1 -unix.se, 1 unixadm.org, 1 unixapp.ml, 1 unixattic.com, 1 @@ -111940,7 +111927,6 @@ urnes.org, 1 urocentre.ga, 1 uroki.tk, 1 urokoff.net, 1 -urology.wiki, 1 urologyoklahoma.com, 1 urologyspecialistspc.com, 1 urologywi.com, 1 @@ -112182,6 +112168,7 @@ utterberry.io, 1 uttkarsh.net, 1 uttnetgroup.fr, 0 utural.tk, 1 +utvbloggen.se, 1 utw.me, 1 utzon.net, 1 uu5197.co, 1 @@ -115531,7 +115518,6 @@ wbt-solutions.ch, 1 wbt-solutions.net, 1 wbudd.com, 1 wbut.ml, 1 -wbvb.nl, 1 wby.by, 1 wby.tw, 1 wc-is.com, 1 @@ -118230,7 +118216,6 @@ wuminhao.com, 1 wunder.io, 1 wunderkarten.de, 1 wunderlist.com, 1 -wundernas.ch, 1 wundi.net, 1 wunschpreisauto.de, 1 wunschzettel.de, 1 @@ -120286,7 +120271,6 @@ yilanju.com, 1 yilconstruction.ca, 1 yiluup.com, 0 yimgo.fr, 0 -yin8888.tv, 0 yinduyy.com, 0 yinfor.com, 1 ying.gift, 1 @@ -121520,6 +121504,7 @@ zdrowebodomowe.pl, 1 zdrowezywienie.edu.pl, 1 zdymak.by, 1 ze.delivery, 1 +ze3kr.com, 1 zeadaniel.com, 1 zeal-and.jp, 1 zeal-interior.com, 1 @@ -121900,7 +121885,7 @@ zindagilive.tk, 1 zindan.tk, 1 zindec.com, 1 zinewords.com, 1 -zingjerijk.nl, 1 +zingjerijk.nl, 0 zinglix.xyz, 1 zingpetfood.com, 1 zings.eu, 1 diff --git a/services/settings/dumps/blocklists/addons-bloomfilters.json b/services/settings/dumps/blocklists/addons-bloomfilters.json index 25f7893eef2e3..a878b524e39f1 100644 --- a/services/settings/dumps/blocklists/addons-bloomfilters.json +++ b/services/settings/dumps/blocklists/addons-bloomfilters.json @@ -1,5 +1,36 @@ { "data": [ + { + "stash": { + "blocked": [ + "{d619d6d4-d562-4ec3-a62b-9246e1553b42}:1.8.2", + "{d619d6d4-d562-4ec3-a62b-9246e1553b42}:1.8.1", + "{c4c9b8f3-3c9b-41c2-827e-569e556fcb8a}:1.0.0.7", + "{d619d6d4-d562-4ec3-a62b-9246e1553b42}:1.9.0", + "{d619d6d4-d562-4ec3-a62b-9246e1553b42}:1.8.3d", + "{d619d6d4-d562-4ec3-a62b-9246e1553b42}:1.2d", + "{d619d6d4-d562-4ec3-a62b-9246e1553b42}:1.1d", + "{d619d6d4-d562-4ec3-a62b-9246e1553b42}:1.9.0d", + "{d619d6d4-d562-4ec3-a62b-9246e1553b42}:1.3d", + "{d619d6d4-d562-4ec3-a62b-9246e1553b42}:1.7f", + "{d619d6d4-d562-4ec3-a62b-9246e1553b42}:1.5d", + "{d619d6d4-d562-4ec3-a62b-9246e1553b42}:1.0d", + "{c4c9b8f3-3c9b-41c2-827e-569e556fcb8a}:1.0.0.0", + "{d619d6d4-d562-4ec3-a62b-9246e1553b42}:1.8.0", + "{c4c9b8f3-3c9b-41c2-827e-569e556fcb8a}:1.0.0.5", + "{d619d6d4-d562-4ec3-a62b-9246e1553b42}:1.4d", + "{d619d6d4-d562-4ec3-a62b-9246e1553b42}:1.9.1", + "{d619d6d4-d562-4ec3-a62b-9246e1553b42}:1.6d", + "{d619d6d4-d562-4ec3-a62b-9246e1553b42}:1.7d" + ], + "unblocked": [] + }, + "schema": 1649691602593, + "key_format": "{guid}:{version}", + "stash_time": 1649788507913, + "id": "9f608cfe-480d-4ec7-b692-0b26cb3ac3c3", + "last_modified": 1649788697027 + }, { "stash": { "blocked": [ diff --git a/services/settings/dumps/security-state/intermediates.json b/services/settings/dumps/security-state/intermediates.json index 12a7dd66ed404..39711215a0438 100644 --- a/services/settings/dumps/security-state/intermediates.json +++ b/services/settings/dumps/security-state/intermediates.json @@ -10620,114 +10620,6 @@ "id": "bf7893da-0baf-4aae-8bfc-282641a4dcff", "last_modified": 1640876333340 }, - { - "schema": 1640787170249, - "derHash": "yX42zr8VgKsb2tYcHVOwXHWBnoXZNyFL5oTIWbItReA=", - "subject": "CN=vTrus ECC DV SSL CA,O=iTrusChina Co.\,Ltd.,C=CN", - "subjectDN": "MEkxCzAJBgNVBAYTAkNOMRwwGgYDVQQKExNpVHJ1c0NoaW5hIENvLixMdGQuMRwwGgYDVQQDExN2VHJ1cyBFQ0MgRFYgU1NMIENB", - "whitelist": false, - "attachment": { - "hash": "ef4575a1abe7f8492e2e0d89dbbf6e80b196e4b6dccd8bf4e48700ed4bcfec4a", - "size": 1183, - "filename": "gJ1It3GyfR5y0xbHIcRJPwjI6151kRqrGSR_W5v6jek=.pem", - "location": "security-state-staging/intermediates/3a24be71-e5b8-4645-ba9c-4fabca8847d3.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "gJ1It3GyfR5y0xbHIcRJPwjI6151kRqrGSR/W5v6jek=", - "crlite_enrolled": false, - "id": "e296d20d-073e-4563-afc7-6e55d5946b3e", - "last_modified": 1640789973594 - }, - { - "schema": 1640787171474, - "derHash": "I1ge8ZId8vkpDboNTU9IqX+Yrq77XjNQs/cFgujNvng=", - "subject": "CN=vTrus ECC OV SSL CA,O=iTrusChina Co.\,Ltd.,C=CN", - "subjectDN": "MEkxCzAJBgNVBAYTAkNOMRwwGgYDVQQKExNpVHJ1c0NoaW5hIENvLixMdGQuMRwwGgYDVQQDExN2VHJ1cyBFQ0MgT1YgU1NMIENB", - "whitelist": false, - "attachment": { - "hash": "f5e788b19092bef358268ca50c1012469e23bacaec6b8968235a7fde8315fae3", - "size": 1183, - "filename": "atwg6ejpADR_jBbKnuSFzeAuVeHiQKJdUl2HSR0gLmU=.pem", - "location": "security-state-staging/intermediates/c703ae6f-ec40-48dd-a708-54774a3fa005.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "atwg6ejpADR/jBbKnuSFzeAuVeHiQKJdUl2HSR0gLmU=", - "crlite_enrolled": false, - "id": "2224e522-7889-4a09-b2de-d963d7e65cac", - "last_modified": 1640789973587 - }, - { - "schema": 1640787172648, - "derHash": "vTDA0eesuD78T19sYvjzpXm6snUnr65mbGlsOoZxdfE=", - "subject": "CN=vTrus ECC EV SSL CA,O=iTrusChina Co.\,Ltd.,C=CN", - "subjectDN": "MEkxCzAJBgNVBAYTAkNOMRwwGgYDVQQKExNpVHJ1c0NoaW5hIENvLixMdGQuMRwwGgYDVQQDExN2VHJ1cyBFQ0MgRVYgU1NMIENB", - "whitelist": false, - "attachment": { - "hash": "5efe51a26c5280ef3910747587a1258ee032a5cd4592afff27a55faecd152eec", - "size": 1183, - "filename": "7k0rYa-qry4wDaWSSycBwDVQALkMXBvBWeWHCjNIjTA=.pem", - "location": "security-state-staging/intermediates/1999d48b-3e07-48cf-bf4a-7656a1b29a53.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "7k0rYa+qry4wDaWSSycBwDVQALkMXBvBWeWHCjNIjTA=", - "crlite_enrolled": false, - "id": "72729739-8817-4cc4-a6d6-e50b179466d3", - "last_modified": 1640789973580 - }, - { - "schema": 1640787173887, - "derHash": "86ptcSoV9j+DUIBJedtUJBmmGysdIudWxBer/o10o8o=", - "subject": "CN=vTrus EV SSL CA,O=iTrusChina Co.\,Ltd.,C=CN", - "subjectDN": "MEUxCzAJBgNVBAYTAkNOMRwwGgYDVQQKExNpVHJ1c0NoaW5hIENvLixMdGQuMRgwFgYDVQQDEw92VHJ1cyBFViBTU0wgQ0E=", - "whitelist": false, - "attachment": { - "hash": "01cb1f5c741d941d11e0575e8235a3df364dc571bdd452841c23bd28e35016d3", - "size": 2003, - "filename": "tHoUHCrraSrjkHaUbZGcxRVrjSHn8i6s8_iI6HHC6Ok=.pem", - "location": "security-state-staging/intermediates/bfdb2a93-b869-4473-9246-b6dae2c91caf.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "tHoUHCrraSrjkHaUbZGcxRVrjSHn8i6s8/iI6HHC6Ok=", - "crlite_enrolled": false, - "id": "cd2c0c6f-fc8b-45b0-aa2b-15777338beb9", - "last_modified": 1640789973573 - }, - { - "schema": 1640787175080, - "derHash": "X36LSowRuvLL5kWbR/221QwChcSplPTu8v5RYKoKt4o=", - "subject": "CN=vTrus DV SSL CA,O=iTrusChina Co.\,Ltd.,C=CN", - "subjectDN": "MEUxCzAJBgNVBAYTAkNOMRwwGgYDVQQKExNpVHJ1c0NoaW5hIENvLixMdGQuMRgwFgYDVQQDEw92VHJ1cyBEViBTU0wgQ0E=", - "whitelist": false, - "attachment": { - "hash": "02cc66488a37100af024e6807b42f3d0fcca6bac68c70036847c21859c2e0f9f", - "size": 2003, - "filename": "75pE_IZKhqgviWzR4qTd2zPqnbH6f4VSS4OvPeBjEjQ=.pem", - "location": "security-state-staging/intermediates/c817af85-7cff-40a6-960f-7cb18bce787c.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "75pE/IZKhqgviWzR4qTd2zPqnbH6f4VSS4OvPeBjEjQ=", - "crlite_enrolled": false, - "id": "e3914740-82e4-4c6d-8237-d4b4be3ea8a3", - "last_modified": 1640789973567 - }, - { - "schema": 1640787176349, - "derHash": "pTtcm7WtknA9xPd/5k2ROiOf03IHOkjiegSBWApWN8Q=", - "subject": "CN=vTrus OV SSL CA,O=iTrusChina Co.\,Ltd.,C=CN", - "subjectDN": "MEUxCzAJBgNVBAYTAkNOMRwwGgYDVQQKExNpVHJ1c0NoaW5hIENvLixMdGQuMRgwFgYDVQQDEw92VHJ1cyBPViBTU0wgQ0E=", - "whitelist": false, - "attachment": { - "hash": "4edc5bd03aede64fb9a23473cb654b555c969e2142043a263b82aeb3a59fe874", - "size": 2003, - "filename": "_AQe5lWT9xIwgAiIHcAT-pRj70-ckw8xE4qArEfIyd0=.pem", - "location": "security-state-staging/intermediates/0539c864-9413-4569-b1db-013de19c4878.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "/AQe5lWT9xIwgAiIHcAT+pRj70+ckw8xE4qArEfIyd0=", - "crlite_enrolled": false, - "id": "a1713f8e-1fc7-4247-88b6-891789cca9d7", - "last_modified": 1640789973559 - }, { "schema": 1640574023025, "derHash": "vrUcj0UkJrK55nL33R7qSzPWw49MoqlpVs4kvQWww40=",
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit 2f5340c78f0a0d34a367ac4c20239b374ac48559 Author: Nika Layzell nika@thelayzells.com AuthorDate: Wed Apr 6 15:00:57 2022 +0000
Bug 1761981, r=smaug,a=dsmith
Differential Revision: https://phabricator.services.mozilla.com/D142596 --- dom/jsurl/nsJSProtocolHandler.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/dom/jsurl/nsJSProtocolHandler.cpp b/dom/jsurl/nsJSProtocolHandler.cpp index 06ec5027d5120..09b729442ed57 100644 --- a/dom/jsurl/nsJSProtocolHandler.cpp +++ b/dom/jsurl/nsJSProtocolHandler.cpp @@ -232,18 +232,19 @@ nsresult nsJSThunk::EvaluateScript(
mozilla::dom::Document* targetDoc = innerWin->GetExtantDoc();
- if (targetDoc) { - // Sandboxed document check: javascript: URI execution is disabled - // in a sandboxed document unless 'allow-scripts' was specified. - if (targetDoc->HasScriptsBlockedBySandbox()) { - if (nsCOMPtr<nsIObserverService> obs = - mozilla::services::GetObserverService()) { - obs->NotifyWhenScriptSafe(ToSupports(innerWin), - "javascript-uri-blocked-by-sandbox"); - } - return NS_ERROR_DOM_RETVAL_UNDEFINED; + // Sandboxed document check: javascript: URI execution is disabled in a + // sandboxed document unless 'allow-scripts' was specified. + if ((targetDoc && !targetDoc->IsScriptEnabled()) || + (loadInfo->GetTriggeringSandboxFlags() & SANDBOXED_SCRIPTS)) { + if (nsCOMPtr<nsIObserverService> obs = + mozilla::services::GetObserverService()) { + obs->NotifyWhenScriptSafe(ToSupports(innerWin), + "javascript-uri-blocked-by-sandbox"); } + return NS_ERROR_DOM_RETVAL_UNDEFINED; + }
+ if (targetDoc) { // Perform a Security check against the CSP of the document we are // running against. javascript: URIs are disabled unless "inline" // scripts are allowed. We only do that if targetDoc->NodePrincipal()
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit ec1239b68b31f679316f3e920c256b4cf5649d91 Author: Nika Layzell nika@thelayzells.com AuthorDate: Wed Apr 6 17:55:46 2022 +0000
Bug 1761981 - fix unexpected-pass wpts,a=dsmith
Differential Revision: https://phabricator.services.mozilla.com/D143077 --- ...-disallow-scripts-via-unsandboxed-popup.tentative.html.ini | 11 ----------- 1 file changed, 11 deletions(-)
diff --git a/testing/web-platform/meta/html/browsers/sandboxing/sandbox-disallow-scripts-via-unsandboxed-popup.tentative.html.ini b/testing/web-platform/meta/html/browsers/sandboxing/sandbox-disallow-scripts-via-unsandboxed-popup.tentative.html.ini deleted file mode 100644 index 7d99b28aa1b4e..0000000000000 --- a/testing/web-platform/meta/html/browsers/sandboxing/sandbox-disallow-scripts-via-unsandboxed-popup.tentative.html.ini +++ /dev/null @@ -1,11 +0,0 @@ -[sandbox-disallow-scripts-via-unsandboxed-popup.tentative.html] - bug: 1600442 - expected: - if release_or_beta: [OK, TIMEOUT] - [Sandboxed => unsandboxed popup] - expected: - if release_or_beta: [FAIL, TIMEOUT] - if (os == "android") and debug: ["FAIL", "PASS"] - if (os == "android") and not debug: ["FAIL", "PASS"] - FAIL -
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit e692ca4879c94163d2941e327673c68573c65e69 Author: ffxbld ffxbld@mozilla.com AuthorDate: Mon Apr 18 10:55:39 2022 +0000
No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings tld-suffixes - a=repo-update,a=dsmith
Differential Revision: https://phabricator.services.mozilla.com/D143905 --- netwerk/dns/effective_tld_names.dat | 10 +- security/manager/ssl/StaticHPKPins.h | 2 +- security/manager/ssl/nsSTSPreloadList.inc | 251 ++-- .../dumps/blocklists/addons-bloomfilters.json | 13 + .../dumps/security-state/intermediates.json | 1220 +++++--------------- 5 files changed, 404 insertions(+), 1092 deletions(-)
diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat index a53985ed4897c..4c0c6e9a98695 100644 --- a/netwerk/dns/effective_tld_names.dat +++ b/netwerk/dns/effective_tld_names.dat @@ -7130,7 +7130,7 @@ org.zw
// newGTLDs
-// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2022-03-27T15:13:38Z +// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2022-04-14T15:15:34Z // This list is auto-generated, don't edit it manually. // aaa : 2015-02-26 American Automobile Association, Inc. aaa @@ -7471,7 +7471,7 @@ bio // black : 2014-01-16 Afilias Limited black
-// blackfriday : 2014-01-16 UNR Corp. +// blackfriday : 2014-01-16 Registry Services, LLC blackfriday
// blockbuster : 2015-07-30 Dish DBS Corporation @@ -8308,7 +8308,7 @@ gdn // gea : 2014-12-04 GEA Group Aktiengesellschaft gea
-// gent : 2014-01-23 COMBELL NV +// gent : 2014-01-23 Easyhost BV gent
// genting : 2015-03-12 Resorts World Inc Pte. Ltd. @@ -9307,7 +9307,7 @@ philips // phone : 2016-06-02 Dish DBS Corporation phone
-// photo : 2013-11-14 UNR Corp. +// photo : 2013-11-14 Registry Services, LLC photo
// photography : 2013-09-20 Binky Moon, LLC @@ -9550,7 +9550,7 @@ rsvp // rugby : 2016-12-15 World Rugby Strategic Developments Limited rugby
-// ruhr : 2013-10-02 regiodot GmbH & Co. KG +// ruhr : 2013-10-02 dotSaarland GmbH ruhr
// run : 2015-03-19 Binky Moon, LLC diff --git a/security/manager/ssl/StaticHPKPins.h b/security/manager/ssl/StaticHPKPins.h index b78ddc9d2faa9..576a67dfe78e0 100644 --- a/security/manager/ssl/StaticHPKPins.h +++ b/security/manager/ssl/StaticHPKPins.h @@ -1149,4 +1149,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
static const int32_t kUnknownId = -1;
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1658400641057000); +static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1658746191791000); diff --git a/security/manager/ssl/nsSTSPreloadList.inc b/security/manager/ssl/nsSTSPreloadList.inc index 8ff11b8c8cc2e..760149c018cf0 100644 --- a/security/manager/ssl/nsSTSPreloadList.inc +++ b/security/manager/ssl/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/
#include <stdint.h> -const PRTime gPreloadListExpirationTime = INT64_C(1660819833605000); +const PRTime gPreloadListExpirationTime = INT64_C(1661165383365000); %% 0--1.de, 1 0-1.party, 1 @@ -274,7 +274,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660819833605000); 083967.com, 1 084552.com, 1 085851.com, 1 -087010.com, 1 08845.cc, 1 089818.com, 1 08detaxe.fr, 1 @@ -1108,6 +1107,8 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660819833605000); 162ca.com, 1 162cb.com, 1 162cf.com, 1 +162cr.com, 1 +162ea.com, 1 162ee.com, 1 162ff.com, 1 162jj.com, 1 @@ -1550,6 +1551,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660819833605000); 200llll.com, 1 200mmmm.com, 1 200oooo.com, 1 +200pppp.com, 1 200qqqq.com, 1 200rrrr.com, 1 200uuuu.com, 1 @@ -1635,7 +1637,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660819833605000); 222k8.com, 1 222k8.net, 1 222tips.com, 1 -22321365.com, 0 225485.com, 1 2255motion.com, 1 2264707.ru, 1 @@ -1759,7 +1760,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660819833605000); 2322bet.com, 1 233.be, 1 233.land, 1 -233.ro, 0 233.services, 1 2333.press, 1 233333.ga, 1 @@ -1934,6 +1934,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660819833605000); 291167.xyz, 1 2912.nl, 1 29227.com, 1 +2948.ca, 1 297computers.com, 1 2991236.com, 1 299ks.com, 1 @@ -2518,6 +2519,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660819833605000); 375ks.com, 1 377625.com, 1 377632.com, 1 +3778vip.com, 0 377ks.com, 1 377zzz.com, 1 37879.com, 0 @@ -3631,6 +3633,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660819833605000); 5yeb.com, 0 600aaaa.com, 1 600bbbb.com, 1 +600cao.com, 1 600dddd.com, 1 600iiii.com, 1 600k8.com, 1 @@ -3793,6 +3796,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1660819833605000); 63et.com, 1 63fb.com, 1 63fd.com, 1 +63fg.com, 1 63fk.com, 1 63fn.com, 1 63fp.com, 1 @@ -5955,6 +5959,7 @@ aaronburrows.com, 1 aaronfurtado.com, 1 aaronhorler.com, 1 aaronkimmig.de, 1 +aaronmaar.de, 1 aaronosmani.com, 1 aaronqueen.com, 1 aaronroyle.com, 1 @@ -6358,6 +6363,7 @@ academiaeureka.tk, 1 academiaoposicionescorreos.com, 1 academiasdemodelos.com, 1 academica.nl, 1 +academichealthscience.net, 1 academichelp.gq, 1 academicperks.org, 1 academie-de-police.ch, 0 @@ -7200,7 +7206,6 @@ adventure-runner.tk, 1 adventureally.com, 1 adventurealpinetreks.com, 1 adventurearts.tk, 1 -adventureboundlife.com, 1 adventurecorps.cf, 1 adventurecorps.ga, 1 adventurecorps.gq, 1 @@ -7503,7 +7508,6 @@ aforadearrastu.tk, 1 aforism.tk, 1 afp548.com, 1 afreelancersworld.com, 1 -afri.cc, 1 africa.dating, 1 africaindemander.tk, 1 africalebanon.tk, 1 @@ -8883,7 +8887,6 @@ alex97000.de, 0 alexaconnect.tk, 1 alexalist.tk, 1 alexander-beck.eu, 1 -alexander-cameron.com, 1 alexander-van-nieuwenhoven.tk, 1 alexanderb.info, 1 alexanderbernitz.eu, 1 @@ -10791,7 +10794,6 @@ animesekken.tk, 1 animesharp.com, 1 animeshka.tk, 1 animesoftcream.com, 1 -animestreamingfr.fr, 1 animetosho.org, 1 animetriad.com, 1 animewallpapers.tk, 1 @@ -10808,7 +10810,6 @@ anitaalbersen.nl, 1 anitahebe.com, 1 anitalk.dk, 1 anitavangelderleeromgeving.nl, 1 -anitaxcph.dk, 1 anitcloud.cc, 1 anitklib.ml, 1 anitop.ga, 1 @@ -11411,6 +11412,7 @@ apisyouwonthate.com, 0 apit-kovrov.ru, 1 apitodemestre.com.br, 1 apiu.me, 1 +apix.uz, 1 apk.li, 1 apk4fun.com, 1 apkdv.com, 0 @@ -11420,7 +11422,6 @@ apkmaze.com, 1 apkmody.io, 1 apkmody.ir, 1 apknut.com, 1 -apkoyunlar.club, 1 apkpokemongo.ga, 1 apkpokemongo.gq, 1 apkpokemongo.tk, 1 @@ -12160,7 +12161,6 @@ armcar.ga, 1 armchess.tk, 1 armdirectoryers.ga, 1 armdirectoryest.ga, 1 -armenians.online, 1 armeniaweb.tk, 1 armeo.top, 1 armfilm.co, 1 @@ -12263,7 +12263,6 @@ arquitectura-ilimitada.tk, 1 arquitet.com.br, 1 arr-outremont.ca, 1 arrakis.se, 1 -arrangeyour.com, 1 arraudi.be, 1 arraudi.eu, 1 arrazane.com.br, 1 @@ -13190,6 +13189,7 @@ atovelin.gq, 1 atovelin.tk, 1 atoz-union.org, 1 atozeventrentalsofpa.com, 1 +atplastics.vn, 0 atplonline.co, 1 atrafloor.com, 1 atraining.ru, 1 @@ -15145,7 +15145,6 @@ baltimorecashflow.com, 1 baltimorejetcharter.com, 1 baltimoreroofingservices.com, 1 bam.com.gt, 1 -bamaagahi.ir, 1 bamahammer.com, 1 bamaland.org, 1 bamberger-maelzerei.de, 1 @@ -15750,6 +15749,7 @@ bazari.com.pl, 1 bazarotehijos.com, 1 bazdell.com, 0 bazhan.me, 1 +bazinga-events.nl, 1 bazos.at, 1 bazos.cz, 1 bazos.pl, 1 @@ -15866,7 +15866,6 @@ bdbe.ga, 1 bdbxml.net, 1 bdd.fi, 1 bdepolytechgrenoble.fr, 1 -bdeshi.space, 1 bdfriends.tk, 1 bdikaros-network.net, 1 bdmusic25.us, 1 @@ -17079,8 +17078,8 @@ bet333r.com, 0 bet333s.com, 1 bet333t.com, 1 bet333u.com, 1 -bet333v.com, 1 -bet333w.com, 1 +bet333v.com, 0 +bet333w.com, 0 bet333x.com, 1 bet333y.com, 1 bet333z.com, 0 @@ -17664,6 +17663,7 @@ biggles.io, 1 biggsconstruction.com, 1 bighappy.com, 1 bighome.ml, 1 +bighorn.co.jp, 1 bighouse-events.co.uk, 1 bigio.com.br, 1 biglagoonrentals.com, 1 @@ -17830,7 +17830,7 @@ billy.wales, 1 billybob.tk, 1 billyoh.com, 1 billywig.stream, 1 -biloxihistoricalsociety.org, 1 +biloxihistoricalsociety.org, 0 biloxisportfishing.com, 1 bilsho.com, 1 biltmoreatthepark.com, 1 @@ -18067,7 +18067,6 @@ birchbarkfurniture.com, 0 birchbarkfurniture.fr, 0 birdbrowser.com, 1 birdersunite.com, 1 -birdfeeder.online, 1 birdgifs.nz, 1 birdiehosting.nl, 1 birdrave.com, 1 @@ -18131,7 +18130,6 @@ bisnisonlinecerdas.tk, 1 biso.ga, 1 bisoga.ga, 1 bisq.community, 1 -bisq.network, 1 bisq.services, 1 bisq.wiki, 1 bisrockloverclan.tk, 1 @@ -18541,6 +18539,7 @@ blackgamelp.de, 1 blackgate.org, 1 blackhail.tk, 1 blackhat.dk, 1 +blackhat.nz, 1 blackheads.tk, 1 blackhealthwealth.com, 1 blackhelicopters.net, 1 @@ -18925,6 +18924,7 @@ bltc.com, 1 bltc.net, 1 bltc.org, 1 bltc.org.uk, 1 +bltdirect.com, 1 bluavido.ml, 1 blubop.fr, 1 blubux.tk, 1 @@ -19720,7 +19720,6 @@ bouncingbuddiesleicester.co.uk, 1 bouncingbuzzybees.co.uk, 1 bouncinghigher.co.uk, 1 bouncingscotland.com, 1 -bouncourseplanner.net, 1 bouncy-castles-surrey.co.uk, 1 bouncy-tots.co.uk, 1 bouncybaileys.co.uk, 1 @@ -21049,7 +21048,7 @@ burbaguena.tk, 1 burbankdental.com, 1 burberry-outlet.cf, 1 burcevo.info, 1 -burchfabrics.com, 0 +burchfabrics.com, 1 burdurhaber.tk, 1 burdursondakika.tk, 1 bureaubolster.nl, 0 @@ -21455,7 +21454,6 @@ buy-jeansbiz.tk, 1 buy-lasix-without-a-doctor-s-prescription.ga, 1 buy-lingerie.tk, 1 buy-lipitor.tk, 1 -buy-out.jp, 1 buy-prednisolone.ga, 1 buy-premarin.ml, 1 buy-robaxin.gq, 1 @@ -22079,6 +22077,7 @@ calendriergratuit.fr, 1 calendum.ru, 1 calenfil.com, 1 caletka.cz, 1 +caletka.nl, 1 calgarydermatologisters.ga, 1 calgraf.com, 1 calhoun.tk, 1 @@ -23533,6 +23532,7 @@ cbncuritiba.com, 1 cboard.ml, 1 cbproject.co.za, 1 cbr-rcb.ca, 1 +cbr-xml-daily.ru, 1 cbrtrainer.com, 1 cbt.tj, 1 cbw.sh, 1 @@ -23654,7 +23654,6 @@ cdnaval.tk, 1 cdncompanies.com, 1 cdndepo.com, 1 cdnjs.com, 1 -cdnk39.com, 1 cdnmc.cn, 1 cdns.cloud, 1 cdnsys.net, 1 @@ -24748,7 +24747,6 @@ chinafree.site, 1 chinahealthcareblog.cf, 1 chinaicpower.org, 0 chinalosers.com, 1 -chinasa.net, 1 chinasearch.tk, 1 chinaspaceflight.com, 1 chinastory.tk, 1 @@ -25381,7 +25379,7 @@ cisa.gov, 1 cisamexico.com, 1 ciscoasanetflow.com, 1 ciscocyberthreatdefense.com, 1 -ciscodude.net, 1 +ciscodude.net, 0 ciscom.tk, 1 cisconetflowleader.com, 1 cisconetflowpartners.com, 1 @@ -26323,6 +26321,7 @@ cncollege.tk, 1 cncr.ga, 1 cncrans.ch, 0 cncs.gob.do, 1 +cncs.gov.pt, 1 cnet-hosting.com, 1 cnetw.xyz, 1 cnexchange.com, 1 @@ -26583,7 +26582,6 @@ codulrutier.tk, 1 codwarzonepoints.com, 1 cody.sh, 1 codydostal.com, 1 -codyqx4.com, 1 coeburnva.gov, 1 coenraets.com, 1 coens.me.uk, 1 @@ -26680,7 +26678,7 @@ col-head.com, 1 col.la, 1 cola-host.tk, 1 colaborativa.tv, 1 -colabug.com, 0 +colabug.com, 1 colah.com.au, 1 colapsys.net, 0 colarelli.ch, 1 @@ -26866,6 +26864,7 @@ columbushydroxide.com, 1 columbushydroxide.net, 1 columbushydroxide.org, 1 columbusks.gov, 1 +columbuswines.com, 1 colwichks.gov, 1 colyakoomusic.com, 1 com-news.io, 1 @@ -28170,7 +28169,6 @@ cppan.org, 1 cppaste.org, 1 cppressinc.com, 1 cpqcol.gov.co, 1 -cprewritten.net, 1 cpro.pt, 1 cps-sante.ml, 1 cpsa.co.uk, 1 @@ -28500,7 +28498,6 @@ crimefreeliving.com, 1 crimesolutions.gov, 1 crimethincx.tk, 1 crimevictims.gov, 1 -criminal-attorney.ru, 1 criminal-market.ml, 1 criminal-news.tk, 1 criminal.enterprises, 1 @@ -28677,7 +28674,6 @@ croxu.com, 1 croydonapartments.com.au, 1 croydonbouncycastles.co.uk, 1 crrev.com, 1 -crsmsodry.cz, 1 crsoresina.it, 1 crsserviceogkloak.dk, 1 crstat.ru, 1 @@ -28860,7 +28856,6 @@ csasummit.org, 1 csbya.com, 1 csca.me, 0 cscau.com, 0 -cscdn.net, 1 csci571.com, 1 csd-sevnica.si, 1 csd-slovenije.si, 1 @@ -28951,7 +28946,6 @@ csy.hu, 1 ct-watches.dk, 1 ct.search.yahoo.com, 0 ct100.by, 1 -ctc-transportation.com, 1 ctchosting.net.au, 1 ctcloud.ml, 1 ctcom-peru.com, 1 @@ -29040,7 +29034,6 @@ cucek.tk, 1 cuchichi.es, 1 cuckoo.ee, 1 cuddlecat.io, 1 -cuddlecomfort.com, 1 cuddlingyaks.com, 1 cuddlybeardaycare.com.au, 1 cudesa.gq, 1 @@ -29394,6 +29387,7 @@ cyberdyne.llc, 1 cyberex.es, 1 cyberexplained.info, 1 cyberfebrio.tk, 1 +cyberforensics.com, 1 cyberforge.ml, 1 cyberfruit.tk, 1 cybergame-host.tk, 1 @@ -29710,7 +29704,6 @@ dabhand.studio, 1 dabi.tk, 1 dabneydriveanimalhospital.com, 1 dabro.tk, 1 -dabstairs.com, 1 dabuzz.tk, 1 dacada-porn.com, 1 daceurope.co.uk, 1 @@ -29769,7 +29762,6 @@ dag-hebergement.fr, 1 dag-konsult.com, 1 dag-ogni.tk, 1 daganzo.tk, 1 -dagbestedingwarrie.nl, 1 dagensannonser.se, 1 dagestan.cf, 1 dagestanci.tk, 1 @@ -29825,7 +29817,6 @@ dailysomething.site, 1 dailysuperheroes.com, 1 dailytrip.de, 1 dailyusbusiness.tk, 1 -dailyw88.com, 1 dailywarteg.com, 1 dailywork.ga, 1 dailyxenang.com, 1 @@ -30033,7 +30024,6 @@ danielheal.net, 0 danielhinterlechner.eu, 1 danielhurley.com, 1 danielhurley.eu, 1 -danielhurley.ie, 1 danielhurley.info, 1 danielhurley.org, 1 danieliancu.com, 1 @@ -30054,6 +30044,8 @@ danielmiessler.com, 1 danielmoch.com, 1 danielmorales917.com, 1 danielmorell.com, 1 +danielmostertman.com, 1 +danielmostertman.nl, 1 danielnaaman.net, 1 danielnaaman.org, 1 danielparker.com.au, 1 @@ -30666,6 +30658,7 @@ daxpatterns.com, 1 daxperience.eu, 1 daxrunbase.com, 1 day, 1 +day-peak.com, 1 daycontactlens.com, 1 daycubrem.com, 1 daydream.team, 1 @@ -30782,6 +30775,7 @@ dcpower.eu, 1 dcpudwa.gov, 1 dcrdev.com, 1 dctrl.ch, 1 +dcw.io, 1 dcyph.de, 1 dd-groupinc.com, 1 dd.art.pl, 1 @@ -31015,7 +31009,6 @@ decorativecosmetics.tk, 1 decorativeflooring.com, 1 decorator.uk, 1 decoratore.roma.it, 1 -decorauvent.ca, 1 decorestilo.com.br, 1 decorlux.bg, 1 decormiernissanparts.com, 1 @@ -31080,7 +31073,6 @@ deepaero.com, 1 deeparamaraj.com, 1 deepbluecrafting.co.uk, 1 deepblueemail.com, 1 -deepcode.io, 1 deepcreampie.com, 1 deeperwalkinternational.org, 1 deepgame.tk, 1 @@ -32065,7 +32057,6 @@ dexonservicedeskws.azurewebsites.net, 1 dexonsoftware.com, 0 dexterseries.ru, 1 dextra.tk, 1 -deyanadeco.com, 1 deyute.com, 1 dez-online.de, 1 dezea.net, 1 @@ -32768,7 +32759,6 @@ dipsytroller.com, 1 dipulse.it, 1 dir2epub.com, 1 dir2epub.org, 1 -dirba.io, 1 dirch.tk, 1 dirdur.cf, 1 direcore.xyz, 1 @@ -33697,6 +33687,7 @@ dogadayiz.net, 1 dogan.ch, 0 doganoglu.net, 1 dogcam.tk, 1 +dogcat.vn, 0 dogcratereview.info, 1 dogday.tk, 1 doge-fa.tk, 1 @@ -33746,6 +33737,7 @@ dogwithblog.in, 1 dogwoodceramics.com, 1 dogworld.com.br, 1 doh.sb, 1 +dohanews.co, 1 dohertyconsulting.tk, 1 doi.org, 1 doihavetoputonpants.com, 1 @@ -34058,7 +34050,6 @@ dontfwithmyvote.us, 1 donthedragonwilson.com, 1 dontkeylog.me, 1 dontkillspike.tk, 1 -dontlistentoruss.com, 1 dontpayfull.com, 1 dontstopcoffee.com, 1 donttrust.me, 1 @@ -34196,7 +34187,6 @@ dosyanet.tk, 1 dot.sb, 1 dot42.no, 1 dota2free.tk, 1 -dota2huds.com, 1 dotadotaman.tk, 1 dotbox.org, 1 dotcircle.co, 1 @@ -34411,6 +34401,7 @@ drach.xyz, 1 dracheisolation.tk, 1 drachenleder.de, 1 dracisvet.cz, 1 +dracoon.team, 1 dracox.com, 0 dracula.city, 1 draft.cards, 1 @@ -34419,7 +34410,6 @@ drafton.com, 1 dragcave.net, 1 dragdroplearning.com, 1 dragfiles.com, 1 -draghetti.it, 1 draghive.asia, 1 draghive.ca, 1 draghive.co.uk, 1 @@ -35065,6 +35055,7 @@ duckside.tk, 1 ducksify.com, 1 ducksoft.fi, 1 duckstad.net, 1 +duckyubuntu.tk, 1 ductcare.com, 1 dude.tokyo, 1 dudedood.tk, 1 @@ -35206,7 +35197,6 @@ durchblick-shop.de, 1 durcoin.com, 1 durcoin.org, 1 durdal.no, 1 -durdle.com, 1 duredo.com, 1 dureuil.info, 1 durexwinkel.nl, 1 @@ -35377,6 +35367,7 @@ dylanknoll.ca, 1 dylanlogan.xyz, 1 dylanscott.com.au, 1 dylansevier.com, 1 +dylanspcrepairs.com, 1 dylanuwr.pl, 1 dylanwise.net, 1 dylanwolff.com, 1 @@ -35478,7 +35469,6 @@ dzworld.com, 1 dzyabchenko.com, 0 dzyszla.pl, 1 dzytdl.com, 1 -dzz.by, 0 e-account.by, 1 e-alink.com, 1 e-antikvar.tk, 1 @@ -36218,6 +36208,7 @@ ebjork.se, 1 ebki-nsn.gov, 1 eblan.gq, 1 eblog.cf, 1 +eblog.ink, 1 ebola-hosting.cz, 1 ebolacharts.ga, 1 ebolavirus.tk, 1 @@ -38669,7 +38660,6 @@ eric.jetzt, 1 eric1932.tk, 1 ericabrahamsen.net, 1 ericairwin.com, 1 -ericca.org, 1 ericdiao.com, 1 ericfm.tk, 1 ericfo.cf, 1 @@ -39011,7 +39001,6 @@ esmart.ro, 1 esmejor.tk, 1 esmincg2t1.com, 1 esnekkaucuk.com, 1 -esoa.net, 1 esocite.la, 1 esoko.eu, 1 esolcourses.com, 1 @@ -39484,6 +39473,7 @@ europeancupinline.eu, 1 europeanpreppers.com, 1 europeanstudies-chemnitz.de, 1 europeantransportmanagement.com, 1 +europeanwineresource.com, 1 europeluxuryweddings.com, 1 europeonline.tk, 1 europeos.es, 1 @@ -39988,7 +39978,6 @@ expeditiegrensland.nl, 0 expelliarmus.tk, 1 expensivejewelsest.ga, 1 exper.gr, 1 -experens.com, 1 experienceoz.com.au, 1 experiment-626.tk, 1 experimentalguruji.cf, 1 @@ -40544,7 +40533,6 @@ factorypartsdirect.com, 1 factozia.tk, 1 facts-about-bees.ml, 1 factslider.tk, 1 -factsvision.sr, 1 factua.nl, 1 factum-info.net, 1 facturama.pt, 1 @@ -40590,7 +40578,6 @@ fahrenwalde.de, 1 fahrschule-laux.de, 1 fahrwerk.io, 1 fahrzeug-talk.de, 1 -fai.gov, 1 faidanoi.it, 1 faidatefacile.it, 1 faieurope.it, 1 @@ -41094,6 +41081,7 @@ fastos.de, 1 fastpeoplesearch.com, 1 fastpresence.com, 1 fastproxyforfree.gq, 1 +fastrack.co.mz, 1 fastserv.pl, 1 faststage.ch, 1 fasturl.ml, 1 @@ -41878,7 +41866,6 @@ fileservicios.com.ar, 1 fileshare.party, 1 filestar.io, 1 filestartest.io, 1 -filestreak.com, 1 filesuffix.com, 1 filetransfer.one, 1 filezilla-project.org, 1 @@ -42083,6 +42070,7 @@ finestinfo.com, 1 finestrabatalera.tk, 1 finestreview.cf, 1 finestrina.net, 1 +finestroom.ru, 1 finex.by, 1 finexo.ch, 1 finfleet.id, 1 @@ -42743,7 +42731,6 @@ floralin.se, 1 floralworkshopsers.ga, 1 florasite.tk, 1 florausa.net, 0 -floravan.com, 1 floravino.de, 1 floreg.com, 1 florenceapp.co.uk, 1 @@ -42783,7 +42770,6 @@ floridasexhealth.com, 1 floridastadium.ga, 1 floridastadiumers.ga, 1 floridastadiumest.ga, 1 -floridawaterapparel.net, 1 floridaweightlossdoctors.com, 1 floriebriand.com, 1 floriimorii.tk, 1 @@ -42852,7 +42838,6 @@ flslawyer.com, 1 flubio.de, 1 flucky.xyz, 1 fluconazole.gq, 1 -flucover.com, 1 fluenciamodas.com.br, 1 fluencytech.com, 1 fluessiggas.de, 1 @@ -43714,7 +43699,6 @@ foxontheinter.net, 1 foxquill.com, 0 foxroy.com, 1 foxsburg.xyz, 1 -foxscribbler.com, 1 foxstreetcomms.co.za, 0 foxstyle.gq, 1 foxtransportables.com.au, 1 @@ -44661,7 +44645,6 @@ fujikochan.tk, 1 fujiwarashinzo.com, 1 fujiyakimono.com, 1 fukabori-kaidora.com, 1 -fukakukeiba.com, 1 fukase-seed.com, 1 fukikaeru.com, 1 fukn.jp, 1 @@ -44901,7 +44884,6 @@ furgo.love, 1 furi.ga, 1 furisode-yamaguchiya.com, 1 furiya.tk, 1 -furkancaliskan.com, 1 furkankose.ml, 1 furkot.com, 1 furkot.de, 1 @@ -45038,7 +45020,6 @@ fxislamic.com, 1 fxnotch.com, 1 fxopen.co.uk, 1 fxopen.com, 1 -fxopen.com.au, 1 fxopen.com.br, 1 fxopen.com.mx, 1 fxopen.my, 1 @@ -45932,7 +45913,7 @@ geekcreations.co.uk, 1 geekdama.com.br, 1 geekdocs.de, 1 geekedin.ga, 1 -geekeries.org, 0 +geekeries.org, 1 geekgao.cn, 1 geekgear.tk, 1 geekgirltech.com, 1 @@ -46546,6 +46527,7 @@ getgeek.io, 1 getgeek.no, 1 getgeek.nu, 1 getgeek.pl, 1 +getgeek.se, 1 gethome.ru, 1 gethost.co.zw, 1 gethttpsforfree.com, 1 @@ -47335,6 +47317,7 @@ gloryofloveband.tk, 1 gloryofmusic.tk, 1 gloryrise.tk, 1 glosiko.cn, 1 +glosiko.com, 1 glosiko.com.cn, 1 glosiko.net, 1 glosiko.org, 1 @@ -47547,7 +47530,6 @@ goedkopetonerkopen.nl, 1 goehler-baumpflege.de, 1 goeikan.life, 1 goemail.me, 1 -goempyrean.com, 1 goenea.com, 1 goerdeler-alumni-club.de, 1 goergetown.tk, 1 @@ -48171,7 +48153,6 @@ grahambaker.ca, 1 grahamcarruthers.co.za, 1 grahamcluley.com, 0 grahamleeonline.com, 1 -grahamsmith.tech, 1 grailify.com, 1 grain-feature-branch.co, 1 grain-staging.co, 1 @@ -53010,6 +52991,7 @@ hrmn.xyz, 1 hrndz.io, 1 hro.to, 1 hrobert.hu, 1 +hroling.nl, 1 hromaticworld.tk, 1 hroschyk.cz, 1 hrpage.ml, 1 @@ -54091,7 +54073,6 @@ idkidknow.com, 1 idleleo.com, 1 idlemon.net, 1 idlethoughtsandramblings.com, 1 -idlewildflowers.com, 1 idlxb.com, 1 idmanagement.gov, 1 idmaster.ml, 1 @@ -55193,6 +55174,7 @@ infinityengine.org, 1 infinityepos.co.uk, 1 infinityfaces.tk, 1 infinityhts.com, 1 +infinityrecruitinggroup.com, 1 infinitysearch.co, 1 infinitysportsandfitness.in, 1 infinityvr.net, 1 @@ -56908,6 +56890,7 @@ it-enthusiasts.tech, 1 it-expert.tk, 1 it-inside.ch, 1 it-jobbank.dk, 1 +it-journal.de, 0 it-kron.de, 1 it-maker.eu, 1 it-meneer.nl, 1 @@ -57973,7 +57956,6 @@ jcadg.com, 1 jcaicedo.com, 1 jcaicedo.tk, 1 jcb.com, 1 -jcbgolfandcountryclub.com, 1 jccars-occasions.be, 1 jccrew.org, 1 jcde.xyz, 0 @@ -59219,7 +59201,6 @@ jpilan.com, 1 jpinfo.tk, 1 jplennard.com, 1 jpm-inc.jp, 1 -jpmelos.com, 1 jpmelos.com.br, 1 jpmguitarshop.com.br, 1 jpn-ks.co.jp, 1 @@ -59236,6 +59217,7 @@ jpshop.ru, 1 jpsinflatables.co.uk, 1 jpslconsulting.ca, 1 jpst.it, 1 +jpvermogensregie.com, 1 jqlin.com, 1 jqlsql.com, 1 jquery.wtf, 1 @@ -59485,6 +59467,7 @@ jummedia.com.au, 1 jump4funinflatables.co.uk, 1 jumpalitan.tk, 1 jumpandbounce.co.uk, 1 +jumpandjivechildrensparties.co.uk, 1 jumparoundbouncycastles.co.uk, 1 jumparty.co.uk, 1 jumpbuttonnorth.com, 1 @@ -59585,7 +59568,6 @@ juspay.in, 1 jusquauxdents.tk, 1 just-a-clanpage.de, 1 just-bees.de, 1 -just-heberg.fr, 1 just-keep-swimming.tk, 1 just-muh.de, 1 just-pools.co.za, 1 @@ -60455,6 +60437,7 @@ kasparovru.ml, 1 kasparovru.tk, 1 kasper-team.tk, 1 kasperstad.dk, 1 +kassa.at, 1 kassa.com, 1 kassa.expert, 1 kassola.tk, 1 @@ -60959,7 +60942,7 @@ kernel-error.de, 1 kernel-panik.me, 1 kernel.nz, 1 kernelpanics.nl, 1 -kernelprogrammer.com, 1 +kernelprogrammer.com, 0 kernet.com.ar, 1 kernkompas.nl, 1 kerocristais.pt, 0 @@ -62052,7 +62035,6 @@ koalapress.fr, 0 koalarong.com, 0 koalas.org, 1 koba.jp, 1 -kobar.id, 1 kobb.tk, 1 kobejet.com, 1 kobezda.net, 1 @@ -62216,7 +62198,6 @@ kolorwell.tk, 1 kolotsainaskoto.tk, 1 kolpingsfamilie-vechta-maria-frieden.de, 1 kolrami.com, 1 -koltiva.com, 1 koluke.co, 1 koluke.com, 1 kolyapetrov.tk, 1 @@ -63333,7 +63314,6 @@ kylebaldw.in, 0 kyledrake.net, 1 kyleggiero.me, 1 kylegutschow.com, 1 -kylehakala.com, 1 kylejohnson.io, 1 kylelaker.com, 1 kylepet.co, 1 @@ -63713,7 +63693,6 @@ lakehavasuwebsites.com, 1 lakelandbank.com, 1 lakelandmom.com, 1 lakemillsiowa.gov, 1 -lakeoswegotowncar.com, 1 lakersview.com, 1 lakesherwoodelectric.com, 1 lakesherwoodelectrical.com, 1 @@ -65674,6 +65653,7 @@ libget.com, 1 libhttp.org, 1 libishe.top, 1 libmpq.org, 1 +libnull.com, 1 libpdf.org, 1 libportal.cf, 1 libra.com, 1 @@ -67382,7 +67362,6 @@ lordsesshoumaru.tk, 1 lordshaokahn.tk, 1 lordskate.tk, 1 lordusa.com, 1 -lordusers.com, 1 lore.azurewebsites.net, 1 loreedeslandes.com, 1 loremipsum.info, 1 @@ -67698,6 +67677,7 @@ lrumeq.com, 1 lrv-grobbendonk.tk, 1 ls-alarm.de, 1 ls-mapping-team.de, 1 +ls-rp.es, 1 lsal.me, 1 lsbricks.com, 1 lsc-dillingen.de, 1 @@ -67743,6 +67723,7 @@ ltmw.xyz, 1 ltn-tom-morel.fr, 1 ltonlinestore.in, 0 ltransferts.com, 1 +lts-tec.de, 1 ltservers.net, 1 lty.space, 1 lu-rp.es, 1 @@ -67825,7 +67806,6 @@ lucklesslovelocks.com, 1 lucko.me, 1 luckperms.net, 1 lucky-bul.tk, 1 -lucky-frog.co.uk, 1 lucky-time.tk, 1 luckyabonent.ml, 1 luckycasino.se, 1 @@ -67960,7 +67940,6 @@ lukekuza.com, 1 lukekuza.me, 1 lukem.eu, 0 lukem.net, 1 -lukeng.net, 1 lukepeltier.com, 1 lukesbouncycastlehire.com, 1 lukesutton.info, 1 @@ -68185,6 +68164,7 @@ lvnacapital.com, 1 lvrsystems.com, 1 lvtrafficticketguy.com, 1 lw1.at, 1 +lwis.me, 1 lwisa.ma, 1 lwl-foej-bewerbung.de, 1 lwl.moe, 1 @@ -68542,6 +68522,7 @@ madrespect.com, 1 madridagency.com, 1 madridartcollection.com, 1 madride.tk, 1 +madscientistwebdesign.com, 1 madsgencydemo.com, 1 madskauts.tk, 1 madskills.tk, 1 @@ -69399,7 +69380,6 @@ manytubes.ga, 1 manyzero.ml, 1 maomihz.com, 1 maone.net, 1 -maorx.cn, 1 maowtm.org, 1 maozedong.red, 1 map4erfurt.de, 1 @@ -69635,7 +69615,6 @@ marinelausa.com, 0 marinella.tk, 1 marinershousecalstock.com, 1 marinettecountywi.gov, 1 -maringalazer.com.br, 1 mario-ancic.tk, 1 mario-sarto.com, 1 mario.com.ua, 1 @@ -69737,7 +69716,6 @@ marketplacestrategy.com, 1 marketsearch.ga, 1 marketsosyali.tk, 1 marketvalue.gq, 1 -markf.io, 1 markfietje.eu, 1 markfisher.photo, 1 markhaehnel.de, 1 @@ -70051,7 +70029,6 @@ masqueradecostumes.tk, 1 masrilanguage.tk, 1 masrur.org, 1 mass.pt, 1 -massaboutique.com, 1 massaer.tk, 1 massage-colleges.com, 1 massage-la-clusaz.com, 1 @@ -70098,6 +70075,7 @@ mastercareplus-staging.com, 1 mastercareplus-uat.com, 1 mastercareplus.com, 1 mastercheat.net, 1 +mastercomfig.com, 1 masterdan.net, 1 masterdemolitioninc.com, 1 masterdesingweb.tk, 1 @@ -70552,6 +70530,7 @@ maxwellcity.ml, 1 maxwellcody.com, 1 maxwellmoore.co.uk, 1 maxwittfeld.tech, 1 +may24.tw, 1 mayaimplant.com, 1 mayamaibach.org, 1 mayamushrooms.co.uk, 1 @@ -70808,7 +70787,6 @@ mdma.net, 1 mdmbat.com, 1 mdmed.clinic, 1 mdns.eu, 1 -mdoering.de, 0 mdosch.de, 1 mdpp.com.br, 1 mdpparish.com, 1 @@ -71470,6 +71448,7 @@ megabouncingcastles.com, 1 megadrol.com, 1 megaelettrostimolatore.com, 1 megafilez.tk, 1 +megaflix.nl, 1 megaflowers.ru, 1 megagifs.de, 1 megaherz.tk, 1 @@ -71510,6 +71489,7 @@ megatyumen.ru, 0 megauction.tk, 1 megavasoc.com.ar, 1 megaviews.tk, 1 +megawarez.org, 1 megawebsite.tk, 1 megawhat.energy, 1 megaxchange.cash, 1 @@ -72428,7 +72408,7 @@ michielbijland.nl, 1 michig.tk, 1 michiganhealth.tk, 1 michiganstateuniversityonline.com, 1 -michiganunionoptout.com, 1 +michiganunionoptout.com, 0 michilaw.com, 1 michmexguides.com.mx, 1 michu.pl, 1 @@ -72926,7 +72906,7 @@ minhng99.eu, 1 minhyukpark.com, 1 mini-igra.tk, 1 mini-piraten.de, 1 -mini2.fi, 0 +mini2.fi, 1 minialbums.ga, 1 miniatomium.tk, 1 minibackpackgirls.cf, 1 @@ -73018,7 +72998,6 @@ mintert.net, 1 mintitafever.tk, 1 minto.cc, 1 minton.systems, 1 -mintosherbs.com, 1 mintse.com, 1 minttang.cn, 0 minu.link, 1 @@ -73341,6 +73320,7 @@ mj420.com, 1 mjacobson.net, 1 mjanja.ch, 1 mjasm.org, 1 +mjgroup.io, 1 mjhs.org, 1 mjhsfoundation.org, 1 mjkholding.nl, 1 @@ -74491,9 +74471,6 @@ motolinesupply.com, 1 motomorgen.com, 1 motopoland.com.ua, 1 motor-agro.com, 1 -motor-agro.com.ua, 1 -motor-agro.kz, 1 -motor-agro.ru, 1 motor-cycles.tk, 1 motor-forum.nl, 1 motor1.com, 1 @@ -74893,8 +74870,6 @@ mtehe-square.com, 1 mteleport.net, 1 mtf.rip, 1 mtfgnettoyage.fr, 1 -mtgeni.us, 1 -mtgenius.com, 1 mtgoptex.com, 1 mtgsuomi.fi, 1 mthode.org, 1 @@ -75043,7 +75018,6 @@ multi-tool.ml, 1 multiagent.tk, 1 multichange.net, 1 multiclinicacardio.com.br, 1 -multicomhost.com, 1 multicore.cl, 1 multicorpbra.com, 1 multievidence.es, 1 @@ -76778,7 +76752,7 @@ nationalgridrenewables.com, 1 nationalhomeimprovements.co.uk, 1 nationalhomequotes.com, 1 nationalmall.gov, 1 -nationalmap.gov, 1 +nationalmap.gov, 0 nationalopera.ml, 1 nationalpriorities.org, 1 nationaltrails.ru, 1 @@ -76811,7 +76785,7 @@ natur-udvar.hu, 1 natur.com, 1 natura-sense.com, 1 natura2000.tk, 1 -naturalbeautyhacks.com, 0 +naturalbeautyhacks.com, 1 naturalbijou.com, 1 naturalbladdercontrol.tk, 1 naturalcosmetics.cf, 1 @@ -77508,7 +77482,6 @@ netlentes.com.br, 1 netletic.com, 1 netlevel.ga, 1 netlify.com, 1 -netliste.com, 1 netlocal.ru, 1 netmaddy.com, 1 netmagicas.com.br, 1 @@ -77552,6 +77525,7 @@ netsoftit.com, 1 netsoins.org, 1 netsparker.com.tr, 1 netspeedia.net, 1 +netsphere.cloud, 1 netsphere.cz, 1 netsyms.com, 1 netsys.com.tr, 1 @@ -78012,7 +77986,6 @@ nexusbyte.de, 1 nexussystems.tk, 1 nexwebsites.com, 1 nexxus-sistemas.net.br, 1 -nexzcore.com, 1 neyer-lorenz.de, 1 neyjens.com, 1 nezis.tk, 1 @@ -78859,7 +78832,6 @@ nomasfraudecolorado.gov, 1 nomaspicaduras.com, 1 nomaster.cc, 1 nomenclator.org, 1 -nomesbiblicos.com, 1 nomial.co.uk, 1 nomifensine.com, 1 nomik.xyz, 1 @@ -80622,6 +80594,7 @@ omandatapark.com, 1 omangrid.com, 1 omanhr.cf, 1 omanko.porn, 0 +omaosurveys.org, 0 omarans.com, 1 omarbaba.shop, 1 omarh.net, 1 @@ -80929,7 +80902,6 @@ onlinebs.tk, 1 onlinebupropion.gq, 1 onlinebusiness.law, 1 onlinecarstyling.nl, 1 -onlinecasinobluebook.com, 1 onlinecasinoerdk.com, 1 onlinecasinoreviewz.com, 1 onlinecasinoselite.org, 1 @@ -81038,7 +81010,6 @@ onodera.com.br, 1 onoelixir.gr, 1 onondaga.gov, 1 onoranze-funebri.biz, 1 -onoranzefunebri.roma.it, 1 onore.org, 1 onourwifi.com, 1 onpatient.com, 1 @@ -81202,7 +81173,6 @@ opendata.cz, 1 opendataincubator.eu, 1 opendecide.com, 1 opendolls.com, 1 -opendoorcounselingpa.com, 1 openevic.info, 1 openfir.st, 1 openfitapi-falke.azurewebsites.net, 1 @@ -81237,6 +81207,7 @@ openrainbow.org, 1 openre.site, 1 openrealestate.co, 1 openreel.com, 0 +openresearch.amsterdam, 1 openreview.net, 1 openroademail.com, 1 openrtm.org, 1 @@ -81653,6 +81624,7 @@ ortaev.tk, 1 ortanatech.com, 1 ortegaportfolio.com, 1 ortemis.host, 1 +orteo.co, 1 ortho-graz.at, 1 orthocab.com, 1 orthocop.cz, 1 @@ -82052,6 +82024,7 @@ overthegate.tk, 1 overtunes.tk, 1 overture.london, 1 overwall.org, 1 +overwatchss.club, 1 overzicht.pro, 1 overzicht.ws, 1 oveweddings.com, 1 @@ -83013,6 +82986,7 @@ party-time-inflatables-durham.co.uk, 1 partyaccommodationsers.ga, 1 partyaccommodationsest.ga, 1 partyausstatter24.de, 1 +partybounceplay.co.uk, 1 partyclub.tk, 1 partycoin.ga, 1 partydj.be, 1 @@ -84408,7 +84382,6 @@ pgmsp.net, 1 pgmtechnologies.com, 1 pgnetwork.net, 1 pgp.lol, 1 -pgp.network, 1 pgpaintanddesign.com, 1 pgpmail.cc, 1 pgprosupplies.com, 1 @@ -84773,7 +84746,6 @@ physia.gr, 1 physicalism.com, 1 physicalist.com, 1 physicianbookest.ga, 1 -physicpezeshki.com, 1 physics-schools.com, 1 physik.hu, 1 physik.lol, 1 @@ -85073,7 +85045,6 @@ pinnaclebank.com, 1 pinnaclecare.com, 1 pinnaclelife.co.nz, 0 pinnaclelife.nz, 1 -pinnakl.com, 1 pinnoto.org, 1 pinot.it, 1 pinoyreal.com, 1 @@ -85153,7 +85124,6 @@ pirateproxy.buzz, 1 pirateproxy.cc, 1 pirateproxy.cloud, 1 pirateproxy.earth, 1 -pirateproxy.gdn, 1 pirateproxy.how, 1 pirateproxy.ltda, 1 pirateproxy.name, 1 @@ -85274,6 +85244,7 @@ pixeon.com, 1 pixie.ga, 1 pixifi.space, 1 pixiin.com, 1 +pixiv.cat, 1 pixiv.moe, 1 pixlfox.com, 1 pixloc.fr, 1 @@ -85392,7 +85363,7 @@ planet-work.com, 1 planet.live, 1 planeta-deti.org, 1 planeta-remontika.ga, 1 -planetadeti.org, 0 +planetadeti.org, 1 planetalife.com, 1 planetamarrom.tk, 1 planetamend.com, 1 @@ -87132,7 +87103,6 @@ prestigerepairs.com.au, 1 prestigesigns.net, 1 prestigesoundandlight.co.uk, 1 prestigeworldwidepr.com, 1 -prestigiouskitchen.com, 1 prestonapp.com, 1 prestonbrant.com, 1 prestopizzas63.fr, 1 @@ -87262,6 +87232,7 @@ princez.uk, 1 princezna.club, 1 principalsexam.com, 1 principalship.net, 1 +principalstest.ph, 0 principaltoolbox.com, 1 principedepaz.gt, 1 principia-journal.de, 1 @@ -87834,7 +87805,7 @@ propertydealer.ga, 1 propertyfindercdn.com, 1 propertyflare.com, 1 propertygroup.pl, 1 -propertyinside.id, 1 +propertyinside.id, 0 propertymingo.com, 1 propertyofariana.pw, 1 propertyone.mk, 1 @@ -87936,7 +87907,6 @@ protection.ga, 1 protectionformula.com.ua, 1 protectwrap.ml, 1 protege.moi, 1 -protegetudescanso.com, 1 proteh.com.ua, 1 protein-riegel-test.de, 1 proteinreport.org, 1 @@ -88442,6 +88412,7 @@ purecbdvapors.com, 1 puredayshop.com.tw, 1 puredisinfecting.com, 1 puredisinfection.com, 1 +puredns.org, 1 purefoot.jp, 1 purefreefrom.co.uk, 0 purelife.photography, 1 @@ -90045,6 +90016,7 @@ ravihotel.com, 0 ravijuhend.ee, 1 ravik.tk, 1 ravimiamet.ee, 1 +ravindran.me, 1 raviparekh.co.uk, 1 ravis.org, 1 ravkr.duckdns.org, 1 @@ -90588,6 +90560,7 @@ reddyai.com, 1 rede-reim.de, 1 rede-t.com, 1 redearsliderturtles.com, 1 +redecsirt.pt, 1 redeemingbeautyminerals.com, 1 redefineyounow.com, 1 redelectrical.co.uk, 0 @@ -91595,7 +91568,6 @@ rexburgid.gov, 1 rexcutty.com, 1 rexdf.net, 1 rexeroofing.com, 1 -rexfinland.fi, 1 rexled.fi, 1 rexograph.com, 1 rexskz.info, 1 @@ -92681,7 +92653,6 @@ roslagensmansjour.tk, 1 roslynpad.net, 1 rosme.it, 1 rosound.cz, 1 -rospotreb.com, 1 rosrabota.tk, 1 ross-mitchell.com, 0 rosset.me, 1 @@ -93326,7 +93297,6 @@ russandol.eu, 1 russchooljordan.tk, 1 russell-tech.co.uk, 1 russellenvy.com, 1 -russelljohn.net, 1 russellshobby.com, 1 russellupevents.co.uk, 1 russenes.com, 1 @@ -94248,6 +94218,8 @@ sandelduggal.com, 1 sander.sh, 1 sanderdesign.tk, 1 sanderdorigo.nl, 1 +sanderkoenders.eu, 1 +sanderkoenders.nl, 1 sanderpoppe.com, 1 sanderstech.solutions, 1 sandervanderstap.nl, 1 @@ -94652,7 +94624,6 @@ savanna.io, 1 savannahhappycats.com, 1 savannahsidewalktours.com, 1 savantcare.com, 1 -savantic.io, 1 savasanadam.com, 1 savatha.tk, 1 savbus.com, 1 @@ -94992,6 +94963,7 @@ schnuckenhof-wesseloh.de, 1 schnyder-werbung.ch, 0 schody-rozycki.pl, 1 schoenstatt-fathers.link, 1 +schoenstatt-fathers.us, 1 schoenstatt.link, 1 schoepski.de, 1 schoffelcountry.com, 1 @@ -95661,6 +95633,7 @@ secure.advancepayroll.com.au, 1 secure.facebook.com, 0 securebot.ga, 1 securecloudplatform.nl, 1 +securecomms.cz, 1 secureddocumentshredding.com, 1 securedrop.org, 1 secureenduserconnection.se, 1 @@ -95852,6 +95825,7 @@ seishinan.xyz, 1 seishinchuo-lawoffice.com, 1 seishuncollection.com, 1 seismas1.com, 1 +seitai-nabejun.jp, 1 seitai-taiyou.com, 1 seitanic-cookbook.de, 1 seitenwaelzer.de, 1 @@ -96104,6 +96078,7 @@ sentry.io, 1 sentry.nu, 1 sentrybay.com, 1 sentworks.com, 1 +senu.pro, 1 senzaparole.de, 1 senzei.tk, 1 seo-analyse.com, 1 @@ -96159,6 +96134,7 @@ seoified.com, 1 seojaguar.tk, 1 seokaos.com, 0 seokatka.tk, 1 +seolabuitest.azurewebsites.net, 1 seolib.org, 1 seoline.cf, 1 seolister.cf, 1 @@ -96483,7 +96459,6 @@ setuid.io, 1 setuid0.kr, 1 setun.tk, 1 setuplog.io, 1 -setxrm.com, 1 seu.edu.sa, 1 seutens.be, 1 seutens.eu, 1 @@ -97623,6 +97598,7 @@ sibertakvim.com, 0 sibfk.org, 1 sibirium-red.ga, 1 sibnerpartie.tk, 1 +sibrenvasse.nl, 1 siccardisport.it, 1 sice-si.org, 1 sich-fight.club, 1 @@ -97930,7 +97906,6 @@ silvergoldbull.ws, 1 silverkattens.tk, 1 silverlinkz.net, 1 silvermatch.ga, 1 -silvernight.social, 1 silveronline.ml, 1 silveronline.tk, 1 silversgarage.com, 1 @@ -98746,6 +98721,7 @@ skyscapecanopies.com, 1 skyscnr.com, 1 skyseo.cf, 1 skysoftbg.com, 1 +skysuite.nl, 1 skytec.host, 1 skyterraathome.com, 1 skyterraembrace.com, 1 @@ -98806,6 +98782,7 @@ slavblog.ru, 1 slaws.io, 1 slayingqueen.com, 1 slbknives.com, 1 +sld08.com, 1 sldev.ovh, 1 sldlcdn.com, 1 sledgeroofing.com, 1 @@ -99187,7 +99164,6 @@ smokefree.gov, 1 smokefreerowan.org, 1 smokeping.pl, 1 smoker.tk, 1 -smokingblendoils.com, 1 smokinghunks.com, 1 smokingrio.com.br, 1 smokingtapes.ga, 1 @@ -100433,7 +100409,6 @@ spartacuslife.com, 1 spartaermelo.nl, 1 spartamet.tk, 1 spartan300.tk, 1 -spartancoin.ooo, 1 spartanis.tk, 1 spartankids.in, 1 spartantheatre.org, 1 @@ -100544,6 +100519,7 @@ speerpunt.info, 1 speets.ca, 1 spegeltankar.tk, 1 speich.net, 1 +speights-law.com, 1 spek.tech, 1 spelaspelautomater.ga, 1 speleo-explo.fr, 1 @@ -100809,7 +100785,6 @@ sportygirlsjewels.ga, 1 sportztalk.com, 1 spot-cleaner.tk, 1 spot-lumiere-led.com, 1 -spot.su, 1 spotifyfreetrial.co.uk, 1 spotifytop.me, 1 spotlabs.uk, 1 @@ -101074,6 +101049,7 @@ srsfwd.eu, 1 srsfwd.net, 1 srsfwd.org, 1 srshopping-rest.herokuapp.com, 1 +srun.in, 0 sruthisjewellery.com, 1 srvonfire.com, 1 srx.sx, 1 @@ -101901,6 +101877,7 @@ stichtingscholierenvervoerzeeland.nl, 1 stichtingsticky.nl, 0 stichtingwwtoegankelijk.nl, 1 stick2bike.de, 1 +stickandpoketattookit.com, 1 stickerparadise.me, 1 stickers-garage.com, 1 stickertrade.me, 1 @@ -101973,7 +101950,6 @@ stirblaut.de, 1 stirling.co, 1 stisidores.org, 1 stitch.money, 1 -stitchfiddle.com, 1 stitchinprogress.com, 1 stjohncamden.com, 1 stjohnin.com, 1 @@ -102803,6 +102779,7 @@ succubus.xxx, 1 sucessclick.gq, 1 suceveanca.ro, 1 suche.org, 1 +suchem.com, 0 suchhire.com, 1 suchmaschinen-werkstatt.de, 1 suckmyan.us, 0 @@ -104134,7 +104111,6 @@ tadalafil-tablets.tk, 1 tadalafilindia.gq, 1 taddiestales.com, 1 tadinfos.fr, 1 -tadiranbatteries.de, 0 tadj-mahalat.com, 0 tadjiki.tk, 1 tadjikistan.tk, 1 @@ -104805,6 +104781,7 @@ tci-style.pl, 1 tciit.pl, 1 tcit.fr, 0 tcj.ir, 1 +tcksolutions.com, 1 tcl.sh, 1 tcmk-tomsk.ru, 1 tcnapplications.com, 1 @@ -105116,7 +105093,6 @@ techmahindrafoundation.org, 1 techmaish.com, 1 techmanstan.com, 1 techmasters.io, 1 -techmepro.com, 1 techmerch.ru, 0 techmoviles.com, 0 technavio.com, 1 @@ -105750,6 +105726,7 @@ test-my.tk, 1 test-na-beremennost.tk, 1 test-online.tk, 1 test-school.ml, 1 +test-sev-web.pantheonsite.io, 1 test-textbooks.com, 1 test.de, 1 testadministrators.net, 1 @@ -107171,7 +107148,6 @@ think-asia.org, 1 think-positive-watches.de, 1 thinkbigdobig.tk, 1 thinkbot.de, 1 -thinkbrands.co.uk, 1 thinkcash.nl, 1 thinkcoconut.com.au, 1 thinkdata.com.br, 1 @@ -107509,6 +107485,7 @@ tiener-herentals.be, 1 tienerdienst-johanneskapel.tk, 1 tienic.com, 1 tiens-ib.cz, 1 +tierarzt-karlsruhe-durlach.de, 1 tierarztpraxis-illerwinkel.de, 1 tierarztpraxis-weinert.de, 1 tiergear.com.au, 1 @@ -108068,7 +108045,6 @@ tobis.cloud, 1 tobischo.de, 1 tobostop.de, 1 tobtennis.tk, 1 -toby.website, 1 tobyalden.com, 1 tobyschrapel.com, 0 tobyslawn.com, 1 @@ -108446,6 +108422,7 @@ toolroomrecords.com, 1 tools.pro, 1 toolsbit.com, 1 toolsense.io, 1 +toolset.com, 1 toolsforbiblestudy.com, 1 toolspain.tk, 1 toolsu.com, 1 @@ -108681,7 +108658,6 @@ tork.news, 1 torkel.se, 1 torkware.com, 1 torlock.com, 1 -torlock.icu, 1 torlock2.com, 1 tormakristof.eu, 1 tormentedradio.com, 0 @@ -108727,8 +108703,6 @@ torrentbd.net, 1 torrentdb.tk, 1 torrentdownload.gq, 1 torrentfunk.com, 1 -torrentfunk.icu, 1 -torrentfunk.pw, 1 torrentfunk2.com, 1 torrentgalaxy.to, 1 torrentz2.al, 1 @@ -108875,7 +108849,6 @@ tournamentmgr.com, 1 tournaments.tk, 1 tournevis.ch, 0 tours-in-petersburg.tk, 1 -tours.co.th, 1 toursandtransfers.it, 1 toursencancun.com, 1 toursinvietnam.tk, 1 @@ -110099,7 +110072,6 @@ tsrv.pw, 0 tss.am, 1 tst-band.tk, 1 tstech.mx, 1 -tstrubberstamp.com, 0 tsu.re, 1 tsueri.cloud, 1 tsukhani.com, 1 @@ -110879,7 +110851,7 @@ uatgootax.ru, 0 uatuning.com.ua, 1 uatx.mx, 1 uavis.com.au, 1 -uawoptout.com, 1 +uawoptout.com, 0 ub3rk1tten.com, 0 ub889.com, 1 uba-tra.tk, 1 @@ -110943,7 +110915,6 @@ ucamind.com, 1 ucangiller.com, 1 ucasa.org.au, 1 ucatchemguideservice.com, 1 -ucc.edu.gh, 1 ucch.be, 0 uccisme.net.ua, 1 ucdap.com, 1 @@ -110955,7 +110926,6 @@ ucheba.ga, 1 ucheba.gq, 1 ucheba.tk, 1 uchuumontreal.com, 1 -ucibt.com, 1 ucinvest.com.au, 1 uciplasticsurgery.com, 1 uclf.de, 1 @@ -111927,6 +111897,7 @@ urnes.org, 1 urocentre.ga, 1 uroki.tk, 1 urokoff.net, 1 +urology.wiki, 1 urologyoklahoma.com, 1 urologyspecialistspc.com, 1 urologywi.com, 1 @@ -112339,6 +112310,7 @@ va11hal.la, 1 va11halla.ddns.net, 1 vaabogados.legal, 1 vaaddress.co, 1 +vaaes.org, 0 vaan-arbeidsrecht.nl, 1 vaartjesboten.nl, 1 vaat.io, 1 @@ -112441,8 +112413,10 @@ valentin-dederer.de, 1 valentin-ochs.de, 1 valentin.app, 1 valentinaquino.com, 1 +valentinarosamilia.com, 1 valentinberclaz.com, 0 valentineapparel.com, 1 +valentineforpresident.com, 1 valentinemom.cf, 1 valentinemom.ga, 1 valentinemom.gq, 1 @@ -112461,7 +112435,6 @@ valeriansaliou.name, 1 valeriapanarina.com, 1 valerieadolff.com, 1 valerieorsoni.com, 1 -valescaind.com.br, 1 valhallastrengthsthbne.com.au, 1 valheim.pro, 1 valiakhmetov.tk, 1 @@ -113475,7 +113448,6 @@ vidos-eu.com, 1 vidracariaespelhosbh.com.br, 1 vidyabhavanam.org, 1 vidyamonk.com, 1 -vieaw.com, 1 viega.at, 1 viega.be, 1 viega.ca, 1 @@ -114365,6 +114337,7 @@ vokeapp.com, 1 vokieciupamokos.lt, 1 vokov.ml, 1 vokrug.ga, 1 +vokzalperm.ru, 1 volatile.pw, 1 volatilesystems.org, 1 volatilethunk.com, 1 @@ -114507,7 +114480,6 @@ votan.cf, 1 vote.gov, 1 vote.nz, 1 vote.org, 1 -vote2019.appspot.com, 1 vote4.hk, 1 votebrevard.gov, 1 votebymail.gov, 1 @@ -114783,6 +114755,7 @@ vv9397.com, 0 vv9721.com, 0 vv9728.co, 1 vvactivia.nl, 1 +vvave.net, 0 vvcasteren.nl, 1 vvd.bz, 1 vvdbronckhorst.nl, 1 @@ -115033,7 +115006,6 @@ wafni.com, 1 wafuton.com, 1 wagcenter.com, 1 wage-feeg.gc.ca, 1 -wagenmanswonen.nl, 1 wagesweldandfab.com, 1 wageverify.com, 1 wagn3r.de, 1 @@ -115911,7 +115883,6 @@ webpagetest.org, 1 webpakken.dk, 1 webpantry.ga, 1 webparallax.cf, 1 -webpc.com.ua, 1 webpcstudio.com, 1 webperformance.io, 1 webpiar.tk, 1 @@ -115949,6 +115920,7 @@ websectools.com, 1 websecurity.is, 1 webseitendesigner.com, 0 webseitenserver.com, 0 +webshan.ir, 0 webshaped.de, 1 webshop.nl, 1 website-engineering.co.za, 0 @@ -116187,7 +116159,6 @@ weitergedacht.eu, 1 weitsolutions.nl, 1 weitundbreit.ch, 1 weizenke.im, 1 -wejdmark.com, 1 wekibe.de, 1 wekipedia.com, 1 weknowhowtodoit.com, 1 @@ -116220,6 +116191,7 @@ wellness-bonbon.de, 1 wellness-gutschein.de, 1 wellnesscheck.net, 1 wellnessever.com, 1 +wellnesshotel-weimar.de, 1 wellsolveit.com, 0 wellspringsga.com, 1 wellsprung.net, 1 @@ -116396,7 +116368,6 @@ westlander-nostalgie.tk, 1 westlandplacestudios.com, 1 westlebanonpa.gov, 1 westline.com.tr, 1 -westlinntowncar.com, 1 westlogistic.com, 1 westmead.org, 1 westmeadapartments.com.au, 1 @@ -116765,7 +116736,6 @@ widecontrol.it, 1 widegab.com, 0 wideinfo.org, 1 widejeans.tk, 1 -widely.io, 1 widememory.com, 1 widenews.org, 1 wideworks.agency, 1 @@ -117725,6 +117695,7 @@ wordspy.com, 1 wordwidessl.net, 1 wordxtra.net, 1 wordzite.com, 1 +worf.in, 1 work-at-home.ga, 1 work-at-home.gq, 1 work-in-progress.website, 1 @@ -118785,7 +118756,6 @@ xiaofengsky.com, 0 xiaohui.love, 1 xiaojiyoupin.com, 1 xiaolanglang.net, 0 -xiaolong.link, 1 xiaomao.tk, 1 xiaomi.com.ge, 1 xiaomibarato.com, 1 @@ -119635,7 +119605,6 @@ xuming.studio, 1 xumm.community, 1 xumm.me, 1 xunmengdu.com, 1 -xunn.io, 1 xuntaosms.com, 1 xuntier.ch, 1 xurl.gq, 1 @@ -119941,7 +119910,6 @@ yandong.tk, 1 yangcs.net, 0 yangfamily.tw, 1 yangjingwen.cn, 1 -yangjingwen.com, 1 yangmao.info, 1 yangmaodang.org, 0 yangmi.blog, 1 @@ -120271,6 +120239,7 @@ yilanju.com, 1 yilconstruction.ca, 1 yiluup.com, 0 yimgo.fr, 0 +yin8888.tv, 0 yinduyy.com, 0 yinfor.com, 1 ying.gift, 1 @@ -120545,7 +120514,6 @@ yourazbraces.com, 1 yourbetterkitchen.com, 0 yourbind.com, 1 yourbittorrent.com, 1 -yourbittorrent.pw, 1 yourbittorrent2.com, 1 yourblazeguard.com, 1 yourbodyknows.dk, 1 @@ -120568,7 +120536,6 @@ yourdemowebsite.ml, 1 yourdomain.host, 1 yourdrive.tk, 1 youreallyneedthis.co, 1 -youregeeks.com, 1 youreitbranding.com, 1 youreward.ga, 1 yourforex.org, 1 @@ -121585,7 +121552,6 @@ zemlova.cz, 1 zemlyaki.ga, 1 zemlyaki.ml, 1 zemlyaki.tk, 1 -zen-solutions.io, 1 zen-zone.tk, 1 zen3tech.com, 1 zenassociates.com, 1 @@ -121890,6 +121856,7 @@ zinglix.xyz, 1 zingpetfood.com, 1 zings.eu, 1 zinhar.tk, 1 +zinniazorgverlening.nl, 1 zinnowitzer-ferienwohnung.de, 1 zinoui.com, 1 zion-craft.tk, 1 @@ -121930,7 +121897,6 @@ ziz.exchange, 0 zizcollections.com, 1 zizibook.ml, 1 zizin.tk, 1 -zjateaucafe.be, 1 zjawa.pro, 1 zjc3.com, 1 zju.tv, 1 @@ -122056,7 +122022,7 @@ znanie-sila.tk, 1 znaniya.cf, 1 znanje.gq, 1 znation.nl, 1 -znbr.com, 0 +znbr.com, 1 znd.jp, 1 zngay.com, 1 znhglobalresources.com, 1 @@ -122312,7 +122278,6 @@ zumba-oostende.be, 1 zumba.com, 1 zumberak.tk, 1 zumtaedanceschool.co.za, 1 -zumub.com, 1 zumwildenaffen.com, 1 zund-app.com, 1 zundapp.one, 1 diff --git a/services/settings/dumps/blocklists/addons-bloomfilters.json b/services/settings/dumps/blocklists/addons-bloomfilters.json index a878b524e39f1..85d5ada3ffb49 100644 --- a/services/settings/dumps/blocklists/addons-bloomfilters.json +++ b/services/settings/dumps/blocklists/addons-bloomfilters.json @@ -1,5 +1,18 @@ { "data": [ + { + "stash": { + "blocked": [ + "{dd70ce08-6a8a-4899-b2bd-17c2ce37805e}:0.0.2" + ], + "unblocked": [] + }, + "schema": 1649860691900, + "key_format": "{guid}:{version}", + "stash_time": 1649939709345, + "id": "042538b6-1e10-495f-a086-d0c9f42ce759", + "last_modified": 1649939903644 + }, { "stash": { "blocked": [ diff --git a/services/settings/dumps/security-state/intermediates.json b/services/settings/dumps/security-state/intermediates.json index 39711215a0438..7d1583c3a029c 100644 --- a/services/settings/dumps/security-state/intermediates.json +++ b/services/settings/dumps/security-state/intermediates.json @@ -1,5 +1,275 @@ { "data": [ + { + "schema": 1650070130036, + "derHash": "k45SZCUB3RbiPYrr+5frPDslYvUMMkFEw5CUayloSn4=", + "subject": "CN=Telekom Security DV RSA CA 22,O=Deutsche Telekom Security GmbH,C=DE", + "subjectDN": "MF4xCzAJBgNVBAYTAkRFMScwJQYDVQQKDB5EZXV0c2NoZSBUZWxla29tIFNlY3VyaXR5IEdtYkgxJjAkBgNVBAMMHVRlbGVrb20gU2VjdXJpdHkgRFYgUlNBIENBIDIy", + "whitelist": false, + "attachment": { + "hash": "2630819dec418a1e189974ade9765910f477438175848468a64894d5bbda8f67", + "size": 2113, + "filename": "PQgCR2Tyj2gl6d2EvsaoRq_hO9GQc1sBcmN7QkGUKf4=.pem", + "location": "security-state-staging/intermediates/0d78df23-c84c-4c49-8425-168287f3071c.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "PQgCR2Tyj2gl6d2EvsaoRq/hO9GQc1sBcmN7QkGUKf4=", + "crlite_enrolled": true, + "id": "159ab7e9-8e9c-4450-a603-927a7ba6336a", + "last_modified": 1650077838684 + }, + { + "schema": 1650070129502, + "derHash": "Lf5H4USrs5+f5FHOzTUtmpvSiYI1HotlJP6xAdurH+w=", + "subject": "CN=GlobalSign Atlas R3 DV ACME CA 2022 Q2,O=GlobalSign nv-sa,C=BE", + "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIFIzIERWIEFDTUUgQ0EgMjAyMiBRMg==", + "whitelist": false, + "attachment": { + "hash": "63657216ab2e0265cbcbce85e9b2783ccd35376d4e7c0f127fcac181251aa5ed", + "size": 1642, + "filename": "_1VRS6Ha0tRFo_8a_6PqqF4wtj16qRxOO4rXTjqDNFk=.pem", + "location": "security-state-staging/intermediates/c70a5a54-9017-4d7c-814c-c431416e70eb.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "/1VRS6Ha0tRFo/8a/6PqqF4wtj16qRxOO4rXTjqDNFk=", + "crlite_enrolled": true, + "id": "681f5a20-f291-4509-bec3-6adbf5c05429", + "last_modified": 1650077838672 + }, + { + "schema": 1650070130566, + "derHash": "qBav/3RuoPCgoGTAQy+dK30M557C0emUD0oYaiUYIoQ=", + "subject": "CN=GlobalSign Atlas ECCR5 OV TLS CA 2022 Q2,O=GlobalSign nv-sa,C=BE", + "subjectDN": "MFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIEF0bGFzIEVDQ1I1IE9WIFRMUyBDQSAyMDIyIFEy", + "whitelist": false, + "attachment": { + "hash": "049fc8dce345f116d37deb30e65527acd5a647e1de6e9d53685b97fe4fe7c5fe", + "size": 1195, + "filename": "TdoclaY2HEKPADeH2W-4kosHzm7UvYAafcidCBnsRDA=.pem", + "location": "security-state-staging/intermediates/6c42ca37-a352-4db9-b44d-e1a577fb1168.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "TdoclaY2HEKPADeH2W+4kosHzm7UvYAafcidCBnsRDA=", + "crlite_enrolled": true, + "id": "6de1a4fe-3539-4329-9838-cb4883353866", + "last_modified": 1650077838660 + }, + { + "schema": 1650070130388, + "derHash": "c1zDhuwaguZXpbRRyUlZYR08fQy7H9nZ7bQscZL4Rjo=", + "subject": "CN=GlobalSign Atlas R3 DV TLS CA 2022 Q2,O=GlobalSign nv-sa,C=BE", + "subjectDN": "MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIERWIFRMUyBDQSAyMDIyIFEy", + "whitelist": false, + "attachment": { + "hash": "5dc3ef9866bfcfb8743ef46140622103cd877f3ecd2310029ef8d8ff09b17dd4", + "size": 1642, + "filename": "7Zgd-tc1DR60EUxxu86y2PNtnPLUCDONUQJhN35HWIU=.pem", + "location": "security-state-staging/intermediates/63da4365-743a-4755-bfb8-beb8ff31e794.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "7Zgd+tc1DR60EUxxu86y2PNtnPLUCDONUQJhN35HWIU=", + "crlite_enrolled": true, + "id": "12cc99be-332a-4aef-af43-25fe8420b210", + "last_modified": 1650077838648 + }, + { + "schema": 1650070129680, + "derHash": "RfGFRTDsA3qqy0st6bTQ/b/GGIir1O4EFBg9meYEN6w=", + "subject": "CN=GlobalSign Atlas R3 AlphaSSL CA 2022 Q2,O=Globalsign nv-sa,C=BE", + "subjectDN": "MFoxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxzaWduIG52LXNhMTAwLgYDVQQDEydHbG9iYWxTaWduIEF0bGFzIFIzIEFscGhhU1NMIENBIDIwMjIgUTI=", + "whitelist": false, + "attachment": { + "hash": "0f455b2160c81e5b49b03b477baaa020d52928d16a4fe13504fca71f176fcf2e", + "size": 1642, + "filename": "6bop5gsmVRhy033XqsI4UKTek3IMHHpiLVeicdR_Luw=.pem", + "location": "security-state-staging/intermediates/12de76d7-2251-470d-8c62-aebb1b54b3d5.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "6bop5gsmVRhy033XqsI4UKTek3IMHHpiLVeicdR/Luw=", + "crlite_enrolled": true, + "id": "18283798-9f59-4d62-9a34-f643b9b7a76f", + "last_modified": 1650077838634 + }, + { + "schema": 1650070130741, + "derHash": "r9s8OW2F0Z++WCBt8GWermFMSrGPXM8gt4Oq8LvpagM=", + "subject": "CN=GlobalSign Atlas R3 OV TLS CA 2022 Q2,O=GlobalSign nv-sa,C=BE", + "subjectDN": "MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIE9WIFRMUyBDQSAyMDIyIFEy", + "whitelist": false, + "attachment": { + "hash": "810129eb69110a8c071f593ade366adbaa81a2420d3531e8f862ea7a5b423c11", + "size": 1642, + "filename": "VkNfITzp8T2xdmHOxT0ZZUfHySNBzxU2GWFfqmC3oLE=.pem", + "location": "security-state-staging/intermediates/8ae25e5b-e31b-4d80-be59-24ed2ecd5386.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "VkNfITzp8T2xdmHOxT0ZZUfHySNBzxU2GWFfqmC3oLE=", + "crlite_enrolled": true, + "id": "6982bfcf-221f-44f5-b27e-d4af6dd1ab4f", + "last_modified": 1650077838620 + }, + { + "schema": 1650070129316, + "derHash": "Iy9jZ89WHgDIPhgKn8qFRrN3H7RQ68tKBSb4NJyMoTk=", + "subject": "CN=Entrust Certification Authority - L1E,OU=www.entrust.net/rpa is incorporated by reference+OU=(c) 2009 Entrust\, Inc.,O=Entrust\, Inc.,C=US", + "subjectDN": "MIGxMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjE5MDcGA1UECxMwd3d3LmVudHJ1c3QubmV0L3JwYSBpcyBpbmNvcnBvcmF0ZWQgYnkgcmVmZXJlbmNlMR8wHQYDVQQLExYoYykgMjAwOSBFbnRydXN0LCBJbmMuMS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFF", + "whitelist": false, + "attachment": { + "hash": "fb13e64f68c20f1be87aefb4a955348c9604a4103426723d49f8029f9fbcc797", + "size": 1833, + "filename": "HeMEDmta9acr_zmjHkdP_dKlW5RaqBlmADFOqTG56eA=.pem", + "location": "security-state-staging/intermediates/524fa4a4-38af-437a-a31e-038e5aaf46ef.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "HeMEDmta9acr/zmjHkdP/dKlW5RaqBlmADFOqTG56eA=", + "crlite_enrolled": true, + "id": "7a058667-a078-4b7b-a38e-adb1e3e95b39", + "last_modified": 1650077838604 + }, + { + "schema": 1650070129859, + "derHash": "yikDieDYxipAg/Yoo59S/j84tzGZz/r3wDcjeKRA+2o=", + "subject": "CN=Entrust Certification Authority - L1M,OU=See www.entrust.net/legal-terms+OU=(c) 2014 Entrust\, Inc. - for authorized use only,O=Entrust\, Inc.,C=US", + "subjectDN": "MIG6MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTQgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gTDFN", + "whitelist": false, + "attachment": { + "hash": "02e23f9b06e438417e4e71c8b9fb42a8e2da31ad266ad1ca50792fd36d7251b9", + "size": 1829, + "filename": "VYZwGiJkq3NNo1YRI2RGiSTI1mqTWG8zDcRf1_KAN6I=.pem", + "location": "security-state-staging/intermediates/75652090-686b-4e77-99f1-1f4effac785a.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "VYZwGiJkq3NNo1YRI2RGiSTI1mqTWG8zDcRf1/KAN6I=", + "crlite_enrolled": true, + "id": "e7ad797a-d41f-4eb9-b47a-1af34311a9d1", + "last_modified": 1650077838590 + }, + { + "schema": 1650070130208, + "derHash": "Q6cONiC8RSM52HiqaPLlNYrEYHrHIsTXfTxNLCBPf3E=", + "subject": "CN=DigiCert Assured ID G2 TLS RSA4096 SHA256 2022 CA1,O=DigiCert\, Inc.,C=US", + "subjectDN": "MGMxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgQXNzdXJlZCBJRCBHMiBUTFMgUlNBNDA5NiBTSEEyNTYgMjAyMiBDQTE=", + "whitelist": false, + "attachment": { + "hash": "fce800188289208c71c42766d767c63249b981ca723bba46e543fa2f5d87596c", + "size": 2093, + "filename": "Ld64SpoeXjpLjc-_7Wahk6p5-KVyzVSUptciuWsyxeY=.pem", + "location": "security-state-staging/intermediates/df08562c-f117-43d1-a40a-3997497594ad.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "Ld64SpoeXjpLjc+/7Wahk6p5+KVyzVSUptciuWsyxeY=", + "crlite_enrolled": true, + "id": "55420fa1-1fcf-457c-ae91-dd6b8197e62b", + "last_modified": 1650077838575 + }, + { + "schema": 1649973510479, + "derHash": "2OGKZa94RUhUyqKPsvXnm1fsFB8BBCO8yKcav8BJbCw=", + "subject": "CN=GENIOUS RSA Extended Validation Secure Server CA,OU=Controlled by Sectigo exclusively for Genious Communications,O=Genious Communications,L=Marrakech,ST=Marrakech,C=MA", + "subjectDN": "MIHYMQswCQYDVQQGEwJNQTESMBAGA1UECBMJTWFycmFrZWNoMRIwEAYDVQQHEwlNYXJyYWtlY2gxHzAdBgNVBAoTFkdlbmlvdXMgQ29tbXVuaWNhdGlvbnMxRTBDBgNVBAsTPENvbnRyb2xsZWQgYnkgU2VjdGlnbyBleGNsdXNpdmVseSBmb3IgR2VuaW91cyBDb21tdW5pY2F0aW9uczE5MDcGA1UEAxMwR0VOSU9VUyBSU0EgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB", + "whitelist": false, + "attachment": { + "hash": "dc505a925299ceeea43e708019d0fb1086a320d0a035fb0cf585b7e376d7e4f6", + "size": 2304, + "filename": "ImErDX6kNNxXp53lr4QRD49owJiK0A8orzjdda8pDb0=.pem", + "location": "security-state-staging/intermediates/ae100f8d-c411-4912-908b-ef0fe59832c9.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "ImErDX6kNNxXp53lr4QRD49owJiK0A8orzjdda8pDb0=", + "crlite_enrolled": true, + "id": "51c58311-bdec-4aab-a6cb-4a4f8e10e262", + "last_modified": 1650077838556 + }, + { + "schema": 1649796517769, + "derHash": "P94NNuAmtujr4sKIg2B8hlHeEL1sH8rTZeVg9OovOwM=", + "subject": "CN=Entrust Root Certification Authority - EC1,OU=See www.entrust.net/legal-terms+OU=(c) 2012 Entrust\, Inc. - for authorized use only,O=Entrust\, Inc.,C=US", + "subjectDN": "MIG/MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTIgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MTMwMQYDVQQDEypFbnRydXN0IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBFQzE=", + "whitelist": false, + "attachment": { + "hash": "fa84991015956f299a21164f4a77c8da26802bb7bac4207eb696cc086ce715b0", + "size": 1577, + "filename": "_qK31kX7pz11PB7Jp4cMQOH3sMVh6Se5hb9xGGbjbyI=.pem", + "location": "security-state-staging/intermediates/df5a27df-b846-4677-a6cf-a3cff5a7c5fd.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "/qK31kX7pz11PB7Jp4cMQOH3sMVh6Se5hb9xGGbjbyI=", + "crlite_enrolled": false, + "id": "d033c52e-0329-43dc-8844-1181a6da4c4c", + "last_modified": 1649973509957 + }, + { + "schema": 1649796515890, + "derHash": "axQ8IAXVU5zCLqtfdy2yqf6HRn/v+gf88Kn30oJ0yno=", + "subject": "CN=Entrust Root Certification Authority - G2,OU=See www.entrust.net/legal-terms+OU=(c) 2009 Entrust\, Inc. - for authorized use only,O=Entrust\, Inc.,C=US", + "subjectDN": "MIG+MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9sZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMDkgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3JpemVkIHVzZSBvbmx5MTIwMAYDVQQDEylFbnRydXN0IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMg==", + "whitelist": false, + "attachment": { + "hash": "d1674b1f7b1aef60543ae1256c7298ed99b5016d5a49c8ba8b9745c679003a0f", + "size": 1792, + "filename": "du6FkDdMcVQ3u8prumAo6t3i3G27uMP2EOhR8R0at_U=.pem", + "location": "security-state-staging/intermediates/4edf9367-ee46-443f-859e-c6bca2b52092.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "du6FkDdMcVQ3u8prumAo6t3i3G27uMP2EOhR8R0at/U=", + "crlite_enrolled": false, + "id": "d1b5e055-c4f8-4f16-96cf-f0ef4ee6496e", + "last_modified": 1649973509938 + }, + { + "schema": 1649860690936, + "derHash": "d81ReEppPZSC5+ppTkBTvP2d9lWA+84UsqdSfAgYA+E=", + "subject": "CN=DigiCert Assured ID TLS CA G2,O=DigiCert Inc,C=US", + "subjectDN": "MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IEFzc3VyZWQgSUQgVExTIENBIEcy", + "whitelist": false, + "attachment": { + "hash": "38c26b5824725648f58682db859677ed5f482b8a98476190e2f4b5cea965ce52", + "size": 1918, + "filename": "7DHaE3Q3dQ9k5S7DaYbXog4BK-Oj492ta3kc2xRJ04s=.pem", + "location": "security-state-staging/intermediates/84f2426b-c265-4fe5-8bcc-09e6d612433c.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "7DHaE3Q3dQ9k5S7DaYbXog4BK+Oj492ta3kc2xRJ04s=", + "crlite_enrolled": false, + "id": "d8d54086-08a6-43e4-94b4-1d46de796b92", + "last_modified": 1649973509799 + }, + { + "schema": 1649861371015, + "derHash": "E0XC05rktlzKceiOmispxx3JE/lS6TWoErAE26eueVc=", + "subject": "CN=ACCVCA-110,OU=PKIACCV,O=ACCV,C=ES", + "subjectDN": "MEMxEzARBgNVBAMMCkFDQ1ZDQS0xMTAxEDAOBgNVBAsMB1BLSUFDQ1YxDTALBgNVBAoMBEFDQ1YxCzAJBgNVBAYTAkVT", + "whitelist": false, + "attachment": { + "hash": "e6da6a137d62a7acc06ba43bbecbca249317995ef2a5821be7c4c3e4904d11cd", + "size": 2649, + "filename": "qX1E174XIirdC_7IZnHG6ACm0iCltwbZSr_U507C-Ck=.pem", + "location": "security-state-staging/intermediates/27528fc3-b963-415a-a99a-4f327d7d7c83.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "qX1E174XIirdC/7IZnHG6ACm0iCltwbZSr/U507C+Ck=", + "crlite_enrolled": false, + "id": "4dff9826-c4f5-4bad-9c0b-ef5d5c0bc30d", + "last_modified": 1649973509688 + }, + { + "schema": 1649947717604, + "derHash": "6TJ6NHy+HLlM3JqlTLMbbkPWiWjRfQnOMmoJG/wvCxE=", + "subject": "CN=ACCVCA-110,OU=PKIACCV,O=ACCV,C=ES", + "subjectDN": "MEMxEzARBgNVBAMMCkFDQ1ZDQS0xMTAxEDAOBgNVBAsMB1BLSUFDQ1YxDTALBgNVBAoMBEFDQ1YxCzAJBgNVBAYTAkVT", + "whitelist": false, + "attachment": { + "hash": "88d175177fc311fc5ad5e439d61dfabfbe6a0cc3dbf7be58654a104156ba2dae", + "size": 2686, + "filename": "qX1E174XIirdC_7IZnHG6ACm0iCltwbZSr_U507C-Ck=.pem", + "location": "security-state-staging/intermediates/7b9e7264-b0e3-4c9e-bda1-908a922c5b3f.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "qX1E174XIirdC/7IZnHG6ACm0iCltwbZSr/U507C+Ck=", + "crlite_enrolled": false, + "id": "772a5e91-e4ab-4bc1-b2a7-9d88c0c7e9bf", + "last_modified": 1649973509629 + }, { "schema": 1649450920946, "derHash": "Bp3y+JGdkgnQxSSla6EYHfbRu/xKphyfAdCS4tXDof0=", @@ -126,24 +396,6 @@ "id": "339940cb-d4d8-4caa-88ba-b807e82edbbc", "last_modified": 1649041064889 }, - { - "schema": 1648802913684, - "derHash": "Q6cONiC8RSM52HiqaPLlNYrEYHrHIsTXfTxNLCBPf3E=", - "subject": "CN=DigiCert Assured ID G2 TLS RSA4096 SHA256 2022 CA1,O=DigiCert\, Inc.,C=US", - "subjectDN": "MGMxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgQXNzdXJlZCBJRCBHMiBUTFMgUlNBNDA5NiBTSEEyNTYgMjAyMiBDQTE=", - "whitelist": false, - "attachment": { - "hash": "fce800188289208c71c42766d767c63249b981ca723bba46e543fa2f5d87596c", - "size": 2093, - "filename": "Ld64SpoeXjpLjc-_7Wahk6p5-KVyzVSUptciuWsyxeY=.pem", - "location": "security-state-staging/intermediates/df08562c-f117-43d1-a40a-3997497594ad.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "Ld64SpoeXjpLjc+/7Wahk6p5+KVyzVSUptciuWsyxeY=", - "crlite_enrolled": false, - "id": "55420fa1-1fcf-457c-ae91-dd6b8197e62b", - "last_modified": 1648803454399 - }, { "schema": 1648781340337, "derHash": "F2rr8pcr1vRxee3j3mOEixVDtFrilUvqRRhbFSU3ucQ=", @@ -1710,24 +1962,6 @@ "id": "5705dc06-ede8-4c93-a12e-57dc9c4abc2c", "last_modified": 1645930654960 }, - { - "schema": 1645714111086, - "derHash": "k45SZCUB3RbiPYrr+5frPDslYvUMMkFEw5CUayloSn4=", - "subject": "CN=Telekom Security DV RSA CA 22,O=Deutsche Telekom Security GmbH,C=DE", - "subjectDN": "MF4xCzAJBgNVBAYTAkRFMScwJQYDVQQKDB5EZXV0c2NoZSBUZWxla29tIFNlY3VyaXR5IEdtYkgxJjAkBgNVBAMMHVRlbGVrb20gU2VjdXJpdHkgRFYgUlNBIENBIDIy", - "whitelist": false, - "attachment": { - "hash": "2630819dec418a1e189974ade9765910f477438175848468a64894d5bbda8f67", - "size": 2113, - "filename": "PQgCR2Tyj2gl6d2EvsaoRq_hO9GQc1sBcmN7QkGUKf4=.pem", - "location": "security-state-staging/intermediates/0d78df23-c84c-4c49-8425-168287f3071c.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "PQgCR2Tyj2gl6d2EvsaoRq/hO9GQc1sBcmN7QkGUKf4=", - "crlite_enrolled": false, - "id": "159ab7e9-8e9c-4450-a603-927a7ba6336a", - "last_modified": 1645714648430 - }, { "schema": 1645578826247, "derHash": "6IHTuDw7xpTX2Z+S3oOyv/XG7i2YcaRG3qEH1jl1Zfw=", @@ -1872,24 +2106,6 @@ "id": "6393a1a0-fd0e-418f-bc54-c3861d8508de", "last_modified": 1645579199159 }, - { - "schema": 1645578772450, - "derHash": "J47PIR4lGOndmROvxYPusxJ8gYS8vu2q171k6J6MQxA=", - "subject": "CN=QuoVadis Grid ICA G2,O=QuoVadis Limited,C=BM", - "subjectDN": "MEcxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR0wGwYDVQQDExRRdW9WYWRpcyBHcmlkIElDQSBHMg==", - "whitelist": false, - "attachment": { - "hash": "8e15c43f71096a592c3d5819db25f4547bb4ef4f8232293578abdf314d149392", - "size": 2353, - "filename": "5rlUfVlXaS82HCd6DZI7w8rIamphHCdjnXNpXREZynQ=.pem", - "location": "security-state-staging/intermediates/1524fb2d-0b4f-4e05-95b5-4ef2d0f54ce4.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "5rlUfVlXaS82HCd6DZI7w8rIamphHCdjnXNpXREZynQ=", - "crlite_enrolled": true, - "id": "fcc1dad7-82be-4595-a2a7-e393e733325e", - "last_modified": 1645579199146 - }, { "schema": 1645578799164, "derHash": "N/0pxwHWl3mY8gUVPqikwumWNU3wctSYTcXYsfdaK2E=", @@ -1998,24 +2214,6 @@ "id": "dcd062fb-bdaf-4f1e-beed-4dbb87f7b6fc", "last_modified": 1645579199066 }, - { - "schema": 1645578795149, - "derHash": "0zqEf2QDd74K4aQpFToH6HyIJ/pIQLUVi83LheEKRTo=", - "subject": "CN=VR IDENT EV SSL CA 2020,O=Fiducia & GAD IT AG,C=DE", - "subjectDN": "ME0xCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMSAwHgYDVQQDDBdWUiBJREVOVCBFViBTU0wgQ0EgMjAyMA==", - "whitelist": false, - "attachment": { - "hash": "a95e7ccf2ef4b020f65fbd061c44e49d966821be27623376e3f16a8a3ebd371f", - "size": 2361, - "filename": "te09bIALahNazDua57TEibeM7CatIkOAT8t-qu_Kdro=.pem", - "location": "security-state-staging/intermediates/298033d7-ae37-44c9-a510-5a992462dd9b.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "te09bIALahNazDua57TEibeM7CatIkOAT8t+qu/Kdro=", - "crlite_enrolled": true, - "id": "7a72a490-73aa-431e-8475-2fe1df233eff", - "last_modified": 1645579199052 - }, { "schema": 1645578772806, "derHash": "6ywqgGxp/JY8TiSlu+og7U47hq55hzC7TupRv53jMyU=", @@ -2268,24 +2466,6 @@ "id": "162f1ce8-9959-4cbc-995b-5fdbbca305d7", "last_modified": 1645579198849 }, - { - "schema": 1645578782836, - "derHash": "n/I8uTh7ngCDvVqhlU7t33kokKqOZ81NON0or0pDmtg=", - "subject": "CN=AC SERVIDORES SEGUROS TIPO2,OU=Ceres,O=FNMT-RCM,C=ES", - "subjectDN": "MHAxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEOMAwGA1UECwwFQ2VyZXMxGDAWBgNVBGEMD1ZBVEVTLVEyODI2MDA0SjEkMCIGA1UEAwwbQUMgU0VSVklET1JFUyBTRUdVUk9TIFRJUE8y", - "whitelist": false, - "attachment": { - "hash": "ce9833a29f1fcb59210dd0a59d92c50ef56f427317cc530e9f61e8b7c2584453", - "size": 1280, - "filename": "dCoEY_Du2xeUAuG2_98ZWoRzf_eJoM-rCMtK2M1wF94=.pem", - "location": "security-state-staging/intermediates/598a03d5-c331-41bf-8b90-254be5a3768b.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "dCoEY/Du2xeUAuG2/98ZWoRzf/eJoM+rCMtK2M1wF94=", - "crlite_enrolled": true, - "id": "208442ca-2a8f-4348-837d-b7ae6c345a5b", - "last_modified": 1645579198835 - }, { "schema": 1645578806912, "derHash": "MoZpFBLzDs5cBl/WL0OSpHYtHneBUzg1nfOQKZ+9Ye8=", @@ -2430,24 +2610,6 @@ "id": "2259a85b-27f3-422d-bc53-7fb3e8c2f4bc", "last_modified": 1645579198720 }, - { - "schema": 1645578808398, - "derHash": "YDiLdz0z6RQWSGE/NrkUnwFaEUN4us8+NpSGT/2kJuw=", - "subject": "CN=HydrantID EV SSL CA G2,O=HydrantID (Avalanche Cloud Corporation),C=US", - "subjectDN": "MGAxCzAJBgNVBAYTAlVTMTAwLgYDVQQKDCdIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxHzAdBgNVBAMMFkh5ZHJhbnRJRCBFViBTU0wgQ0EgRzI=", - "whitelist": false, - "attachment": { - "hash": "ba2cc602bd31081e17f7745ac462854773e79726958ff1b8a553cc7ecaba9db2", - "size": 2389, - "filename": "FpAps1LWs_UTm3xApHYkNccnnZX-7Wc_v8V0t70p6rg=.pem", - "location": "security-state-staging/intermediates/63b88c2f-4e40-486a-9d6f-55dfd935e74d.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "FpAps1LWs/UTm3xApHYkNccnnZX+7Wc/v8V0t70p6rg=", - "crlite_enrolled": true, - "id": "500ac819-9169-4961-98fe-e44519ef181d", - "last_modified": 1645579198703 - }, { "schema": 1645578810985, "derHash": "3JmT3DOnH9lYCHh9GaS1VwTmAdV+vOrMiALHi1w29cc=", @@ -3258,42 +3420,6 @@ "id": "4ced6b80-9ab5-40e3-8387-a5e5366d6c64", "last_modified": 1645579198073 }, - { - "schema": 1645578770223, - "derHash": "9nwj73v3QSgJ22sd09RKCNN1TZnKumoT96BcckkInIk=", - "subject": "CN=QuoVadis Global SSL ICA G2,O=QuoVadis Limited,C=BM", - "subjectDN": "ME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMg==", - "whitelist": false, - "attachment": { - "hash": "f3d6221594115cd098f20f66a013d90aae3becd3c578a737a8e58a35230c208d", - "size": 2016, - "filename": "tYkfFN27P1GUjH5ME128BCg302dL2iwOYhz5wwFJb50=.pem", - "location": "security-state-staging/intermediates/36feb64b-7e91-4cc9-a103-1c3a3407616c.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "tYkfFN27P1GUjH5ME128BCg302dL2iwOYhz5wwFJb50=", - "crlite_enrolled": true, - "id": "4465bd66-5d4a-4188-9862-8b514b0f1f46", - "last_modified": 1645579198047 - }, - { - "schema": 1645578790344, - "derHash": "Httr2RJ0iC23lb/FFPiqvhCtlVy8z9P9Wltf67LOW2g=", - "subject": "CN=AC SERVIDORES SEGUROS TIPO1,OU=Ceres,O=FNMT-RCM,C=ES", - "subjectDN": "MHAxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEOMAwGA1UECwwFQ2VyZXMxGDAWBgNVBGEMD1ZBVEVTLVEyODI2MDA0SjEkMCIGA1UEAwwbQUMgU0VSVklET1JFUyBTRUdVUk9TIFRJUE8x", - "whitelist": false, - "attachment": { - "hash": "1b46f0408f2325ad33c8b3c5dbcf16fa1e7e49dc37065a9692b2b6f8b93fc666", - "size": 1280, - "filename": "Rlnql4UHcyG02SDPnuECa_zDzdDX09uEM9PKaegr4Qs=.pem", - "location": "security-state-staging/intermediates/08be4d50-7440-476f-b9ec-304930e3bb59.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "Rlnql4UHcyG02SDPnuECa/zDzdDX09uEM9PKaegr4Qs=", - "crlite_enrolled": true, - "id": "b5f78224-02b0-4114-bef3-50c347e8ed22", - "last_modified": 1645579198034 - }, { "schema": 1645578827714, "derHash": "RAs3QW8t6FLKOGFQ1hHsCvMd1Y2KJ/iCgVp+o+5oSO4=", @@ -4284,24 +4410,6 @@ "id": "9f250868-30ab-4a11-8a09-ba0e03b8130e", "last_modified": 1645579197271 }, - { - "schema": 1645578780234, - "derHash": "y2Zmsyv/Lv7cxBh98Umm00pdELcWW5z/KmfA4xGu7tc=", - "subject": "CN=QuoVadis Europe EV SSL CA G1,O=QuoVadis Trustlink B.V.,C=NL", - "subjectDN": "MFYxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjElMCMGA1UEAwwcUXVvVmFkaXMgRXVyb3BlIEVWIFNTTCBDQSBHMQ==", - "whitelist": false, - "attachment": { - "hash": "990290f2ea4ff420df521c3b3851971e7be41a8508394faa2cb562a69bce9e55", - "size": 2385, - "filename": "WkWVWx1-X3CuwtFGJvDjdr5hOX8PeMryJG2Va7Y6cj8=.pem", - "location": "security-state-staging/intermediates/e5b45de5-c4f7-4c43-82de-dedc4ae1a1e2.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "WkWVWx1+X3CuwtFGJvDjdr5hOX8PeMryJG2Va7Y6cj8=", - "crlite_enrolled": true, - "id": "003ddfee-23a8-48f9-8ae6-373cd5fcf8da", - "last_modified": 1645579197257 - }, { "schema": 1645578829207, "derHash": "2ImiZB9d+UE1OBfIelzQ2c2s7TiGJAv72TcynpTTpFs=", @@ -4590,24 +4698,6 @@ "id": "0ae7a24d-a084-4832-94f5-f7b373e4faf0", "last_modified": 1645579197021 }, - { - "schema": 1645578795878, - "derHash": "NH0Y3Mwu/FGpIOen+7B7+9o1YTaB+C3KXExyuwyDwDU=", - "subject": "CN=VR IDENT SSL CA 2020,O=Fiducia & GAD IT AG,C=DE", - "subjectDN": "MEoxCzAJBgNVBAYTAkRFMRwwGgYDVQQKDBNGaWR1Y2lhICYgR0FEIElUIEFHMR0wGwYDVQQDDBRWUiBJREVOVCBTU0wgQ0EgMjAyMA==", - "whitelist": false, - "attachment": { - "hash": "4158e246be129509cb8d8eb14b647517fea0196e81a9d593f4b8f64a11a6414f", - "size": 2357, - "filename": "fQUctsUYoew1aFnAFT0prf-kJmkVNqkPo2jJ5Jm9RaA=.pem", - "location": "security-state-staging/intermediates/dad40639-ba45-44a1-a203-773fa93a2393.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "fQUctsUYoew1aFnAFT0prf+kJmkVNqkPo2jJ5Jm9RaA=", - "crlite_enrolled": true, - "id": "b0feb9ce-0625-4089-8193-4f2e7d87b79e", - "last_modified": 1645579197008 - }, { "schema": 1645578757683, "derHash": "TzXGucEAkF/yW7AcCiDr4zW87vJJzp/6HhHgYu1m/NE=", @@ -4626,24 +4716,6 @@ "id": "19600eea-019e-4daa-a78f-5e230337d109", "last_modified": 1645579196995 }, - { - "schema": 1645578819587, - "derHash": "sarhvNVV6KPR492o7ITnV8VSZVNEzj/uu6+Y6JXb7aw=", - "subject": "CN=QuoVadis Europe SSL CA G2,O=QuoVadis Trustlink B.V.,C=NL", - "subjectDN": "MFMxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEiMCAGA1UEAwwZUXVvVmFkaXMgRXVyb3BlIFNTTCBDQSBHMg==", - "whitelist": false, - "attachment": { - "hash": "dfb31ebff112bccbef0ba90c29987f9962823acb59f69bd984351d9e2c7e22df", - "size": 2381, - "filename": "XOogr9_VItHwTOA_JogutdX4V06tVw9btHQLa2tR0_A=.pem", - "location": "security-state-staging/intermediates/edc35c3e-658f-4b1e-a6c0-925b06319a69.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "XOogr9/VItHwTOA/JogutdX4V06tVw9btHQLa2tR0/A=", - "crlite_enrolled": true, - "id": "d7036b24-b5f1-44e4-8404-0f50130b95fd", - "last_modified": 1645579196981 - }, { "schema": 1645578826623, "derHash": "JXaHE9O0Wfk4LSpZT4XzRwn9KokwcxVCpBRv+yRr7Gk=", @@ -4986,24 +5058,6 @@ "id": "cbe28fbe-3eec-45be-a5ef-d53c15988acd", "last_modified": 1645579196726 }, - { - "schema": 1645578779868, - "derHash": "f+uTdOqwjTknF8ZHQ22uBhdqJMAQYH/aHM5eXwEGtHI=", - "subject": "CN=QuoVadis Qualified Web ICA G2,O=QuoVadis Trustlink B.V.,C=NL", - "subjectDN": "MFcxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEmMCQGA1UEAwwdUXVvVmFkaXMgUXVhbGlmaWVkIFdlYiBJQ0EgRzI=", - "whitelist": false, - "attachment": { - "hash": "c551ff3d69db56e747169ab80b2fdea513f1de4806de98e0e34ab04da70a7566", - "size": 2385, - "filename": "HW4ktpkbc6tiWRVtXWUrZxqP505LD1tPqFHb3HiZbX8=.pem", - "location": "security-state-staging/intermediates/7f71d4f9-9d6e-4293-8a84-ecd68df1e8f5.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "HW4ktpkbc6tiWRVtXWUrZxqP505LD1tPqFHb3HiZbX8=", - "crlite_enrolled": true, - "id": "d082eca9-ebf1-4e1a-9d25-56d598ae88bc", - "last_modified": 1645579196711 - }, { "schema": 1645578794003, "derHash": "iu/r2IvoejCxnGDFvQ+16fvNFdVYLV/Jp0mVeNaNzsA=", @@ -5040,24 +5094,6 @@ "id": "b0dce077-d224-4f84-8dcf-8f24cfbd18b4", "last_modified": 1645579196683 }, - { - "schema": 1645578773545, - "derHash": "DakU+3El9uZE63qiYd6euAncf5Jbayp9in7dhzY5i1s=", - "subject": "CN=Staat der Nederlanden Domein Server CA 2020,O=Staat der Nederlanden,C=NL", - "subjectDN": "MGMxCzAJBgNVBAYTAk5MMR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xNDAyBgNVBAMMK1N0YWF0IGRlciBOZWRlcmxhbmRlbiBEb21laW4gU2VydmVyIENBIDIwMjA=", - "whitelist": false, - "attachment": { - "hash": "2f30004a37d33d9c2a59bae9b9e7ae94f816bd331c1a88deabd4af0f028ec59e", - "size": 2438, - "filename": "N9-YluTCUa_HTXc60QxjUReBLpRniAkIK2N84DhgmW4=.pem", - "location": "security-state-staging/intermediates/3a5cccbb-d1da-4d6e-8650-128cb451f578.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "N9+YluTCUa/HTXc60QxjUReBLpRniAkIK2N84DhgmW4=", - "crlite_enrolled": true, - "id": "93fb54cf-1df3-4b48-80dc-309fa3745243", - "last_modified": 1645579196670 - }, { "schema": 1645578794396, "derHash": "tl/mob8tUv9ot9Pp0PBrMAocPySDCbcEBcp73sBUvd0=", @@ -5076,24 +5112,6 @@ "id": "91782dd2-8264-4d7f-ac0c-485fc46cf10c", "last_modified": 1645579196657 }, - { - "schema": 1645578806141, - "derHash": "MCQkQ/aJWpRWDkjk3/cgU26vUWPLQvXod0AqveL4Ynw=", - "subject": "CN=QuoVadis Global SSL ICA G3,O=QuoVadis Limited,C=BM", - "subjectDN": "ME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMw==", - "whitelist": false, - "attachment": { - "hash": "63f37d712386cb1b4ab3fb0368f861aeb7ba74ec9b9bc7ecdd247bcf94725693", - "size": 2373, - "filename": "KM3iZPSceB-hgYuNI-cSg4LRgTiUxCeGjrfXRQAY6Rs=.pem", - "location": "security-state-staging/intermediates/ea7c6aaf-2f08-4bd8-9233-93359bef2b5f.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "KM3iZPSceB+hgYuNI+cSg4LRgTiUxCeGjrfXRQAY6Rs=", - "crlite_enrolled": true, - "id": "d938811f-e653-4554-a74d-f8eec3a4920b", - "last_modified": 1645579196643 - }, { "schema": 1645578788470, "derHash": "FGwc+bt9IxBg0Pq9mG6YUPAFAfWjt7asQsUbOMjiKiM=", @@ -5994,24 +6012,6 @@ "id": "bfe76d97-1690-4d0c-956d-45056e87dcd2", "last_modified": 1645578267528 }, - { - "schema": 1645577500961, - "derHash": "PyJb2814jOkkhwyvkvgUt8b/Ttq6utk/HTqRdyUs8dE=", - "subject": "CN=QuoVadis Qualified Web ICA G3,O=QuoVadis Trustlink B.V.,C=NL", - "subjectDN": "MFcxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEmMCQGA1UEAwwdUXVvVmFkaXMgUXVhbGlmaWVkIFdlYiBJQ0EgRzM=", - "whitelist": false, - "attachment": { - "hash": "8eb4cfbfd4e31a971f563f4a974c582ecd679cc8c15604af9f0f24fb1daf720e", - "size": 2385, - "filename": "e7hbHQSuhSDkhjhlY1CGhoHNKcgJCpQxSU_inT417rc=.pem", - "location": "security-state-staging/intermediates/5b740164-6457-41b6-89f7-410a326facec.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "e7hbHQSuhSDkhjhlY1CGhoHNKcgJCpQxSU/inT417rc=", - "crlite_enrolled": false, - "id": "1a82be4e-e5db-438f-b125-fc325af58983", - "last_modified": 1645578267456 - }, { "schema": 1645577504932, "derHash": "T4OELx8Eqx4E1NjnUWZvyoLlGRyvwkBiv9H+d8AspLQ=", @@ -6390,24 +6390,6 @@ "id": "e4c35ef9-ffde-447a-999d-1910ed7cec36", "last_modified": 1645578266854 }, - { - "schema": 1645577587363, - "derHash": "HjVoI/5AwOqsKfntVGO3stscCItj67BYdqLmMcEId5g=", - "subject": "CN=QuoVadis Enterprise Trust CA 2 G4,O=QuoVadis Trustlink B.V.,C=NL", - "subjectDN": "MFsxCzAJBgNVBAYTAk5MMSAwHgYDVQQKDBdRdW9WYWRpcyBUcnVzdGxpbmsgQi5WLjEqMCgGA1UEAwwhUXVvVmFkaXMgRW50ZXJwcmlzZSBUcnVzdCBDQSAyIEc0", - "whitelist": false, - "attachment": { - "hash": "756cc72bf46fca106a4ae94315fc04ea6bbe1b93e3229513d02875b33ca13f45", - "size": 2385, - "filename": "z-lEyVPfwY15LjMDGouWc4Jt0MFWaf2MpLOSN9mx9tM=.pem", - "location": "security-state-staging/intermediates/0032aafc-3f1d-42e6-ac9e-078fb2d97821.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "z+lEyVPfwY15LjMDGouWc4Jt0MFWaf2MpLOSN9mx9tM=", - "crlite_enrolled": false, - "id": "35e53c32-41fc-4447-a3ba-9572bd7995c5", - "last_modified": 1645578266814 - }, { "schema": 1645577590130, "derHash": "BYd+5cz+fPGrs8nt85BbX2FCx7eTnWfjJBHPiWMn+Yc=", @@ -6588,24 +6570,6 @@ "id": "15c61ec9-5b89-4812-8240-d6bf15fa38dd", "last_modified": 1645578266596 }, - { - "schema": 1645577618495, - "derHash": "tvZVm7zgosyR5Qe11zGeMkh+2uKKBjvHO2QF5sRGZbY=", - "subject": "CN=QuoVadis Enterprise Trust CA 2 G3,O=QuoVadis Limited,C=BM", - "subjectDN": "MFQxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSowKAYDVQQDDCFRdW9WYWRpcyBFbnRlcnByaXNlIFRydXN0IENBIDIgRzM=", - "whitelist": false, - "attachment": { - "hash": "0e8105a00963a2942951dacf763351b5c4f4fcffe32ab691c090848452d6b285", - "size": 2377, - "filename": "U_l9o-Lg2NOgB-7MLJUzZzbVrqatI_likIE44Ciah6M=.pem", - "location": "security-state-staging/intermediates/1c6a63e2-fcd0-42ea-a406-fce0e2a968cf.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "U/l9o+Lg2NOgB+7MLJUzZzbVrqatI/likIE44Ciah6M=", - "crlite_enrolled": false, - "id": "422b8455-5064-4577-9215-5a33b2d002c8", - "last_modified": 1645578266575 - }, { "schema": 1645577621120, "derHash": "s0oztER0/bAHjxE1J7vbdv5b+ByiS7htYoE2xQFgQ+g=", @@ -7560,24 +7524,6 @@ "id": "8e8cddfa-e58f-4def-a0f9-af5024b733c8", "last_modified": 1643540242323 }, - { - "schema": 1643539724307, - "derHash": "nOYws1+K4sZBnnNK2dL6MEdt2ec5Sx6Tsn+D93agJOo=", - "subject": "CN=AC Unidades de Sellado de Tiempo,OU=Ceres,O=FNMT-RCM,C=ES", - "subjectDN": "MHUxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEOMAwGA1UECwwFQ2VyZXMxGDAWBgNVBGEMD1ZBVEVTLVEyODI2MDA0SjEpMCcGA1UEAwwgQUMgVW5pZGFkZXMgZGUgU2VsbGFkbyBkZSBUaWVtcG8=", - "whitelist": false, - "attachment": { - "hash": "671a59fe01d2cd2074dbea84483abb7c9c75db400f3b54d2aebd79a620add787", - "size": 2836, - "filename": "RFLsjPTrs1EoFCjTCI7RLImxM2pGcGMiymQyT87-GT4=.pem", - "location": "security-state-staging/intermediates/ba299b7d-dc4a-4efd-b7d4-c67563ad72aa.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "RFLsjPTrs1EoFCjTCI7RLImxM2pGcGMiymQyT87+GT4=", - "crlite_enrolled": true, - "id": "590c1b99-aca9-4c60-8b11-030c3d8071a5", - "last_modified": 1643540242313 - }, { "schema": 1643539752426, "derHash": "jNco+cM5G6Q2ChDGbKSEyAdlHWIH8QYzZp7YiB/pG/U=", @@ -8442,24 +8388,6 @@ "id": "201bbcbe-98a9-4e1d-9ba8-1d91ccaef4d5", "last_modified": 1643317054962 }, - { - "schema": 1643294903582, - "derHash": "Lf5H4USrs5+f5FHOzTUtmpvSiYI1HotlJP6xAdurH+w=", - "subject": "CN=GlobalSign Atlas R3 DV ACME CA 2022 Q2,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIFIzIERWIEFDTUUgQ0EgMjAyMiBRMg==", - "whitelist": false, - "attachment": { - "hash": "63657216ab2e0265cbcbce85e9b2783ccd35376d4e7c0f127fcac181251aa5ed", - "size": 1642, - "filename": "_1VRS6Ha0tRFo_8a_6PqqF4wtj16qRxOO4rXTjqDNFk=.pem", - "location": "security-state-staging/intermediates/c70a5a54-9017-4d7c-814c-c431416e70eb.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "/1VRS6Ha0tRFo/8a/6PqqF4wtj16qRxOO4rXTjqDNFk=", - "crlite_enrolled": false, - "id": "681f5a20-f291-4509-bec3-6adbf5c05429", - "last_modified": 1643295452290 - }, { "schema": 1643294904826, "derHash": "FbY83XcqjULcXkgXTB9+PUD8gsR43zpkQ8e9kvvG1d4=", @@ -8532,24 +8460,6 @@ "id": "de6506a7-2e51-4f8a-9030-a74ab368ad3f", "last_modified": 1643295452263 }, - { - "schema": 1643294909522, - "derHash": "qBav/3RuoPCgoGTAQy+dK30M557C0emUD0oYaiUYIoQ=", - "subject": "CN=GlobalSign Atlas ECCR5 OV TLS CA 2022 Q2,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIEF0bGFzIEVDQ1I1IE9WIFRMUyBDQSAyMDIyIFEy", - "whitelist": false, - "attachment": { - "hash": "049fc8dce345f116d37deb30e65527acd5a647e1de6e9d53685b97fe4fe7c5fe", - "size": 1195, - "filename": "TdoclaY2HEKPADeH2W-4kosHzm7UvYAafcidCBnsRDA=.pem", - "location": "security-state-staging/intermediates/6c42ca37-a352-4db9-b44d-e1a577fb1168.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "TdoclaY2HEKPADeH2W+4kosHzm7UvYAafcidCBnsRDA=", - "crlite_enrolled": false, - "id": "6de1a4fe-3539-4329-9838-cb4883353866", - "last_modified": 1643295452256 - }, { "schema": 1643294910716, "derHash": "JWYC3IqAQbLtwMrmEaapjZs5rU3j4Z9i3AoKGVi3InE=", @@ -8568,24 +8478,6 @@ "id": "cb9ed798-b5dc-4b00-a04a-35e7aa09dbaf", "last_modified": 1643295452249 }, - { - "schema": 1643294911965, - "derHash": "c1zDhuwaguZXpbRRyUlZYR08fQy7H9nZ7bQscZL4Rjo=", - "subject": "CN=GlobalSign Atlas R3 DV TLS CA 2022 Q2,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIERWIFRMUyBDQSAyMDIyIFEy", - "whitelist": false, - "attachment": { - "hash": "5dc3ef9866bfcfb8743ef46140622103cd877f3ecd2310029ef8d8ff09b17dd4", - "size": 1642, - "filename": "7Zgd-tc1DR60EUxxu86y2PNtnPLUCDONUQJhN35HWIU=.pem", - "location": "security-state-staging/intermediates/63da4365-743a-4755-bfb8-beb8ff31e794.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "7Zgd+tc1DR60EUxxu86y2PNtnPLUCDONUQJhN35HWIU=", - "crlite_enrolled": false, - "id": "12cc99be-332a-4aef-af43-25fe8420b210", - "last_modified": 1643295452242 - }, { "schema": 1643294913157, "derHash": "1Qsgrf+Vm/vug7b9H6s2/eeUG5YM/Gg5qsY7n/20ZBM=", @@ -8604,42 +8496,6 @@ "id": "ee6d035c-95ae-42a3-b398-340dd0c12120", "last_modified": 1643295452235 }, - { - "schema": 1643294914396, - "derHash": "RfGFRTDsA3qqy0st6bTQ/b/GGIir1O4EFBg9meYEN6w=", - "subject": "CN=GlobalSign Atlas R3 AlphaSSL CA 2022 Q2,O=Globalsign nv-sa,C=BE", - "subjectDN": "MFoxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxzaWduIG52LXNhMTAwLgYDVQQDEydHbG9iYWxTaWduIEF0bGFzIFIzIEFscGhhU1NMIENBIDIwMjIgUTI=", - "whitelist": false, - "attachment": { - "hash": "0f455b2160c81e5b49b03b477baaa020d52928d16a4fe13504fca71f176fcf2e", - "size": 1642, - "filename": "6bop5gsmVRhy033XqsI4UKTek3IMHHpiLVeicdR_Luw=.pem", - "location": "security-state-staging/intermediates/12de76d7-2251-470d-8c62-aebb1b54b3d5.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "6bop5gsmVRhy033XqsI4UKTek3IMHHpiLVeicdR/Luw=", - "crlite_enrolled": false, - "id": "18283798-9f59-4d62-9a34-f643b9b7a76f", - "last_modified": 1643295452228 - }, - { - "schema": 1643294915568, - "derHash": "r9s8OW2F0Z++WCBt8GWermFMSrGPXM8gt4Oq8LvpagM=", - "subject": "CN=GlobalSign Atlas R3 OV TLS CA 2022 Q2,O=GlobalSign nv-sa,C=BE", - "subjectDN": "MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIE9WIFRMUyBDQSAyMDIyIFEy", - "whitelist": false, - "attachment": { - "hash": "810129eb69110a8c071f593ade366adbaa81a2420d3531e8f862ea7a5b423c11", - "size": 1642, - "filename": "VkNfITzp8T2xdmHOxT0ZZUfHySNBzxU2GWFfqmC3oLE=.pem", - "location": "security-state-staging/intermediates/8ae25e5b-e31b-4d80-be59-24ed2ecd5386.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "VkNfITzp8T2xdmHOxT0ZZUfHySNBzxU2GWFfqmC3oLE=", - "crlite_enrolled": false, - "id": "6982bfcf-221f-44f5-b27e-d4af6dd1ab4f", - "last_modified": 1643295452221 - }, { "schema": 1643294916739, "derHash": "yyxoXLIU3NLyzabiwVWq8hp+E0vAvOgIsRMMRZElsKQ=", @@ -10033,34 +9889,16 @@ "subjectDN": "MEQxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFUdlb1RydXN0IEVDQyBDTiBDQSBHMg==", "whitelist": false, "attachment": { - "hash": "253b1b900adc6be80e90ac3862b020d22321e25976cb9c08fa7266318159ad58", - "size": 1374, - "filename": "5hUeeQGevtQx_9LReJqSkj73Yv0TUcld9s9jPFCqJqA=.pem", - "location": "security-state-staging/intermediates/ff6fd4b8-f7d7-4779-922b-29b398cecef6.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "5hUeeQGevtQx/9LReJqSkj73Yv0TUcld9s9jPFCqJqA=", - "crlite_enrolled": true, - "id": "c542f5dc-33cb-490b-9311-a1dadc26b605", - "last_modified": 1641481037225 - }, - { - "schema": 1641477704850, - "derHash": "d81ReEppPZSC5+ppTkBTvP2d9lWA+84UsqdSfAgYA+E=", - "subject": "CN=DigiCert Assured ID TLS CA G2,O=DigiCert Inc,C=US", - "subjectDN": "MEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJjAkBgNVBAMTHURpZ2lDZXJ0IEFzc3VyZWQgSUQgVExTIENBIEcy", - "whitelist": false, - "attachment": { - "hash": "38c26b5824725648f58682db859677ed5f482b8a98476190e2f4b5cea965ce52", - "size": 1918, - "filename": "7DHaE3Q3dQ9k5S7DaYbXog4BK-Oj492ta3kc2xRJ04s=.pem", - "location": "security-state-staging/intermediates/84f2426b-c265-4fe5-8bcc-09e6d612433c.pem", + "hash": "253b1b900adc6be80e90ac3862b020d22321e25976cb9c08fa7266318159ad58", + "size": 1374, + "filename": "5hUeeQGevtQx_9LReJqSkj73Yv0TUcld9s9jPFCqJqA=.pem", + "location": "security-state-staging/intermediates/ff6fd4b8-f7d7-4779-922b-29b398cecef6.pem", "mimetype": "application/x-pem-file" }, - "pubKeyHash": "7DHaE3Q3dQ9k5S7DaYbXog4BK+Oj492ta3kc2xRJ04s=", + "pubKeyHash": "5hUeeQGevtQx/9LReJqSkj73Yv0TUcld9s9jPFCqJqA=", "crlite_enrolled": true, - "id": "d8d54086-08a6-43e4-94b4-1d46de796b92", - "last_modified": 1641481037215 + "id": "c542f5dc-33cb-490b-9311-a1dadc26b605", + "last_modified": 1641481037225 }, { "schema": 1641477710651, @@ -11106,24 +10944,6 @@ "id": "0d31579b-64f1-4e30-bf5f-c484b7588ede", "last_modified": 1639083515813 }, - { - "schema": 1639083021523, - "derHash": "E0XC05rktlzKceiOmispxx3JE/lS6TWoErAE26eueVc=", - "subject": "CN=ACCVCA-110,OU=PKIACCV,O=ACCV,C=ES", - "subjectDN": "MEMxEzARBgNVBAMMCkFDQ1ZDQS0xMTAxEDAOBgNVBAsMB1BLSUFDQ1YxDTALBgNVBAoMBEFDQ1YxCzAJBgNVBAYTAkVT", - "whitelist": false, - "attachment": { - "hash": "e6da6a137d62a7acc06ba43bbecbca249317995ef2a5821be7c4c3e4904d11cd", - "size": 2649, - "filename": "qX1E174XIirdC_7IZnHG6ACm0iCltwbZSr_U507C-Ck=.pem", - "location": "security-state-staging/intermediates/27528fc3-b963-415a-a99a-4f327d7d7c83.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "qX1E174XIirdC/7IZnHG6ACm0iCltwbZSr/U507C+Ck=", - "crlite_enrolled": true, - "id": "4dff9826-c4f5-4bad-9c0b-ef5d5c0bc30d", - "last_modified": 1639083515803 - }, { "schema": 1639083021821, "derHash": "I5/6htcQM7olWRR4IFfYfoQhrt1ZELeGkotqEkjD40E=", @@ -11178,24 +10998,6 @@ "id": "a0571407-53b3-407c-bbd4-0be77d0d2d3e", "last_modified": 1639083515774 }, - { - "schema": 1639083015751, - "derHash": "6TJ6NHy+HLlM3JqlTLMbbkPWiWjRfQnOMmoJG/wvCxE=", - "subject": "CN=ACCVCA-110,OU=PKIACCV,O=ACCV,C=ES", - "subjectDN": "MEMxEzARBgNVBAMMCkFDQ1ZDQS0xMTAxEDAOBgNVBAsMB1BLSUFDQ1YxDTALBgNVBAoMBEFDQ1YxCzAJBgNVBAYTAkVT", - "whitelist": false, - "attachment": { - "hash": "88d175177fc311fc5ad5e439d61dfabfbe6a0cc3dbf7be58654a104156ba2dae", - "size": 2686, - "filename": "qX1E174XIirdC_7IZnHG6ACm0iCltwbZSr_U507C-Ck=.pem", - "location": "security-state-staging/intermediates/7b9e7264-b0e3-4c9e-bda1-908a922c5b3f.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "qX1E174XIirdC/7IZnHG6ACm0iCltwbZSr/U507C+Ck=", - "crlite_enrolled": true, - "id": "772a5e91-e4ab-4bc1-b2a7-9d88c0c7e9bf", - "last_modified": 1639083515765 - }, { "schema": 1639083020657, "derHash": "MlNBL9rUUjEIwJi7DuDv7df6/dAPsw5Hxrup/j4c24g=", @@ -11790,24 +11592,6 @@ "id": "1a8145a6-66a3-4c40-914b-e027086ea091", "last_modified": 1636556282833 }, - { - "schema": 1635991660699, - "derHash": "Fh7lOGMpsoon/0BXNlUqYh1ahEpDgR42I+Uu76C6hAo=", - "subject": "CN=QuoVadis Global SSL ICA G3,O=QuoVadis Limited,C=BM", - "subjectDN": "ME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMw==", - "whitelist": false, - "attachment": { - "hash": "b8fd47c4234e14aae99e993f325e88c880408479e0c6ecf0a155bcb2481f0c25", - "size": 2353, - "filename": "KM3iZPSceB-hgYuNI-cSg4LRgTiUxCeGjrfXRQAY6Rs=.pem", - "location": "security-state-staging/intermediates/54eee2eb-1fa3-4f22-84be-3db33a9a0e5d.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "KM3iZPSceB+hgYuNI+cSg4LRgTiUxCeGjrfXRQAY6Rs=", - "crlite_enrolled": true, - "id": "9f149ba1-e8dc-457d-9abd-23718172f6af", - "last_modified": 1635994653520 - }, { "schema": 1635735519825, "derHash": "DhC93udRLb156/C09I/u18g8K9PdgXZVZfT/EQt7+kI=", @@ -13914,24 +13698,6 @@ "id": "721ae378-ec64-48a3-a56d-34fd12f08946", "last_modified": 1610999846045 }, - { - "schema": 1610979409846, - "derHash": "AUU/ZFzZHiM7dISCfyP4pXP9ZBAp6opr/lSe9O2LMj0=", - "subject": "CN=HydrantID SSL ICA G2,O=HydrantID (Avalanche Cloud Corporation),C=US", - "subjectDN": "MF4xCzAJBgNVBAYTAlVTMTAwLgYDVQQKEydIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxHTAbBgNVBAMTFEh5ZHJhbnRJRCBTU0wgSUNBIEcy", - "whitelist": false, - "attachment": { - "hash": "7210ab4fd67176c39b121dc273d719681e6df16720f1ec337d1ed98f2f42397f", - "size": 2410, - "filename": "400Fim9IQe4j-Gj-Ci4R44M3gA6J1_TRh8LlPSLF3I8=.pem", - "location": "security-state-staging/intermediates/d86830f0-be1c-4699-823a-14b96b05fedd.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "400Fim9IQe4j+Gj+Ci4R44M3gA6J1/TRh8LlPSLF3I8=", - "crlite_enrolled": true, - "id": "03652dfb-4639-4ce5-a586-d186a812f8e7", - "last_modified": 1610981840623 - }, { "schema": 1608651068348, "derHash": "wWnWndPSbTbLgt8TXFf+M27P9+fqQB6Z484ZF6j7gYA=", @@ -14256,60 +14022,6 @@ "id": "980e074c-1142-4749-9f90-b1d7d8e5f3b2", "last_modified": 1603418262218 }, - { - "schema": 1603331414283, - "derHash": "GLtw79o/kUOBFcnrTzM+tOxoNUVx5pSRlaCpHJ5vvNg=", - "subject": "CN=QuoVadis RCA1G3 TLS CA,O=QuoVadis Limited,C=BM", - "subjectDN": "MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDDBZRdW9WYWRpcyBSQ0ExRzMgVExTIENB", - "whitelist": false, - "attachment": { - "hash": "b3bb67e5eae26a4c94edb219c24b0b5e4b61ccf76dfc1f6b45000e822a22ceb3", - "size": 2369, - "filename": "oVTzYxEWPWmbDlo2GZhwL-6my7pLP_DO_Q5zS0j4erM=.pem", - "location": "security-state-staging/intermediates/0142a491-80f0-4728-bbff-4b23436aafa0.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "oVTzYxEWPWmbDlo2GZhwL+6my7pLP/DO/Q5zS0j4erM=", - "crlite_enrolled": false, - "id": "6737f4c2-a14c-4b1d-8e0c-b062884b238a", - "last_modified": 1603331864382 - }, - { - "schema": 1603331409918, - "derHash": "7MDResMmOsahZNzbCPgtB+k/zqcj9muIsG7rqWeN8rs=", - "subject": "CN=QuoVadis RCA3G3 TLS CA,O=QuoVadis Limited,C=BM", - "subjectDN": "MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDDBZRdW9WYWRpcyBSQ0EzRzMgVExTIENB", - "whitelist": false, - "attachment": { - "hash": "fc4fc6584822834debd279e4a8481536c6bd26913df00dda003fbc4ed5facf42", - "size": 2369, - "filename": "HGG1eHmdWucI4rZV77-UwfI3jqj3-wm0NFUmWbyNZvs=.pem", - "location": "security-state-staging/intermediates/098ff8c0-cbd6-4de0-93e9-b29fc7971c7d.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "HGG1eHmdWucI4rZV77+UwfI3jqj3+wm0NFUmWbyNZvs=", - "crlite_enrolled": false, - "id": "c4121d69-d075-4111-9d27-6dbed565f530", - "last_modified": 1603331864371 - }, - { - "schema": 1603331407633, - "derHash": "OmbmSCEuYyH5TZ6rzJLAUuZ52ZLJmtRZak57ha3O5d4=", - "subject": "CN=QuoVadis RCA3G1 TLS CA,O=QuoVadis Limited,C=BM", - "subjectDN": "MEkxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMR8wHQYDVQQDDBZRdW9WYWRpcyBSQ0EzRzEgVExTIENB", - "whitelist": false, - "attachment": { - "hash": "e5c77c38ef33f161625bc3592afbf547db64bc8507aff887efbd2902cd674003", - "size": 2361, - "filename": "cDYpcfBIVfSGVjIXkR2jSnkBmuagMeyfAzJa6dOp_y4=.pem", - "location": "security-state-staging/intermediates/4251568a-3965-4fe1-81c3-100b6c736472.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "cDYpcfBIVfSGVjIXkR2jSnkBmuagMeyfAzJa6dOp/y4=", - "crlite_enrolled": false, - "id": "6eca33ec-4f64-4e1a-9686-48926a7dccbd", - "last_modified": 1603331864347 - }, { "schema": 1603241851952, "derHash": "qmHCkn3InbIlypoX1gA3PQWPaW2G0Q4r17Xo9EqX7tE=", @@ -14328,24 +14040,6 @@ "id": "ff45948b-1310-4371-a262-b582c5ad0bbb", "last_modified": 1603245450595 }, - { - "schema": 1602961037868, - "derHash": "qlf0gsvFFrTRDKQJfdkNmfWqcn0gcJDQfanDaZirua0=", - "subject": "CN=HydrantID SSL CA G3,O=HydrantID (Avalanche Cloud Corporation),C=US", - "subjectDN": "MF0xCzAJBgNVBAYTAlVTMTAwLgYDVQQKDCdIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxHDAaBgNVBAMME0h5ZHJhbnRJRCBTU0wgQ0EgRzM=", - "whitelist": false, - "attachment": { - "hash": "7e0808e92ebc33ef96558a3d7c46b9b86290ea9b9c814fe1b375dd5f6e94179f", - "size": 2414, - "filename": "CgDzm8Z-Gk0j7D6yq4U4IstjpiYpBiVqyPDYr-62oO8=.pem", - "location": "security-state-staging/intermediates/5cbfc23e-7d49-4372-82b5-58e1a0a3785e.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "CgDzm8Z+Gk0j7D6yq4U4IstjpiYpBiVqyPDYr+62oO8=", - "crlite_enrolled": true, - "id": "b97f538d-34bf-41f2-ba3b-3ffa41cdfa5e", - "last_modified": 1602964635139 - }, { "schema": 1601581757962, "derHash": "vao4RyBgT/RlOwDaOHOoxUWZb/uKuR1hbxBJX8Am6Pw=", @@ -14490,24 +14184,6 @@ "id": "ee033ab1-7bfc-4f08-b26a-b3b2bce86767", "last_modified": 1601517444135 }, - { - "schema": 1601376774088, - "derHash": "BTHIb3hZWJOf3FOZJNOV0e+kCTZOaCfTq5h2MR/7J7A=", - "subject": "CN=QuoVadis Enterprise Trust CA 1 G3,O=QuoVadis Limited,C=BM", - "subjectDN": "MFQxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSowKAYDVQQDDCFRdW9WYWRpcyBFbnRlcnByaXNlIFRydXN0IENBIDEgRzM=", - "whitelist": false, - "attachment": { - "hash": "0838a224858164040768ee9fb8bab6de6efb11294b58f2c5db9fea5788b39bc7", - "size": 2333, - "filename": "8ZpHrAG1eQIQZnOeYn-p9E7tqq_yc1fiaSaeKR1BY2I=.pem", - "location": "security-state-staging/intermediates/360e077f-09bb-4788-bbfe-80bd616b8011.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "8ZpHrAG1eQIQZnOeYn+p9E7tqq/yc1fiaSaeKR1BY2I=", - "crlite_enrolled": false, - "id": "2a1565c1-b11e-4fb4-a545-99acd43e82cf", - "last_modified": 1601517444099 - }, { "schema": 1601376769580, "derHash": "rY6zLJ2pHdyFXzgnRZkBR9xvI9n7sE/J1Hax7iD8cdg=", @@ -14580,24 +14256,6 @@ "id": "39be0c8a-1350-49d8-95ce-b5095d2d226d", "last_modified": 1601517443537 }, - { - "schema": 1601376749293, - "derHash": "2lRiUmoMLphSqGGGsCU5AVh1nNymriHwn3E8pqzN0fE=", - "subject": "CN=QuoVadis Enterprise Trust CA 3 G3,O=QuoVadis Limited,C=BM", - "subjectDN": "MFQxCzAJBgNVBAYTAkJNMRkwFwYDVQQKDBBRdW9WYWRpcyBMaW1pdGVkMSowKAYDVQQDDCFRdW9WYWRpcyBFbnRlcnByaXNlIFRydXN0IENBIDMgRzM=", - "whitelist": false, - "attachment": { - "hash": "0b01ec78286d184607dd09e4cac9c4992d4af9f58534eb2cb8fea437481a6197", - "size": 2333, - "filename": "smsafMf1m1b-3NN_jssl3RMKHXok-GELWWNtG9vZEmA=.pem", - "location": "security-state-staging/intermediates/e3b263a6-dc7b-4bda-8acb-d8c10b677b2f.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "smsafMf1m1b+3NN/jssl3RMKHXok+GELWWNtG9vZEmA=", - "crlite_enrolled": false, - "id": "b1c31974-0f71-4207-8532-82f8138e8ca8", - "last_modified": 1601517443502 - }, { "schema": 1601376725349, "derHash": "KGibMOTDBqq1OwJ7KeNq1t0dz0uVOZRILKhL3B7KyZY=", @@ -14652,24 +14310,6 @@ "id": "ff319db3-4ac0-4406-9c29-03f632e42c98", "last_modified": 1601517443342 }, - { - "schema": 1601376757868, - "derHash": "uCIQzend6g4UvimvZH5LMvlu0qnvGqW6qcxks4tsAco=", - "subject": "OU=AC RAIZ FNMT-RCM,O=FNMT-RCM,C=ES", - "subjectDN": "MDsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTQ==", - "whitelist": false, - "attachment": { - "hash": "dda828b4a97c8a8f24d378bef318af5d144be4d873ff73ba3f07303c1c298e49", - "size": 1971, - "filename": "L8VmekuaJnjtasatJUZfy_YJS_zZUECXx6j6R63l6Ig=.pem", - "location": "security-state-staging/intermediates/517b4707-ce8c-4711-b41b-f2251c5edd3d.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "L8VmekuaJnjtasatJUZfy/YJS/zZUECXx6j6R63l6Ig=", - "crlite_enrolled": false, - "id": "a16f609b-1af0-4b48-90e8-2d6a182ca81f", - "last_modified": 1601517443289 - }, { "schema": 1601376755045, "derHash": "5x2MO69D9rM1LfV0qfDUogZb8D2heVFLH8xdm+yMj80=", @@ -16020,24 +15660,6 @@ "id": "3ce95fd6-d1f8-4199-9fa8-c95bac94f60f", "last_modified": 1591199862091 }, - { - "schema": 1591166848442, - "derHash": "gmV1bdXNijfuYeQDUSiOSxaondJIwexOuiWq8WGr9Jg=", - "subject": "CN=AC Sector Público,OU=Ceres,O=FNMT-RCM,C=ES", - "subjectDN": "MGcxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEOMAwGA1UECwwFQ2VyZXMxGDAWBgNVBGEMD1ZBVEVTLVEyODI2MDA0SjEbMBkGA1UEAwwSQUMgU2VjdG9yIFDDumJsaWNv", - "whitelist": false, - "attachment": { - "hash": "cfe09ce65e4dcbc8449292b7e92e1cdaacc6c228de14a49ccc6300fda8e73598", - "size": 2816, - "filename": "aN4wUQfL0YidepsDn9ylA8GoitH0XRdS349Qxylp2RU=.pem", - "location": "security-state-staging/intermediates/7f6c9b16-66e0-4bd8-bb34-a2812443ecfb.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "aN4wUQfL0YidepsDn9ylA8GoitH0XRdS349Qxylp2RU=", - "crlite_enrolled": false, - "id": "72c55deb-6292-4294-b3d7-cd0eb0bc896a", - "last_modified": 1591199862045 - }, { "schema": 1591166832366, "derHash": "HhMjmuBLlxvd5lOv38cyRDi44UbFxIqBcDEibJV2RTk=", @@ -17658,24 +17280,6 @@ "id": "db71c7f0-2fac-43c3-ad72-dd258c250fa5", "last_modified": 1576536533196 }, - { - "schema": 1576535678404, - "derHash": "Ocdjqc8Z2SP5d9I2JquJBEmkRKuLeVyBXvHvgf68Hjg=", - "subject": "CN=Amazon,OU=Server CA 1A,O=Amazon,C=US", - "subjectDN": "MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAxQTEPMA0GA1UEAxMGQW1hem9u", - "whitelist": false, - "attachment": { - "hash": "f399c4419d079a15a697f418e9a8d5ff90d3ac32db49507e30ee4a17491a1fd2", - "size": 1544, - "filename": "ZLtb2AMR-j9TvZlATKuHYq1uBIRH0Kl_IZ_OyhZh83w=.pem", - "location": "security-state-staging/intermediates/0bf45415-b984-4367-b6a5-c8d413da9d72.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "ZLtb2AMR+j9TvZlATKuHYq1uBIRH0Kl/IZ/OyhZh83w=", - "crlite_enrolled": false, - "id": "ad381075-9d54-4e8f-9730-7b932a4f8b90", - "last_modified": 1576536533183 - }, { "schema": 1576535676932, "derHash": "lqWizTmADPtqKoMO5S3PR/uwD/GwMgTbNpFc6jHxM0I=", @@ -17730,24 +17334,6 @@ "id": "6acdc223-21b9-4ff8-847f-e22f72f1795a", "last_modified": 1576536533071 }, - { - "schema": 1576535651001, - "derHash": "8DhCHwfyDWOiDTaR5aF4q4RZ6+VwwWR7dpBVTvI4dqs=", - "subject": "OU=AC Componentes Informáticos,O=FNMT-RCM,C=ES", - "subjectDN": "MEcxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTElMCMGA1UECwwcQUMgQ29tcG9uZW50ZXMgSW5mb3Jtw6F0aWNvcw==", - "whitelist": false, - "attachment": { - "hash": "711fb746c38ddfee6090169d62da5358968caf228ade2ad75cb8be4c4dd3832d", - "size": 2430, - "filename": "MEJWDQI0WXBrEdYtj1u1WdwD26XsIXQQ-57NkgXsoGc=.pem", - "location": "security-state-staging/intermediates/0ab80520-1d1a-43c3-88ab-467f0681114b.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "MEJWDQI0WXBrEdYtj1u1WdwD26XsIXQQ+57NkgXsoGc=", - "crlite_enrolled": true, - "id": "e28f2f6d-d594-43d7-8356-195ce9834fcf", - "last_modified": 1576536533065 - }, { "schema": 1576535643788, "derHash": "7nk2QxmUdO1g79yMzeTTdEWSFoNZOqdRu/juSRo5Hpc=", @@ -18018,24 +17604,6 @@ "id": "5db685fc-9b69-480f-8fc6-f5e4386636ad", "last_modified": 1576536532774 }, - { - "schema": 1576535552192, - "derHash": "38x3XGRNtKM61xKTQz9GPI4xBXziLLJn+dMaA1P0/C8=", - "subject": "CN=Amazon,OU=Server CA 0A,O=Amazon,C=US", - "subjectDN": "MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAwQTEPMA0GA1UEAxMGQW1hem9u", - "whitelist": false, - "attachment": { - "hash": "beb147abe96d6e343843d2e2fd729d58e42b2dab74a3c0ccc41530639168e721", - "size": 1666, - "filename": "tYU57KoTkhzNuA0400h1_eZHHFoVnZvu8vpvmZg71hE=.pem", - "location": "security-state-staging/intermediates/e3003237-67fc-4118-adfa-35b22f4430b8.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "tYU57KoTkhzNuA0400h1/eZHHFoVnZvu8vpvmZg71hE=", - "crlite_enrolled": false, - "id": "838bb94d-8f5e-4921-a93a-9035addc8ae6", - "last_modified": 1576536532770 - }, { "schema": 1576535550809, "derHash": "U5wT1vJzElL5ndK69D1AVZxGxYV1jE/EQQx+xILb7Wk=", @@ -18072,24 +17640,6 @@ "id": "cf7c93de-8a6e-4b12-b0aa-7dc5ef535f84", "last_modified": 1576536532759 }, - { - "schema": 1576535549332, - "derHash": "ORIgcFt1vPPtPNSzYxIT9WnSz4ImEB4XB5mlNUqxKGE=", - "subject": "CN=Amazon Root CA 1,O=Amazon,C=US", - "subjectDN": "MDkxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xGTAXBgNVBAMTEEFtYXpvbiBSb290IENBIDE=", - "whitelist": false, - "attachment": { - "hash": "076400302106a1d71c433340807aa21af7fdcdd85ff586d57757cf6d6718dbc4", - "size": 1646, - "filename": "--MBgDH5WGvL9Bcn5Be30cRcL0f5O-NyoXuWtQdX1aI=.pem", - "location": "security-state-staging/intermediates/3f9e0d02-5eec-434a-9f82-730c885b8a36.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "++MBgDH5WGvL9Bcn5Be30cRcL0f5O+NyoXuWtQdX1aI=", - "crlite_enrolled": false, - "id": "9cb19f7a-6a36-46ac-a938-502daee657ab", - "last_modified": 1576536532756 - }, { "schema": 1576535544989, "derHash": "pfS4JqWGN/kStp/oWZByQ73+qnGgLcRCnQZk4hSgqds=", @@ -18180,24 +17730,6 @@ "id": "b281f90d-4780-4454-a47e-7aa979cc9791", "last_modified": 1576536532675 }, - { - "schema": 1576535485113, - "derHash": "GKQ8UdCBdMOm2F8cExi9KQl1PnXZHPZZn3M0ewBwKJA=", - "subject": "SERIALNUMBER=Q2826004J,CN=AC Administración Pública,OU=CERES,O=FNMT-RCM,C=ES", - "subjectDN": "MGoxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEOMAwGA1UECwwFQ0VSRVMxEjAQBgNVBAUTCVEyODI2MDA0SjEkMCIGA1UEAwwbQUMgQWRtaW5pc3RyYWNpw7NuIFDDumJsaWNh", - "whitelist": false, - "attachment": { - "hash": "b1b8087026dcff96160076000ab8ec70cb29448880359f0ce676c987951eea3d", - "size": 2438, - "filename": "uoKUEuwkPtDw_4xcvGkwXVXs-8X9iESzjMRl18SDGV0=.pem", - "location": "security-state-staging/intermediates/b3020299-7dbb-43c6-97f7-e87736a45fc9.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "uoKUEuwkPtDw/4xcvGkwXVXs+8X9iESzjMRl18SDGV0=", - "crlite_enrolled": true, - "id": "aabec165-9b72-4d6a-8fa8-d4eeb29669f0", - "last_modified": 1576536532600 - }, { "schema": 1576535467347, "derHash": "9V+f/Lg8c0UyYWAcfgRNsVoPA0uTwFgw8oY174ic9nA=", @@ -18306,24 +17838,6 @@ "id": "626a64c6-27bd-4788-ac43-961a6c286a2f", "last_modified": 1576536532446 }, - { - "schema": 1576536118729, - "derHash": "izWEZtZhJjEhIGRaWHWmpX48gdmEdqlnYEJEJU6sAPA=", - "subject": "CN=Amazon Root CA 2,O=Amazon,C=US", - "subjectDN": "MDkxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xGTAXBgNVBAMTEEFtYXpvbiBSb290IENBIDI=", - "whitelist": false, - "attachment": { - "hash": "099a90f379b0ecca696c3cde0f60b64211dbaafa0ce4ae4b1b13e1dc145c4f27", - "size": 1991, - "filename": "f0KW_FtqTjs108NpYj42SrGvOB2PpxIVM8nWxjPqJGE=.pem", - "location": "security-state-staging/intermediates/b138d0b5-195f-401a-8c97-1bd007ddf648.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "f0KW/FtqTjs108NpYj42SrGvOB2PpxIVM8nWxjPqJGE=", - "crlite_enrolled": false, - "id": "4a7d284b-1295-4ae6-af24-7de01c05ab0d", - "last_modified": 1576536532395 - }, { "schema": 1576536107246, "derHash": "cpVqHFql2RrGnNYxB6JaoYQ4Gd3CHFEI7B2X8yKWA84=", @@ -18360,24 +17874,6 @@ "id": "d77ee3af-f063-4cbf-8b9b-f99976780075", "last_modified": 1576536532374 }, - { - "schema": 1576536113725, - "derHash": "h9zU3HRkCjIs0gVVJQbRvmTxJZYlgJZUSYa0hQvHJwY=", - "subject": "CN=Amazon Root CA 1,O=Amazon,C=US", - "subjectDN": "MDkxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xGTAXBgNVBAMTEEFtYXpvbiBSb290IENBIDE=", - "whitelist": false, - "attachment": { - "hash": "8f2766bb42744fe0fcf37f433c66191277a29d9bd4641cc4121ccf842ecf940c", - "size": 1646, - "filename": "--MBgDH5WGvL9Bcn5Be30cRcL0f5O-NyoXuWtQdX1aI=.pem", - "location": "security-state-staging/intermediates/6e41f0a0-496f-4745-a675-09b997850d04.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "++MBgDH5WGvL9Bcn5Be30cRcL0f5O+NyoXuWtQdX1aI=", - "crlite_enrolled": false, - "id": "a3c4dda1-24a7-46e0-97f3-4ce13eb70857", - "last_modified": 1576536532366 - }, { "schema": 1576536088977, "derHash": "h8cVU0Res8M8PgcQcRuZ6cd3PwTZGsOKn0wILuJBAeo=", @@ -18576,24 +18072,6 @@ "id": "ede04aed-0845-44f9-b1a8-03b4525fd10b", "last_modified": 1576536532124 }, - { - "schema": 1576536128757, - "derHash": "VD2bf8KmRxzYT8pSws9hWd+D6/zYjYsIta8/iHN/UuY=", - "subject": "CN=Amazon Root CA 4,O=Amazon,C=US", - "subjectDN": "MDkxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xGTAXBgNVBAMTEEFtYXpvbiBSb290IENBIDQ=", - "whitelist": false, - "attachment": { - "hash": "529e23adcf592c5f3ead786e4cade919e70e5ce97467aa24135ffedb958ca909", - "size": 1410, - "filename": "9-ze1cZgR9KO1kZrVDxA4HQ6voHRCSVNz4RdTCx4U8U=.pem", - "location": "security-state-staging/intermediates/7e2813c8-5040-4edb-82d1-6727b462247e.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "9+ze1cZgR9KO1kZrVDxA4HQ6voHRCSVNz4RdTCx4U8U=", - "crlite_enrolled": false, - "id": "6fb12511-5167-469d-9692-07522e197a11", - "last_modified": 1576536532102 - }, { "schema": 1576536080221, "derHash": "m/WJZ1RZlhlFEtthdxUa/plwauo9o2/u562fizwFB8s=", @@ -18702,24 +18180,6 @@ "id": "b5c03b14-145c-4893-ae49-ec141b83889c", "last_modified": 1576536531830 }, - { - "schema": 1576536097708, - "derHash": "QMgm/bIroyovnbT5R3D3K4sdqcj/2nsR5vJ68kXIm14=", - "subject": "CN=Amazon Root CA 3,O=Amazon,C=US", - "subjectDN": "MDkxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xGTAXBgNVBAMTEEFtYXpvbiBSb290IENBIDM=", - "whitelist": false, - "attachment": { - "hash": "527804e0cdb3a780b57c0f3f7429e1a5b42984b3bd67157b9fda6ba75cdc6d0a", - "size": 1370, - "filename": "NqvDJlas_GRcYbcWE8S_IceH9cq77kg0jVhZeAPXq8k=.pem", - "location": "security-state-staging/intermediates/52ba3866-d596-48e9-9a8f-b80188b6a77a.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "NqvDJlas/GRcYbcWE8S/IceH9cq77kg0jVhZeAPXq8k=", - "crlite_enrolled": false, - "id": "249a688b-b665-4574-a1c8-43ac8cff8067", - "last_modified": 1576536531740 - }, { "schema": 1576536075273, "derHash": "jxn/4C/Hle1wdl0UNq3fdy/g8Hc9pDbtvbQqLjDi6Cg=", @@ -19098,24 +18558,6 @@ "id": "26f75550-6f7c-4915-a0c5-6ce0fc78a16b", "last_modified": 1576536530666 }, - { - "schema": 1576536134890, - "derHash": "2OGKZa94RUhUyqKPsvXnm1fsFB8BBCO8yKcav8BJbCw=", - "subject": "CN=GENIOUS RSA Extended Validation Secure Server CA,OU=Controlled by Sectigo exclusively for Genious Communications,O=Genious Communications,L=Marrakech,ST=Marrakech,C=MA", - "subjectDN": "MIHYMQswCQYDVQQGEwJNQTESMBAGA1UECBMJTWFycmFrZWNoMRIwEAYDVQQHEwlNYXJyYWtlY2gxHzAdBgNVBAoTFkdlbmlvdXMgQ29tbXVuaWNhdGlvbnMxRTBDBgNVBAsTPENvbnRyb2xsZWQgYnkgU2VjdGlnbyBleGNsdXNpdmVseSBmb3IgR2VuaW91cyBDb21tdW5pY2F0aW9uczE5MDcGA1UEAxMwR0VOSU9VUyBSU0EgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB", - "whitelist": false, - "attachment": { - "hash": "dc505a925299ceeea43e708019d0fb1086a320d0a035fb0cf585b7e376d7e4f6", - "size": 2304, - "filename": "ImErDX6kNNxXp53lr4QRD49owJiK0A8orzjdda8pDb0=.pem", - "location": "security-state-staging/intermediates/ae100f8d-c411-4912-908b-ef0fe59832c9.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "ImErDX6kNNxXp53lr4QRD49owJiK0A8orzjdda8pDb0=", - "crlite_enrolled": false, - "id": "51c58311-bdec-4aab-a6cb-4a4f8e10e262", - "last_modified": 1576536530584 - }, { "schema": 1562108591033, "derHash": "pKfQXyloVnnjwAoyLOa2zVf92l8u9CxsbnNYHIpHEHc=", @@ -19422,24 +18864,6 @@ "id": "b68c9aa1-a037-426c-872e-e863b1da96e0", "last_modified": 1562108490643 }, - { - "schema": 1562108488345, - "derHash": "2w2hYDLxZDoklv3nQuK76B2spYzXYSBhQg4VTOG84r0=", - "subject": "OU=AC Componentes Informáticos,O=FNMT-RCM,C=ES", - "subjectDN": "MEcxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTElMCMGA1UECwwcQUMgQ29tcG9uZW50ZXMgSW5mb3Jtw6F0aWNvcw==", - "whitelist": false, - "attachment": { - "hash": "9667524969985c4cb1aa76f3e3c434be6441809f9c3d2bad6265165a0b509b08", - "size": 2430, - "filename": "MEJWDQI0WXBrEdYtj1u1WdwD26XsIXQQ-57NkgXsoGc=.pem", - "location": "security-state-staging/intermediates/5bc2733e-1751-448d-9db9-b1e6c1f4afc4.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "MEJWDQI0WXBrEdYtj1u1WdwD26XsIXQQ+57NkgXsoGc=", - "crlite_enrolled": true, - "id": "43dee182-4f7e-46ed-8e3c-f6b84da2e351", - "last_modified": 1562108489116 - }, { "schema": 1562108486020, "derHash": "dCZArGf41xssR3dQdK2MYLriwBI6sYNUwkwXGTLYYYM=", @@ -19890,24 +19314,6 @@ "id": "7c0ed329-430c-4414-a659-6daec3ec0bc0", "last_modified": 1562108340038 }, - { - "schema": 1562108330185, - "derHash": "chMOOyiQA0khRhf01vP7hdCEde54vwlcWUWKFNGCiGY=", - "subject": "CN=Amazon,OU=Server CA 2A,O=Amazon,C=US", - "subjectDN": "MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAyQTEPMA0GA1UEAxMGQW1hem9u", - "whitelist": false, - "attachment": { - "hash": "2a82794488d990d2916a320c0881fba10016362c3188bf9954c30bf6848d39ec", - "size": 2235, - "filename": "G9pa__g3gTgL9wgZj599LbHgZ_FLuep7rnCqwLAwXns=.pem", - "location": "security-state-staging/intermediates/83918488-ba2c-4ac0-8d46-0bf63d394383.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "G9pa//g3gTgL9wgZj599LbHgZ/FLuep7rnCqwLAwXns=", - "crlite_enrolled": false, - "id": "b35b0a67-1556-41a4-a319-97a50209d163", - "last_modified": 1562108330937 - }, { "schema": 1562108327127, "derHash": "ykOJyJ3fwxvsJsdLRKhJjFiy2DhRb6AbFPE5NinlikA=", @@ -20934,24 +20340,6 @@ "id": "0fb33d2f-f64b-456b-ac79-80910985aadd", "last_modified": 1562025423424 }, - { - "schema": 1562025418924, - "derHash": "e+0pJ2rL7Z8Xbzi7o6Z85YFbXL8VIse7WezYawnhbtI=", - "subject": "CN=Amazon,OU=Server CA 4A,O=Amazon,C=US", - "subjectDN": "MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSA0QTEPMA0GA1UEAxMGQW1hem9u", - "whitelist": false, - "attachment": { - "hash": "80e7ade2cfaf2410560723bc955bfee6189c0738bf29f0cbef746f8ab6211ff5", - "size": 1089, - "filename": "F3CN_yt_rsnLG1IV67JCHZewVDyTb6ydbgK5LyDlxwc=.pem", - "location": "security-state-staging/intermediates/e35a1354-e5b2-4212-a952-670b71886c48.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "F3CN/yt/rsnLG1IV67JCHZewVDyTb6ydbgK5LyDlxwc=", - "crlite_enrolled": false, - "id": "e892e888-930b-4d65-ac61-bac8ebb2adc5", - "last_modified": 1562025419658 - }, { "schema": 1562025406966, "derHash": "SKL31+gNQucip1LYkjgcBu7EQUFVydZFKqUG7qTtQ/Y=", @@ -21438,24 +20826,6 @@ "id": "a48f8f7b-e4c4-4695-b74a-c002a3d4d4c9", "last_modified": 1562025274069 }, - { - "schema": 1562025267327, - "derHash": "nG0IkzIBQH+/KxJUC2fMDkyWZvEy4VBHYqcXy66PP9Y=", - "subject": "CN=HydrantID SSL ICA G2,O=HydrantID (Avalanche Cloud Corporation),C=US", - "subjectDN": "MF4xCzAJBgNVBAYTAlVTMTAwLgYDVQQKEydIeWRyYW50SUQgKEF2YWxhbmNoZSBDbG91ZCBDb3Jwb3JhdGlvbikxHTAbBgNVBAMTFEh5ZHJhbnRJRCBTU0wgSUNBIEcy", - "whitelist": false, - "attachment": { - "hash": "c4fbca9a15eb275e83118896e4839aba070abde056cf047aa1a57afdd78af927", - "size": 2406, - "filename": "400Fim9IQe4j-Gj-Ci4R44M3gA6J1_TRh8LlPSLF3I8=.pem", - "location": "security-state-staging/intermediates/a6966be8-fd40-411c-9f57-e4027bd92592.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "400Fim9IQe4j+Gj+Ci4R44M3gA6J1/TRh8LlPSLF3I8=", - "crlite_enrolled": true, - "id": "c6e5ffe6-a302-4ac5-a6b6-3b6b960d5347", - "last_modified": 1562025268059 - }, { "schema": 1562025265805, "derHash": "CCf2v9u/MOoP6s8be9Bu72XbJxrNfptdJpoPLzcrIek=", @@ -22428,24 +21798,6 @@ "id": "e64924af-35f5-4a17-be7d-7a374e1f9cf9", "last_modified": 1562024929214 }, - { - "schema": 1562024919307, - "derHash": "IFFUt3ftxVpRRlhaXlTgVKcL5KrTuF0CMY2ie/gHrfE=", - "subject": "CN=Amazon,OU=Server CA 3A,O=Amazon,C=US", - "subjectDN": "MEYxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZBbWF6b24xFTATBgNVBAsTDFNlcnZlciBDQSAzQTEPMA0GA1UEAxMGQW1hem9u", - "whitelist": false, - "attachment": { - "hash": "05a3b22929a248fe09c8e080b25d2e2076a990ab5c629c24916624485d790547", - "size": 1008, - "filename": "fFO133kTXZr2GV72u3OrmMLImVC4krGS3_14TbklpBw=.pem", - "location": "security-state-staging/intermediates/88877557-2163-4dde-bcc8-c9e7b0b12206.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "fFO133kTXZr2GV72u3OrmMLImVC4krGS3/14TbklpBw=", - "crlite_enrolled": false, - "id": "7760fae2-5a3c-4718-9149-d102bf58eb33", - "last_modified": 1562024920055 - }, { "schema": 1562024917049, "derHash": "bN+dy/NRCju0AnYdYtDF5OevxR2c/wHwK9UyVtxWet8=", @@ -23634,24 +22986,6 @@ "id": "97a2119a-a356-445c-8eb8-989fd062161b", "last_modified": 1562023810560 }, - { - "schema": 1561997070297, - "derHash": "gw/yBa5pSFBZw/sjdqfy+e4cKmHeJZ3QnQu2rWn4iDI=", - "subject": "SERIALNUMBER=Q2826004J,CN=AC Administración Pública,OU=CERES,O=FNMT-RCM,C=ES", - "subjectDN": "MGoxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEOMAwGA1UECwwFQ0VSRVMxEjAQBgNVBAUTCVEyODI2MDA0SjEkMCIGA1UEAwwbQUMgQWRtaW5pc3RyYWNpw7NuIFDDumJsaWNh", - "whitelist": false, - "attachment": { - "hash": "1a643193c39cf1aa75be19f71a124a43c4ff5403f87361b228eed95bdccebd66", - "size": 2438, - "filename": "uoKUEuwkPtDw_4xcvGkwXVXs-8X9iESzjMRl18SDGV0=.pem", - "location": "security-state-staging/intermediates/b2066e9b-2ccd-4607-b8f6-e71ba0621bca.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "uoKUEuwkPtDw/4xcvGkwXVXs+8X9iESzjMRl18SDGV0=", - "crlite_enrolled": true, - "id": "a37e40f6-ffa2-4d26-992d-432521bce7f9", - "last_modified": 1562023808306 - }, { "schema": 1559867684823, "derHash": "9nIr5ErNrltaizsLSvn0v15fvDlhz1JsvZdp0cbhSFk=",
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit e8b1bf77a277426999b734a6fea0d6bec6adbab1 Author: ffxbld ffxbld@mozilla.com AuthorDate: Thu Apr 21 10:56:21 2022 +0000
No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings - a=repo-update,r=dsmith
Differential Revision: https://phabricator.services.mozilla.com/D144273 --- security/manager/ssl/StaticHPKPins.h | 2 +- security/manager/ssl/nsSTSPreloadList.inc | 143 +++++++++------------ .../dumps/blocklists/addons-bloomfilters.json | 14 ++ 3 files changed, 73 insertions(+), 86 deletions(-)
diff --git a/security/manager/ssl/StaticHPKPins.h b/security/manager/ssl/StaticHPKPins.h index 576a67dfe78e0..b0b96b7582b50 100644 --- a/security/manager/ssl/StaticHPKPins.h +++ b/security/manager/ssl/StaticHPKPins.h @@ -1149,4 +1149,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
static const int32_t kUnknownId = -1;
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1658746191791000); +static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1659005507277000); diff --git a/security/manager/ssl/nsSTSPreloadList.inc b/security/manager/ssl/nsSTSPreloadList.inc index 760149c018cf0..39befbccb303e 100644 --- a/security/manager/ssl/nsSTSPreloadList.inc +++ b/security/manager/ssl/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/
#include <stdint.h> -const PRTime gPreloadListExpirationTime = INT64_C(1661165383365000); +const PRTime gPreloadListExpirationTime = INT64_C(1661424700337000); %% 0--1.de, 1 0-1.party, 1 @@ -1038,6 +1038,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1661165383365000); 156k66.com, 1 156z6.com, 1 157z6.com, 1 +158306.com, 0 158bg.com, 1 158fb.com, 1 158ia.com, 1 @@ -1439,7 +1440,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1661165383365000); 1hfree.tk, 1 1huiszoeken.nl, 1 1ii.im, 1 -1in9.net, 1 1it.click, 1 1js.de, 1 1kando.com, 0 @@ -3615,6 +3615,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1661165383365000); 5i.gs, 1 5icsb.com, 1 5ilg.com, 1 +5in.win, 0 5keys.ru, 1 5long88.com, 1 5net.ga, 1 @@ -6363,7 +6364,6 @@ academiaeureka.tk, 1 academiaoposicionescorreos.com, 1 academiasdemodelos.com, 1 academica.nl, 1 -academichealthscience.net, 1 academichelp.gq, 1 academicperks.org, 1 academie-de-police.ch, 0 @@ -7715,7 +7715,6 @@ agence-wazacom.fr, 1 agences-cegee.fr, 1 agencesaintpierre.fr, 1 agencetourismemali.ml, 1 -agencia.cat, 1 agenciacanina.tk, 1 agenciacorujadesign.com.br, 1 agenciaempleo.tk, 1 @@ -7892,7 +7891,6 @@ agpsn.com, 1 agptco.com, 1 agr.asia, 1 agralines.tk, 1 -agrargruppe.tk, 1 agraw.tk, 1 agregator.tk, 1 agrekov.ru, 1 @@ -7987,6 +7985,7 @@ ahealthyjourney.ca, 1 ahegaoroulette.com, 1 ahelos.tk, 1 ahenkerp.com, 1 +ahero4all.org, 1 ahg-offices.fr, 1 ahhcomfortshoes.com, 1 ahidta.gov, 1 @@ -9649,6 +9648,7 @@ altaizemlya.ga, 1 altaizemlya.ml, 1 altaizemlya.tk, 1 altaplana.be, 1 +altaynews.kz, 0 altco.group, 1 altcoinandme.com, 1 altd.cz, 1 @@ -10215,7 +10215,6 @@ ams.co.rs, 1 amsconnectapp.com, 1 amscrosscomp.nl, 1 amsel305nc.ddnss.de, 1 -amsfoodhk.com, 1 amstelradio.tk, 1 amstelveentje.nl, 1 amsterdam4u.tk, 1 @@ -12017,7 +12016,6 @@ argovpn.com, 1 argrafiche.it, 1 argumentative-essay.gq, 1 argumentplus.ru, 1 -argyrakis.gr, 1 arheh.com, 1 arhipka.tk, 1 arhitekti.hr, 1 @@ -13243,7 +13241,6 @@ atuendomr.com, 1 atunel.tk, 1 atvirtual.at, 1 atvsafety.gov, 1 -atwar-mod.com, 1 atwatermn.gov, 1 atwonline.org, 1 atxchirocoverage.com, 1 @@ -13374,7 +13371,6 @@ aulasprofdanilo.com.br, 1 aumentada.net, 1 aumilieudumonde.gf, 1 aumisc.com, 1 -aunali1.com, 1 auntiesnorkel.com, 1 auntmia.com, 1 aunto.xyz, 1 @@ -14099,7 +14095,6 @@ avtoucheba.tk, 1 avtours.gr, 1 avtoveles.by, 1 avtovikup.ml, 1 -avtovokzaly.ru, 1 avtoyurist.cf, 1 avtoyurist.ga, 1 avtoyurist.gq, 1 @@ -14983,7 +14978,6 @@ bairrosonline.com, 1 bairuo.top, 0 bait55.ru, 1 baitable.ml, 1 -baithe.co.za, 1 baitulongbaycruises.com, 1 baity.net, 1 baixadordemusica.tk, 1 @@ -15145,6 +15139,7 @@ baltimorecashflow.com, 1 baltimorejetcharter.com, 1 baltimoreroofingservices.com, 1 bam.com.gt, 1 +bamaagahi.ir, 1 bamahammer.com, 1 bamaland.org, 1 bamberger-maelzerei.de, 1 @@ -17077,7 +17072,7 @@ bet333q.com, 1 bet333r.com, 0 bet333s.com, 1 bet333t.com, 1 -bet333u.com, 1 +bet333u.com, 0 bet333v.com, 0 bet333w.com, 0 bet333x.com, 1 @@ -20775,7 +20770,6 @@ bubblegumblog.com, 1 bubblelist.tk, 1 bubblesco.tk, 1 bubblespetspa.com, 1 -bubblin.io, 1 bubblinghottubs.co.uk, 1 bubblybouncers.co.uk, 1 bubhub.io, 1 @@ -22441,7 +22435,6 @@ canmipai.com, 1 cannabis-marijuana.com, 1 cannabiscare.ca, 1 cannabislegality.info, 1 -cannabismd.com, 1 cannabiz.tk, 1 cannacards.ca, 1 cannagoals.com, 1 @@ -23425,7 +23418,6 @@ catl.st, 1 catland.club, 1 catlettsburgky.gov, 1 catlicking.com, 1 -catlovingcare.com, 1 catmash.tk, 0 catme.org, 1 catmoose.ca, 1 @@ -23523,7 +23515,6 @@ cbh.org, 1 cbhq.net, 1 cbi-epa.gov, 1 cbin168.com, 1 -cbin9.com, 1 cbintermountainrealty.com, 1 cbmanager.dk, 1 cbmusa.com, 1 @@ -25321,6 +25312,7 @@ cio.go.jp, 0 cio.gov, 1 ciordigital.com, 1 cioscloud.com, 1 +cip.md, 1 cipartyhire.co.uk, 1 ciph.zone, 1 cipher.team, 1 @@ -25379,7 +25371,7 @@ cisa.gov, 1 cisamexico.com, 1 ciscoasanetflow.com, 1 ciscocyberthreatdefense.com, 1 -ciscodude.net, 0 +ciscodude.net, 1 ciscom.tk, 1 cisconetflowleader.com, 1 cisconetflowpartners.com, 1 @@ -26321,7 +26313,6 @@ cncollege.tk, 1 cncr.ga, 1 cncrans.ch, 0 cncs.gob.do, 1 -cncs.gov.pt, 1 cnet-hosting.com, 1 cnetw.xyz, 1 cnexchange.com, 1 @@ -26864,7 +26855,6 @@ columbushydroxide.com, 1 columbushydroxide.net, 1 columbushydroxide.org, 1 columbusks.gov, 1 -columbuswines.com, 1 colwichks.gov, 1 colyakoomusic.com, 1 com-news.io, 1 @@ -27369,7 +27359,6 @@ connyduck.art, 1 connyduck.at, 1 conocchialidasole.it, 1 conocedordigital.com, 1 -conociendosalama.com, 1 conoha.vip, 1 conorboyd.info, 1 conory.com, 1 @@ -27965,7 +27954,6 @@ costinstefan.eu, 1 costoflipitor.gq, 1 costreportdata.com, 0 costruzioni.milano.it, 1 -costulessdirect.com, 1 costum-for-men.tk, 1 costumestylesers.ga, 1 cosummitconstruction.com, 1 @@ -28498,6 +28486,7 @@ crimefreeliving.com, 1 crimesolutions.gov, 1 crimethincx.tk, 1 crimevictims.gov, 1 +criminal-attorney.ru, 1 criminal-market.ml, 1 criminal-news.tk, 1 criminal.enterprises, 1 @@ -28959,6 +28948,7 @@ cthomas.work, 1 cthu.io, 1 cthulhuden.com, 1 ctir.gov.br, 1 +ctj.im, 1 ctknight.me, 1 ctkwwri.org, 1 ctliu.com, 1 @@ -29026,7 +29016,6 @@ cuboxmovies.ga, 1 cubrebocas.tk, 1 cubsbestteaminbaseball.com, 1 cubsradio.tk, 1 -cubua.com, 1 cubyhome.com, 1 cucabot.tk, 1 cucaracha.tk, 1 @@ -29034,6 +29023,7 @@ cucek.tk, 1 cuchichi.es, 1 cuckoo.ee, 1 cuddlecat.io, 1 +cuddlecomfort.com, 1 cuddlingyaks.com, 1 cuddlybeardaycare.com.au, 1 cudesa.gq, 1 @@ -29224,7 +29214,6 @@ custombobbleheads.com, 1 custombuttonco.com, 1 customcodeit.com.au, 0 customcompleteautomotive.com, 1 -customd.com, 0 customdissertation.com, 1 customerbuilders.com, 1 customerfocus.co.za, 1 @@ -29265,6 +29254,7 @@ cutmylink.gq, 1 cutner.co, 1 cutout.ml, 1 cutpasteprofit.tk, 1 +cutt.pro, 0 cutter.li, 1 cuttingedgeperiodontist.com, 1 cuttingedges.tk, 1 @@ -29286,6 +29276,7 @@ cuxpool.net, 1 cuyahogacommunitycollege.tk, 1 cuyahogacountyvotesoh.gov, 1 cvalda.tk, 1 +cvazquez.es, 1 cvbp.nl, 1 cvc.digital, 1 cvdeexpo.com, 1 @@ -29881,6 +29872,7 @@ dallaswestinternational.ga, 1 dallatana.tk, 1 dallemon.dk, 1 dalliard.ch, 1 +dallinbryce.com, 1 dallmeier.net, 1 dalmatians.tk, 1 dalmatiersheusden.be, 1 @@ -32057,6 +32049,7 @@ dexonservicedeskws.azurewebsites.net, 1 dexonsoftware.com, 0 dexterseries.ru, 1 dextra.tk, 1 +deyanadeco.com, 1 deyute.com, 1 dez-online.de, 1 dezea.net, 1 @@ -34401,7 +34394,6 @@ drach.xyz, 1 dracheisolation.tk, 1 drachenleder.de, 1 dracisvet.cz, 1 -dracoon.team, 1 dracox.com, 0 dracula.city, 1 draft.cards, 1 @@ -36141,6 +36133,7 @@ eatsleeprepeat.net, 1 eatson.com, 1 eatz-and-treatz.com, 1 eaucole.com, 1 +eaucube.com, 1 eaugalliediscountpharmacy.com, 1 eaugenethomas.cf, 1 eautocollision.com, 1 @@ -36208,7 +36201,6 @@ ebjork.se, 1 ebki-nsn.gov, 1 eblan.gq, 1 eblog.cf, 1 -eblog.ink, 1 ebola-hosting.cz, 1 ebolacharts.ga, 1 ebolavirus.tk, 1 @@ -38609,7 +38601,6 @@ er-music.com, 1 er.pl, 1 er.tl, 1 era-tec.de, 1 -era.fi, 1 erafat.com, 1 erandymoreira.cf, 1 erandymoreira.ga, 1 @@ -39134,7 +39125,6 @@ esteban-abadahs.tk, 1 estebanborges.com, 1 estebanoria.net, 1 estedafah.com, 1 -esteladigital.com, 1 estenio.com.mx, 1 esteniomexico.com, 1 esteriliza-me.org, 1 @@ -40275,7 +40265,6 @@ f1fever.net, 1 f1grandprix.tk, 1 f1iran.com, 1 f1minute.com, 1 -f1nal-lap.be, 1 f1simulator.tk, 1 f1sport.tk, 1 f1tv-streams.live, 1 @@ -40572,12 +40561,14 @@ faggut.gg, 1 fagus.hopto.org, 1 fahadbook.com, 1 faharas.net, 1 +fahmed.de, 0 fahnamporn.com, 1 fahrenwal.de, 1 fahrenwalde.de, 1 fahrschule-laux.de, 1 fahrwerk.io, 1 fahrzeug-talk.de, 1 +fai.gov, 1 faidanoi.it, 1 faidatefacile.it, 1 faieurope.it, 1 @@ -41187,7 +41178,6 @@ fbi.gov, 1 fbigame.com, 1 fbihr.gov, 1 fbiic.gov, 1 -fbijobs.gov, 1 fbo.gov, 1 fbo.network, 1 fboerman.nl, 1 @@ -43409,7 +43399,6 @@ formulaveevictoria.com.au, 1 fornarisandres.com, 1 fornwall.net, 0 foro-coopfuture.tk, 1 -foro.io, 0 foro.red, 1 foroaranda.com, 1 forobachiller.com, 1 @@ -44645,6 +44634,7 @@ fujikochan.tk, 1 fujiwarashinzo.com, 1 fujiyakimono.com, 1 fukabori-kaidora.com, 1 +fukakukeiba.com, 1 fukase-seed.com, 1 fukikaeru.com, 1 fukn.jp, 1 @@ -44915,7 +44905,6 @@ furrybot.co, 1 furrycraft.ga, 1 furrytech.network, 1 fursandfur.tk, 1 -fursuitbutts.com, 0 furtodo.com, 1 furu-sato.com, 1 furuy.com, 1 @@ -45020,6 +45009,7 @@ fxislamic.com, 1 fxnotch.com, 1 fxopen.co.uk, 1 fxopen.com, 1 +fxopen.com.au, 1 fxopen.com.br, 1 fxopen.com.mx, 1 fxopen.my, 1 @@ -45183,7 +45173,6 @@ gadecs.com, 1 gadget-freak.cf, 1 gadget-tips.com, 1 gadgetflashers.ga, 1 -gadgetflip.com, 1 gadgetfreak.cf, 1 gadgetgi.ga, 1 gadgethacks.com, 1 @@ -46917,7 +46906,6 @@ giochistem.it, 1 giocolive.com, 1 gioielleriamolena.com, 1 giongcaosu.com, 1 -giordano.com, 1 giordanomultiservice.it, 1 giorgia.tk, 1 giovannarossi.tk, 1 @@ -47470,7 +47458,6 @@ goand.run, 1 goapunks.net, 0 goarmy.eu, 1 goatbot.xyz, 1 -goatcloud.com, 1 goatstore.ca, 1 goatstudio.sg, 1 goaudits.com, 1 @@ -50157,7 +50144,6 @@ hatachan.site, 1 hatake.tk, 1 hataonline.tk, 1 hatarisecurity.co.ke, 1 -hatcher.cloud, 1 hate.ga, 1 hate.tk, 1 hatemarga.tk, 1 @@ -50775,7 +50761,6 @@ heatherleysephotography.com, 1 heathersmithcommercial.com, 1 heatingequipment.tk, 1 heaven-boutique.de, 0 -heaven.moe, 1 heavenlybeauty.tk, 1 heavenlyseals.com, 1 heavenlysmokenc.com, 1 @@ -51336,7 +51321,6 @@ hexstreamsoft.com, 1 hexxagon.com, 1 hey.pw, 1 heybaker.com.au, 1 -heyboldface.com, 1 heybookmark.ga, 1 heybookmark.gq, 1 heybritney.tk, 1 @@ -52110,6 +52094,7 @@ holytransaction.com, 1 holyubofficial.net, 1 holywhite.com, 1 holywr.it, 1 +holz.nu, 1 holzed.com, 1 holzschutz-holzbearbeitung.de, 1 holzspielzeug-shop.ch, 1 @@ -52874,7 +52859,6 @@ howellaccounts.co.uk, 1 howesky.com, 1 howgoodwasmysex.com, 1 howieisawesome.com, 1 -howinsider.com, 1 howlers.tk, 1 howlettmartin.com, 1 howlingbasset.co.uk, 1 @@ -52991,7 +52975,6 @@ hrmn.xyz, 1 hrndz.io, 1 hro.to, 1 hrobert.hu, 1 -hroling.nl, 1 hromaticworld.tk, 1 hroschyk.cz, 1 hrpage.ml, 1 @@ -53865,6 +53848,7 @@ icesemulator.com, 1 iceshadow.tk, 1 icetiger.eu, 1 icetravellers.com, 0 +icetwister.com, 1 icewoman.net, 1 icewood-bois.com, 1 ich-finde-wikipedia-toll.tk, 1 @@ -53913,7 +53897,6 @@ icon-art.nl, 1 icon-programming.tk, 1 iconintegration.com.au, 1 iconoarte.tk, 1 -iconomi.net, 1 icons4free.tk, 1 iconworld.ml, 1 iconx.ml, 1 @@ -55598,7 +55581,6 @@ innovum.cz, 1 innowire.tk, 1 innsalzachsingles.de, 1 innvisiondesign.net, 1 -innwan.com, 1 inoa8.com, 1 inoder.com, 1 inoio.de, 1 @@ -56906,6 +56888,7 @@ it-stack.de, 1 it-support-stockholm.se, 1 it-tainment.de, 1 it-tekniker.nu, 1 +it-ti.me, 1 it-uws.com, 0 it-volgograd.tk, 1 it-web-entwicklung.de, 1 @@ -56914,7 +56897,6 @@ it-xperts.be, 1 it-zt.at, 1 it.search.yahoo.com, 0 it1b.com, 1 -it4sure.nl, 1 it82.com, 1 itabenar.tk, 1 itactiq.com, 1 @@ -58370,7 +58352,6 @@ jewelleryoutlook.com, 1 jewelleryrack.com, 1 jewelry-directories.tk, 1 jewelrycoverers.ga, 1 -jewishboyscouts.com, 1 jewishinseattle.org, 1 jewishmusic.tk, 1 jewishphilanthropies.org, 1 @@ -58433,7 +58414,6 @@ jiangshiart.com, 1 jiangwu.eu, 1 jiangxu.site, 1 jiangzm.com, 0 -jianji.de, 1 jianny.me, 1 jianshu.com, 1 jianwei.wang, 1 @@ -59568,6 +59548,7 @@ juspay.in, 1 jusquauxdents.tk, 1 just-a-clanpage.de, 1 just-bees.de, 1 +just-heberg.fr, 1 just-keep-swimming.tk, 1 just-muh.de, 1 just-pools.co.za, 1 @@ -60437,7 +60418,6 @@ kasparovru.ml, 1 kasparovru.tk, 1 kasper-team.tk, 1 kasperstad.dk, 1 -kassa.at, 1 kassa.com, 1 kassa.expert, 1 kassola.tk, 1 @@ -61964,7 +61944,7 @@ knighki-knighki.ml, 1 knighkidoma.tk, 1 knightsblog.de, 1 knightsbridge.net, 1 -knightsweep.com, 1 +knightsweep.com, 0 knighulki.cf, 1 knigi-free.cf, 1 knigi-market.ml, 1 @@ -62764,6 +62744,7 @@ krosovki-nike.tk, 1 krossakorven.tk, 1 krouzkyliduska.cz, 0 krovatka.tk, 1 +kroy.io, 1 kroyou.com, 0 krozilla.tk, 1 krpaforum.org, 1 @@ -63494,7 +63475,6 @@ lacaveducinquantenaire.com, 1 lacazadora.tk, 1 laceleste.it, 1 lacentral.com, 0 -lacetsfun.com, 1 lacetsroses.ch, 1 laceysfarm.ie, 1 lachainedesentrepreneurs.fr, 1 @@ -63946,7 +63926,6 @@ lanyards.com.au, 1 lanyardsfactory.com.au, 0 lanzalex.com, 1 lanzamientovirtual.es, 1 -laobayy.com, 1 laoctavadireccion.tk, 1 laodongkynghi.info, 1 laolaweb.tk, 1 @@ -66832,7 +66811,6 @@ locald.at, 1 localegroup.com, 0 localexpert.realestate, 1 localhorst.duckdns.org, 1 -localhost.cat, 1 localized.tk, 1 localizejs.com, 1 localizestaging.com, 1 @@ -67677,7 +67655,6 @@ lrumeq.com, 1 lrv-grobbendonk.tk, 1 ls-alarm.de, 1 ls-mapping-team.de, 1 -ls-rp.es, 1 lsal.me, 1 lsbricks.com, 1 lsc-dillingen.de, 1 @@ -67696,7 +67673,6 @@ lsmentor.com, 1 lspdonline.gq, 1 lsquo.com, 1 lsscreens.de, 1 -lstlx.com, 1 lstma.com, 1 lstu.tk, 1 lsv-tech.com, 1 @@ -67723,7 +67699,6 @@ ltmw.xyz, 1 ltn-tom-morel.fr, 1 ltonlinestore.in, 0 ltransferts.com, 1 -lts-tec.de, 1 ltservers.net, 1 lty.space, 1 lu-rp.es, 1 @@ -69380,6 +69355,7 @@ manytubes.ga, 1 manyzero.ml, 1 maomihz.com, 1 maone.net, 1 +maorx.cn, 1 maowtm.org, 1 maozedong.red, 1 map4erfurt.de, 1 @@ -70362,6 +70338,7 @@ matuslab.net, 1 matway.com, 1 matway.net, 1 matyldamost.cz, 1 +matze.co, 1 matze.org, 0 mau.chat, 1 mau.fi, 1 @@ -70462,6 +70439,7 @@ maxibanki.ovh, 1 maxico.tk, 1 maxiglobal.net, 1 maxihide.tk, 1 +maxima.at, 0 maximanet.tk, 1 maximbaz.com, 1 maximdeboiserie.be, 1 @@ -72405,6 +72383,7 @@ michelwolf.ch, 1 michey.tk, 1 michibeck.eu, 1 michielbijland.nl, 1 +michielvanfastenhout.nl, 1 michig.tk, 1 michiganhealth.tk, 1 michiganstateuniversityonline.com, 1 @@ -72998,6 +72977,7 @@ mintert.net, 1 mintitafever.tk, 1 minto.cc, 1 minton.systems, 1 +mintosherbs.com, 1 mintse.com, 1 minttang.cn, 0 minu.link, 1 @@ -73631,7 +73611,6 @@ mobisuper.com.au, 1 mobitracker.co, 1 mobius.network, 1 mobizat.com, 1 -mobizma.com, 1 moblkar.com, 1 mobmp4.info, 1 mobobe.com, 1 @@ -73783,7 +73762,6 @@ moeloli.ac.cn, 1 moenew.top, 1 moenew.us, 1 moepass.com, 1 -moeqing.net, 1 moescat.xyz, 0 moesif.com, 1 moetrack.com, 1 @@ -76212,7 +76190,6 @@ n-design-service.de, 1 n-design.de, 1 n-doc.com, 1 n-doc.de, 1 -n-gram.it, 1 n-laboratory.jp, 1 n-linear.org, 1 n-m.lu, 1 @@ -77606,7 +77583,6 @@ netzklad.de, 1 netzona.org, 1 netzspielplatz.de, 0 netzsv.website, 1 -netztest.at, 1 netzvieh.de, 1 netzwerk-lq.com, 1 netzwerk-sozialliberal.de, 1 @@ -78832,6 +78808,7 @@ nomasfraudecolorado.gov, 1 nomaspicaduras.com, 1 nomaster.cc, 1 nomenclator.org, 1 +nomesbiblicos.com, 1 nomial.co.uk, 1 nomifensine.com, 1 nomik.xyz, 1 @@ -78949,7 +78926,6 @@ norichanmama.com, 1 noriel.ro, 1 norikazumatsuno.tk, 1 noris.de, 0 -noriskit.nl, 1 noritakechina.com, 1 normaculta.com.br, 1 normalady.com, 1 @@ -80594,7 +80570,6 @@ omandatapark.com, 1 omangrid.com, 1 omanhr.cf, 1 omanko.porn, 0 -omaosurveys.org, 0 omarans.com, 1 omarbaba.shop, 1 omarh.net, 1 @@ -80610,6 +80585,7 @@ omayn.com, 1 ombregialle.it, 1 omdesign.cz, 0 omega-intranet.com, 1 +omega-marijuana.com, 1 omegachess.tk, 1 omegahosting.net, 1 omegalan.tk, 1 @@ -81010,6 +80986,7 @@ onodera.com.br, 1 onoelixir.gr, 1 onondaga.gov, 1 onoranze-funebri.biz, 1 +onoranzefunebri.roma.it, 0 onore.org, 1 onourwifi.com, 1 onpatient.com, 1 @@ -82771,6 +82748,7 @@ paradiserydes.com, 1 paradisestore.org, 1 paradisim.tk, 1 paradordelgitano.com, 1 +paradoxdesigns.org, 1 paradoxium.ml, 1 paraelganzo.tk, 1 paragon-consult.ru, 1 @@ -83213,7 +83191,6 @@ patrickcontainerrotator.ga, 1 patrickdankers.nl, 1 patrickhoefler.net, 1 patricklustigmediation.com, 1 -patrickneuro.de, 1 patrickpeeters.com, 1 patricksymmes.com, 1 patrikjohan.cf, 1 @@ -87907,6 +87884,7 @@ protection.ga, 1 protectionformula.com.ua, 1 protectwrap.ml, 1 protege.moi, 1 +protegetudescanso.com, 1 proteh.com.ua, 1 protein-riegel-test.de, 1 proteinreport.org, 1 @@ -88211,7 +88189,6 @@ psykometrisk.se, 1 psykosyntes.tk, 1 psylab.cc, 0 psylab.re, 0 -psylab.vip, 1 psylliums.com, 1 psynapse.net.au, 1 psyshell.tk, 1 @@ -88245,7 +88222,6 @@ ptit-trocoeur.fr, 1 ptk-svarka.ru, 0 ptlibrary.ml, 1 ptltrade.com, 1 -ptm.ro, 1 ptmarquees.ie, 1 ptrbrs.nl, 1 ptrl.ws, 1 @@ -88260,7 +88236,6 @@ pty.gg, 1 puac.de, 1 pub-online.ro, 1 pubclub.com, 1 -pube.tk, 1 pubertytalk.com, 1 pubi.me, 1 pubkit.io, 1 @@ -88782,6 +88757,7 @@ qldcarwreckers.com.au, 1 qldconservation.org.au, 1 qldformulaford.org, 1 qliving.com, 1 +qlix.pl, 1 qlrace.com, 0 qm-marzahnnordwest.de, 1 qmarket.tk, 1 @@ -90016,7 +89992,6 @@ ravihotel.com, 0 ravijuhend.ee, 1 ravik.tk, 1 ravimiamet.ee, 1 -ravindran.me, 1 raviparekh.co.uk, 1 ravis.org, 1 ravkr.duckdns.org, 1 @@ -90299,7 +90274,6 @@ realestateboston.tk, 1 realestatecentralcoast.info, 1 realestateexecutives.tk, 1 realestategreenville.tk, 1 -realestateonehowell.com, 1 realestatesales.gov, 1 realfamilyincest.com, 1 realfreedom.city, 0 @@ -91748,6 +91722,7 @@ richmondradiologists.com, 1 richmondsunlight.com, 1 richmoney.us, 1 richmtdriver.com, 1 +richonrails.com, 1 richviajero.com, 1 richwayfun.com, 1 ricketyspace.net, 0 @@ -92240,7 +92215,6 @@ rochow.me, 1 rocis.gov, 1 rock-base.tk, 1 rocka.me, 1 -rockagogo.com, 1 rockandroll.tk, 1 rockbankland.com.au, 1 rockbridge.tk, 1 @@ -93297,6 +93271,7 @@ russandol.eu, 1 russchooljordan.tk, 1 russell-tech.co.uk, 1 russellenvy.com, 1 +russelljohn.net, 1 russellshobby.com, 1 russellupevents.co.uk, 1 russenes.com, 1 @@ -94963,7 +94938,6 @@ schnuckenhof-wesseloh.de, 1 schnyder-werbung.ch, 0 schody-rozycki.pl, 1 schoenstatt-fathers.link, 1 -schoenstatt-fathers.us, 1 schoenstatt.link, 1 schoepski.de, 1 schoffelcountry.com, 1 @@ -95633,7 +95607,6 @@ secure.advancepayroll.com.au, 1 secure.facebook.com, 0 securebot.ga, 1 securecloudplatform.nl, 1 -securecomms.cz, 1 secureddocumentshredding.com, 1 securedrop.org, 1 secureenduserconnection.se, 1 @@ -96078,7 +96051,6 @@ sentry.io, 1 sentry.nu, 1 sentrybay.com, 1 sentworks.com, 1 -senu.pro, 1 senzaparole.de, 1 senzei.tk, 1 seo-analyse.com, 1 @@ -96841,7 +96813,6 @@ shashlik.tk, 1 shatabdichildrenschool.tk, 1 shatalov.com, 1 shaumine.ml, 1 -shaun.net, 1 shaunallen.co.uk, 1 shaunandamyswedding.com, 1 shaunc.com, 1 @@ -97906,6 +97877,7 @@ silvergoldbull.ws, 1 silverkattens.tk, 1 silverlinkz.net, 1 silvermatch.ga, 1 +silvernight.social, 1 silveronline.ml, 1 silveronline.tk, 1 silversgarage.com, 1 @@ -98721,7 +98693,6 @@ skyscapecanopies.com, 1 skyscnr.com, 1 skyseo.cf, 1 skysoftbg.com, 1 -skysuite.nl, 1 skytec.host, 1 skyterraathome.com, 1 skyterraembrace.com, 1 @@ -98850,7 +98821,6 @@ slmail.me, 1 sln.cloud, 1 slneighbors.org, 1 slo-tech.com, 1 -sloancom.com, 1 sloanrealtygroup.com, 1 sloboda.tk, 1 slobrowink.com, 1 @@ -98927,6 +98897,7 @@ sma-dev.de, 1 sma-gift.com, 1 smackhappy.com, 1 smadav.ml, 1 +smakoszwegrzynka.pl, 1 smaksbanken.no, 1 smalandscountryclub.tk, 1 small-blog.cf, 1 @@ -101727,7 +101698,6 @@ stensund.se, 1 stenvallmcclain.tk, 1 stenzhorn-cloud.de, 1 step2web-cms.info, 1 -stepanvanek.cz, 1 steparovi.cz, 1 steph.ninja, 1 steph3n.me, 1 @@ -101950,6 +101920,7 @@ stirblaut.de, 1 stirling.co, 1 stisidores.org, 1 stitch.money, 1 +stitchfiddle.com, 1 stitchinprogress.com, 1 stjohncamden.com, 1 stjohnin.com, 1 @@ -102416,6 +102387,7 @@ stroeder.com, 1 stroeder.de, 1 stroeerdigital.de, 1 stroginopk.ga, 1 +strogov.me, 1 strogova.me, 1 stroifenix.ru, 1 stroigid.tk, 1 @@ -103009,6 +102981,7 @@ sunkar.tk, 1 sunkimurology.com, 1 sunlit.cloud, 1 sunn.ie, 1 +sunny.co.uk, 1 sunnyhome.tk, 1 sunnylyx.com, 1 sunnynetworks.net, 1 @@ -105371,7 +105344,7 @@ telcodb.net, 1 telcu.com, 1 teldak.pt, 1 tele-alarme.ch, 1 -tele-assistance.ch, 1 +tele-assistance.ch, 0 tele-points.net, 1 tele.wiki, 1 teleafrica.ga, 1 @@ -105875,7 +105848,6 @@ textundblog.de, 1 texus.me, 1 texy.info, 1 teycos.com, 1 -teysens.com, 1 tezcam.tk, 1 tezwifi.com, 1 tf-network.de, 1 @@ -106163,7 +106135,9 @@ thebirchwoods.com, 1 thebismarckmarathon.com, 1 thebit.link, 1 thebitchneyfiles.tk, 1 +theblackboard.gr, 1 theblackcat.ga, 1 +theblackknightsings.com, 1 theblisters.tk, 1 theblondeabroad.com, 0 theblue.tk, 1 @@ -106263,6 +106237,7 @@ thecompanysheffield.uk, 1 theconcordbridge.azurewebsites.net, 1 thecondemned.tk, 1 theconsultingpeople.tk, 1 +thecontentcloud.com, 1 theconversation.com, 1 theconverter.net, 1 thecook.com.co, 1 @@ -107148,6 +107123,7 @@ think-asia.org, 1 think-positive-watches.de, 1 thinkbigdobig.tk, 1 thinkbot.de, 1 +thinkbrands.co.uk, 1 thinkcash.nl, 1 thinkcoconut.com.au, 1 thinkdata.com.br, 1 @@ -108387,6 +108363,8 @@ tonnycat.com, 1 tono.us, 1 tonorosario.tk, 1 tonshaiza.tk, 1 +tonsit.com, 1 +tonsit.org, 0 tonton.cf, 1 tontonnews.net, 1 tontonroger.org, 1 @@ -110865,7 +110843,6 @@ uber-work.tk, 1 uberactivist.com, 1 uberalles.live, 1 uberboxen.net, 1 -uberestimator.com, 1 ubergamingworld.tk, 1 uberhorny.tk, 1 uberi.fi, 1 @@ -110915,6 +110892,7 @@ ucamind.com, 1 ucangiller.com, 1 ucasa.org.au, 1 ucatchemguideservice.com, 1 +ucc.edu.gh, 1 ucch.be, 0 uccisme.net.ua, 1 ucdap.com, 1 @@ -110926,6 +110904,7 @@ ucheba.ga, 1 ucheba.gq, 1 ucheba.tk, 1 uchuumontreal.com, 1 +ucibt.com, 1 ucinvest.com.au, 1 uciplasticsurgery.com, 1 uclf.de, 1 @@ -111378,10 +111357,6 @@ unicorndesign.ninja, 1 unicornmusic.tk, 1 unicorntooling.eu, 1 unicrack.cf, 1 -unicredit.ba, 1 -unicredit.ro, 1 -unicreditbank.hu, 1 -unicreditbank.rs, 1 unicreditbank.ru, 0 unicreditbulbank.info, 1 unicul.tk, 1 @@ -111613,7 +111588,6 @@ unrestricted.ga, 1 unric.org, 1 unripple.com, 1 unruh.fr, 0 -uns.vn, 1 unsee.cc, 1 unseeliefilms.com, 1 unseeliepress.com, 1 @@ -111860,7 +111834,6 @@ urge55.com, 1 urgences-valais.ch, 1 urgent-notice.ml, 1 urgentcaresouthaven.com, 1 -urion.com.br, 1 uriport.com, 1 uriports.com, 1 uripura.de, 1 @@ -112310,7 +112283,6 @@ va11hal.la, 1 va11halla.ddns.net, 1 vaabogados.legal, 1 vaaddress.co, 1 -vaaes.org, 0 vaan-arbeidsrecht.nl, 1 vaartjesboten.nl, 1 vaat.io, 1 @@ -113748,7 +113720,6 @@ violettecleaning.be, 1 violin4fun.nl, 1 viome.com, 1 vionicbeach.com, 1 -vionicshoes.co.uk, 1 vionicshoes.com, 1 vionity.co, 1 viosey.com, 1 @@ -114950,7 +114921,6 @@ w889889.net, 1 w889vip.com, 1 w88info.com, 1 w88info.win, 1 -w88xinxi.com, 1 w8less.nl, 1 w8wat.com, 1 w9196.com, 1 @@ -116078,6 +116048,7 @@ weednews.co, 0 weedupdate.com, 1 weedworthy.com, 1 weedypedia.de, 1 +week.report, 1 weekdone.com, 1 weekendcandy.com, 1 weekendinitaly.com, 1 @@ -116111,6 +116082,7 @@ wegner.no, 1 wego.ca, 1 wegonnagetsued.org, 1 wegotcookies.com, 1 +wegrzynek.org, 1 wegvielfalt.de, 1 wehealasone.gov.ph, 1 weho.gov, 1 @@ -117341,7 +117313,6 @@ witcher.tk, 1 witchhunt.tk, 1 witchthicktits.tk, 1 with-environment.com, 1 -with-planning.co.jp, 1 wither.cf, 1 witheveryheartbeat.com.au, 1 withextraveg.net, 1 @@ -121552,6 +121523,7 @@ zemlova.cz, 1 zemlyaki.ga, 1 zemlyaki.ml, 1 zemlyaki.tk, 1 +zen-solutions.io, 1 zen-zone.tk, 1 zen3tech.com, 1 zenassociates.com, 1 @@ -122278,6 +122250,7 @@ zumba-oostende.be, 1 zumba.com, 1 zumberak.tk, 1 zumtaedanceschool.co.za, 1 +zumub.com, 1 zumwildenaffen.com, 1 zund-app.com, 1 zundapp.one, 1 diff --git a/services/settings/dumps/blocklists/addons-bloomfilters.json b/services/settings/dumps/blocklists/addons-bloomfilters.json index 85d5ada3ffb49..855aed7471f53 100644 --- a/services/settings/dumps/blocklists/addons-bloomfilters.json +++ b/services/settings/dumps/blocklists/addons-bloomfilters.json @@ -1,5 +1,19 @@ { "data": [ + { + "stash": { + "blocked": [ + "{d8246cf5-fdcf-470b-9599-9daa31c7376c}:1.0", + "{f9508171-fff5-4fee-94d2-d4bf00adb7e2}:1.0" + ], + "unblocked": [] + }, + "schema": 1649939903702, + "key_format": "{guid}:{version}", + "stash_time": 1650371708670, + "id": "982c0a03-ffd9-4e68-92eb-db63664bb880", + "last_modified": 1650371906091 + }, { "stash": { "blocked": [
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit adbcbe5ad63ba5fdbd1da8790a13ba08624de696 Author: Matthew Gregan kinetik@flim.org AuthorDate: Sat Apr 16 05:30:17 2022 +0000
Bug 1753298 - Improve error handling in BaseMediaResource::ModifyLoadFlags. r=padenot,a=dsmith
Differential Revision: https://phabricator.services.mozilla.com/D143863 --- dom/media/BaseMediaResource.cpp | 17 ++++++++++------- dom/media/BaseMediaResource.h | 2 +- dom/media/ChannelMediaResource.cpp | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/dom/media/BaseMediaResource.cpp b/dom/media/BaseMediaResource.cpp index 181668f4dc270..e5ba50109a1f9 100644 --- a/dom/media/BaseMediaResource.cpp +++ b/dom/media/BaseMediaResource.cpp @@ -136,24 +136,25 @@ void BaseMediaResource::SetLoadInBackground(bool aLoadInBackground) { } else { loadFlags &= ~nsIRequest::LOAD_BACKGROUND; } - ModifyLoadFlags(loadFlags); + Unused << NS_WARN_IF(NS_FAILED(ModifyLoadFlags(loadFlags))); } }
-void BaseMediaResource::ModifyLoadFlags(nsLoadFlags aFlags) { +nsresult BaseMediaResource::ModifyLoadFlags(nsLoadFlags aFlags) { nsCOMPtr<nsILoadGroup> loadGroup; nsresult rv = mChannel->GetLoadGroup(getter_AddRefs(loadGroup)); MOZ_ASSERT(NS_SUCCEEDED(rv), "GetLoadGroup() failed!");
- nsresult status; - mChannel->GetStatus(&status); - bool inLoadGroup = false; if (loadGroup) { + nsresult status; + mChannel->GetStatus(&status); + rv = loadGroup->RemoveRequest(mChannel, nullptr, status); - if (NS_SUCCEEDED(rv)) { - inLoadGroup = true; + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; } + inLoadGroup = true; }
rv = mChannel->SetLoadFlags(aFlags); @@ -163,6 +164,8 @@ void BaseMediaResource::ModifyLoadFlags(nsLoadFlags aFlags) { rv = loadGroup->AddRequest(mChannel, nullptr); MOZ_ASSERT(NS_SUCCEEDED(rv), "AddRequest() failed!"); } + + return NS_OK; }
} // namespace mozilla diff --git a/dom/media/BaseMediaResource.h b/dom/media/BaseMediaResource.h index 3c2e2419a82b2..29cde01e8c59c 100644 --- a/dom/media/BaseMediaResource.h +++ b/dom/media/BaseMediaResource.h @@ -127,7 +127,7 @@ class BaseMediaResource : public MediaResource, // Set the request's load flags to aFlags. If the request is part of a // load group, the request is removed from the group, the flags are set, and // then the request is added back to the load group. - void ModifyLoadFlags(nsLoadFlags aFlags); + nsresult ModifyLoadFlags(nsLoadFlags aFlags);
RefPtr<MediaResourceCallback> mCallback;
diff --git a/dom/media/ChannelMediaResource.cpp b/dom/media/ChannelMediaResource.cpp index ce35987e79747..7643ed249f0ff 100644 --- a/dom/media/ChannelMediaResource.cpp +++ b/dom/media/ChannelMediaResource.cpp @@ -339,7 +339,7 @@ nsresult ChannelMediaResource::OnStopRequest(nsIRequest* aRequest, NS_ASSERTION(NS_SUCCEEDED(rv), "GetLoadFlags() failed!");
if (loadFlags & nsIRequest::LOAD_BACKGROUND) { - ModifyLoadFlags(loadFlags & ~nsIRequest::LOAD_BACKGROUND); + Unused << NS_WARN_IF(NS_FAILED(ModifyLoadFlags(loadFlags & ~nsIRequest::LOAD_BACKGROUND))); }
// Note that aStatus might have succeeded --- this might be a normal close
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit 6f108e7ce8efe949336af3f23e280427a07ac5d4 Author: Rob Lemley rob@thunderbird.net AuthorDate: Thu Jan 13 19:10:26 2022 +0000
Bug 1747879 - Pass Thunderbird subrepo srcpath to symbolstore.py. r=firefox-build-system-reviewers,andi,a=dsmith
The sym files generated for Thunderbird builds contain incorrect VCS references. symbolstore.py will handle the subrepo correctly with an additional -s argument if MOZ_SOURCE_REPO and MOZ_SOURCE_CHANGESET are not set. See D135392.
Differential Revision: https://phabricator.services.mozilla.com/D135299 --- python/mozbuild/mozbuild/action/dumpsymbols.py | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/python/mozbuild/mozbuild/action/dumpsymbols.py b/python/mozbuild/mozbuild/action/dumpsymbols.py index 088bc288d8839..f1f565b985d43 100644 --- a/python/mozbuild/mozbuild/action/dumpsymbols.py +++ b/python/mozbuild/mozbuild/action/dumpsymbols.py @@ -57,6 +57,9 @@ def dump_symbols(target, tracking_file, count_ctors=False): if objcopy: os.environ["OBJCOPY"] = objcopy
+ if buildconfig.substs.get("MOZ_THUNDERBIRD"): + sym_store_args.extend(["-s", os.path.join(buildconfig.topsrcdir, "comm")]) + args = ( [ sys.executable,
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit 405e75b662d6977d5d319ae16b5c24534236555f Author: Jeff Muizelaar jmuizelaar@mozilla.com AuthorDate: Mon Apr 11 12:42:24 2022 +0000
Bug 1762125. Allow DXVA on newer Intel drivers. r=aosmond a=a=dsmith
Newer Intel drivers break our assumptions about the bottom four digits being the build id and we end up blocking newer drivers with build ids like 11404. This reverts the change in bug 1295902 which changed this blocklist rule to only look at the build number. I think bug 1295902 was just trying to be more correct and I don't know that it actually blocks important crashes. Decoding now mostly happens in the GPU process so the impact of these crashes is reduced from what it originally was.
The information on how to interpret Intel driver version is from: https://www.intel.ca/content/www/ca/en/support/articles/000005654/graphics.h...
The proper fix is to have Intel specific driver version parsing.
This is a more conservative fix that also adds blocking for drivers earlier or equal to 8.15.10.2849.
Differential Revision: https://phabricator.services.mozilla.com/D143362 --- widget/windows/GfxInfo.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/widget/windows/GfxInfo.cpp b/widget/windows/GfxInfo.cpp index 6a58c9a71d6f4..cbf42c810092c 100644 --- a/widget/windows/GfxInfo.cpp +++ b/widget/windows/GfxInfo.cpp @@ -1686,12 +1686,18 @@ const nsTArray<GfxDriverInfo>& GfxInfo::GetGfxDriverInfo() { V(8, 15, 10, 2869), "FEATURE_FAILURE_INTEL_W7_HW_DECODING");
/* Bug 1203199/1092166: DXVA startup crashes on some intel drivers. */ - APPEND_TO_DRIVER_BLOCKLIST(OperatingSystem::Windows, DeviceFamily::IntelAll, - nsIGfxInfo::FEATURE_HARDWARE_VIDEO_DECODING, - nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION, - DRIVER_BUILD_ID_LESS_THAN_OR_EQUAL, 2849, - "FEATURE_FAILURE_BUG_1203199_1", - "Intel driver > X.X.X.2849"); + APPEND_TO_DRIVER_BLOCKLIST_RANGE(OperatingSystem::Windows, DeviceFamily::IntelAll, + nsIGfxInfo::FEATURE_HARDWARE_VIDEO_DECODING, + nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION, + DRIVER_BETWEEN_INCLUSIVE, V(9,17,10,0), V(9,17,10,2849), + "FEATURE_FAILURE_BUG_1203199_1", "Intel driver > 9.17.10.2849"); + + /* Bug 1203199/1092166: DXVA startup crashes on some intel drivers. */ + APPEND_TO_DRIVER_BLOCKLIST_RANGE(OperatingSystem::Windows, DeviceFamily::IntelAll, + nsIGfxInfo::FEATURE_HARDWARE_VIDEO_DECODING, + nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION, + DRIVER_BETWEEN_INCLUSIVE, V(8,15,10,0), V(8,15,10,2849), + "FEATURE_FAILURE_BUG_1203199_1", "Intel driver > 8.15.10.2849");
APPEND_TO_DRIVER_BLOCKLIST2( OperatingSystem::Windows, DeviceFamily::Nvidia8800GTS,
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit 2ccdca191a440f17990f9ab00680d034eb59c9ea Author: Tom Ritter tom@mozilla.com AuthorDate: Mon Apr 11 16:51:56 2022 +0000
Bug 1762614: Update libopus to 2654707e86cc94413998976d179b2ab4a2aa3114 r=kinetik,a=dsmith
Differential Revision: https://phabricator.services.mozilla.com/D142717 --- media/libopus/README_MOZILLA | 2 +- media/libopus/celt/arch.h | 5 +- media/libopus/celt/arm/armcpu.c | 2 + media/libopus/celt/bands.c | 11 +- media/libopus/celt/celt_decoder.c | 10 +- media/libopus/celt/celt_encoder.c | 4 +- media/libopus/celt/celt_lpc.c | 62 +- media/libopus/celt/ecintrin.h | 4 + media/libopus/celt/fixed_debug.h | 45 + media/libopus/celt/fixed_generic.h | 14 +- media/libopus/celt/float_cast.h | 58 +- media/libopus/celt/mathops.h | 4 +- media/libopus/celt/mips/celt_mipsr1.h | 1 + media/libopus/celt/mips/vq_mipsr1.h | 8 +- media/libopus/celt/os_support.h | 1 - media/libopus/celt/rate.c | 2 +- media/libopus/celt/rate.h | 2 +- media/libopus/celt/stack_alloc.h | 4 +- media/libopus/celt/vq.c | 4 + media/libopus/celt/vq.h | 4 - media/libopus/celt/x86/pitch_sse.h | 2 +- media/libopus/celt/x86/pitch_sse4_1.c | 51 +- media/libopus/celt/x86/x86cpu.h | 34 +- media/libopus/include/opus_custom.h | 4 +- media/libopus/include/opus_defines.h | 13 +- media/libopus/moz.build | 2 +- media/libopus/nonunified2.patch | 2 - media/libopus/silk/CNG.c | 4 + media/libopus/silk/LPC_fit.c | 3 +- media/libopus/silk/MacroCount.h | 2 +- media/libopus/silk/NSQ.c | 36 +- media/libopus/silk/NSQ_del_dec.c | 40 +- media/libopus/silk/PLC.c | 6 +- media/libopus/silk/SigProc_FIX.h | 6 +- media/libopus/silk/VAD.c | 5 +- media/libopus/silk/VQ_WMat_EC.c | 4 +- .../libopus/silk/arm/LPC_inv_pred_gain_neon_intr.c | 22 +- media/libopus/silk/bwexpander_32.c | 3 +- media/libopus/silk/debug.c | 10 +- media/libopus/silk/debug.h | 25 +- media/libopus/silk/decode_frame.c | 1 - media/libopus/silk/define.h | 1 + .../arm/warped_autocorrelation_FIX_neon_intr.c | 9 +- media/libopus/silk/fixed/burg_modified_FIX.c | 8 +- .../fixed/mips/warped_autocorrelation_FIX_mipsr1.h | 7 +- media/libopus/silk/fixed/vector_ops_FIX.c | 2 +- .../silk/fixed/warped_autocorrelation_FIX.c | 2 + .../silk/fixed/x86/burg_modified_FIX_sse4_1.c | 69 +- .../libopus/silk/fixed/x86/vector_ops_FIX_sse4_1.c | 40 +- .../silk/float/warped_autocorrelation_FLP.c | 4 +- media/libopus/silk/main.h | 60 +- media/libopus/silk/typedef.h | 3 + media/libopus/silk/x86/NSQ_del_dec_sse4_1.c | 179 ++- media/libopus/silk/x86/NSQ_sse4_1.c | 211 ++-- media/libopus/silk/x86/SigProc_FIX_sse.h | 12 +- media/libopus/silk/x86/VAD_sse4_1.c | 28 +- media/libopus/silk/x86/VQ_WMat_EC_sse4_1.c | 189 +-- media/libopus/silk/x86/main_sse.h | 170 ++- media/libopus/silk/x86/x86_silk_map.c | 89 +- media/libopus/src/analysis.c | 66 +- media/libopus/src/analysis.h | 1 + media/libopus/src/mapping_matrix.h | 2 +- media/libopus/src/mlp.c | 75 +- media/libopus/src/mlp_data.c | 1248 ++++++++++---------- media/libopus/src/opus.c | 2 +- media/libopus/src/opus_encoder.c | 142 ++- media/libopus/src/opus_multistream_decoder.c | 9 +- media/libopus/src/opus_multistream_encoder.c | 11 +- media/libopus/src/opus_private.h | 1 + 69 files changed, 1780 insertions(+), 1382 deletions(-)
diff --git a/media/libopus/README_MOZILLA b/media/libopus/README_MOZILLA index 76f12ab98afaf..d2c5c4920bc90 100644 --- a/media/libopus/README_MOZILLA +++ b/media/libopus/README_MOZILLA @@ -8,4 +8,4 @@ files after the copy step.
The upstream repository is https://git.xiph.org/opus.git
-The git tag/revision used was v1.3-rc-19-g5cbd7d5f. +The git tag/revision used was 2654707e86cc94413998976d179b2ab4a2aa3114. diff --git a/media/libopus/celt/arch.h b/media/libopus/celt/arch.h index c627a744bd291..3845c3a08323f 100644 --- a/media/libopus/celt/arch.h +++ b/media/libopus/celt/arch.h @@ -73,6 +73,9 @@ __attribute__((noreturn)) void celt_fatal(const char *str, const char *file, int line) { fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str); +#if defined(_MSC_VER) + _set_abort_behavior( 0, _WRITE_ABORT_MSG); +#endif abort(); } #endif @@ -160,7 +163,7 @@ static OPUS_INLINE opus_int16 SAT16(opus_int32 x) {
#ifdef OPUS_ARM_PRESUME_AARCH64_NEON_INTR #include "arm/fixed_arm64.h" -#elif OPUS_ARM_INLINE_EDSP +#elif defined (OPUS_ARM_INLINE_EDSP) #include "arm/fixed_armv5e.h" #elif defined (OPUS_ARM_INLINE_ASM) #include "arm/fixed_armv4.h" diff --git a/media/libopus/celt/arm/armcpu.c b/media/libopus/celt/arm/armcpu.c index 694a63b78e687..cce3ae3a9db70 100644 --- a/media/libopus/celt/arm/armcpu.c +++ b/media/libopus/celt/arm/armcpu.c @@ -93,6 +93,8 @@ static OPUS_INLINE opus_uint32 opus_cpu_capabilities(void){
#elif defined(__linux__) /* Linux based */ +#include <stdio.h> + opus_uint32 opus_cpu_capabilities(void) { opus_uint32 flags = 0; diff --git a/media/libopus/celt/bands.c b/media/libopus/celt/bands.c index f7bb66a9358b1..bd54036afe079 100644 --- a/media/libopus/celt/bands.c +++ b/media/libopus/celt/bands.c @@ -371,14 +371,14 @@ void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_mas static void compute_channel_weights(celt_ener Ex, celt_ener Ey, opus_val16 w[2]) { celt_ener minE; -#if FIXED_POINT +#ifdef FIXED_POINT int shift; #endif minE = MIN32(Ex, Ey); /* Adjustment to make the weights a bit more conservative. */ Ex = ADD32(Ex, minE/3); Ey = ADD32(Ey, minE/3); -#if FIXED_POINT +#ifdef FIXED_POINT shift = celt_ilog2(EPSILON+MAX32(Ex, Ey))-14; #endif w[0] = VSHR32(Ex, shift); @@ -901,7 +901,7 @@ static void compute_theta(struct band_ctx *ctx, struct split_ctx *sctx, sctx->itheta = itheta; sctx->qalloc = qalloc; } -static unsigned quant_band_n1(struct band_ctx *ctx, celt_norm *X, celt_norm *Y, int b, +static unsigned quant_band_n1(struct band_ctx *ctx, celt_norm *X, celt_norm *Y, celt_norm *lowband_out) { int c; @@ -926,7 +926,6 @@ static unsigned quant_band_n1(struct band_ctx *ctx, celt_norm *X, celt_norm *Y, sign = ec_dec_bits(ec, 1); } ctx->remaining_bits -= 1<<BITRES; - b-=1<<BITRES; } if (ctx->resynth) x[0] = sign ? -NORM_SCALING : NORM_SCALING; @@ -1134,7 +1133,7 @@ static unsigned quant_band(struct band_ctx *ctx, celt_norm *X, /* Special case for one sample */ if (N==1) { - return quant_band_n1(ctx, X, NULL, b, lowband_out); + return quant_band_n1(ctx, X, NULL, lowband_out); }
if (tf_change>0) @@ -1256,7 +1255,7 @@ static unsigned quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_norm /* Special case for one sample */ if (N==1) { - return quant_band_n1(ctx, X, Y, b, lowband_out); + return quant_band_n1(ctx, X, Y, lowband_out); }
orig_fill = fill; diff --git a/media/libopus/celt/celt_decoder.c b/media/libopus/celt/celt_decoder.c index 8520e57b1f8de..74ca3b740df77 100644 --- a/media/libopus/celt/celt_decoder.c +++ b/media/libopus/celt/celt_decoder.c @@ -117,13 +117,19 @@ void validate_celt_decoder(CELTDecoder *st) #ifndef CUSTOM_MODES celt_assert(st->mode == opus_custom_mode_create(48000, 960, NULL)); celt_assert(st->overlap == 120); + celt_assert(st->end <= 21); +#else +/* From Section 4.3 in the spec: "The normal CELT layer uses 21 of those bands, + though Opus Custom (see Section 6.2) may use a different number of bands" + + Check if it's within the maximum number of Bark frequency bands instead */ + celt_assert(st->end <= 25); #endif celt_assert(st->channels == 1 || st->channels == 2); celt_assert(st->stream_channels == 1 || st->stream_channels == 2); celt_assert(st->downsample > 0); celt_assert(st->start == 0 || st->start == 17); celt_assert(st->start < st->end); - celt_assert(st->end <= 21); #ifdef OPUS_ARCHMASK celt_assert(st->arch >= 0); celt_assert(st->arch <= OPUS_ARCHMASK); @@ -1059,7 +1065,7 @@ int celt_decode_with_ec(CELTDecoder * OPUS_RESTRICT st, const unsigned char *dat ALLOC(pulses, nbEBands, int); ALLOC(fine_priority, nbEBands, int);
- codedBands = compute_allocation(mode, start, end, offsets, cap, + codedBands = clt_compute_allocation(mode, start, end, offsets, cap, alloc_trim, &intensity, &dual_stereo, bits, &balance, pulses, fine_quant, fine_priority, C, LM, dec, 0, 0, 0);
diff --git a/media/libopus/celt/celt_encoder.c b/media/libopus/celt/celt_encoder.c index e6a47df616378..d6f8afc20bfb6 100644 --- a/media/libopus/celt/celt_encoder.c +++ b/media/libopus/celt/celt_encoder.c @@ -1571,7 +1571,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm, (tmp+4*mode->Fs)/(8*mode->Fs)-!!st->signalling)); effectiveBytes = nbCompressedBytes - nbFilledBytes; } - equiv_rate = ((opus_int32)nbCompressedBytes*8*50 >> (3-LM)) - (40*C+20)*((400>>LM) - 50); + equiv_rate = ((opus_int32)nbCompressedBytes*8*50 << (3-LM)) - (40*C+20)*((400>>LM) - 50); if (st->bitrate != OPUS_BITRATE_MAX) equiv_rate = IMIN(equiv_rate, st->bitrate - (40*C+20)*((400>>LM) - 50));
@@ -2191,7 +2191,7 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm, #endif if (st->lfe) signalBandwidth = 1; - codedBands = compute_allocation(mode, start, end, offsets, cap, + codedBands = clt_compute_allocation(mode, start, end, offsets, cap, alloc_trim, &st->intensity, &dual_stereo, bits, &balance, pulses, fine_quant, fine_priority, C, LM, enc, 1, st->lastCodedBands, signalBandwidth); if (st->lastCodedBands) diff --git a/media/libopus/celt/celt_lpc.c b/media/libopus/celt/celt_lpc.c index 8ecb693ee984d..242e6df55e6dc 100644 --- a/media/libopus/celt/celt_lpc.c +++ b/media/libopus/celt/celt_lpc.c @@ -50,17 +50,21 @@ int p #endif
OPUS_CLEAR(lpc, p); +#ifdef FIXED_POINT if (ac[0] != 0) +#else + if (ac[0] > 1e-10f) +#endif { for (i = 0; i < p; i++) { /* Sum up this iteration's reflection coefficient */ opus_val32 rr = 0; for (j = 0; j < i; j++) rr += MULT32_32_Q31(lpc[j],ac[i - j]); - rr += SHR32(ac[i + 1],3); - r = -frac_div32(SHL32(rr,3), error); + rr += SHR32(ac[i + 1],6); + r = -frac_div32(SHL32(rr,6), error); /* Update LPC coefficients and total error */ - lpc[i] = SHR32(r,3); + lpc[i] = SHR32(r,6); for (j = 0; j < (i+1)>>1; j++) { opus_val32 tmp1, tmp2; @@ -73,17 +77,61 @@ int p error = error - MULT32_32_Q31(MULT32_32_Q31(r,r),error); /* Bail out once we get 30 dB gain */ #ifdef FIXED_POINT - if (error<SHR32(ac[0],10)) + if (error<=SHR32(ac[0],10)) break; #else - if (error<.001f*ac[0]) + if (error<=.001f*ac[0]) break; #endif } } #ifdef FIXED_POINT - for (i=0;i<p;i++) - _lpc[i] = ROUND16(lpc[i],16); + { + /* Convert the int32 lpcs to int16 and ensure there are no wrap-arounds. + This reuses the logic in silk_LPC_fit() and silk_bwexpander_32(). Any bug + fixes should also be applied there. */ + int iter, idx = 0; + opus_val32 maxabs, absval, chirp_Q16, chirp_minus_one_Q16; + + for (iter = 0; iter < 10; iter++) { + maxabs = 0; + for (i = 0; i < p; i++) { + absval = ABS32(lpc[i]); + if (absval > maxabs) { + maxabs = absval; + idx = i; + } + } + maxabs = PSHR32(maxabs, 13); /* Q25->Q12 */ + + if (maxabs > 32767) { + maxabs = MIN32(maxabs, 163838); + chirp_Q16 = QCONST32(0.999, 16) - DIV32(SHL32(maxabs - 32767, 14), + SHR32(MULT32_32_32(maxabs, idx + 1), 2)); + chirp_minus_one_Q16 = chirp_Q16 - 65536; + + /* Apply bandwidth expansion. */ + for (i = 0; i < p - 1; i++) { + lpc[i] = MULT32_32_Q16(chirp_Q16, lpc[i]); + chirp_Q16 += PSHR32(MULT32_32_32(chirp_Q16, chirp_minus_one_Q16), 16); + } + lpc[p - 1] = MULT32_32_Q16(chirp_Q16, lpc[p - 1]); + } else { + break; + } + } + + if (iter == 10) { + /* If the coeffs still do not fit into the 16 bit range after 10 iterations, + fall back to the A(z)=1 filter. */ + OPUS_CLEAR(lpc, p); + _lpc[0] = 4096; /* Q12 */ + } else { + for (i = 0; i < p; i++) { + _lpc[i] = EXTRACT16(PSHR32(lpc[i], 13)); /* Q25->Q12 */ + } + } + } #endif }
diff --git a/media/libopus/celt/ecintrin.h b/media/libopus/celt/ecintrin.h index 2263cff6bdf30..66a4c36ea40d5 100644 --- a/media/libopus/celt/ecintrin.h +++ b/media/libopus/celt/ecintrin.h @@ -49,7 +49,11 @@ This macro should only be used for implementing ec_ilog(), if it is defined. All other code should use EC_ILOG() instead.*/ #if defined(_MSC_VER) && (_MSC_VER >= 1400) +#if defined(_MSC_VER) && (_MSC_VER >= 1910) +# include <intrin0.h> /* Improve compiler throughput. */ +#else # include <intrin.h> +#endif /*In _DEBUG mode this is not an intrinsic by default.*/ # pragma intrinsic(_BitScanReverse)
diff --git a/media/libopus/celt/fixed_debug.h b/media/libopus/celt/fixed_debug.h index f435295234cff..3765baa60b501 100644 --- a/media/libopus/celt/fixed_debug.h +++ b/media/libopus/celt/fixed_debug.h @@ -410,6 +410,51 @@ static OPUS_INLINE short MULT16_16_16(int a, int b) return res; }
+/* result fits in 32 bits */ +static OPUS_INLINE int MULT32_32_32(opus_int64 a, opus_int64 b) +{ + opus_int64 res; + if (!VERIFY_INT(a) || !VERIFY_INT(b)) + { + fprintf (stderr, "MULT32_32_32: inputs are not int: %d %d\n", a, b); +#ifdef FIXED_DEBUG_ASSERT + celt_assert(0); +#endif + } + res = a*b; + if (!VERIFY_INT(res)) + { + fprintf (stderr, "MULT32_32_32: output is not int: %d\n", res); +#ifdef FIXED_DEBUG_ASSERT + celt_assert(0); +#endif + } + celt_mips+=5; + return res; +} + +static OPUS_INLINE int MULT32_32_Q16(opus_int64 a, opus_int64 b) +{ + opus_int64 res; + if (!VERIFY_INT(a) || !VERIFY_INT(b)) + { + fprintf (stderr, "MULT32_32_Q16: inputs are not int: %d %d\n", a, b); +#ifdef FIXED_DEBUG_ASSERT + celt_assert(0); +#endif + } + res = ((opus_int64)(a)*(opus_int64)(b)) >> 16; + if (!VERIFY_INT(res)) + { + fprintf (stderr, "MULT32_32_Q16: output is not int: %d*%d=%d\n", a, b, (int)res); +#ifdef FIXED_DEBUG_ASSERT + celt_assert(0); +#endif + } + celt_mips+=5; + return res; +} + #define MULT16_16(a, b) MULT16_16_(a, b, __FILE__, __LINE__) static OPUS_INLINE int MULT16_16_(int a, int b, char *file, int line) { diff --git a/media/libopus/celt/fixed_generic.h b/media/libopus/celt/fixed_generic.h index 5f4abda76ed8c..8f29d46bb7647 100644 --- a/media/libopus/celt/fixed_generic.h +++ b/media/libopus/celt/fixed_generic.h @@ -57,6 +57,13 @@ #define MULT16_32_Q15(a,b) ADD32(SHL(MULT16_16((a),SHR((b),16)),1), SHR(MULT16_16SU((a),((b)&0x0000ffff)),15)) #endif
+/** 32x32 multiplication, followed by a 16-bit shift right. Results fits in 32 bits */ +#if OPUS_FAST_INT64 +#define MULT32_32_Q16(a,b) ((opus_val32)SHR((opus_int64)(a)*(opus_int64)(b),16)) +#else +#define MULT32_32_Q16(a,b) (ADD32(ADD32(ADD32((opus_val32)(SHR32(((opus_uint32)((a)&0x0000ffff)*(opus_uint32)((b)&0x0000ffff)),16)), MULT16_16SU(SHR32(a,16),((b)&0x0000ffff))), MULT16_16SU(SHR32(b,16),((a)&0x0000ffff))), SHL32(MULT16_16(SHR32(a,16),SHR32(b,16)),16))) +#endif + /** 32x32 multiplication, followed by a 31-bit shift right. Results fits in 32 bits */ #if OPUS_FAST_INT64 #define MULT32_32_Q31(a,b) ((opus_val32)SHR((opus_int64)(a)*(opus_int64)(b),31)) @@ -102,9 +109,9 @@
#define SATURATE16(x) (EXTRACT16((x)>32767 ? 32767 : (x)<-32768 ? -32768 : (x)))
-/** Shift by a and round-to-neareast 32-bit value. Result is a 16-bit value */ +/** Shift by a and round-to-nearest 32-bit value. Result is a 16-bit value */ #define ROUND16(x,a) (EXTRACT16(PSHR32((x),(a)))) -/** Shift by a and round-to-neareast 32-bit value. Result is a saturated 16-bit value */ +/** Shift by a and round-to-nearest 32-bit value. Result is a saturated 16-bit value */ #define SROUND16(x,a) EXTRACT16(SATURATE(PSHR32(x,a), 32767));
/** Divide by two */ @@ -131,6 +138,9 @@ /** 16x16 multiplication where the result fits in 16 bits */ #define MULT16_16_16(a,b) ((((opus_val16)(a))*((opus_val16)(b))))
+/** 32x32 multiplication where the result fits in 32 bits */ +#define MULT32_32_32(a,b) ((((opus_val32)(a))*((opus_val32)(b)))) + /* (opus_val32)(opus_val16) gives TI compiler a hint that it's 16x16->32 multiply */ /** 16x16 multiplication where the result fits in 32 bits */ #define MULT16_16(a,b) (((opus_val32)(opus_val16)(a))*((opus_val32)(opus_val16)(b))) diff --git a/media/libopus/celt/float_cast.h b/media/libopus/celt/float_cast.h index 98b40abcf65f5..9d34976ee216a 100644 --- a/media/libopus/celt/float_cast.h +++ b/media/libopus/celt/float_cast.h @@ -67,6 +67,38 @@ #include <xmmintrin.h> static OPUS_INLINE opus_int32 float2int(float x) {return _mm_cvt_ss2si(_mm_set_ss(x));}
+#elif (defined(_MSC_VER) && _MSC_VER >= 1400) && (defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 1)) + + #include <xmmintrin.h> + static OPUS_INLINE opus_int32 float2int(float value) + { + /* _mm_load_ss will generate same code as _mm_set_ss + ** in _MSC_VER >= 1914 /02 so keep __mm_load__ss + ** for backward compatibility. + */ + return _mm_cvtss_si32(_mm_load_ss(&value)); + } + +#elif (defined(_MSC_VER) && _MSC_VER >= 1400) && defined (_M_IX86) + + #include <math.h> + + /* Win32 doesn't seem to have these functions. + ** Therefore implement OPUS_INLINE versions of these functions here. + */ + + static OPUS_INLINE opus_int32 + float2int (float flt) + { int intgr; + + _asm + { fld flt + fistp intgr + } ; + + return intgr ; + } + #elif defined(HAVE_LRINTF)
/* These defines enable functionality introduced with the 1999 ISO C @@ -96,32 +128,6 @@ static OPUS_INLINE opus_int32 float2int(float x) {return _mm_cvt_ss2si(_mm_set_s #include <math.h> #define float2int(x) lrint(x)
-#elif (defined(_MSC_VER) && _MSC_VER >= 1400) && defined (_M_X64) - #include <xmmintrin.h> - - __inline long int float2int(float value) - { - return _mm_cvtss_si32(_mm_load_ss(&value)); - } -#elif (defined(_MSC_VER) && _MSC_VER >= 1400) && defined (_M_IX86) - #include <math.h> - - /* Win32 doesn't seem to have these functions. - ** Therefore implement OPUS_INLINE versions of these functions here. - */ - - __inline long int - float2int (float flt) - { int intgr; - - _asm - { fld flt - fistp intgr - } ; - - return intgr ; - } - #else
#if (defined(__GNUC__) && defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) diff --git a/media/libopus/celt/mathops.h b/media/libopus/celt/mathops.h index 5e86ff0dd2579..fe29dac1c21df 100644 --- a/media/libopus/celt/mathops.h +++ b/media/libopus/celt/mathops.h @@ -137,7 +137,7 @@ static OPUS_INLINE float celt_log2(float x) } in; in.f = x; integer = (in.i>>23)-127; - in.i -= integer<<23; + in.i -= (opus_uint32)integer<<23; frac = in.f - 1.5f; frac = -0.41445418f + frac*(0.95909232f + frac*(-0.33951290f + frac*0.16541097f)); @@ -160,7 +160,7 @@ static OPUS_INLINE float celt_exp2(float x) /* K0 = 1, K1 = log(2), K2 = 3-4*log(2), K3 = 3*log(2) - 2 */ res.f = 0.99992522f + frac * (0.69583354f + frac * (0.22606716f + 0.078024523f*frac)); - res.i = (res.i + (integer<<23)) & 0x7fffffff; + res.i = (res.i + ((opus_uint32)integer<<23)) & 0x7fffffff; return res.f; }
diff --git a/media/libopus/celt/mips/celt_mipsr1.h b/media/libopus/celt/mips/celt_mipsr1.h index e85661a6618ce..c332fe0471e31 100644 --- a/media/libopus/celt/mips/celt_mipsr1.h +++ b/media/libopus/celt/mips/celt_mipsr1.h @@ -53,6 +53,7 @@ #include "celt_lpc.h" #include "vq.h"
+#define OVERRIDE_COMB_FILTER_CONST #define OVERRIDE_comb_filter void comb_filter(opus_val32 *y, opus_val32 *x, int T0, int T1, int N, opus_val16 g0, opus_val16 g1, int tapset0, int tapset1, diff --git a/media/libopus/celt/mips/vq_mipsr1.h b/media/libopus/celt/mips/vq_mipsr1.h index fd18eab7a9660..f26a33e755e83 100644 --- a/media/libopus/celt/mips/vq_mipsr1.h +++ b/media/libopus/celt/mips/vq_mipsr1.h @@ -36,8 +36,6 @@ #include "mathops.h" #include "arch.h"
-static void renormalise_vector_mips(celt_norm *X, int N, opus_val16 gain, int arch); - #define OVERRIDE_vq_exp_rotation1 static void exp_rotation1(celt_norm *X, int len, int stride, opus_val16 c, opus_val16 s) { @@ -66,11 +64,7 @@ static void exp_rotation1(celt_norm *X, int len, int stride, opus_val16 c, opus_ }
#define OVERRIDE_renormalise_vector - -#define renormalise_vector(X, N, gain, arch) \ - (renormalise_vector_mips(X, N, gain, arch)) - -void renormalise_vector_mips(celt_norm *X, int N, opus_val16 gain, int arch) +void renormalise_vector(celt_norm *X, int N, opus_val16 gain, int arch) { int i; #ifdef FIXED_POINT diff --git a/media/libopus/celt/os_support.h b/media/libopus/celt/os_support.h index a2171971e9d65..009bf861daf7f 100644 --- a/media/libopus/celt/os_support.h +++ b/media/libopus/celt/os_support.h @@ -39,7 +39,6 @@ #include "opus_defines.h"
#include <string.h> -#include <stdio.h> #include <stdlib.h>
/** Opus wrapper for malloc(). To do your own dynamic allocation, all you need to do is replace this function and opus_free */ diff --git a/media/libopus/celt/rate.c b/media/libopus/celt/rate.c index ca4cc870eaa41..465e1ba26cb4e 100644 --- a/media/libopus/celt/rate.c +++ b/media/libopus/celt/rate.c @@ -529,7 +529,7 @@ static OPUS_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end, return codedBands; }
-int compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stereo, +int clt_compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stereo, opus_int32 total, opus_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth) { int lo, hi, len, j; diff --git a/media/libopus/celt/rate.h b/media/libopus/celt/rate.h index 515f7687cec6f..fad5e412dafac 100644 --- a/media/libopus/celt/rate.h +++ b/media/libopus/celt/rate.h @@ -95,7 +95,7 @@ static OPUS_INLINE int pulses2bits(const CELTMode *m, int band, int LM, int puls @param pulses Number of pulses per band (returned) @return Total number of bits allocated */ -int compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stero, +int clt_compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stereo, opus_int32 total, opus_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth);
#endif diff --git a/media/libopus/celt/stack_alloc.h b/media/libopus/celt/stack_alloc.h index 2b51c8d80cc58..ae40e2a1659fa 100644 --- a/media/libopus/celt/stack_alloc.h +++ b/media/libopus/celt/stack_alloc.h @@ -40,7 +40,7 @@ #endif
#ifdef USE_ALLOCA -# ifdef WIN32 +# ifdef _WIN32 # include <malloc.h> # else # ifdef HAVE_ALLOCA_H @@ -102,7 +102,7 @@
#define VARDECL(type, var) type *var
-# ifdef WIN32 +# ifdef _WIN32 # define ALLOC(var, size, type) var = ((type*)_alloca(sizeof(type)*(size))) # else # define ALLOC(var, size, type) var = ((type*)alloca(sizeof(type)*(size))) diff --git a/media/libopus/celt/vq.c b/media/libopus/celt/vq.c index a6b5552d69c52..8011e22548bda 100644 --- a/media/libopus/celt/vq.c +++ b/media/libopus/celt/vq.c @@ -39,6 +39,10 @@ #include "rate.h" #include "pitch.h"
+#if defined(MIPSr1_ASM) +#include "mips/vq_mipsr1.h" +#endif + #ifndef OVERRIDE_vq_exp_rotation1 static void exp_rotation1(celt_norm *X, int len, int stride, opus_val16 c, opus_val16 s) { diff --git a/media/libopus/celt/vq.h b/media/libopus/celt/vq.h index 0dfe6af058239..45ec55918e322 100644 --- a/media/libopus/celt/vq.h +++ b/media/libopus/celt/vq.h @@ -41,10 +41,6 @@ #include "x86/vq_sse.h" #endif
-#if defined(MIPSr1_ASM) -#include "mips/vq_mipsr1.h" -#endif - void exp_rotation(celt_norm *X, int len, int dir, int stride, int K, int spread);
opus_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch); diff --git a/media/libopus/celt/x86/pitch_sse.h b/media/libopus/celt/x86/pitch_sse.h index e5f87ab51af6e..f7a014b6e03a1 100644 --- a/media/libopus/celt/x86/pitch_sse.h +++ b/media/libopus/celt/x86/pitch_sse.h @@ -91,7 +91,7 @@ opus_val32 celt_inner_prod_sse2( int N); #endif
-#if defined(OPUS_X86_MAY_HAVE_SSE2) && !defined(FIXED_POINT) +#if defined(OPUS_X86_MAY_HAVE_SSE) && !defined(FIXED_POINT) opus_val32 celt_inner_prod_sse( const opus_val16 *x, const opus_val16 *y, diff --git a/media/libopus/celt/x86/pitch_sse4_1.c b/media/libopus/celt/x86/pitch_sse4_1.c index a092c68b24333..2bc578304faf2 100644 --- a/media/libopus/celt/x86/pitch_sse4_1.c +++ b/media/libopus/celt/x86/pitch_sse4_1.c @@ -117,6 +117,14 @@ void xcorr_kernel_sse4_1(const opus_val16 * x, const opus_val16 * y, opus_val32 __m128i sum0, sum1, sum2, sum3, vecSum; __m128i initSum;
+#ifdef OPUS_CHECK_ASM + opus_val32 sum_c[4]; + for (j=0;j<4;j++) { + sum_c[j] = sum[j]; + } + xcorr_kernel_c(x, y, sum_c, len); +#endif + celt_assert(len >= 3);
sum0 = _mm_setzero_si128(); @@ -177,19 +185,56 @@ void xcorr_kernel_sse4_1(const opus_val16 * x, const opus_val16 * y, opus_val32 vecSum = _mm_add_epi32(vecSum, sum2); }
- for (;j<len;j++) + vecX = OP_CVTEPI16_EPI32_M64(&x[len - 4]); + if (len - j == 3) { - vecX = OP_CVTEPI16_EPI32_M64(&x[j + 0]); - vecX0 = _mm_shuffle_epi32(vecX, 0x00); + vecX0 = _mm_shuffle_epi32(vecX, 0x55); + vecX1 = _mm_shuffle_epi32(vecX, 0xaa); + vecX2 = _mm_shuffle_epi32(vecX, 0xff);
vecY0 = OP_CVTEPI16_EPI32_M64(&y[j + 0]); + vecY1 = OP_CVTEPI16_EPI32_M64(&y[j + 1]); + vecY2 = OP_CVTEPI16_EPI32_M64(&y[j + 2]);
sum0 = _mm_mullo_epi32(vecX0, vecY0); + sum1 = _mm_mullo_epi32(vecX1, vecY1); + sum2 = _mm_mullo_epi32(vecX2, vecY2); + + vecSum = _mm_add_epi32(vecSum, sum0); + vecSum = _mm_add_epi32(vecSum, sum1); + vecSum = _mm_add_epi32(vecSum, sum2); + } + else if (len - j == 2) + { + vecX0 = _mm_shuffle_epi32(vecX, 0xaa); + vecX1 = _mm_shuffle_epi32(vecX, 0xff); + + vecY0 = OP_CVTEPI16_EPI32_M64(&y[j + 0]); + vecY1 = OP_CVTEPI16_EPI32_M64(&y[j + 1]); + + sum0 = _mm_mullo_epi32(vecX0, vecY0); + sum1 = _mm_mullo_epi32(vecX1, vecY1); + + vecSum = _mm_add_epi32(vecSum, sum0); + vecSum = _mm_add_epi32(vecSum, sum1); + } + else if (len - j == 1) + { + vecX0 = _mm_shuffle_epi32(vecX, 0xff); + + vecY0 = OP_CVTEPI16_EPI32_M64(&y[j + 0]); + + sum0 = _mm_mullo_epi32(vecX0, vecY0); + vecSum = _mm_add_epi32(vecSum, sum0); }
initSum = _mm_loadu_si128((__m128i *)(&sum[0])); initSum = _mm_add_epi32(initSum, vecSum); _mm_storeu_si128((__m128i *)sum, initSum); + +#ifdef OPUS_CHECK_ASM + celt_assert(!memcmp(sum_c, sum, sizeof(sum_c))); +#endif } #endif diff --git a/media/libopus/celt/x86/x86cpu.h b/media/libopus/celt/x86/x86cpu.h index 1e2bf17b9b84e..0de8df3556da4 100644 --- a/media/libopus/celt/x86/x86cpu.h +++ b/media/libopus/celt/x86/x86cpu.h @@ -56,40 +56,10 @@ int opus_select_arch(void); # endif
-/*gcc appears to emit MOVDQA's to load the argument of an _mm_cvtepi8_epi32() - or _mm_cvtepi16_epi32() when optimizations are disabled, even though the - actual PMOVSXWD instruction takes an m32 or m64. Unlike a normal memory - reference, these require 16-byte alignment and load a full 16 bytes (instead - of 4 or 8), possibly reading out of bounds. - - We can insert an explicit MOVD or MOVQ using _mm_cvtsi32_si128() or - _mm_loadl_epi64(), which should have the same semantics as an m32 or m64 - reference in the PMOVSXWD instruction itself, but gcc is not smart enough to - optimize this out when optimizations ARE enabled. - - Clang, in contrast, requires us to do this always for _mm_cvtepi8_epi32 - (which is fair, since technically the compiler is always allowed to do the - dereference before invoking the function implementing the intrinsic). - However, it is smart enough to eliminate the extra MOVD instruction. - For _mm_cvtepi16_epi32, it does the right thing, though does *not* optimize out - the extra MOVQ if it's specified explicitly */ - -# if defined(__clang__) || !defined(__OPTIMIZE__) -# define OP_CVTEPI8_EPI32_M32(x) \ +#define OP_CVTEPI8_EPI32_M32(x) \ (_mm_cvtepi8_epi32(_mm_cvtsi32_si128(*(int *)(x)))) -# else -# define OP_CVTEPI8_EPI32_M32(x) \ - (_mm_cvtepi8_epi32(*(__m128i *)(x))) -#endif
-/* similar reasoning about the instruction sequence as in the 32-bit macro above, - */ -# if defined(__clang__) || !defined(__OPTIMIZE__) -# define OP_CVTEPI16_EPI32_M64(x) \ +#define OP_CVTEPI16_EPI32_M64(x) \ (_mm_cvtepi16_epi32(_mm_loadl_epi64((__m128i *)(x)))) -# else -# define OP_CVTEPI16_EPI32_M64(x) \ - (_mm_cvtepi16_epi32(*(__m128i *)(x))) -# endif
#endif diff --git a/media/libopus/include/opus_custom.h b/media/libopus/include/opus_custom.h index 41f36bf2fbc90..2227be011bd2f 100644 --- a/media/libopus/include/opus_custom.h +++ b/media/libopus/include/opus_custom.h @@ -178,7 +178,7 @@ OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT OpusCustomEncoder *opus_custom_encode ) OPUS_ARG_NONNULL(1);
-/** Destroys a an encoder state. +/** Destroys an encoder state. * @param[in] st <tt>OpusCustomEncoder*</tt>: State to be freed. */ OPUS_CUSTOM_EXPORT void opus_custom_encoder_destroy(OpusCustomEncoder *st); @@ -286,7 +286,7 @@ OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT OpusCustomDecoder *opus_custom_decode int *error ) OPUS_ARG_NONNULL(1);
-/** Destroys a an decoder state. +/** Destroys a decoder state. * @param[in] st <tt>OpusCustomDecoder*</tt>: State to be freed. */ OPUS_CUSTOM_EXPORT void opus_custom_decoder_destroy(OpusCustomDecoder *st); diff --git a/media/libopus/include/opus_defines.h b/media/libopus/include/opus_defines.h index fbf5d0eb74fd9..ceee5b840cf5b 100644 --- a/media/libopus/include/opus_defines.h +++ b/media/libopus/include/opus_defines.h @@ -64,7 +64,7 @@ extern "C" { /**Export control for opus functions */
#ifndef OPUS_EXPORT -# if defined(WIN32) +# if defined(_WIN32) # if defined(OPUS_BUILD) && defined(DLL_EXPORT) # define OPUS_EXPORT __declspec(dllexport) # else @@ -168,6 +168,7 @@ extern "C" { /* Don't use 4045, it's already taken by OPUS_GET_GAIN_REQUEST */ #define OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST 4046 #define OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST 4047 +#define OPUS_GET_IN_DTX_REQUEST 4049
/** Defines for the presence of extended APIs. */ #define OPUS_HAVE_OPUS_PROJECTION_H @@ -715,6 +716,16 @@ extern "C" { * </dl> * @hideinitializer */ #define OPUS_GET_PHASE_INVERSION_DISABLED(x) OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST, __opus_check_int_ptr(x) +/** Gets the DTX state of the encoder. + * Returns whether the last encoded frame was either a comfort noise update + * during DTX or not encoded because of DTX. + * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values: + * <dl> + * <dt>0</dt><dd>The encoder is not in DTX.</dd> + * <dt>1</dt><dd>The encoder is in DTX.</dd> + * </dl> + * @hideinitializer */ +#define OPUS_GET_IN_DTX(x) OPUS_GET_IN_DTX_REQUEST, __opus_check_int_ptr(x)
/**@}*/
diff --git a/media/libopus/moz.build b/media/libopus/moz.build index 37be53beb6850..7b9ac6568612d 100644 --- a/media/libopus/moz.build +++ b/media/libopus/moz.build @@ -20,7 +20,7 @@ AllowCompilerWarnings() FINAL_LIBRARY = 'gkmedias'
DEFINES['OPUS_BUILD'] = True -DEFINES['OPUS_VERSION'] = '"v1.3-rc-19-g5cbd7d5f-mozilla"' +DEFINES['OPUS_VERSION'] = '2654707e86cc94413998976d179b2ab4a2aa3114' DEFINES['USE_ALLOCA'] = True DEFINES['ENABLE_HARDENING'] = True
diff --git a/media/libopus/nonunified2.patch b/media/libopus/nonunified2.patch index 762d9ee63bc83..02241de5230e8 100644 --- a/media/libopus/nonunified2.patch +++ b/media/libopus/nonunified2.patch @@ -1,5 +1,3 @@ -diff --git a/media/libopus/nonunified2.patch b/media/libopus/nonunified2.patch -new file mode 100644 diff --git a/media/libopus/sources.mozbuild b/media/libopus/sources.mozbuild --- a/media/libopus/sources.mozbuild +++ b/media/libopus/sources.mozbuild diff --git a/media/libopus/silk/CNG.c b/media/libopus/silk/CNG.c index ef8e38df9ffc2..2a910099ed36e 100644 --- a/media/libopus/silk/CNG.c +++ b/media/libopus/silk/CNG.c @@ -118,6 +118,10 @@ void silk_CNG( /* Smooth gains */ for( i = 0; i < psDec->nb_subfr; i++ ) { psCNG->CNG_smth_Gain_Q16 += silk_SMULWB( psDecCtrl->Gains_Q16[ i ] - psCNG->CNG_smth_Gain_Q16, CNG_GAIN_SMTH_Q16 ); + /* If the smoothed gain is 3 dB greater than this subframe's gain, use this subframe's gain to adapt faster. */ + if( silk_SMULWW( psCNG->CNG_smth_Gain_Q16, CNG_GAIN_SMTH_THRESHOLD_Q16 ) > psDecCtrl->Gains_Q16[ i ] ) { + psCNG->CNG_smth_Gain_Q16 = psDecCtrl->Gains_Q16[ i ]; + } } }
diff --git a/media/libopus/silk/LPC_fit.c b/media/libopus/silk/LPC_fit.c index cdea4f3abcaf7..c0690a1fc9a84 100644 --- a/media/libopus/silk/LPC_fit.c +++ b/media/libopus/silk/LPC_fit.c @@ -31,7 +31,8 @@ POSSIBILITY OF SUCH DAMAGE.
#include "SigProc_FIX.h"
-/* Convert int32 coefficients to int16 coefs and make sure there's no wrap-around */ +/* Convert int32 coefficients to int16 coefs and make sure there's no wrap-around. + This logic is reused in _celt_lpc(). Any bug fixes should also be applied there. */ void silk_LPC_fit( opus_int16 *a_QOUT, /* O Output signal */ opus_int32 *a_QIN, /* I/O Input signal */ diff --git a/media/libopus/silk/MacroCount.h b/media/libopus/silk/MacroCount.h index 78100ffedeb29..dab2f57a68a25 100644 --- a/media/libopus/silk/MacroCount.h +++ b/media/libopus/silk/MacroCount.h @@ -27,9 +27,9 @@ POSSIBILITY OF SUCH DAMAGE.
#ifndef SIGPROCFIX_API_MACROCOUNT_H #define SIGPROCFIX_API_MACROCOUNT_H -#include <stdio.h>
#ifdef silk_MACRO_COUNT +#include <stdio.h> #define varDefine opus_int64 ops_count = 0;
extern opus_int64 ops_count; diff --git a/media/libopus/silk/NSQ.c b/media/libopus/silk/NSQ.c index 1d64d8e257b85..45dd45ce8dc63 100644 --- a/media/libopus/silk/NSQ.c +++ b/media/libopus/silk/NSQ.c @@ -75,21 +75,21 @@ static OPUS_INLINE void silk_noise_shape_quantizer(
void silk_NSQ_c ( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - SideInfoIndices *psIndices, /* I/O Quantization Indices */ + const silk_encoder_state *psEncC, /* I Encoder State */ + silk_nsq_state *NSQ, /* I/O NSQ state */ + SideInfoIndices *psIndices, /* I/O Quantization Indices */ const opus_int16 x16[], /* I Input */ - opus_int8 pulses[], /* O Quantized pulse signal */ - const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ - const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ - const opus_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ - const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ - const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ - const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ - const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ - const opus_int LTP_scale_Q14 /* I LTP state scaling */ + opus_int8 pulses[], /* O Quantized pulse signal */ + const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ + const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ + const opus_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ + const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ + const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ + const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ + const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ + const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ + const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ + const opus_int LTP_scale_Q14 /* I LTP state scaling */ ) { opus_int k, lag, start_idx, LSF_interpolation_flag; @@ -173,9 +173,9 @@ void silk_NSQ_c RESTORE_STACK; }
-/***********************************/ -/* silk_noise_shape_quantizer */ -/***********************************/ +/******************************/ +/* silk_noise_shape_quantizer */ +/******************************/
#if !defined(OPUS_X86_MAY_HAVE_SSE4_1) static OPUS_INLINE @@ -262,7 +262,7 @@ void silk_noise_shape_quantizer( tmp1 = silk_SUB32( tmp1, n_LF_Q12 ); /* Q12 */ if( lag > 0 ) { /* Symmetric, packed FIR coefficients */ - n_LTP_Q13 = silk_SMULWB( silk_ADD32( shp_lag_ptr[ 0 ], shp_lag_ptr[ -2 ] ), HarmShapeFIRPacked_Q14 ); + n_LTP_Q13 = silk_SMULWB( silk_ADD_SAT32( shp_lag_ptr[ 0 ], shp_lag_ptr[ -2 ] ), HarmShapeFIRPacked_Q14 ); n_LTP_Q13 = silk_SMLAWT( n_LTP_Q13, shp_lag_ptr[ -1 ], HarmShapeFIRPacked_Q14 ); n_LTP_Q13 = silk_LSHIFT( n_LTP_Q13, 1 ); shp_lag_ptr++; diff --git a/media/libopus/silk/NSQ_del_dec.c b/media/libopus/silk/NSQ_del_dec.c index 3fd9fa0d5b722..41f3fc93ef171 100644 --- a/media/libopus/silk/NSQ_del_dec.c +++ b/media/libopus/silk/NSQ_del_dec.c @@ -115,21 +115,21 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec( );
void silk_NSQ_del_dec_c( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - SideInfoIndices *psIndices, /* I/O Quantization Indices */ + const silk_encoder_state *psEncC, /* I Encoder State */ + silk_nsq_state *NSQ, /* I/O NSQ state */ + SideInfoIndices *psIndices, /* I/O Quantization Indices */ const opus_int16 x16[], /* I Input */ - opus_int8 pulses[], /* O Quantized pulse signal */ - const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ - const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ - const opus_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ - const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ - const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ - const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ - const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ - const opus_int LTP_scale_Q14 /* I LTP state scaling */ + opus_int8 pulses[], /* O Quantized pulse signal */ + const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ + const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ + const opus_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ + const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ + const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ + const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ + const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ + const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ + const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ + const opus_int LTP_scale_Q14 /* I LTP state scaling */ ) { opus_int i, k, lag, start_idx, LSF_interpolation_flag, Winner_ind, subfr; @@ -394,8 +394,8 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec( /* Long-term shaping */ if( lag > 0 ) { /* Symmetric, packed FIR coefficients */ - n_LTP_Q14 = silk_SMULWB( silk_ADD32( shp_lag_ptr[ 0 ], shp_lag_ptr[ -2 ] ), HarmShapeFIRPacked_Q14 ); - n_LTP_Q14 = silk_SMLAWT( n_LTP_Q14, shp_lag_ptr[ -1 ], HarmShapeFIRPacked_Q14 ); + n_LTP_Q14 = silk_SMULWB( silk_ADD_SAT32( shp_lag_ptr[ 0 ], shp_lag_ptr[ -2 ] ), HarmShapeFIRPacked_Q14 ); + n_LTP_Q14 = silk_SMLAWT( n_LTP_Q14, shp_lag_ptr[ -1 ], HarmShapeFIRPacked_Q14 ); n_LTP_Q14 = silk_SUB_LSHIFT32( LTP_pred_Q14, n_LTP_Q14, 2 ); /* Q12 -> Q14 */ shp_lag_ptr++; } else { @@ -451,9 +451,9 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec(
/* Input minus prediction plus noise feedback */ /* r = x[ i ] - LTP_pred - LPC_pred + n_AR + n_Tilt + n_LF + n_LTP */ - tmp1 = silk_ADD32( n_AR_Q14, n_LF_Q14 ); /* Q14 */ + tmp1 = silk_ADD_SAT32( n_AR_Q14, n_LF_Q14 ); /* Q14 */ tmp2 = silk_ADD32( n_LTP_Q14, LPC_pred_Q14 ); /* Q13 */ - tmp1 = silk_SUB32( tmp2, tmp1 ); /* Q13 */ + tmp1 = silk_SUB_SAT32( tmp2, tmp1 ); /* Q13 */ tmp1 = silk_RSHIFT_ROUND( tmp1, 4 ); /* Q10 */
r_Q10 = silk_SUB32( x_Q10[ i ], tmp1 ); /* residual error Q10 */ @@ -535,7 +535,7 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec( /* Update states */ psSS[ 0 ].Diff_Q14 = silk_SUB_LSHIFT32( xq_Q14, x_Q10[ i ], 4 ); sLF_AR_shp_Q14 = silk_SUB32( psSS[ 0 ].Diff_Q14, n_AR_Q14 ); - psSS[ 0 ].sLTP_shp_Q14 = silk_SUB32( sLF_AR_shp_Q14, n_LF_Q14 ); + psSS[ 0 ].sLTP_shp_Q14 = silk_SUB_SAT32( sLF_AR_shp_Q14, n_LF_Q14 ); psSS[ 0 ].LF_AR_Q14 = sLF_AR_shp_Q14; psSS[ 0 ].LPC_exc_Q14 = LPC_exc_Q14; psSS[ 0 ].xq_Q14 = xq_Q14; @@ -555,7 +555,7 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec( /* Update states */ psSS[ 1 ].Diff_Q14 = silk_SUB_LSHIFT32( xq_Q14, x_Q10[ i ], 4 ); sLF_AR_shp_Q14 = silk_SUB32( psSS[ 1 ].Diff_Q14, n_AR_Q14 ); - psSS[ 1 ].sLTP_shp_Q14 = silk_SUB32( sLF_AR_shp_Q14, n_LF_Q14 ); + psSS[ 1 ].sLTP_shp_Q14 = silk_SUB_SAT32( sLF_AR_shp_Q14, n_LF_Q14 ); psSS[ 1 ].LF_AR_Q14 = sLF_AR_shp_Q14; psSS[ 1 ].LPC_exc_Q14 = LPC_exc_Q14; psSS[ 1 ].xq_Q14 = xq_Q14; diff --git a/media/libopus/silk/PLC.c b/media/libopus/silk/PLC.c index f89391651cdf9..4667440db2b7f 100644 --- a/media/libopus/silk/PLC.c +++ b/media/libopus/silk/PLC.c @@ -328,10 +328,8 @@ static OPUS_INLINE void silk_PLC_conceal( for( j = 0; j < LTP_ORDER; j++ ) { B_Q14[ j ] = silk_RSHIFT( silk_SMULBB( harm_Gain_Q15, B_Q14[ j ] ), 15 ); } - if ( psDec->indices.signalType != TYPE_NO_VOICE_ACTIVITY ) { - /* Gradually reduce excitation gain */ - rand_scale_Q14 = silk_RSHIFT( silk_SMULBB( rand_scale_Q14, rand_Gain_Q15 ), 15 ); - } + /* Gradually reduce excitation gain */ + rand_scale_Q14 = silk_RSHIFT( silk_SMULBB( rand_scale_Q14, rand_Gain_Q15 ), 15 );
/* Slowly increase pitch lag */ psPLC->pitchL_Q8 = silk_SMLAWB( psPLC->pitchL_Q8, psPLC->pitchL_Q8, PITCH_DRIFT_FAC_Q16 ); diff --git a/media/libopus/silk/SigProc_FIX.h b/media/libopus/silk/SigProc_FIX.h index f9ae326326d31..1d9bf2f16e45b 100644 --- a/media/libopus/silk/SigProc_FIX.h +++ b/media/libopus/silk/SigProc_FIX.h @@ -381,7 +381,7 @@ opus_int32 silk_inner_prod_aligned_scale( const opus_int len /* I vector lengths */ );
-opus_int64 silk_inner_prod16_aligned_64_c( +opus_int64 silk_inner_prod16_c( const opus_int16 *inVec1, /* I input vector 1 */ const opus_int16 *inVec2, /* I input vector 2 */ const opus_int len /* I vector lengths */ @@ -613,8 +613,8 @@ static OPUS_INLINE opus_int64 silk_max_64(opus_int64 a, opus_int64 b) #define silk_burg_modified(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch) \ ((void)(arch), silk_burg_modified_c(res_nrg, res_nrg_Q, A_Q16, x, minInvGain_Q30, subfr_length, nb_subfr, D, arch))
-#define silk_inner_prod16_aligned_64(inVec1, inVec2, len, arch) \ - ((void)(arch),silk_inner_prod16_aligned_64_c(inVec1, inVec2, len)) +#define silk_inner_prod16(inVec1, inVec2, len, arch) \ + ((void)(arch),silk_inner_prod16_c(inVec1, inVec2, len)) #endif
#include "Inlines.h" diff --git a/media/libopus/silk/VAD.c b/media/libopus/silk/VAD.c index 541e5056ff697..d0cda52162c1c 100644 --- a/media/libopus/silk/VAD.c +++ b/media/libopus/silk/VAD.c @@ -312,6 +312,8 @@ void silk_VAD_GetNoiseLevels( /* Initially faster smoothing */ if( psSilk_VAD->counter < 1000 ) { /* 1000 = 20 sec */ min_coef = silk_DIV32_16( silk_int16_MAX, silk_RSHIFT( psSilk_VAD->counter, 4 ) + 1 ); + /* Increment frame counter */ + psSilk_VAD->counter++; } else { min_coef = 0; } @@ -355,7 +357,4 @@ void silk_VAD_GetNoiseLevels( /* Store as part of state */ psSilk_VAD->NL[ k ] = nl; } - - /* Increment frame counter */ - psSilk_VAD->counter++; } diff --git a/media/libopus/silk/VQ_WMat_EC.c b/media/libopus/silk/VQ_WMat_EC.c index 0f3d545c4ef8c..245a7e4b06d17 100644 --- a/media/libopus/silk/VQ_WMat_EC.c +++ b/media/libopus/silk/VQ_WMat_EC.c @@ -64,7 +64,7 @@ void silk_VQ_WMat_EC_c( *rate_dist_Q8 = silk_int32_MAX; *res_nrg_Q15 = silk_int32_MAX; cb_row_Q7 = cb_Q7; - /* In things go really bad, at least *ind is set to something safe. */ + /* If things go really bad, at least *ind is set to something safe. */ *ind = 0; for( k = 0; k < L; k++ ) { opus_int32 penalty; @@ -115,7 +115,7 @@ void silk_VQ_WMat_EC_c( if( sum1_Q15 >= 0 ) { /* Translate residual energy to bits using high-rate assumption (6 dB ==> 1 bit/sample) */ bits_res_Q8 = silk_SMULBB( subfr_len, silk_lin2log( sum1_Q15 + penalty) - (15 << 7) ); - /* In the following line we reduce the codelength component by half ("-1"); seems to slghtly improve quality */ + /* In the following line we reduce the codelength component by half ("-1"); seems to slightly improve quality */ bits_tot_Q8 = silk_ADD_LSHIFT32( bits_res_Q8, cl_Q5[ k ], 3-1 ); if( bits_tot_Q8 <= *rate_dist_Q8 ) { *rate_dist_Q8 = bits_tot_Q8; diff --git a/media/libopus/silk/arm/LPC_inv_pred_gain_neon_intr.c b/media/libopus/silk/arm/LPC_inv_pred_gain_neon_intr.c index ab426bcd66f8b..726e6667b4a51 100644 --- a/media/libopus/silk/arm/LPC_inv_pred_gain_neon_intr.c +++ b/media/libopus/silk/arm/LPC_inv_pred_gain_neon_intr.c @@ -210,19 +210,23 @@ opus_int32 silk_LPC_inverse_pred_gain_neon( /* O Returns inverse predi /* Increase Q domain of the AR coefficients */ t0_s16x8 = vld1q_s16( A_Q12 + 0 ); t1_s16x8 = vld1q_s16( A_Q12 + 8 ); - t2_s16x8 = vld1q_s16( A_Q12 + 16 ); + if ( order > 16 ) { + t2_s16x8 = vld1q_s16( A_Q12 + 16 ); + } t0_s32x4 = vpaddlq_s16( t0_s16x8 );
switch( order - leftover ) { case 24: t0_s32x4 = vpadalq_s16( t0_s32x4, t2_s16x8 ); + vst1q_s32( Atmp_QA + 16, vshll_n_s16( vget_low_s16 ( t2_s16x8 ), QA - 12 ) ); + vst1q_s32( Atmp_QA + 20, vshll_n_s16( vget_high_s16( t2_s16x8 ), QA - 12 ) ); /* FALLTHROUGH */
case 16: t0_s32x4 = vpadalq_s16( t0_s32x4, t1_s16x8 ); - vst1q_s32( Atmp_QA + 16, vshll_n_s16( vget_low_s16 ( t2_s16x8 ), QA - 12 ) ); - vst1q_s32( Atmp_QA + 20, vshll_n_s16( vget_high_s16( t2_s16x8 ), QA - 12 ) ); + vst1q_s32( Atmp_QA + 8, vshll_n_s16( vget_low_s16 ( t1_s16x8 ), QA - 12 ) ); + vst1q_s32( Atmp_QA + 12, vshll_n_s16( vget_high_s16( t1_s16x8 ), QA - 12 ) ); /* FALLTHROUGH */
case 8: @@ -230,8 +234,8 @@ opus_int32 silk_LPC_inverse_pred_gain_neon( /* O Returns inverse predi const int32x2_t t_s32x2 = vpadd_s32( vget_low_s32( t0_s32x4 ), vget_high_s32( t0_s32x4 ) ); const int64x1_t t_s64x1 = vpaddl_s32( t_s32x2 ); DC_resp = vget_lane_s32( vreinterpret_s32_s64( t_s64x1 ), 0 ); - vst1q_s32( Atmp_QA + 8, vshll_n_s16( vget_low_s16 ( t1_s16x8 ), QA - 12 ) ); - vst1q_s32( Atmp_QA + 12, vshll_n_s16( vget_high_s16( t1_s16x8 ), QA - 12 ) ); + vst1q_s32( Atmp_QA + 0, vshll_n_s16( vget_low_s16 ( t0_s16x8 ), QA - 12 ) ); + vst1q_s32( Atmp_QA + 4, vshll_n_s16( vget_high_s16( t0_s16x8 ), QA - 12 ) ); } break;
@@ -246,16 +250,22 @@ opus_int32 silk_LPC_inverse_pred_gain_neon( /* O Returns inverse predi case 6: DC_resp += (opus_int32)A_Q12[ 5 ]; DC_resp += (opus_int32)A_Q12[ 4 ]; + Atmp_QA[ order - leftover + 5 ] = silk_LSHIFT32( (opus_int32)A_Q12[ 5 ], QA - 12 ); + Atmp_QA[ order - leftover + 4 ] = silk_LSHIFT32( (opus_int32)A_Q12[ 4 ], QA - 12 ); /* FALLTHROUGH */
case 4: DC_resp += (opus_int32)A_Q12[ 3 ]; DC_resp += (opus_int32)A_Q12[ 2 ]; + Atmp_QA[ order - leftover + 3 ] = silk_LSHIFT32( (opus_int32)A_Q12[ 3 ], QA - 12 ); + Atmp_QA[ order - leftover + 2 ] = silk_LSHIFT32( (opus_int32)A_Q12[ 2 ], QA - 12 ); /* FALLTHROUGH */
case 2: DC_resp += (opus_int32)A_Q12[ 1 ]; DC_resp += (opus_int32)A_Q12[ 0 ]; + Atmp_QA[ order - leftover + 1 ] = silk_LSHIFT32( (opus_int32)A_Q12[ 1 ], QA - 12 ); + Atmp_QA[ order - leftover + 0 ] = silk_LSHIFT32( (opus_int32)A_Q12[ 0 ], QA - 12 ); /* FALLTHROUGH */
default: @@ -266,8 +276,6 @@ opus_int32 silk_LPC_inverse_pred_gain_neon( /* O Returns inverse predi if( DC_resp >= 4096 ) { invGain_Q30 = 0; } else { - vst1q_s32( Atmp_QA + 0, vshll_n_s16( vget_low_s16 ( t0_s16x8 ), QA - 12 ) ); - vst1q_s32( Atmp_QA + 4, vshll_n_s16( vget_high_s16( t0_s16x8 ), QA - 12 ) ); invGain_Q30 = LPC_inverse_pred_gain_QA_neon( Atmp_QA, order ); } } diff --git a/media/libopus/silk/bwexpander_32.c b/media/libopus/silk/bwexpander_32.c index d0010f73dfd50..0f32b9df1a1d7 100644 --- a/media/libopus/silk/bwexpander_32.c +++ b/media/libopus/silk/bwexpander_32.c @@ -31,7 +31,8 @@ POSSIBILITY OF SUCH DAMAGE.
#include "SigProc_FIX.h"
-/* Chirp (bandwidth expand) LP AR filter */ +/* Chirp (bandwidth expand) LP AR filter. + This logic is reused in _celt_lpc(). Any bug fixes should also be applied there. */ void silk_bwexpander_32( opus_int32 *ar, /* I/O AR filter to be expanded (without leading 1) */ const opus_int d, /* I Length of ar */ diff --git a/media/libopus/silk/debug.c b/media/libopus/silk/debug.c index 9253faf71bfe3..eb0c36ef1f9a0 100644 --- a/media/libopus/silk/debug.c +++ b/media/libopus/silk/debug.c @@ -30,18 +30,20 @@ POSSIBILITY OF SUCH DAMAGE. #endif
#include "debug.h" + +#if SILK_DEBUG || SILK_TIC_TOC #include "SigProc_FIX.h" +#endif
#if SILK_TIC_TOC
-#ifdef _WIN32 - #if (defined(_WIN32) || defined(_WINCE)) #include <windows.h> /* timer */ #else /* Linux or Mac*/ #include <sys/time.h> #endif
+#ifdef _WIN32 unsigned long silk_GetHighResolutionTime(void) /* O time in usec*/ { /* Returns a time counter in microsec */ @@ -65,7 +67,7 @@ unsigned long GetHighResolutionTime(void) /* O time in usec*/ int silk_Timer_nTimers = 0; int silk_Timer_depth_ctr = 0; char silk_Timer_tags[silk_NUM_TIMERS_MAX][silk_NUM_TIMERS_MAX_TAG_LEN]; -#ifdef WIN32 +#ifdef _WIN32 LARGE_INTEGER silk_Timer_start[silk_NUM_TIMERS_MAX]; #else unsigned long silk_Timer_start[silk_NUM_TIMERS_MAX]; @@ -76,7 +78,7 @@ opus_int64 silk_Timer_sum[silk_NUM_TIMERS_MAX]; opus_int64 silk_Timer_max[silk_NUM_TIMERS_MAX]; opus_int64 silk_Timer_depth[silk_NUM_TIMERS_MAX];
-#ifdef WIN32 +#ifdef _WIN32 void silk_TimerSave(char *file_name) { if( silk_Timer_nTimers > 0 ) diff --git a/media/libopus/silk/debug.h b/media/libopus/silk/debug.h index 6f68c1ca0f022..36163e478d305 100644 --- a/media/libopus/silk/debug.h +++ b/media/libopus/silk/debug.h @@ -28,28 +28,29 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_DEBUG_H #define SILK_DEBUG_H
-#include "typedef.h" -#include <stdio.h> /* file writing */ -#include <string.h> /* strcpy, strcmp */ - -#ifdef __cplusplus -extern "C" -{ -#endif - -unsigned long GetHighResolutionTime(void); /* O time in usec*/ - /* Set to 1 to enable DEBUG_STORE_DATA() macros for dumping * intermediate signals from the codec. */ #define SILK_DEBUG 0
/* Flag for using timers */ -#define SILK_TIC_TOC 0 +#define SILK_TIC_TOC 0
+#if SILK_DEBUG || SILK_TIC_TOC +#include "typedef.h" +#include <string.h> /* strcpy, strcmp */ +#include <stdio.h> /* file writing */ +#endif + +#ifdef __cplusplus +extern "C" +{ +#endif
#if SILK_TIC_TOC
+unsigned long GetHighResolutionTime(void); /* O time in usec*/ + #if (defined(_WIN32) || defined(_WINCE)) #include <windows.h> /* timer */ #else /* Linux or Mac*/ diff --git a/media/libopus/silk/decode_frame.c b/media/libopus/silk/decode_frame.c index e73825b2676f9..4f36f854c2b59 100644 --- a/media/libopus/silk/decode_frame.c +++ b/media/libopus/silk/decode_frame.c @@ -97,7 +97,6 @@ opus_int silk_decode_frame( psDec->first_frame_after_reset = 0; } else { /* Handle packet loss by extrapolation */ - psDec->indices.signalType = psDec->prevSignalType; silk_PLC( psDec, psDecCtrl, pOut, 1, arch ); }
diff --git a/media/libopus/silk/define.h b/media/libopus/silk/define.h index 247cb0bf71d83..491c86f33e9f5 100644 --- a/media/libopus/silk/define.h +++ b/media/libopus/silk/define.h @@ -225,6 +225,7 @@ extern "C" /* Defines for CN generation */ #define CNG_BUF_MASK_MAX 255 /* 2^floor(log2(MAX_FRAME_LENGTH))-1 */ #define CNG_GAIN_SMTH_Q16 4634 /* 0.25^(1/4) */ +#define CNG_GAIN_SMTH_THRESHOLD_Q16 46396 /* -3 dB */ #define CNG_NLSF_SMTH_Q16 16348 /* 0.25 */
#ifdef __cplusplus diff --git a/media/libopus/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c b/media/libopus/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c index 00a70cb51ffbf..6f3be025cc375 100644 --- a/media/libopus/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c +++ b/media/libopus/silk/fixed/arm/warped_autocorrelation_FIX_neon_intr.c @@ -84,7 +84,9 @@ void silk_warped_autocorrelation_FIX_neon( silk_assert( ( order & 1 ) == 0 ); silk_assert( 2 * QS - QC >= 0 );
- ALLOC( input_QST, length + 2 * MAX_SHAPE_LPC_ORDER, opus_int32 ); + /* The additional +4 is to ensure a later vld1q_s32 call does not overflow. */ + /* Strictly, only +3 is needed but +4 simplifies initialization using the 4x32 neon load. */ + ALLOC( input_QST, length + 2 * MAX_SHAPE_LPC_ORDER + 4, opus_int32 );
input_QS = input_QST; /* input_QS has zero paddings in the beginning and end. */ @@ -121,6 +123,8 @@ void silk_warped_autocorrelation_FIX_neon( vst1q_s32( input_QS, vdupq_n_s32( 0 ) ); input_QS += 4; vst1q_s32( input_QS, vdupq_n_s32( 0 ) ); + input_QS += 4; + vst1q_s32( input_QS, vdupq_n_s32( 0 ) ); input_QS = input_QST + MAX_SHAPE_LPC_ORDER - orderT;
/* The following loop runs ( length + order ) times, with ( order ) extra epilogues. */ @@ -153,7 +157,8 @@ void silk_warped_autocorrelation_FIX_neon( opus_int o = orderT; int32x4_t state_QS_s32x4[ 3 ][ 2 ];
- ALLOC( state, length + orderT, opus_int32 ); + /* The additional +4 is to ensure a later vld1q_s32 call does not overflow. */ + ALLOC( state, length + order + 4, opus_int32 ); state_QS_s32x4[ 2 ][ 1 ] = vdupq_n_s32( 0 );
/* Calculate 8 taps of all inputs in each loop. */ diff --git a/media/libopus/silk/fixed/burg_modified_FIX.c b/media/libopus/silk/fixed/burg_modified_FIX.c index 274d4b28e1125..185a12b178f73 100644 --- a/media/libopus/silk/fixed/burg_modified_FIX.c +++ b/media/libopus/silk/fixed/burg_modified_FIX.c @@ -68,7 +68,7 @@ void silk_burg_modified_c( celt_assert( subfr_length * nb_subfr <= MAX_FRAME_SIZE );
/* Compute autocorrelations, added over subframes */ - C0_64 = silk_inner_prod16_aligned_64( x, x, subfr_length*nb_subfr, arch ); + C0_64 = silk_inner_prod16( x, x, subfr_length*nb_subfr, arch ); lz = silk_CLZ64(C0_64); rshifts = 32 + 1 + N_BITS_HEAD_ROOM - lz; if (rshifts > MAX_RSHIFTS) rshifts = MAX_RSHIFTS; @@ -87,7 +87,7 @@ void silk_burg_modified_c( x_ptr = x + s * subfr_length; for( n = 1; n < D + 1; n++ ) { C_first_row[ n - 1 ] += (opus_int32)silk_RSHIFT64( - silk_inner_prod16_aligned_64( x_ptr, x_ptr + n, subfr_length - n, arch ), rshifts ); + silk_inner_prod16( x_ptr, x_ptr + n, subfr_length - n, arch ), rshifts ); } } } else { @@ -150,7 +150,7 @@ void silk_burg_modified_c( C_first_row[ k ] = silk_MLA( C_first_row[ k ], x1, x_ptr[ n - k - 1 ] ); /* Q( -rshifts ) */ C_last_row[ k ] = silk_MLA( C_last_row[ k ], x2, x_ptr[ subfr_length - n + k ] ); /* Q( -rshifts ) */ Atmp1 = silk_RSHIFT_ROUND( Af_QA[ k ], QA - 17 ); /* Q17 */ - /* We sometimes have get overflows in the multiplications (even beyond +/- 2^32), + /* We sometimes get overflows in the multiplications (even beyond +/- 2^32), but they cancel each other and the real result seems to always fit in a 32-bit signed integer. This was determined experimentally, not theoretically (unfortunately). */ tmp1 = silk_MLA_ovflw( tmp1, x_ptr[ n - k - 1 ], Atmp1 ); /* Q17 */ @@ -253,7 +253,7 @@ void silk_burg_modified_c( if( rshifts > 0 ) { for( s = 0; s < nb_subfr; s++ ) { x_ptr = x + s * subfr_length; - C0 -= (opus_int32)silk_RSHIFT64( silk_inner_prod16_aligned_64( x_ptr, x_ptr, D, arch ), rshifts ); + C0 -= (opus_int32)silk_RSHIFT64( silk_inner_prod16( x_ptr, x_ptr, D, arch ), rshifts ); } } else { for( s = 0; s < nb_subfr; s++ ) { diff --git a/media/libopus/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h b/media/libopus/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h index fcbd96c88d98a..66eb2ed26d11e 100644 --- a/media/libopus/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h +++ b/media/libopus/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h @@ -41,15 +41,14 @@ POSSIBILITY OF SUCH DAMAGE. #define QS 14
/* Autocorrelations for a warped frequency axis */ -#define OVERRIDE_silk_warped_autocorrelation_FIX -void silk_warped_autocorrelation_FIX( +#define OVERRIDE_silk_warped_autocorrelation_FIX_c +void silk_warped_autocorrelation_FIX_c( opus_int32 *corr, /* O Result [order + 1] */ opus_int *scale, /* O Scaling of the correlation vector */ const opus_int16 *input, /* I Input data to correlate */ const opus_int warping_Q16, /* I Warping coefficient */ const opus_int length, /* I Length of input */ - const opus_int order, /* I Correlation order (even) */ - int arch /* I Run-time architecture */ + const opus_int order /* I Correlation order (even) */ ) { opus_int n, i, lsh; diff --git a/media/libopus/silk/fixed/vector_ops_FIX.c b/media/libopus/silk/fixed/vector_ops_FIX.c index d94980014f624..dcf84070a6b00 100644 --- a/media/libopus/silk/fixed/vector_ops_FIX.c +++ b/media/libopus/silk/fixed/vector_ops_FIX.c @@ -87,7 +87,7 @@ opus_int32 silk_inner_prod_aligned( #endif }
-opus_int64 silk_inner_prod16_aligned_64_c( +opus_int64 silk_inner_prod16_c( const opus_int16 *inVec1, /* I input vector 1 */ const opus_int16 *inVec2, /* I input vector 2 */ const opus_int len /* I vector lengths */ diff --git a/media/libopus/silk/fixed/warped_autocorrelation_FIX.c b/media/libopus/silk/fixed/warped_autocorrelation_FIX.c index 52002a111837c..5c79553bc001b 100644 --- a/media/libopus/silk/fixed/warped_autocorrelation_FIX.c +++ b/media/libopus/silk/fixed/warped_autocorrelation_FIX.c @@ -37,6 +37,7 @@ POSSIBILITY OF SUCH DAMAGE.
/* Autocorrelations for a warped frequency axis */ +#ifndef OVERRIDE_silk_warped_autocorrelation_FIX_c void silk_warped_autocorrelation_FIX_c( opus_int32 *corr, /* O Result [order + 1] */ opus_int *scale, /* O Scaling of the correlation vector */ @@ -88,3 +89,4 @@ void silk_warped_autocorrelation_FIX_c( } silk_assert( corr_QC[ 0 ] >= 0 ); /* If breaking, decrease QC*/ } +#endif /* OVERRIDE_silk_warped_autocorrelation_FIX_c */ diff --git a/media/libopus/silk/fixed/x86/burg_modified_FIX_sse4_1.c b/media/libopus/silk/fixed/x86/burg_modified_FIX_sse4_1.c index bbb1ce0fcc458..e58bf079e5a25 100644 --- a/media/libopus/silk/fixed/x86/burg_modified_FIX_sse4_1.c +++ b/media/libopus/silk/fixed/x86/burg_modified_FIX_sse4_1.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2014, Cisco Systems, INC - Written by XiangMingZhu WeiZhou MinPeng YanWang +/* Copyright (c) 2014-2020, Cisco Systems, INC + Written by XiangMingZhu WeiZhou MinPeng YanWang FrancisQuiers
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -42,7 +42,7 @@ #define MAX_FRAME_SIZE 384 /* subfr_length * nb_subfr = ( 0.005 * 16000 + 16 ) * 4 = 384 */
#define QA 25 -#define N_BITS_HEAD_ROOM 2 +#define N_BITS_HEAD_ROOM 3 #define MIN_RSHIFTS -16 #define MAX_RSHIFTS (32 - QA)
@@ -59,7 +59,7 @@ void silk_burg_modified_sse4_1( int arch /* I Run-time architecture */ ) { - opus_int k, n, s, lz, rshifts, rshifts_extra, reached_max_gain; + opus_int k, n, s, lz, rshifts, reached_max_gain; opus_int32 C0, num, nrg, rc_Q31, invGain_Q30, Atmp_QA, Atmp1, tmp1, tmp2, x1, x2; const opus_int16 *x_ptr; opus_int32 C_first_row[ SILK_MAX_ORDER_LPC ]; @@ -68,6 +68,7 @@ void silk_burg_modified_sse4_1( opus_int32 CAf[ SILK_MAX_ORDER_LPC + 1 ]; opus_int32 CAb[ SILK_MAX_ORDER_LPC + 1 ]; opus_int32 xcorr[ SILK_MAX_ORDER_LPC ]; + opus_int64 C0_64;
__m128i FIRST_3210, LAST_3210, ATMP_3210, TMP1_3210, TMP2_3210, T1_3210, T2_3210, PTR_3210, SUBFR_3210, X1_3210, X2_3210; __m128i CONST1 = _mm_set1_epi32(1); @@ -75,23 +76,18 @@ void silk_burg_modified_sse4_1( celt_assert( subfr_length * nb_subfr <= MAX_FRAME_SIZE );
/* Compute autocorrelations, added over subframes */ - silk_sum_sqr_shift( &C0, &rshifts, x, nb_subfr * subfr_length ); - if( rshifts > MAX_RSHIFTS ) { - C0 = silk_LSHIFT32( C0, rshifts - MAX_RSHIFTS ); - silk_assert( C0 > 0 ); - rshifts = MAX_RSHIFTS; + C0_64 = silk_inner_prod16( x, x, subfr_length*nb_subfr, arch ); + lz = silk_CLZ64(C0_64); + rshifts = 32 + 1 + N_BITS_HEAD_ROOM - lz; + if (rshifts > MAX_RSHIFTS) rshifts = MAX_RSHIFTS; + if (rshifts < MIN_RSHIFTS) rshifts = MIN_RSHIFTS; + + if (rshifts > 0) { + C0 = (opus_int32)silk_RSHIFT64(C0_64, rshifts ); } else { - lz = silk_CLZ32( C0 ) - 1; - rshifts_extra = N_BITS_HEAD_ROOM - lz; - if( rshifts_extra > 0 ) { - rshifts_extra = silk_min( rshifts_extra, MAX_RSHIFTS - rshifts ); - C0 = silk_RSHIFT32( C0, rshifts_extra ); - } else { - rshifts_extra = silk_max( rshifts_extra, MIN_RSHIFTS - rshifts ); - C0 = silk_LSHIFT32( C0, -rshifts_extra ); - } - rshifts += rshifts_extra; + C0 = silk_LSHIFT32((opus_int32)C0_64, -rshifts ); } + CAb[ 0 ] = CAf[ 0 ] = C0 + silk_SMMUL( SILK_FIX_CONST( FIND_LPC_COND_FAC, 32 ), C0 ) + 1; /* Q(-rshifts) */ silk_memset( C_first_row, 0, SILK_MAX_ORDER_LPC * sizeof( opus_int32 ) ); if( rshifts > 0 ) { @@ -99,7 +95,7 @@ void silk_burg_modified_sse4_1( x_ptr = x + s * subfr_length; for( n = 1; n < D + 1; n++ ) { C_first_row[ n - 1 ] += (opus_int32)silk_RSHIFT64( - silk_inner_prod16_aligned_64( x_ptr, x_ptr + n, subfr_length - n, arch ), rshifts ); + silk_inner_prod16( x_ptr, x_ptr + n, subfr_length - n, arch ), rshifts ); } } } else { @@ -203,8 +199,11 @@ void silk_burg_modified_sse4_1( C_first_row[ k ] = silk_MLA( C_first_row[ k ], x1, x_ptr[ n - k - 1 ] ); /* Q( -rshifts ) */ C_last_row[ k ] = silk_MLA( C_last_row[ k ], x2, x_ptr[ subfr_length - n + k ] ); /* Q( -rshifts ) */ Atmp1 = silk_RSHIFT_ROUND( Af_QA[ k ], QA - 17 ); /* Q17 */ - tmp1 = silk_MLA( tmp1, x_ptr[ n - k - 1 ], Atmp1 ); /* Q17 */ - tmp2 = silk_MLA( tmp2, x_ptr[ subfr_length - n + k ], Atmp1 ); /* Q17 */ + /* We sometimes get overflows in the multiplications (even beyond +/- 2^32), + but they cancel each other and the real result seems to always fit in a 32-bit + signed integer. This was determined experimentally, not theoretically (unfortunately). */ + tmp1 = silk_MLA_ovflw( tmp1, x_ptr[ n - k - 1 ], Atmp1 ); /* Q17 */ + tmp2 = silk_MLA_ovflw( tmp2, x_ptr[ subfr_length - n + k ], Atmp1 ); /* Q17 */ }
tmp1 = -tmp1; /* Q17 */ @@ -350,7 +349,7 @@ void silk_burg_modified_sse4_1( if( rshifts > 0 ) { for( s = 0; s < nb_subfr; s++ ) { x_ptr = x + s * subfr_length; - C0 -= (opus_int32)silk_RSHIFT64( silk_inner_prod16_aligned_64( x_ptr, x_ptr, D, arch ), rshifts ); + C0 -= (opus_int32)silk_RSHIFT64( silk_inner_prod16( x_ptr, x_ptr, D, arch ), rshifts ); } } else { for( s = 0; s < nb_subfr; s++ ) { @@ -374,4 +373,28 @@ void silk_burg_modified_sse4_1( *res_nrg = silk_SMLAWW( nrg, silk_SMMUL( SILK_FIX_CONST( FIND_LPC_COND_FAC, 32 ), C0 ), -tmp1 );/* Q( -rshifts ) */ *res_nrg_Q = -rshifts; } + +#ifdef OPUS_CHECK_ASM + { + opus_int32 res_nrg_c = 0; + opus_int res_nrg_Q_c = 0; + opus_int32 A_Q16_c[ MAX_LPC_ORDER ] = {0}; + + silk_burg_modified_c( + &res_nrg_c, + &res_nrg_Q_c, + A_Q16_c, + x, + minInvGain_Q30, + subfr_length, + nb_subfr, + D, + 0 + ); + + silk_assert( *res_nrg == res_nrg_c ); + silk_assert( *res_nrg_Q == res_nrg_Q_c ); + silk_assert( !memcmp( A_Q16, A_Q16_c, D * sizeof( *A_Q16 ) ) ); + } +#endif } diff --git a/media/libopus/silk/fixed/x86/vector_ops_FIX_sse4_1.c b/media/libopus/silk/fixed/x86/vector_ops_FIX_sse4_1.c index c1e90564d0ed7..0cfb08d902012 100644 --- a/media/libopus/silk/fixed/x86/vector_ops_FIX_sse4_1.c +++ b/media/libopus/silk/fixed/x86/vector_ops_FIX_sse4_1.c @@ -37,39 +37,36 @@ #include "SigProc_FIX.h" #include "pitch.h"
-opus_int64 silk_inner_prod16_aligned_64_sse4_1( +opus_int64 silk_inner_prod16_sse4_1( const opus_int16 *inVec1, /* I input vector 1 */ const opus_int16 *inVec2, /* I input vector 2 */ const opus_int len /* I vector lengths */ ) { - opus_int i, dataSize8; + opus_int i, dataSize4; opus_int64 sum;
- __m128i xmm_tempa; - __m128i inVec1_76543210, acc1; - __m128i inVec2_76543210, acc2; + __m128i xmm_prod_20, xmm_prod_31; + __m128i inVec1_3210, acc1; + __m128i inVec2_3210, acc2;
sum = 0; - dataSize8 = len & ~7; + dataSize4 = len & ~3;
acc1 = _mm_setzero_si128(); acc2 = _mm_setzero_si128();
- for( i = 0; i < dataSize8; i += 8 ) { - inVec1_76543210 = _mm_loadu_si128( (__m128i *)(&inVec1[i + 0] ) ); - inVec2_76543210 = _mm_loadu_si128( (__m128i *)(&inVec2[i + 0] ) ); + for( i = 0; i < dataSize4; i += 4 ) { + inVec1_3210 = OP_CVTEPI16_EPI32_M64( &inVec1[i + 0] ); + inVec2_3210 = OP_CVTEPI16_EPI32_M64( &inVec2[i + 0] ); + xmm_prod_20 = _mm_mul_epi32( inVec1_3210, inVec2_3210 );
- /* only when all 4 operands are -32768 (0x8000), this results in wrap around */ - inVec1_76543210 = _mm_madd_epi16( inVec1_76543210, inVec2_76543210 ); + inVec1_3210 = _mm_shuffle_epi32( inVec1_3210, _MM_SHUFFLE( 0, 3, 2, 1 ) ); + inVec2_3210 = _mm_shuffle_epi32( inVec2_3210, _MM_SHUFFLE( 0, 3, 2, 1 ) ); + xmm_prod_31 = _mm_mul_epi32( inVec1_3210, inVec2_3210 );
- xmm_tempa = _mm_cvtepi32_epi64( inVec1_76543210 ); - /* equal shift right 8 bytes */ - inVec1_76543210 = _mm_shuffle_epi32( inVec1_76543210, _MM_SHUFFLE( 0, 0, 3, 2 ) ); - inVec1_76543210 = _mm_cvtepi32_epi64( inVec1_76543210 ); - - acc1 = _mm_add_epi64( acc1, xmm_tempa ); - acc2 = _mm_add_epi64( acc2, inVec1_76543210 ); + acc1 = _mm_add_epi64( acc1, xmm_prod_20 ); + acc2 = _mm_add_epi64( acc2, xmm_prod_31 ); }
acc1 = _mm_add_epi64( acc1, acc2 ); @@ -84,5 +81,12 @@ opus_int64 silk_inner_prod16_aligned_64_sse4_1( sum = silk_SMLABB( sum, inVec1[ i ], inVec2[ i ] ); }
+#ifdef OPUS_CHECK_ASM + { + opus_int64 sum_c = silk_inner_prod16_c( inVec1, inVec2, len ); + silk_assert( sum == sum_c ); + } +#endif + return sum; } diff --git a/media/libopus/silk/float/warped_autocorrelation_FLP.c b/media/libopus/silk/float/warped_autocorrelation_FLP.c index 96662767cf3b0..09186e73d463d 100644 --- a/media/libopus/silk/float/warped_autocorrelation_FLP.c +++ b/media/libopus/silk/float/warped_autocorrelation_FLP.c @@ -42,8 +42,8 @@ void silk_warped_autocorrelation_FLP( { opus_int n, i; double tmp1, tmp2; - double state[ MAX_SHAPE_LPC_ORDER + 1 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; - double C[ MAX_SHAPE_LPC_ORDER + 1 ] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; + double state[ MAX_SHAPE_LPC_ORDER + 1 ] = { 0 }; + double C[ MAX_SHAPE_LPC_ORDER + 1 ] = { 0 };
/* Order must be even */ celt_assert( ( order & 1 ) == 0 ); diff --git a/media/libopus/silk/main.h b/media/libopus/silk/main.h index 1a33eed549b6a..a5f568758ffb6 100644 --- a/media/libopus/silk/main.h +++ b/media/libopus/silk/main.h @@ -247,21 +247,21 @@ void silk_VQ_WMat_EC_c( /************************************/
void silk_NSQ_c( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - SideInfoIndices *psIndices, /* I/O Quantization Indices */ - const opus_int16 x16[], /* I Input */ - opus_int8 pulses[], /* O Quantized pulse signal */ - const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ - const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ - const opus_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ - const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ - const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ - const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ - const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ - const opus_int LTP_scale_Q14 /* I LTP state scaling */ + const silk_encoder_state *psEncC, /* I Encoder State */ + silk_nsq_state *NSQ, /* I/O NSQ state */ + SideInfoIndices *psIndices, /* I/O Quantization Indices */ + const opus_int16 x16[], /* I Input */ + opus_int8 pulses[], /* O Quantized pulse signal */ + const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ + const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ + const opus_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ + const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ + const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ + const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ + const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ + const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ + const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ + const opus_int LTP_scale_Q14 /* I LTP state scaling */ );
#if !defined(OVERRIDE_silk_NSQ) @@ -273,21 +273,21 @@ void silk_NSQ_c(
/* Noise shaping using delayed decision */ void silk_NSQ_del_dec_c( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - SideInfoIndices *psIndices, /* I/O Quantization Indices */ - const opus_int16 x16[], /* I Input */ - opus_int8 pulses[], /* O Quantized pulse signal */ - const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ - const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ - const opus_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ - const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ - const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ - const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ - const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ - const opus_int LTP_scale_Q14 /* I LTP state scaling */ + const silk_encoder_state *psEncC, /* I Encoder State */ + silk_nsq_state *NSQ, /* I/O NSQ state */ + SideInfoIndices *psIndices, /* I/O Quantization Indices */ + const opus_int16 x16[], /* I Input */ + opus_int8 pulses[], /* O Quantized pulse signal */ + const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ + const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ + const opus_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ + const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ + const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ + const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ + const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ + const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ + const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ + const opus_int LTP_scale_Q14 /* I LTP state scaling */ );
#if !defined(OVERRIDE_silk_NSQ_del_dec) diff --git a/media/libopus/silk/typedef.h b/media/libopus/silk/typedef.h index 97b7e709be5bc..793d2c0c1d381 100644 --- a/media/libopus/silk/typedef.h +++ b/media/libopus/silk/typedef.h @@ -67,6 +67,9 @@ __attribute__((noreturn)) static OPUS_INLINE void _silk_fatal(const char *str, const char *file, int line) { fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str); +#if defined(_MSC_VER) + _set_abort_behavior( 0, _WRITE_ABORT_MSG); +#endif abort(); } # define silk_assert(COND) {if (!(COND)) {silk_fatal("assertion failed: " #COND);}} diff --git a/media/libopus/silk/x86/NSQ_del_dec_sse4_1.c b/media/libopus/silk/x86/NSQ_del_dec_sse4_1.c index 2c75ede2dde8c..42735c528bf49 100644 --- a/media/libopus/silk/x86/NSQ_del_dec_sse4_1.c +++ b/media/libopus/silk/x86/NSQ_del_dec_sse4_1.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2014, Cisco Systems, INC - Written by XiangMingZhu WeiZhou MinPeng YanWang +/* Copyright (c) 2014-2020, Cisco Systems, INC + Written by XiangMingZhu WeiZhou MinPeng YanWang FrancisQuiers
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -46,6 +46,7 @@ typedef struct { opus_int32 Shape_Q14[ DECISION_DELAY ]; opus_int32 sAR2_Q14[ MAX_SHAPE_LPC_ORDER ]; opus_int32 LF_AR_Q14; + opus_int32 Diff_Q14; opus_int32 Seed; opus_int32 SeedInit; opus_int32 RD_Q10; @@ -56,6 +57,7 @@ typedef struct { opus_int32 RD_Q10; opus_int32 xq_Q14; opus_int32 LF_AR_Q14; + opus_int32 Diff_Q14; opus_int32 sLTP_shp_Q14; opus_int32 LPC_exc_Q14; } NSQ_sample_struct; @@ -66,7 +68,7 @@ static OPUS_INLINE void silk_nsq_del_dec_scale_states_sse4_1( const silk_encoder_state *psEncC, /* I Encoder State */ silk_nsq_state *NSQ, /* I/O NSQ state */ NSQ_del_dec_struct psDelDec[], /* I/O Delayed decision states */ - const opus_int32 x_Q3[], /* I Input in Q3 */ + const opus_int16 x16[], /* I Input */ opus_int32 x_sc_Q10[], /* O Input scaled with 1/Gain in Q10 */ const opus_int16 sLTP[], /* I Re-whitened LTP state in Q0 */ opus_int32 sLTP_Q15[], /* O LTP state matching scaled input */ @@ -112,21 +114,21 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1( );
void silk_NSQ_del_dec_sse4_1( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - SideInfoIndices *psIndices, /* I/O Quantization Indices */ - const opus_int32 x_Q3[], /* I Prefiltered input signal */ - opus_int8 pulses[], /* O Quantized pulse signal */ - const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ - const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ - const opus_int16 AR2_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ - const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ - const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ - const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ - const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ - const opus_int LTP_scale_Q14 /* I LTP state scaling */ + const silk_encoder_state *psEncC, /* I Encoder State */ + silk_nsq_state *NSQ, /* I/O NSQ state */ + SideInfoIndices *psIndices, /* I/O Quantization Indices */ + const opus_int16 x16[], /* I Input */ + opus_int8 pulses[], /* O Quantized pulse signal */ + const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ + const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ + const opus_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ + const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ + const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ + const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ + const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ + const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ + const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ + const opus_int LTP_scale_Q14 /* I LTP state scaling */ ) { opus_int i, k, lag, start_idx, LSF_interpolation_flag, Winner_ind, subfr; @@ -142,8 +144,39 @@ void silk_NSQ_del_dec_sse4_1( VARDECL( opus_int32, delayedGain_Q10 ); VARDECL( NSQ_del_dec_struct, psDelDec ); NSQ_del_dec_struct *psDD; +#ifdef OPUS_CHECK_ASM + silk_nsq_state NSQ_c; + SideInfoIndices psIndices_c; + opus_int8 pulses_c[ MAX_FRAME_LENGTH ]; + const opus_int8 *const pulses_a = pulses; +#endif SAVE_STACK;
+#ifdef OPUS_CHECK_ASM + ( void )pulses_a; + silk_memcpy( &NSQ_c, NSQ, sizeof( NSQ_c ) ); + silk_memcpy( &psIndices_c, psIndices, sizeof( psIndices_c ) ); + silk_assert( psEncC->nb_subfr * psEncC->subfr_length <= MAX_FRAME_LENGTH ); + silk_memcpy( pulses_c, pulses, psEncC->nb_subfr * psEncC->subfr_length * sizeof( pulses[0] ) ); + silk_NSQ_del_dec_c( + psEncC, + &NSQ_c, + &psIndices_c, + x16, + pulses_c, + PredCoef_Q12, + LTPCoef_Q14, + AR_Q13, + HarmShapeGain_Q14, + Tilt_Q14, + LF_shp_Q14, + Gains_Q16, + pitchL, + Lambda_Q10, + LTP_scale_Q14 + ); +#endif + /* Set unvoiced lag to the previous one, overwrite later for voiced */ lag = NSQ->lagPrev;
@@ -158,6 +191,7 @@ void silk_NSQ_del_dec_sse4_1( psDD->SeedInit = psDD->Seed; psDD->RD_Q10 = 0; psDD->LF_AR_Q14 = NSQ->sLF_AR_shp_Q14; + psDD->Diff_Q14 = NSQ->sDiff_shp_Q14; psDD->Shape_Q14[ 0 ] = NSQ->sLTP_shp_Q14[ psEncC->ltp_mem_length - 1 ]; silk_memcpy( psDD->sLPC_Q14, NSQ->sLPC_Q14, NSQ_LPC_BUF_LENGTH * sizeof( opus_int32 ) ); silk_memcpy( psDD->sAR2_Q14, NSQ->sAR2_Q14, sizeof( NSQ->sAR2_Q14 ) ); @@ -185,8 +219,7 @@ void silk_NSQ_del_dec_sse4_1( LSF_interpolation_flag = 1; }
- ALLOC( sLTP_Q15, - psEncC->ltp_mem_length + psEncC->frame_length, opus_int32 ); + ALLOC( sLTP_Q15, psEncC->ltp_mem_length + psEncC->frame_length, opus_int32 ); ALLOC( sLTP, psEncC->ltp_mem_length + psEncC->frame_length, opus_int16 ); ALLOC( x_sc_Q10, psEncC->subfr_length, opus_int32 ); ALLOC( delayedGain_Q10, DECISION_DELAY, opus_int32 ); @@ -198,7 +231,7 @@ void silk_NSQ_del_dec_sse4_1( for( k = 0; k < psEncC->nb_subfr; k++ ) { A_Q12 = &PredCoef_Q12[ ( ( k >> 1 ) | ( 1 - LSF_interpolation_flag ) ) * MAX_LPC_ORDER ]; B_Q14 = <PCoef_Q14[ k * LTP_ORDER ]; - AR_shp_Q13 = &AR2_Q13[ k * MAX_SHAPE_LPC_ORDER ]; + AR_shp_Q13 = &AR_Q13[ k * MAX_SHAPE_LPC_ORDER ];
/* Noise shape parameters */ silk_assert( HarmShapeGain_Q14[ k ] >= 0 ); @@ -257,7 +290,7 @@ void silk_NSQ_del_dec_sse4_1( } }
- silk_nsq_del_dec_scale_states_sse4_1( psEncC, NSQ, psDelDec, x_Q3, x_sc_Q10, sLTP, sLTP_Q15, k, + silk_nsq_del_dec_scale_states_sse4_1( psEncC, NSQ, psDelDec, x16, x_sc_Q10, sLTP, sLTP_Q15, k, psEncC->nStatesDelayedDecision, LTP_scale_Q14, Gains_Q16, pitchL, psIndices->signalType, decisionDelay );
silk_noise_shape_quantizer_del_dec_sse4_1( NSQ, psDelDec, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15, @@ -265,7 +298,7 @@ void silk_NSQ_del_dec_sse4_1( Gains_Q16[ k ], Lambda_Q10, offset_Q10, psEncC->subfr_length, subfr++, psEncC->shapingLPCOrder, psEncC->predictLPCOrder, psEncC->warping_Q16, psEncC->nStatesDelayedDecision, &smpl_buf_idx, decisionDelay );
- x_Q3 += psEncC->subfr_length; + x16 += psEncC->subfr_length; pulses += psEncC->subfr_length; pxq += psEncC->subfr_length; } @@ -288,6 +321,7 @@ void silk_NSQ_del_dec_sse4_1( for( i = 0; i < decisionDelay; i++ ) { last_smple_idx = ( last_smple_idx - 1 ) % DECISION_DELAY; if( last_smple_idx < 0 ) last_smple_idx += DECISION_DELAY; + pulses[ i - decisionDelay ] = (opus_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 ); pxq[ i - decisionDelay ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], Gain_Q10 ), 8 ) ); @@ -298,11 +332,19 @@ void silk_NSQ_del_dec_sse4_1(
/* Update states */ NSQ->sLF_AR_shp_Q14 = psDD->LF_AR_Q14; + NSQ->sDiff_shp_Q14 = psDD->Diff_Q14; NSQ->lagPrev = pitchL[ psEncC->nb_subfr - 1 ];
/* Save quantized speech signal */ silk_memmove( NSQ->xq, &NSQ->xq[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int16 ) ); silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int32 ) ); + +#ifdef OPUS_CHECK_ASM + silk_assert( !memcmp( &NSQ_c, NSQ, sizeof( NSQ_c ) ) ); + silk_assert( !memcmp( &psIndices_c, psIndices, sizeof( psIndices_c ) ) ); + silk_assert( !memcmp( pulses_c, pulses_a, psEncC->nb_subfr * psEncC->subfr_length * sizeof( pulses[0] ) ) ); +#endif + RESTORE_STACK; }
@@ -345,6 +387,7 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1( opus_int32 q1_Q0, q1_Q10, q2_Q10, exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10; opus_int32 tmp1, tmp2, sLF_AR_shp_Q14; opus_int32 *pred_lag_ptr, *shp_lag_ptr, *psLPC_Q14; + VARDECL( NSQ_sample_pair, psSampleState ); NSQ_del_dec_struct *psDD; NSQ_sample_struct *psSS; @@ -356,6 +399,8 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1( celt_assert( nStatesDelayedDecision > 0 ); ALLOC( psSampleState, nStatesDelayedDecision, NSQ_sample_pair );
+ int rdo_offset = (Lambda_Q10 >> 1) - 512; + shp_lag_ptr = &NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS / 2 ]; pred_lag_ptr = &sLTP_Q15[ NSQ->sLTP_buf_idx - lag + LTP_ORDER / 2 ]; Gain_Q10 = silk_RSHIFT( Gain_Q16, 6 ); @@ -407,8 +452,8 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1( /* Long-term shaping */ if( lag > 0 ) { /* Symmetric, packed FIR coefficients */ - n_LTP_Q14 = silk_SMULWB( silk_ADD32( shp_lag_ptr[ 0 ], shp_lag_ptr[ -2 ] ), HarmShapeFIRPacked_Q14 ); - n_LTP_Q14 = silk_SMLAWT( n_LTP_Q14, shp_lag_ptr[ -1 ], HarmShapeFIRPacked_Q14 ); + n_LTP_Q14 = silk_SMULWB( silk_ADD_SAT32( shp_lag_ptr[ 0 ], shp_lag_ptr[ -2 ] ), HarmShapeFIRPacked_Q14 ); + n_LTP_Q14 = silk_SMLAWT( n_LTP_Q14, shp_lag_ptr[ -1 ], HarmShapeFIRPacked_Q14 ); n_LTP_Q14 = silk_SUB_LSHIFT32( LTP_pred_Q14, n_LTP_Q14, 2 ); /* Q12 -> Q14 */ shp_lag_ptr++; } else { @@ -478,7 +523,7 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1( psLPC_Q14_tmp = _mm_srli_epi64( psLPC_Q14_tmp, 16 ); tmpb = _mm_add_epi32( tmpb, psLPC_Q14_tmp );
- /* setp 4 */ + /* step 4 */ psLPC_Q14_tmp = _mm_loadu_si128( (__m128i *)(&psLPC_Q14[ -15 ] ) ); psLPC_Q14_tmp = _mm_shuffle_epi32( psLPC_Q14_tmp, 0x1B ); tmpa = _mm_mul_epi32( psLPC_Q14_tmp, a_Q12_CDEF ); @@ -511,9 +556,9 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1( LPC_pred_Q14 = silk_LSHIFT( LPC_pred_Q14, 4 ); /* Q10 -> Q14 */
/* Noise shape feedback */ - silk_assert( ( shapingLPCOrder & 1 ) == 0 ); /* check that order is even */ + celt_assert( ( shapingLPCOrder & 1 ) == 0 ); /* check that order is even */ /* Output of lowpass section */ - tmp2 = silk_SMLAWB( psLPC_Q14[ 0 ], psDD->sAR2_Q14[ 0 ], warping_Q16 ); + tmp2 = silk_SMLAWB( psDD->Diff_Q14, psDD->sAR2_Q14[ 0 ], warping_Q16 ); /* Output of allpass section */ tmp1 = silk_SMLAWB( psDD->sAR2_Q14[ 0 ], psDD->sAR2_Q14[ 1 ] - tmp2, warping_Q16 ); psDD->sAR2_Q14[ 0 ] = tmp2; @@ -543,9 +588,9 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1(
/* Input minus prediction plus noise feedback */ /* r = x[ i ] - LTP_pred - LPC_pred + n_AR + n_Tilt + n_LF + n_LTP */ - tmp1 = silk_ADD32( n_AR_Q14, n_LF_Q14 ); /* Q14 */ + tmp1 = silk_ADD_SAT32( n_AR_Q14, n_LF_Q14 ); /* Q14 */ tmp2 = silk_ADD32( n_LTP_Q14, LPC_pred_Q14 ); /* Q13 */ - tmp1 = silk_SUB32( tmp2, tmp1 ); /* Q13 */ + tmp1 = silk_SUB_SAT32( tmp2, tmp1 ); /* Q13 */ tmp1 = silk_RSHIFT_ROUND( tmp1, 4 ); /* Q10 */
r_Q10 = silk_SUB32( x_Q10[ i ], tmp1 ); /* residual error Q10 */ @@ -559,6 +604,18 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1( /* Find two quantization level candidates and measure their rate-distortion */ q1_Q10 = silk_SUB32( r_Q10, offset_Q10 ); q1_Q0 = silk_RSHIFT( q1_Q10, 10 ); + if (Lambda_Q10 > 2048) { + /* For aggressive RDO, the bias becomes more than one pulse. */ + if (q1_Q10 > rdo_offset) { + q1_Q0 = silk_RSHIFT( q1_Q10 - rdo_offset, 10 ); + } else if (q1_Q10 < -rdo_offset) { + q1_Q0 = silk_RSHIFT( q1_Q10 + rdo_offset, 10 ); + } else if (q1_Q10 < 0) { + q1_Q0 = -1; + } else { + q1_Q0 = 0; + } + } if( q1_Q0 > 0 ) { q1_Q10 = silk_SUB32( silk_LSHIFT( q1_Q0, 10 ), QUANT_LEVEL_ADJUST_Q10 ); q1_Q10 = silk_ADD32( q1_Q10, offset_Q10 ); @@ -612,8 +669,9 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1( xq_Q14 = silk_ADD32( LPC_exc_Q14, LPC_pred_Q14 );
/* Update states */ - sLF_AR_shp_Q14 = silk_SUB32( xq_Q14, n_AR_Q14 ); - psSS[ 0 ].sLTP_shp_Q14 = silk_SUB32( sLF_AR_shp_Q14, n_LF_Q14 ); + psSS[ 0 ].Diff_Q14 = silk_SUB_LSHIFT32( xq_Q14, x_Q10[ i ], 4 ); + sLF_AR_shp_Q14 = silk_SUB32( psSS[ 0 ].Diff_Q14, n_AR_Q14 ); + psSS[ 0 ].sLTP_shp_Q14 = silk_SUB_SAT32( sLF_AR_shp_Q14, n_LF_Q14 ); psSS[ 0 ].LF_AR_Q14 = sLF_AR_shp_Q14; psSS[ 0 ].LPC_exc_Q14 = LPC_exc_Q14; psSS[ 0 ].xq_Q14 = xq_Q14; @@ -626,14 +684,14 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1( exc_Q14 = -exc_Q14; }
- /* Add predictions */ LPC_exc_Q14 = silk_ADD32( exc_Q14, LTP_pred_Q14 ); xq_Q14 = silk_ADD32( LPC_exc_Q14, LPC_pred_Q14 );
/* Update states */ - sLF_AR_shp_Q14 = silk_SUB32( xq_Q14, n_AR_Q14 ); - psSS[ 1 ].sLTP_shp_Q14 = silk_SUB32( sLF_AR_shp_Q14, n_LF_Q14 ); + psSS[ 1 ].Diff_Q14 = silk_SUB_LSHIFT32( xq_Q14, x_Q10[ i ], 4 ); + sLF_AR_shp_Q14 = silk_SUB32( psSS[ 1 ].Diff_Q14, n_AR_Q14 ); + psSS[ 1 ].sLTP_shp_Q14 = silk_SUB_SAT32( sLF_AR_shp_Q14, n_LF_Q14 ); psSS[ 1 ].LF_AR_Q14 = sLF_AR_shp_Q14; psSS[ 1 ].LPC_exc_Q14 = LPC_exc_Q14; psSS[ 1 ].xq_Q14 = xq_Q14; @@ -705,6 +763,7 @@ static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1( psDD = &psDelDec[ k ]; psSS = &psSampleState[ k ][ 0 ]; psDD->LF_AR_Q14 = psSS->LF_AR_Q14; + psDD->Diff_Q14 = psSS->Diff_Q14; psDD->sLPC_Q14[ NSQ_LPC_BUF_LENGTH + i ] = psSS->xq_Q14; psDD->Xq_Q14[ *smpl_buf_idx ] = psSS->xq_Q14; psDD->Q_Q10[ *smpl_buf_idx ] = psSS->Q_Q10; @@ -728,7 +787,7 @@ static OPUS_INLINE void silk_nsq_del_dec_scale_states_sse4_1( const silk_encoder_state *psEncC, /* I Encoder State */ silk_nsq_state *NSQ, /* I/O NSQ state */ NSQ_del_dec_struct psDelDec[], /* I/O Delayed decision states */ - const opus_int32 x_Q3[], /* I Input in Q3 */ + const opus_int16 x16[], /* I Input */ opus_int32 x_sc_Q10[], /* O Input scaled with 1/Gain in Q10 */ const opus_int16 sLTP[], /* I Re-whitened LTP state in Q0 */ opus_int32 sLTP_Q15[], /* O LTP state matching scaled input */ @@ -742,51 +801,41 @@ static OPUS_INLINE void silk_nsq_del_dec_scale_states_sse4_1( ) { opus_int i, k, lag; - opus_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q23; + opus_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q26; NSQ_del_dec_struct *psDD; - __m128i xmm_inv_gain_Q23, xmm_x_Q3_x2x0, xmm_x_Q3_x3x1; + __m128i xmm_inv_gain_Q26, xmm_x16_x2x0, xmm_x16_x3x1;
lag = pitchL[ subfr ]; inv_gain_Q31 = silk_INVERSE32_varQ( silk_max( Gains_Q16[ subfr ], 1 ), 47 ); - silk_assert( inv_gain_Q31 != 0 );
- /* Calculate gain adjustment factor */ - if( Gains_Q16[ subfr ] != NSQ->prev_gain_Q16 ) { - gain_adj_Q16 = silk_DIV32_varQ( NSQ->prev_gain_Q16, Gains_Q16[ subfr ], 16 ); - } else { - gain_adj_Q16 = (opus_int32)1 << 16; - } - /* Scale input */ - inv_gain_Q23 = silk_RSHIFT_ROUND( inv_gain_Q31, 8 ); + inv_gain_Q26 = silk_RSHIFT_ROUND( inv_gain_Q31, 5 );
- /* prepare inv_gain_Q23 in packed 4 32-bits */ - xmm_inv_gain_Q23 = _mm_set1_epi32(inv_gain_Q23); + /* prepare inv_gain_Q26 in packed 4 32-bits */ + xmm_inv_gain_Q26 = _mm_set1_epi32(inv_gain_Q26);
for( i = 0; i < psEncC->subfr_length - 3; i += 4 ) { - xmm_x_Q3_x2x0 = _mm_loadu_si128( (__m128i *)(&(x_Q3[ i ] ) ) ); + xmm_x16_x2x0 = OP_CVTEPI16_EPI32_M64( &(x16[ i ] ) ); + /* equal shift right 4 bytes*/ - xmm_x_Q3_x3x1 = _mm_shuffle_epi32( xmm_x_Q3_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ) ); + xmm_x16_x3x1 = _mm_shuffle_epi32( xmm_x16_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ) );
- xmm_x_Q3_x2x0 = _mm_mul_epi32( xmm_x_Q3_x2x0, xmm_inv_gain_Q23 ); - xmm_x_Q3_x3x1 = _mm_mul_epi32( xmm_x_Q3_x3x1, xmm_inv_gain_Q23 ); + xmm_x16_x2x0 = _mm_mul_epi32( xmm_x16_x2x0, xmm_inv_gain_Q26 ); + xmm_x16_x3x1 = _mm_mul_epi32( xmm_x16_x3x1, xmm_inv_gain_Q26 );
- xmm_x_Q3_x2x0 = _mm_srli_epi64( xmm_x_Q3_x2x0, 16 ); - xmm_x_Q3_x3x1 = _mm_slli_epi64( xmm_x_Q3_x3x1, 16 ); + xmm_x16_x2x0 = _mm_srli_epi64( xmm_x16_x2x0, 16 ); + xmm_x16_x3x1 = _mm_slli_epi64( xmm_x16_x3x1, 16 );
- xmm_x_Q3_x2x0 = _mm_blend_epi16( xmm_x_Q3_x2x0, xmm_x_Q3_x3x1, 0xCC ); + xmm_x16_x2x0 = _mm_blend_epi16( xmm_x16_x2x0, xmm_x16_x3x1, 0xCC );
- _mm_storeu_si128( (__m128i *)(&(x_sc_Q10[ i ])), xmm_x_Q3_x2x0 ); + _mm_storeu_si128( (__m128i *)(&(x_sc_Q10[ i ] ) ), xmm_x16_x2x0 ); }
for( ; i < psEncC->subfr_length; i++ ) { - x_sc_Q10[ i ] = silk_SMULWW( x_Q3[ i ], inv_gain_Q23 ); + x_sc_Q10[ i ] = silk_SMULWW( x16[ i ], inv_gain_Q26 ); }
- /* Save inverse gain */ - NSQ->prev_gain_Q16 = Gains_Q16[ subfr ]; - /* After rewhitening the LTP state is un-scaled, so scale with inv_gain_Q16 */ if( NSQ->rewhite_flag ) { if( subfr == 0 ) { @@ -800,7 +849,9 @@ static OPUS_INLINE void silk_nsq_del_dec_scale_states_sse4_1( }
/* Adjust for changing gain */ - if( gain_adj_Q16 != (opus_int32)1 << 16 ) { + if( Gains_Q16[ subfr ] != NSQ->prev_gain_Q16 ) { + gain_adj_Q16 = silk_DIV32_varQ( NSQ->prev_gain_Q16, Gains_Q16[ subfr ], 16 ); + /* Scale long-term shaping state */ { __m128i xmm_gain_adj_Q16, xmm_sLTP_shp_Q14_x2x0, xmm_sLTP_shp_Q14_x3x1; @@ -841,6 +892,7 @@ static OPUS_INLINE void silk_nsq_del_dec_scale_states_sse4_1(
/* Scale scalar states */ psDD->LF_AR_Q14 = silk_SMULWW( gain_adj_Q16, psDD->LF_AR_Q14 ); + psDD->Diff_Q14 = silk_SMULWW( gain_adj_Q16, psDD->Diff_Q14 );
/* Scale short-term prediction and shaping states */ for( i = 0; i < NSQ_LPC_BUF_LENGTH; i++ ) { @@ -855,5 +907,8 @@ static OPUS_INLINE void silk_nsq_del_dec_scale_states_sse4_1( } } } + + /* Save inverse gain */ + NSQ->prev_gain_Q16 = Gains_Q16[ subfr ]; } } diff --git a/media/libopus/silk/x86/NSQ_sse4_1.c b/media/libopus/silk/x86/NSQ_sse4_1.c index b0315e35fc896..a2a74659bbe64 100644 --- a/media/libopus/silk/x86/NSQ_sse4_1.c +++ b/media/libopus/silk/x86/NSQ_sse4_1.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2014, Cisco Systems, INC - Written by XiangMingZhu WeiZhou MinPeng YanWang +/* Copyright (c) 2014-2020, Cisco Systems, INC + Written by XiangMingZhu WeiZhou MinPeng YanWang FrancisQuiers
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -37,17 +37,17 @@ #include "stack_alloc.h"
static OPUS_INLINE void silk_nsq_scale_states_sse4_1( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - const opus_int32 x_Q3[], /* I input in Q3 */ - opus_int32 x_sc_Q10[], /* O input scaled with 1/Gain */ - const opus_int16 sLTP[], /* I re-whitened LTP state in Q0 */ - opus_int32 sLTP_Q15[], /* O LTP state matching scaled input */ - opus_int subfr, /* I subframe number */ - const opus_int LTP_scale_Q14, /* I */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lag */ - const opus_int signal_type /* I Signal type */ + const silk_encoder_state *psEncC, /* I Encoder State */ + silk_nsq_state *NSQ, /* I/O NSQ state */ + const opus_int16 x16[], /* I input */ + opus_int32 x_sc_Q10[], /* O input scaled with 1/Gain */ + const opus_int16 sLTP[], /* I re-whitened LTP state in Q0 */ + opus_int32 sLTP_Q15[], /* O LTP state matching scaled input */ + opus_int subfr, /* I subframe number */ + const opus_int LTP_scale_Q14, /* I */ + const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I */ + const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lag */ + const opus_int signal_type /* I Signal type */ );
static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1( @@ -65,27 +65,28 @@ static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1( opus_int Tilt_Q14, /* I Spectral tilt */ opus_int32 LF_shp_Q14, /* I */ opus_int32 Gain_Q16, /* I */ + opus_int Lambda_Q10, /* I */ opus_int offset_Q10, /* I */ opus_int length, /* I Input length */ opus_int32 table[][4] /* I */ );
void silk_NSQ_sse4_1( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - SideInfoIndices *psIndices, /* I/O Quantization Indices */ - const opus_int32 x_Q3[], /* I Prefiltered input signal */ - opus_int8 pulses[], /* O Quantized pulse signal */ - const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ - const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ - const opus_int16 AR2_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ - const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ - const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ - const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ - const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ - const opus_int LTP_scale_Q14 /* I LTP state scaling */ + const silk_encoder_state *psEncC, /* I Encoder State */ + silk_nsq_state *NSQ, /* I/O NSQ state */ + SideInfoIndices *psIndices, /* I/O Quantization Indices */ + const opus_int16 x16[], /* I Input */ + opus_int8 pulses[], /* O Quantized pulse signal */ + const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ + const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ + const opus_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ + const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ + const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ + const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ + const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ + const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ + const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ + const opus_int LTP_scale_Q14 /* I LTP state scaling */ ) { opus_int k, lag, start_idx, LSF_interpolation_flag; @@ -101,8 +102,41 @@ void silk_NSQ_sse4_1( opus_int32 tmp1; opus_int32 q1_Q10, q2_Q10, rd1_Q20, rd2_Q20;
+#ifdef OPUS_CHECK_ASM + silk_nsq_state NSQ_c; + SideInfoIndices psIndices_c; + opus_int8 pulses_c[ MAX_FRAME_LENGTH ]; + const opus_int8 *const pulses_a = pulses; +#endif + SAVE_STACK;
+#ifdef OPUS_CHECK_ASM + ( void )pulses_a; + silk_memcpy( &NSQ_c, NSQ, sizeof( NSQ_c ) ); + silk_memcpy( &psIndices_c, psIndices, sizeof( psIndices_c ) ); + silk_assert( psEncC->nb_subfr * psEncC->subfr_length <= MAX_FRAME_LENGTH ); + silk_memcpy( pulses_c, pulses, psEncC->nb_subfr * psEncC->subfr_length * sizeof( pulses[0] ) ); + + silk_NSQ_c( + psEncC, + &NSQ_c, + &psIndices_c, + x16, + pulses_c, + PredCoef_Q12, + LTPCoef_Q14, + AR_Q13, + HarmShapeGain_Q14, + Tilt_Q14, + LF_shp_Q14, + Gains_Q16, + pitchL, + Lambda_Q10, + LTP_scale_Q14 + ); +#endif + NSQ->rand_seed = psIndices->Seed;
/* Set unvoiced lag to the previous one, overwrite later for voiced */ @@ -172,8 +206,7 @@ void silk_NSQ_sse4_1( LSF_interpolation_flag = 1; }
- ALLOC( sLTP_Q15, - psEncC->ltp_mem_length + psEncC->frame_length, opus_int32 ); + ALLOC( sLTP_Q15, psEncC->ltp_mem_length + psEncC->frame_length, opus_int32 ); ALLOC( sLTP, psEncC->ltp_mem_length + psEncC->frame_length, opus_int16 ); ALLOC( x_sc_Q10, psEncC->subfr_length, opus_int32 ); /* Set up pointers to start of sub frame */ @@ -183,7 +216,7 @@ void silk_NSQ_sse4_1( for( k = 0; k < psEncC->nb_subfr; k++ ) { A_Q12 = &PredCoef_Q12[ (( k >> 1 ) | ( 1 - LSF_interpolation_flag )) * MAX_LPC_ORDER ]; B_Q14 = <PCoef_Q14[ k * LTP_ORDER ]; - AR_shp_Q13 = &AR2_Q13[ k * MAX_SHAPE_LPC_ORDER ]; + AR_shp_Q13 = &AR_Q13[ k * MAX_SHAPE_LPC_ORDER ];
/* Noise shape parameters */ silk_assert( HarmShapeGain_Q14[ k ] >= 0 ); @@ -209,12 +242,12 @@ void silk_NSQ_sse4_1( } }
- silk_nsq_scale_states_sse4_1( psEncC, NSQ, x_Q3, x_sc_Q10, sLTP, sLTP_Q15, k, LTP_scale_Q14, Gains_Q16, pitchL, psIndices->signalType ); + silk_nsq_scale_states_sse4_1( psEncC, NSQ, x16, x_sc_Q10, sLTP, sLTP_Q15, k, LTP_scale_Q14, Gains_Q16, pitchL, psIndices->signalType );
if ( opus_likely( ( 10 == psEncC->shapingLPCOrder ) && ( 16 == psEncC->predictLPCOrder) ) ) { silk_noise_shape_quantizer_10_16_sse4_1( NSQ, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15, A_Q12, B_Q14, - AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ], Gains_Q16[ k ], + AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ], Gains_Q16[ k ], Lambda_Q10, offset_Q10, psEncC->subfr_length, &(table[32]) ); } else @@ -224,7 +257,7 @@ void silk_NSQ_sse4_1( offset_Q10, psEncC->subfr_length, psEncC->shapingLPCOrder, psEncC->predictLPCOrder, psEncC->arch ); }
- x_Q3 += psEncC->subfr_length; + x16 += psEncC->subfr_length; pulses += psEncC->subfr_length; pxq += psEncC->subfr_length; } @@ -235,12 +268,19 @@ void silk_NSQ_sse4_1( /* Save quantized speech and noise shaping signals */ silk_memmove( NSQ->xq, &NSQ->xq[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int16 ) ); silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int32 ) ); + +#ifdef OPUS_CHECK_ASM + silk_assert( !memcmp( &NSQ_c, NSQ, sizeof( NSQ_c ) ) ); + silk_assert( !memcmp( &psIndices_c, psIndices, sizeof( psIndices_c ) ) ); + silk_assert( !memcmp( pulses_c, pulses_a, psEncC->nb_subfr * psEncC->subfr_length * sizeof( pulses[0] ) ) ); +#endif + RESTORE_STACK; }
-/***********************************/ -/* silk_noise_shape_quantizer_10_16 */ -/***********************************/ +/************************************/ +/* silk_noise_shape_quantizer_10_16 */ +/************************************/ static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1( silk_nsq_state *NSQ, /* I/O NSQ state */ opus_int signalType, /* I Signal type */ @@ -256,6 +296,7 @@ static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1( opus_int Tilt_Q14, /* I Spectral tilt */ opus_int32 LF_shp_Q14, /* I */ opus_int32 Gain_Q16, /* I */ + opus_int Lambda_Q10, /* I */ opus_int offset_Q10, /* I */ opus_int length, /* I Input length */ opus_int32 table[][4] /* I */ @@ -264,7 +305,7 @@ static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1( opus_int i; opus_int32 LTP_pred_Q13, LPC_pred_Q10, n_AR_Q12, n_LTP_Q13; opus_int32 n_LF_Q12, r_Q10, q1_Q0, q1_Q10, q2_Q10; - opus_int32 exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10; + opus_int32 exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10, sDiff_shp_Q14; opus_int32 tmp1, tmp2, sLF_AR_shp_Q14; opus_int32 *psLPC_Q14, *shp_lag_ptr, *pred_lag_ptr;
@@ -279,6 +320,8 @@ static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1( __m128i sAR2_Q14_hi_76543210, sAR2_Q14_lo_76543210; __m128i AR_shp_Q13_76543210;
+ int rdo_offset = (Lambda_Q10 >> 1) - 512; + shp_lag_ptr = &NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS / 2 ]; pred_lag_ptr = &sLTP_Q15[ NSQ->sLTP_buf_idx - lag + LTP_ORDER / 2 ]; Gain_Q10 = silk_RSHIFT( Gain_Q16, 6 ); @@ -288,6 +331,7 @@ static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1(
sLF_AR_shp_Q14 = NSQ->sLF_AR_shp_Q14; xq_Q14 = psLPC_Q14[ 0 ]; + sDiff_shp_Q14 = NSQ->sDiff_shp_Q14; LTP_pred_Q13 = 0;
/* load a_Q12 */ @@ -430,8 +474,8 @@ static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1( sAR2_Q14_hi_76543210 = _mm_slli_si128( sAR2_Q14_hi_76543210, 2 ); sAR2_Q14_lo_76543210 = _mm_slli_si128( sAR2_Q14_lo_76543210, 2 );
- sAR2_Q14_hi_76543210 = _mm_insert_epi16( sAR2_Q14_hi_76543210, (xq_Q14 >> 16), 0 ); - sAR2_Q14_lo_76543210 = _mm_insert_epi16( sAR2_Q14_lo_76543210, (xq_Q14), 0 ); + sAR2_Q14_hi_76543210 = _mm_insert_epi16( sAR2_Q14_hi_76543210, (sDiff_shp_Q14 >> 16), 0 ); + sAR2_Q14_lo_76543210 = _mm_insert_epi16( sAR2_Q14_lo_76543210, (sDiff_shp_Q14), 0 );
/* high part, use pmaddwd, results in 4 32-bit */ xmm_hi_07 = _mm_madd_epi16( sAR2_Q14_hi_76543210, AR_shp_Q13_76543210 ); @@ -462,14 +506,14 @@ static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1( n_LF_Q12 = silk_SMULWB( NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - 1 ], LF_shp_Q14 ); n_LF_Q12 = silk_SMLAWT( n_LF_Q12, sLF_AR_shp_Q14, LF_shp_Q14 );
- silk_assert( lag > 0 || signalType != TYPE_VOICED ); + celt_assert( lag > 0 || signalType != TYPE_VOICED );
/* Combine prediction and noise shaping signals */ tmp1 = silk_SUB32( silk_LSHIFT32( LPC_pred_Q10, 2 ), n_AR_Q12 ); /* Q12 */ tmp1 = silk_SUB32( tmp1, n_LF_Q12 ); /* Q12 */ if( lag > 0 ) { /* Symmetric, packed FIR coefficients */ - n_LTP_Q13 = silk_SMULWB( silk_ADD32( shp_lag_ptr[ 0 ], shp_lag_ptr[ -2 ] ), HarmShapeFIRPacked_Q14 ); + n_LTP_Q13 = silk_SMULWB( silk_ADD_SAT32( shp_lag_ptr[ 0 ], shp_lag_ptr[ -2 ] ), HarmShapeFIRPacked_Q14 ); n_LTP_Q13 = silk_SMLAWT( n_LTP_Q13, shp_lag_ptr[ -1 ], HarmShapeFIRPacked_Q14 ); n_LTP_Q13 = silk_LSHIFT( n_LTP_Q13, 1 ); shp_lag_ptr++; @@ -495,6 +539,18 @@ static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1( /* Find two quantization level candidates and measure their rate-distortion */ q1_Q10 = silk_SUB32( r_Q10, offset_Q10 ); q1_Q0 = silk_RSHIFT( q1_Q10, 10 ); + if (Lambda_Q10 > 2048) { + /* For aggressive RDO, the bias becomes more than one pulse. */ + if (q1_Q10 > rdo_offset) { + q1_Q0 = silk_RSHIFT( q1_Q10 - rdo_offset, 10 ); + } else if (q1_Q10 < -rdo_offset) { + q1_Q0 = silk_RSHIFT( q1_Q10 + rdo_offset, 10 ); + } else if (q1_Q10 < 0) { + q1_Q0 = -1; + } else { + q1_Q0 = 0; + } + }
q1_Q10 = table[q1_Q0][0]; q2_Q10 = table[q1_Q0][1]; @@ -519,7 +575,8 @@ static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1( /* Update states */ psLPC_Q14++; *psLPC_Q14 = xq_Q14; - sLF_AR_shp_Q14 = silk_SUB_LSHIFT32( xq_Q14, n_AR_Q12, 2 ); + NSQ->sDiff_shp_Q14 = silk_SUB_LSHIFT32( xq_Q14, x_sc_Q10[ i ], 4 ); + sLF_AR_shp_Q14 = silk_SUB_LSHIFT32( NSQ->sDiff_shp_Q14, n_AR_Q12, 2 );
NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx ] = silk_SUB_LSHIFT32( sLF_AR_shp_Q14, n_LF_Q12, 2 ); sLTP_Q15[ NSQ->sLTP_buf_idx ] = silk_LSHIFT( LPC_exc_Q14, 1 ); @@ -600,64 +657,54 @@ static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1( }
static OPUS_INLINE void silk_nsq_scale_states_sse4_1( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - const opus_int32 x_Q3[], /* I input in Q3 */ - opus_int32 x_sc_Q10[], /* O input scaled with 1/Gain */ - const opus_int16 sLTP[], /* I re-whitened LTP state in Q0 */ - opus_int32 sLTP_Q15[], /* O LTP state matching scaled input */ - opus_int subfr, /* I subframe number */ - const opus_int LTP_scale_Q14, /* I */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lag */ - const opus_int signal_type /* I Signal type */ + const silk_encoder_state *psEncC, /* I Encoder State */ + silk_nsq_state *NSQ, /* I/O NSQ state */ + const opus_int16 x16[], /* I input */ + opus_int32 x_sc_Q10[], /* O input scaled with 1/Gain */ + const opus_int16 sLTP[], /* I re-whitened LTP state in Q0 */ + opus_int32 sLTP_Q15[], /* O LTP state matching scaled input */ + opus_int subfr, /* I subframe number */ + const opus_int LTP_scale_Q14, /* I */ + const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I */ + const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lag */ + const opus_int signal_type /* I Signal type */ ) { opus_int i, lag; - opus_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q23; - __m128i xmm_inv_gain_Q23, xmm_x_Q3_x2x0, xmm_x_Q3_x3x1; + opus_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q26; + __m128i xmm_inv_gain_Q26, xmm_x16_x2x0, xmm_x16_x3x1;
lag = pitchL[ subfr ]; inv_gain_Q31 = silk_INVERSE32_varQ( silk_max( Gains_Q16[ subfr ], 1 ), 47 ); silk_assert( inv_gain_Q31 != 0 );
- /* Calculate gain adjustment factor */ - if( Gains_Q16[ subfr ] != NSQ->prev_gain_Q16 ) { - gain_adj_Q16 = silk_DIV32_varQ( NSQ->prev_gain_Q16, Gains_Q16[ subfr ], 16 ); - } else { - gain_adj_Q16 = (opus_int32)1 << 16; - } - /* Scale input */ - inv_gain_Q23 = silk_RSHIFT_ROUND( inv_gain_Q31, 8 ); + inv_gain_Q26 = silk_RSHIFT_ROUND( inv_gain_Q31, 5 );
- /* prepare inv_gain_Q23 in packed 4 32-bits */ - xmm_inv_gain_Q23 = _mm_set1_epi32(inv_gain_Q23); + /* prepare inv_gain_Q26 in packed 4 32-bits */ + xmm_inv_gain_Q26 = _mm_set1_epi32(inv_gain_Q26);
for( i = 0; i < psEncC->subfr_length - 3; i += 4 ) { - xmm_x_Q3_x2x0 = _mm_loadu_si128( (__m128i *)(&(x_Q3[ i ] ) ) ); + xmm_x16_x2x0 = OP_CVTEPI16_EPI32_M64( &(x16[ i ] ) );
/* equal shift right 4 bytes*/ - xmm_x_Q3_x3x1 = _mm_shuffle_epi32( xmm_x_Q3_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ) ); + xmm_x16_x3x1 = _mm_shuffle_epi32( xmm_x16_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ) );
- xmm_x_Q3_x2x0 = _mm_mul_epi32( xmm_x_Q3_x2x0, xmm_inv_gain_Q23 ); - xmm_x_Q3_x3x1 = _mm_mul_epi32( xmm_x_Q3_x3x1, xmm_inv_gain_Q23 ); + xmm_x16_x2x0 = _mm_mul_epi32( xmm_x16_x2x0, xmm_inv_gain_Q26 ); + xmm_x16_x3x1 = _mm_mul_epi32( xmm_x16_x3x1, xmm_inv_gain_Q26 );
- xmm_x_Q3_x2x0 = _mm_srli_epi64( xmm_x_Q3_x2x0, 16 ); - xmm_x_Q3_x3x1 = _mm_slli_epi64( xmm_x_Q3_x3x1, 16 ); + xmm_x16_x2x0 = _mm_srli_epi64( xmm_x16_x2x0, 16 ); + xmm_x16_x3x1 = _mm_slli_epi64( xmm_x16_x3x1, 16 );
- xmm_x_Q3_x2x0 = _mm_blend_epi16( xmm_x_Q3_x2x0, xmm_x_Q3_x3x1, 0xCC ); + xmm_x16_x2x0 = _mm_blend_epi16( xmm_x16_x2x0, xmm_x16_x3x1, 0xCC );
- _mm_storeu_si128( (__m128i *)(&(x_sc_Q10[ i ] ) ), xmm_x_Q3_x2x0 ); + _mm_storeu_si128( (__m128i *)(&(x_sc_Q10[ i ] ) ), xmm_x16_x2x0 ); }
for( ; i < psEncC->subfr_length; i++ ) { - x_sc_Q10[ i ] = silk_SMULWW( x_Q3[ i ], inv_gain_Q23 ); + x_sc_Q10[ i ] = silk_SMULWW( x16[ i ], inv_gain_Q26 ); }
- /* Save inverse gain */ - NSQ->prev_gain_Q16 = Gains_Q16[ subfr ]; - /* After rewhitening the LTP state is un-scaled, so scale with inv_gain_Q16 */ if( NSQ->rewhite_flag ) { if( subfr == 0 ) { @@ -671,7 +718,9 @@ static OPUS_INLINE void silk_nsq_scale_states_sse4_1( }
/* Adjust for changing gain */ - if( gain_adj_Q16 != (opus_int32)1 << 16 ) { + if( Gains_Q16[ subfr ] != NSQ->prev_gain_Q16 ) { + gain_adj_Q16 = silk_DIV32_varQ( NSQ->prev_gain_Q16, Gains_Q16[ subfr ], 16 ); + /* Scale long-term shaping state */ __m128i xmm_gain_adj_Q16, xmm_sLTP_shp_Q14_x2x0, xmm_sLTP_shp_Q14_x3x1;
@@ -707,6 +756,7 @@ static OPUS_INLINE void silk_nsq_scale_states_sse4_1( }
NSQ->sLF_AR_shp_Q14 = silk_SMULWW( gain_adj_Q16, NSQ->sLF_AR_shp_Q14 ); + NSQ->sDiff_shp_Q14 = silk_SMULWW( gain_adj_Q16, NSQ->sDiff_shp_Q14 );
/* Scale short-term prediction and shaping states */ for( i = 0; i < NSQ_LPC_BUF_LENGTH; i++ ) { @@ -715,5 +765,8 @@ static OPUS_INLINE void silk_nsq_scale_states_sse4_1( for( i = 0; i < MAX_SHAPE_LPC_ORDER; i++ ) { NSQ->sAR2_Q14[ i ] = silk_SMULWW( gain_adj_Q16, NSQ->sAR2_Q14[ i ] ); } + + /* Save inverse gain */ + NSQ->prev_gain_Q16 = Gains_Q16[ subfr ]; } } diff --git a/media/libopus/silk/x86/SigProc_FIX_sse.h b/media/libopus/silk/x86/SigProc_FIX_sse.h index 61efa8da4152d..e49d5d4ecc584 100644 --- a/media/libopus/silk/x86/SigProc_FIX_sse.h +++ b/media/libopus/silk/x86/SigProc_FIX_sse.h @@ -67,7 +67,7 @@ extern void (*const SILK_BURG_MODIFIED_IMPL[OPUS_ARCHMASK + 1])(
#endif
-opus_int64 silk_inner_prod16_aligned_64_sse4_1( +opus_int64 silk_inner_prod16_sse4_1( const opus_int16 *inVec1, const opus_int16 *inVec2, const opus_int len @@ -76,18 +76,18 @@ opus_int64 silk_inner_prod16_aligned_64_sse4_1(
#if defined(OPUS_X86_PRESUME_SSE4_1)
-#define silk_inner_prod16_aligned_64(inVec1, inVec2, len, arch) \ - ((void)(arch),silk_inner_prod16_aligned_64_sse4_1(inVec1, inVec2, len)) +#define silk_inner_prod16(inVec1, inVec2, len, arch) \ + ((void)(arch),silk_inner_prod16_sse4_1(inVec1, inVec2, len))
#else
-extern opus_int64 (*const SILK_INNER_PROD16_ALIGNED_64_IMPL[OPUS_ARCHMASK + 1])( +extern opus_int64 (*const SILK_INNER_PROD16_IMPL[OPUS_ARCHMASK + 1])( const opus_int16 *inVec1, const opus_int16 *inVec2, const opus_int len);
-# define silk_inner_prod16_aligned_64(inVec1, inVec2, len, arch) \ - ((*SILK_INNER_PROD16_ALIGNED_64_IMPL[(arch) & OPUS_ARCHMASK])(inVec1, inVec2, len)) +# define silk_inner_prod16(inVec1, inVec2, len, arch) \ + ((*SILK_INNER_PROD16_IMPL[(arch) & OPUS_ARCHMASK])(inVec1, inVec2, len))
#endif #endif diff --git a/media/libopus/silk/x86/VAD_sse4_1.c b/media/libopus/silk/x86/VAD_sse4_1.c index d02ddf4ad0815..e7eaf9714a742 100644 --- a/media/libopus/silk/x86/VAD_sse4_1.c +++ b/media/libopus/silk/x86/VAD_sse4_1.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2014, Cisco Systems, INC - Written by XiangMingZhu WeiZhou MinPeng YanWang +/* Copyright (c) 2014-2020, Cisco Systems, INC + Written by XiangMingZhu WeiZhou MinPeng YanWang FrancisQuiers
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -63,6 +63,14 @@ opus_int silk_VAD_GetSA_Q8_sse4_1( /* O Return value, 0 if s
SAVE_STACK;
+#ifdef OPUS_CHECK_ASM + silk_encoder_state psEncC_c; + opus_int ret_c; + + silk_memcpy( &psEncC_c, psEncC, sizeof( psEncC_c ) ); + ret_c = silk_VAD_GetSA_Q8_c( &psEncC_c, pIn ); +#endif + /* Safety checks */ silk_assert( VAD_N_BANDS == 4 ); celt_assert( MAX_FRAME_LENGTH >= psEncC->frame_length ); @@ -233,15 +241,14 @@ opus_int silk_VAD_GetSA_Q8_sse4_1( /* O Return value, 0 if s speech_nrg += ( b + 1 ) * silk_RSHIFT( Xnrg[ b ] - psSilk_VAD->NL[ b ], 4 ); }
+ if( psEncC->frame_length == 20 * psEncC->fs_kHz ) { + speech_nrg = silk_RSHIFT32( speech_nrg, 1 ); + } /* Power scaling */ if( speech_nrg <= 0 ) { SA_Q15 = silk_RSHIFT( SA_Q15, 1 ); - } else if( speech_nrg < 32768 ) { - if( psEncC->frame_length == 10 * psEncC->fs_kHz ) { - speech_nrg = silk_LSHIFT_SAT32( speech_nrg, 16 ); - } else { - speech_nrg = silk_LSHIFT_SAT32( speech_nrg, 15 ); - } + } else if( speech_nrg < 16384 ) { + speech_nrg = silk_LSHIFT32( speech_nrg, 16 );
/* square-root */ speech_nrg = silk_SQRT_APPROX( speech_nrg ); @@ -272,6 +279,11 @@ opus_int silk_VAD_GetSA_Q8_sse4_1( /* O Return value, 0 if s psEncC->input_quality_bands_Q15[ b ] = silk_sigm_Q15( silk_RSHIFT( SNR_Q7 - 16 * 128, 4 ) ); }
+#ifdef OPUS_CHECK_ASM + silk_assert( ret == ret_c ); + silk_assert( !memcmp( &psEncC_c, psEncC, sizeof( psEncC_c ) ) ); +#endif + RESTORE_STACK; return( ret ); } diff --git a/media/libopus/silk/x86/VQ_WMat_EC_sse4_1.c b/media/libopus/silk/x86/VQ_WMat_EC_sse4_1.c index 74d6c6d0ec6e4..2c7d18d05eab4 100644 --- a/media/libopus/silk/x86/VQ_WMat_EC_sse4_1.c +++ b/media/libopus/silk/x86/VQ_WMat_EC_sse4_1.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2014, Cisco Systems, INC - Written by XiangMingZhu WeiZhou MinPeng YanWang +/* Copyright (c) 2014-2020, Cisco Systems, INC + Written by XiangMingZhu WeiZhou MinPeng YanWang FrancisQuiers
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -38,105 +38,136 @@ /* Entropy constrained matrix-weighted VQ, hard-coded to 5-element vectors, for a single input data vector */ void silk_VQ_WMat_EC_sse4_1( opus_int8 *ind, /* O index of best codebook vector */ - opus_int32 *rate_dist_Q14, /* O best weighted quant error + mu * rate */ + opus_int32 *res_nrg_Q15, /* O best residual energy */ + opus_int32 *rate_dist_Q8, /* O best total bitrate */ opus_int *gain_Q7, /* O sum of absolute LTP coefficients */ - const opus_int16 *in_Q14, /* I input vector to be quantized */ - const opus_int32 *W_Q18, /* I weighting matrix */ + const opus_int32 *XX_Q17, /* I correlation matrix */ + const opus_int32 *xX_Q17, /* I correlation vector */ const opus_int8 *cb_Q7, /* I codebook */ const opus_uint8 *cb_gain_Q7, /* I codebook effective gain */ const opus_uint8 *cl_Q5, /* I code length for each codebook vector */ - const opus_int mu_Q9, /* I tradeoff betw. weighted error and rate */ + const opus_int subfr_len, /* I number of samples per subframe */ const opus_int32 max_gain_Q7, /* I maximum sum of absolute LTP coefficients */ - opus_int L /* I number of vectors in codebook */ + const opus_int L /* I number of vectors in codebook */ ) { opus_int k, gain_tmp_Q7; const opus_int8 *cb_row_Q7; - opus_int16 diff_Q14[ 5 ]; - opus_int32 sum1_Q14, sum2_Q16; + opus_int32 neg_xX_Q24[ 5 ]; + opus_int32 sum1_Q15, sum2_Q24; + opus_int32 bits_res_Q8, bits_tot_Q8; + __m128i v_XX_31_Q17, v_XX_42_Q17, v_cb_row_31_Q7, v_cb_row_42_Q7, v_acc1_Q24, v_acc2_Q24; + + /* Negate and convert to new Q domain */ + neg_xX_Q24[ 0 ] = -silk_LSHIFT32( xX_Q17[ 0 ], 7 ); + neg_xX_Q24[ 1 ] = -silk_LSHIFT32( xX_Q17[ 1 ], 7 ); + neg_xX_Q24[ 2 ] = -silk_LSHIFT32( xX_Q17[ 2 ], 7 ); + neg_xX_Q24[ 3 ] = -silk_LSHIFT32( xX_Q17[ 3 ], 7 ); + neg_xX_Q24[ 4 ] = -silk_LSHIFT32( xX_Q17[ 4 ], 7 ); + + v_XX_31_Q17 = _mm_loadu_si128( (__m128i *)(&XX_Q17[ 1 ] ) ); + v_XX_42_Q17 = _mm_shuffle_epi32( v_XX_31_Q17, _MM_SHUFFLE( 0, 3, 2, 1 ) );
- __m128i C_tmp1, C_tmp2, C_tmp3, C_tmp4, C_tmp5; /* Loop over codebook */ - *rate_dist_Q14 = silk_int32_MAX; + *rate_dist_Q8 = silk_int32_MAX; + *res_nrg_Q15 = silk_int32_MAX; cb_row_Q7 = cb_Q7; + /* If things go really bad, at least *ind is set to something safe. */ + *ind = 0; for( k = 0; k < L; k++ ) { + opus_int32 penalty; gain_tmp_Q7 = cb_gain_Q7[k]; - - diff_Q14[ 0 ] = in_Q14[ 0 ] - silk_LSHIFT( cb_row_Q7[ 0 ], 7 ); - - C_tmp1 = OP_CVTEPI16_EPI32_M64( &in_Q14[ 1 ] ); - C_tmp2 = OP_CVTEPI8_EPI32_M32( &cb_row_Q7[ 1 ] ); - C_tmp2 = _mm_slli_epi32( C_tmp2, 7 ); - C_tmp1 = _mm_sub_epi32( C_tmp1, C_tmp2 ); - - diff_Q14[ 1 ] = _mm_extract_epi16( C_tmp1, 0 ); - diff_Q14[ 2 ] = _mm_extract_epi16( C_tmp1, 2 ); - diff_Q14[ 3 ] = _mm_extract_epi16( C_tmp1, 4 ); - diff_Q14[ 4 ] = _mm_extract_epi16( C_tmp1, 6 ); - /* Weighted rate */ - sum1_Q14 = silk_SMULBB( mu_Q9, cl_Q5[ k ] ); + /* Quantization error: 1 - 2 * xX * cb + cb' * XX * cb */ + sum1_Q15 = SILK_FIX_CONST( 1.001, 15 );
/* Penalty for too large gain */ - sum1_Q14 = silk_ADD_LSHIFT32( sum1_Q14, silk_max( silk_SUB32( gain_tmp_Q7, max_gain_Q7 ), 0 ), 10 ); - - silk_assert( sum1_Q14 >= 0 ); - - /* first row of W_Q18 */ - C_tmp3 = _mm_loadu_si128( (__m128i *)(&W_Q18[ 1 ] ) ); - C_tmp4 = _mm_mul_epi32( C_tmp3, C_tmp1 ); - C_tmp4 = _mm_srli_si128( C_tmp4, 2 ); - - C_tmp1 = _mm_shuffle_epi32( C_tmp1, _MM_SHUFFLE( 0, 3, 2, 1 ) ); /* shift right 4 bytes */ - C_tmp3 = _mm_shuffle_epi32( C_tmp3, _MM_SHUFFLE( 0, 3, 2, 1 ) ); /* shift right 4 bytes */ - - C_tmp5 = _mm_mul_epi32( C_tmp3, C_tmp1 ); - C_tmp5 = _mm_srli_si128( C_tmp5, 2 ); - - C_tmp5 = _mm_add_epi32( C_tmp4, C_tmp5 ); - C_tmp5 = _mm_slli_epi32( C_tmp5, 1 ); - - C_tmp5 = _mm_add_epi32( C_tmp5, _mm_shuffle_epi32( C_tmp5, _MM_SHUFFLE( 0, 0, 0, 2 ) ) ); - sum2_Q16 = _mm_cvtsi128_si32( C_tmp5 ); - - sum2_Q16 = silk_SMLAWB( sum2_Q16, W_Q18[ 0 ], diff_Q14[ 0 ] ); - sum1_Q14 = silk_SMLAWB( sum1_Q14, sum2_Q16, diff_Q14[ 0 ] ); - - /* second row of W_Q18 */ - sum2_Q16 = silk_SMULWB( W_Q18[ 7 ], diff_Q14[ 2 ] ); - sum2_Q16 = silk_SMLAWB( sum2_Q16, W_Q18[ 8 ], diff_Q14[ 3 ] ); - sum2_Q16 = silk_SMLAWB( sum2_Q16, W_Q18[ 9 ], diff_Q14[ 4 ] ); - sum2_Q16 = silk_LSHIFT( sum2_Q16, 1 ); - sum2_Q16 = silk_SMLAWB( sum2_Q16, W_Q18[ 6 ], diff_Q14[ 1 ] ); - sum1_Q14 = silk_SMLAWB( sum1_Q14, sum2_Q16, diff_Q14[ 1 ] ); - - /* third row of W_Q18 */ - sum2_Q16 = silk_SMULWB( W_Q18[ 13 ], diff_Q14[ 3 ] ); - sum2_Q16 = silk_SMLAWB( sum2_Q16, W_Q18[ 14 ], diff_Q14[ 4 ] ); - sum2_Q16 = silk_LSHIFT( sum2_Q16, 1 ); - sum2_Q16 = silk_SMLAWB( sum2_Q16, W_Q18[ 12 ], diff_Q14[ 2 ] ); - sum1_Q14 = silk_SMLAWB( sum1_Q14, sum2_Q16, diff_Q14[ 2 ] ); - - /* fourth row of W_Q18 */ - sum2_Q16 = silk_SMULWB( W_Q18[ 19 ], diff_Q14[ 4 ] ); - sum2_Q16 = silk_LSHIFT( sum2_Q16, 1 ); - sum2_Q16 = silk_SMLAWB( sum2_Q16, W_Q18[ 18 ], diff_Q14[ 3 ] ); - sum1_Q14 = silk_SMLAWB( sum1_Q14, sum2_Q16, diff_Q14[ 3 ] ); - - /* last row of W_Q18 */ - sum2_Q16 = silk_SMULWB( W_Q18[ 24 ], diff_Q14[ 4 ] ); - sum1_Q14 = silk_SMLAWB( sum1_Q14, sum2_Q16, diff_Q14[ 4 ] ); - - silk_assert( sum1_Q14 >= 0 ); + penalty = silk_LSHIFT32( silk_max( silk_SUB32( gain_tmp_Q7, max_gain_Q7 ), 0 ), 11 ); + + /* first row of XX_Q17 */ + v_cb_row_31_Q7 = OP_CVTEPI8_EPI32_M32( &cb_row_Q7[ 1 ] ); + v_cb_row_42_Q7 = _mm_shuffle_epi32( v_cb_row_31_Q7, _MM_SHUFFLE( 0, 3, 2, 1 ) ); + v_cb_row_31_Q7 = _mm_mul_epi32( v_XX_31_Q17, v_cb_row_31_Q7 ); + v_cb_row_42_Q7 = _mm_mul_epi32( v_XX_42_Q17, v_cb_row_42_Q7 ); + v_acc1_Q24 = _mm_add_epi64( v_cb_row_31_Q7, v_cb_row_42_Q7); + v_acc2_Q24 = _mm_shuffle_epi32( v_acc1_Q24, _MM_SHUFFLE( 1, 0, 3, 2 ) ); + v_acc1_Q24 = _mm_add_epi64( v_acc1_Q24, v_acc2_Q24); + sum2_Q24 = _mm_cvtsi128_si32( v_acc1_Q24 ); + sum2_Q24 = silk_ADD32( neg_xX_Q24[ 0 ], sum2_Q24 ); + sum2_Q24 = silk_LSHIFT32( sum2_Q24, 1 ); + sum2_Q24 = silk_MLA( sum2_Q24, XX_Q17[ 0 ], cb_row_Q7[ 0 ] ); + sum1_Q15 = silk_SMLAWB( sum1_Q15, sum2_Q24, cb_row_Q7[ 0 ] ); + + /* second row of XX_Q17 */ + sum2_Q24 = silk_MLA( neg_xX_Q24[ 1 ], XX_Q17[ 7 ], cb_row_Q7[ 2 ] ); + sum2_Q24 = silk_MLA( sum2_Q24, XX_Q17[ 8 ], cb_row_Q7[ 3 ] ); + sum2_Q24 = silk_MLA( sum2_Q24, XX_Q17[ 9 ], cb_row_Q7[ 4 ] ); + sum2_Q24 = silk_LSHIFT32( sum2_Q24, 1 ); + sum2_Q24 = silk_MLA( sum2_Q24, XX_Q17[ 6 ], cb_row_Q7[ 1 ] ); + sum1_Q15 = silk_SMLAWB( sum1_Q15, sum2_Q24, cb_row_Q7[ 1 ] ); + + /* third row of XX_Q17 */ + sum2_Q24 = silk_MLA( neg_xX_Q24[ 2 ], XX_Q17[ 13 ], cb_row_Q7[ 3 ] ); + sum2_Q24 = silk_MLA( sum2_Q24, XX_Q17[ 14 ], cb_row_Q7[ 4 ] ); + sum2_Q24 = silk_LSHIFT32( sum2_Q24, 1 ); + sum2_Q24 = silk_MLA( sum2_Q24, XX_Q17[ 12 ], cb_row_Q7[ 2 ] ); + sum1_Q15 = silk_SMLAWB( sum1_Q15, sum2_Q24, cb_row_Q7[ 2 ] ); + + /* fourth row of XX_Q17 */ + sum2_Q24 = silk_MLA( neg_xX_Q24[ 3 ], XX_Q17[ 19 ], cb_row_Q7[ 4 ] ); + sum2_Q24 = silk_LSHIFT32( sum2_Q24, 1 ); + sum2_Q24 = silk_MLA( sum2_Q24, XX_Q17[ 18 ], cb_row_Q7[ 3 ] ); + sum1_Q15 = silk_SMLAWB( sum1_Q15, sum2_Q24, cb_row_Q7[ 3 ] ); + + /* last row of XX_Q17 */ + sum2_Q24 = silk_LSHIFT32( neg_xX_Q24[ 4 ], 1 ); + sum2_Q24 = silk_MLA( sum2_Q24, XX_Q17[ 24 ], cb_row_Q7[ 4 ] ); + sum1_Q15 = silk_SMLAWB( sum1_Q15, sum2_Q24, cb_row_Q7[ 4 ] );
/* find best */ - if( sum1_Q14 < *rate_dist_Q14 ) { - *rate_dist_Q14 = sum1_Q14; - *ind = (opus_int8)k; - *gain_Q7 = gain_tmp_Q7; + if( sum1_Q15 >= 0 ) { + /* Translate residual energy to bits using high-rate assumption (6 dB ==> 1 bit/sample) */ + bits_res_Q8 = silk_SMULBB( subfr_len, silk_lin2log( sum1_Q15 + penalty) - (15 << 7) ); + /* In the following line we reduce the codelength component by half ("-1"); seems to slightly improve quality */ + bits_tot_Q8 = silk_ADD_LSHIFT32( bits_res_Q8, cl_Q5[ k ], 3-1 ); + if( bits_tot_Q8 <= *rate_dist_Q8 ) { + *rate_dist_Q8 = bits_tot_Q8; + *res_nrg_Q15 = sum1_Q15 + penalty; + *ind = (opus_int8)k; + *gain_Q7 = gain_tmp_Q7; + } }
/* Go to next cbk vector */ cb_row_Q7 += LTP_ORDER; } + +#ifdef OPUS_CHECK_ASM + { + opus_int8 ind_c = 0; + opus_int32 res_nrg_Q15_c = 0; + opus_int32 rate_dist_Q8_c = 0; + opus_int gain_Q7_c = 0; + + silk_VQ_WMat_EC_c( + &ind_c, + &res_nrg_Q15_c, + &rate_dist_Q8_c, + &gain_Q7_c, + XX_Q17, + xX_Q17, + cb_Q7, + cb_gain_Q7, + cl_Q5, + subfr_len, + max_gain_Q7, + L + ); + + silk_assert( *ind == ind_c ); + silk_assert( *res_nrg_Q15 == res_nrg_Q15_c ); + silk_assert( *rate_dist_Q8 == rate_dist_Q8_c ); + silk_assert( *gain_Q7 == gain_Q7_c ); + } +#endif } diff --git a/media/libopus/silk/x86/main_sse.h b/media/libopus/silk/x86/main_sse.h index 2f15d44869781..0a0391a2dab40 100644 --- a/media/libopus/silk/x86/main_sse.h +++ b/media/libopus/silk/x86/main_sse.h @@ -34,73 +34,72 @@
# if defined(OPUS_X86_MAY_HAVE_SSE4_1)
-#if 0 /* FIXME: SSE disabled until silk_VQ_WMat_EC_sse4_1() gets updated. */ # define OVERRIDE_silk_VQ_WMat_EC
void silk_VQ_WMat_EC_sse4_1( opus_int8 *ind, /* O index of best codebook vector */ - opus_int32 *rate_dist_Q14, /* O best weighted quant error + mu * rate */ + opus_int32 *res_nrg_Q15, /* O best residual energy */ + opus_int32 *rate_dist_Q8, /* O best total bitrate */ opus_int *gain_Q7, /* O sum of absolute LTP coefficients */ - const opus_int16 *in_Q14, /* I input vector to be quantized */ - const opus_int32 *W_Q18, /* I weighting matrix */ + const opus_int32 *XX_Q17, /* I correlation matrix */ + const opus_int32 *xX_Q17, /* I correlation vector */ const opus_int8 *cb_Q7, /* I codebook */ const opus_uint8 *cb_gain_Q7, /* I codebook effective gain */ const opus_uint8 *cl_Q5, /* I code length for each codebook vector */ - const opus_int mu_Q9, /* I tradeoff betw. weighted error and rate */ + const opus_int subfr_len, /* I number of samples per subframe */ const opus_int32 max_gain_Q7, /* I maximum sum of absolute LTP coefficients */ - opus_int L /* I number of vectors in codebook */ + const opus_int L /* I number of vectors in codebook */ );
#if defined OPUS_X86_PRESUME_SSE4_1
-#define silk_VQ_WMat_EC(ind, rate_dist_Q14, gain_Q7, in_Q14, W_Q18, cb_Q7, cb_gain_Q7, cl_Q5, \ - mu_Q9, max_gain_Q7, L, arch) \ - ((void)(arch),silk_VQ_WMat_EC_sse4_1(ind, rate_dist_Q14, gain_Q7, in_Q14, W_Q18, cb_Q7, cb_gain_Q7, cl_Q5, \ - mu_Q9, max_gain_Q7, L)) +#define silk_VQ_WMat_EC(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \ + subfr_len, max_gain_Q7, L, arch) \ + ((void)(arch),silk_VQ_WMat_EC_sse4_1(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \ + subfr_len, max_gain_Q7, L))
#else
extern void (*const SILK_VQ_WMAT_EC_IMPL[OPUS_ARCHMASK + 1])( opus_int8 *ind, /* O index of best codebook vector */ - opus_int32 *rate_dist_Q14, /* O best weighted quant error + mu * rate */ + opus_int32 *res_nrg_Q15, /* O best residual energy */ + opus_int32 *rate_dist_Q8, /* O best total bitrate */ opus_int *gain_Q7, /* O sum of absolute LTP coefficients */ - const opus_int16 *in_Q14, /* I input vector to be quantized */ - const opus_int32 *W_Q18, /* I weighting matrix */ + const opus_int32 *XX_Q17, /* I correlation matrix */ + const opus_int32 *xX_Q17, /* I correlation vector */ const opus_int8 *cb_Q7, /* I codebook */ const opus_uint8 *cb_gain_Q7, /* I codebook effective gain */ const opus_uint8 *cl_Q5, /* I code length for each codebook vector */ - const opus_int mu_Q9, /* I tradeoff betw. weighted error and rate */ + const opus_int subfr_len, /* I number of samples per subframe */ const opus_int32 max_gain_Q7, /* I maximum sum of absolute LTP coefficients */ - opus_int L /* I number of vectors in codebook */ + const opus_int L /* I number of vectors in codebook */ );
-# define silk_VQ_WMat_EC(ind, rate_dist_Q14, gain_Q7, in_Q14, W_Q18, cb_Q7, cb_gain_Q7, cl_Q5, \ - mu_Q9, max_gain_Q7, L, arch) \ - ((*SILK_VQ_WMAT_EC_IMPL[(arch) & OPUS_ARCHMASK])(ind, rate_dist_Q14, gain_Q7, in_Q14, W_Q18, cb_Q7, cb_gain_Q7, cl_Q5, \ - mu_Q9, max_gain_Q7, L)) +# define silk_VQ_WMat_EC(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \ + subfr_len, max_gain_Q7, L, arch) \ + ((*SILK_VQ_WMAT_EC_IMPL[(arch) & OPUS_ARCHMASK])(ind, res_nrg_Q15, rate_dist_Q8, gain_Q7, XX_Q17, xX_Q17, cb_Q7, cb_gain_Q7, cl_Q5, \ + subfr_len, max_gain_Q7, L))
#endif -#endif
-#if 0 /* FIXME: SSE disabled until the NSQ code gets updated. */ # define OVERRIDE_silk_NSQ
void silk_NSQ_sse4_1( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - SideInfoIndices *psIndices, /* I/O Quantization Indices */ - const opus_int32 x_Q3[], /* I Prefiltered input signal */ - opus_int8 pulses[], /* O Quantized pulse signal */ - const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ - const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ - const opus_int16 AR2_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ - const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ - const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ - const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ - const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ - const opus_int LTP_scale_Q14 /* I LTP state scaling */ + const silk_encoder_state *psEncC, /* I Encoder State */ + silk_nsq_state *NSQ, /* I/O NSQ state */ + SideInfoIndices *psIndices, /* I/O Quantization Indices */ + const opus_int16 x16[], /* I Input */ + opus_int8 pulses[], /* O Quantized pulse signal */ + const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ + const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ + const opus_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ + const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ + const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ + const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ + const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ + const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ + const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ + const opus_int LTP_scale_Q14 /* I LTP state scaling */ );
#if defined OPUS_X86_PRESUME_SSE4_1 @@ -113,21 +112,21 @@ void silk_NSQ_sse4_1( #else
extern void (*const SILK_NSQ_IMPL[OPUS_ARCHMASK + 1])( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - SideInfoIndices *psIndices, /* I/O Quantization Indices */ - const opus_int32 x_Q3[], /* I Prefiltered input signal */ - opus_int8 pulses[], /* O Quantized pulse signal */ - const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ - const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ - const opus_int16 AR2_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ - const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ - const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ - const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ - const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ - const opus_int LTP_scale_Q14 /* I LTP state scaling */ + const silk_encoder_state *psEncC, /* I Encoder State */ + silk_nsq_state *NSQ, /* I/O NSQ state */ + SideInfoIndices *psIndices, /* I/O Quantization Indices */ + const opus_int16 x16[], /* I Input */ + opus_int8 pulses[], /* O Quantized pulse signal */ + const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ + const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ + const opus_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ + const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ + const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ + const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ + const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ + const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ + const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ + const opus_int LTP_scale_Q14 /* I LTP state scaling */ );
# define silk_NSQ(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \ @@ -140,57 +139,56 @@ extern void (*const SILK_NSQ_IMPL[OPUS_ARCHMASK + 1])( # define OVERRIDE_silk_NSQ_del_dec
void silk_NSQ_del_dec_sse4_1( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - SideInfoIndices *psIndices, /* I/O Quantization Indices */ - const opus_int32 x_Q3[], /* I Prefiltered input signal */ - opus_int8 pulses[], /* O Quantized pulse signal */ - const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ - const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ - const opus_int16 AR2_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ - const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ - const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ - const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ - const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ - const opus_int LTP_scale_Q14 /* I LTP state scaling */ + const silk_encoder_state *psEncC, /* I Encoder State */ + silk_nsq_state *NSQ, /* I/O NSQ state */ + SideInfoIndices *psIndices, /* I/O Quantization Indices */ + const opus_int16 x16[], /* I Input */ + opus_int8 pulses[], /* O Quantized pulse signal */ + const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ + const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ + const opus_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ + const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ + const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ + const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ + const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ + const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ + const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ + const opus_int LTP_scale_Q14 /* I LTP state scaling */ );
#if defined OPUS_X86_PRESUME_SSE4_1
-#define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \ +#define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \ HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \ - ((void)(arch),silk_NSQ_del_dec_sse4_1(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \ + ((void)(arch),silk_NSQ_del_dec_sse4_1(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \ HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
#else
extern void (*const SILK_NSQ_DEL_DEC_IMPL[OPUS_ARCHMASK + 1])( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - SideInfoIndices *psIndices, /* I/O Quantization Indices */ - const opus_int32 x_Q3[], /* I Prefiltered input signal */ - opus_int8 pulses[], /* O Quantized pulse signal */ - const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ - const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ - const opus_int16 AR2_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ - const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ - const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ - const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ - const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ - const opus_int LTP_scale_Q14 /* I LTP state scaling */ + const silk_encoder_state *psEncC, /* I Encoder State */ + silk_nsq_state *NSQ, /* I/O NSQ state */ + SideInfoIndices *psIndices, /* I/O Quantization Indices */ + const opus_int16 x16[], /* I Input */ + opus_int8 pulses[], /* O Quantized pulse signal */ + const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ + const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ + const opus_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ + const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ + const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ + const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ + const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ + const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ + const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ + const opus_int LTP_scale_Q14 /* I LTP state scaling */ );
-# define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \ +# define silk_NSQ_del_dec(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \ HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14, arch) \ - ((*SILK_NSQ_DEL_DEC_IMPL[(arch) & OPUS_ARCHMASK])(psEncC, NSQ, psIndices, x_Q3, pulses, PredCoef_Q12, LTPCoef_Q14, AR2_Q13, \ + ((*SILK_NSQ_DEL_DEC_IMPL[(arch) & OPUS_ARCHMASK])(psEncC, NSQ, psIndices, x16, pulses, PredCoef_Q12, LTPCoef_Q14, AR_Q13, \ HarmShapeGain_Q14, Tilt_Q14, LF_shp_Q14, Gains_Q16, pitchL, Lambda_Q10, LTP_scale_Q14))
#endif -#endif
void silk_noise_shape_quantizer( silk_nsq_state *NSQ, /* I/O NSQ state */ diff --git a/media/libopus/silk/x86/x86_silk_map.c b/media/libopus/silk/x86/x86_silk_map.c index 32dcc3cab7a93..ca13cde91e5b1 100644 --- a/media/libopus/silk/x86/x86_silk_map.c +++ b/media/libopus/silk/x86/x86_silk_map.c @@ -41,16 +41,16 @@
#include "fixed/main_FIX.h"
-opus_int64 (*const SILK_INNER_PROD16_ALIGNED_64_IMPL[ OPUS_ARCHMASK + 1 ] )( +opus_int64 (*const SILK_INNER_PROD16_IMPL[ OPUS_ARCHMASK + 1 ] )( const opus_int16 *inVec1, const opus_int16 *inVec2, const opus_int len ) = { - silk_inner_prod16_aligned_64_c, /* non-sse */ - silk_inner_prod16_aligned_64_c, - silk_inner_prod16_aligned_64_c, - MAY_HAVE_SSE4_1( silk_inner_prod16_aligned_64 ), /* sse4.1 */ - MAY_HAVE_SSE4_1( silk_inner_prod16_aligned_64 ) /* avx */ + silk_inner_prod16_c, /* non-sse */ + silk_inner_prod16_c, + silk_inner_prod16_c, + MAY_HAVE_SSE4_1( silk_inner_prod16 ), /* sse4.1 */ + MAY_HAVE_SSE4_1( silk_inner_prod16 ) /* avx */ };
#endif @@ -66,23 +66,22 @@ opus_int (*const SILK_VAD_GETSA_Q8_IMPL[ OPUS_ARCHMASK + 1 ] )( MAY_HAVE_SSE4_1( silk_VAD_GetSA_Q8 ) /* avx */ };
-#if 0 /* FIXME: SSE disabled until the NSQ code gets updated. */ void (*const SILK_NSQ_IMPL[ OPUS_ARCHMASK + 1 ] )( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - SideInfoIndices *psIndices, /* I/O Quantization Indices */ - const opus_int32 x_Q3[], /* I Prefiltered input signal */ - opus_int8 pulses[], /* O Quantized pulse signal */ - const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ - const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ - const opus_int16 AR2_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ - const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ - const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ - const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ - const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ - const opus_int LTP_scale_Q14 /* I LTP state scaling */ + const silk_encoder_state *psEncC, /* I Encoder State */ + silk_nsq_state *NSQ, /* I/O NSQ state */ + SideInfoIndices *psIndices, /* I/O Quantization Indices */ + const opus_int16 x16[], /* I Input */ + opus_int8 pulses[], /* O Quantized pulse signal */ + const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ + const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ + const opus_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ + const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ + const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ + const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ + const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ + const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ + const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ + const opus_int LTP_scale_Q14 /* I LTP state scaling */ ) = { silk_NSQ_c, /* non-sse */ silk_NSQ_c, @@ -90,21 +89,20 @@ void (*const SILK_NSQ_IMPL[ OPUS_ARCHMASK + 1 ] )( MAY_HAVE_SSE4_1( silk_NSQ ), /* sse4.1 */ MAY_HAVE_SSE4_1( silk_NSQ ) /* avx */ }; -#endif
-#if 0 /* FIXME: SSE disabled until silk_VQ_WMat_EC_sse4_1() gets updated. */ void (*const SILK_VQ_WMAT_EC_IMPL[ OPUS_ARCHMASK + 1 ] )( opus_int8 *ind, /* O index of best codebook vector */ - opus_int32 *rate_dist_Q14, /* O best weighted quant error + mu * rate */ + opus_int32 *res_nrg_Q15, /* O best residual energy */ + opus_int32 *rate_dist_Q8, /* O best total bitrate */ opus_int *gain_Q7, /* O sum of absolute LTP coefficients */ - const opus_int16 *in_Q14, /* I input vector to be quantized */ - const opus_int32 *W_Q18, /* I weighting matrix */ + const opus_int32 *XX_Q17, /* I correlation matrix */ + const opus_int32 *xX_Q17, /* I correlation vector */ const opus_int8 *cb_Q7, /* I codebook */ const opus_uint8 *cb_gain_Q7, /* I codebook effective gain */ const opus_uint8 *cl_Q5, /* I code length for each codebook vector */ - const opus_int mu_Q9, /* I tradeoff betw. weighted error and rate */ + const opus_int subfr_len, /* I number of samples per subframe */ const opus_int32 max_gain_Q7, /* I maximum sum of absolute LTP coefficients */ - opus_int L /* I number of vectors in codebook */ + const opus_int L /* I number of vectors in codebook */ ) = { silk_VQ_WMat_EC_c, /* non-sse */ silk_VQ_WMat_EC_c, @@ -112,25 +110,23 @@ void (*const SILK_VQ_WMAT_EC_IMPL[ OPUS_ARCHMASK + 1 ] )( MAY_HAVE_SSE4_1( silk_VQ_WMat_EC ), /* sse4.1 */ MAY_HAVE_SSE4_1( silk_VQ_WMat_EC ) /* avx */ }; -#endif
-#if 0 /* FIXME: SSE disabled until the NSQ code gets updated. */ void (*const SILK_NSQ_DEL_DEC_IMPL[ OPUS_ARCHMASK + 1 ] )( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - SideInfoIndices *psIndices, /* I/O Quantization Indices */ - const opus_int32 x_Q3[], /* I Prefiltered input signal */ - opus_int8 pulses[], /* O Quantized pulse signal */ - const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ - const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ - const opus_int16 AR2_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ - const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ - const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ - const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ - const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ - const opus_int LTP_scale_Q14 /* I LTP state scaling */ + const silk_encoder_state *psEncC, /* I Encoder State */ + silk_nsq_state *NSQ, /* I/O NSQ state */ + SideInfoIndices *psIndices, /* I/O Quantization Indices */ + const opus_int16 x16[], /* I Input */ + opus_int8 pulses[], /* O Quantized pulse signal */ + const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ + const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ + const opus_int16 AR_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ + const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ + const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ + const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ + const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ + const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ + const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ + const opus_int LTP_scale_Q14 /* I LTP state scaling */ ) = { silk_NSQ_del_dec_c, /* non-sse */ silk_NSQ_del_dec_c, @@ -138,7 +134,6 @@ void (*const SILK_NSQ_DEL_DEC_IMPL[ OPUS_ARCHMASK + 1 ] )( MAY_HAVE_SSE4_1( silk_NSQ_del_dec ), /* sse4.1 */ MAY_HAVE_SSE4_1( silk_NSQ_del_dec ) /* avx */ }; -#endif
#if defined(FIXED_POINT)
diff --git a/media/libopus/src/analysis.c b/media/libopus/src/analysis.c index 8ee57aa0b4212..058328f0fd513 100644 --- a/media/libopus/src/analysis.c +++ b/media/libopus/src/analysis.c @@ -31,7 +31,9 @@
#define ANALYSIS_C
+#ifdef MLP_TRAINING #include <stdio.h> +#endif
#include "mathops.h" #include "kiss_fft.h" @@ -249,6 +251,15 @@ void tonality_get_info(TonalityAnalysisState *tonal, AnalysisInfo *info_out, int if (curr_lookahead<0) curr_lookahead += DETECT_SIZE;
+ tonal->read_subframe += len/(tonal->Fs/400); + while (tonal->read_subframe>=8) + { + tonal->read_subframe -= 8; + tonal->read_pos++; + } + if (tonal->read_pos>=DETECT_SIZE) + tonal->read_pos-=DETECT_SIZE; + /* On long frames, look at the second analysis window rather than the first. */ if (len > tonal->Fs/50 && pos != tonal->write_pos) { @@ -262,6 +273,8 @@ void tonality_get_info(TonalityAnalysisState *tonal, AnalysisInfo *info_out, int pos = DETECT_SIZE-1; pos0 = pos; OPUS_COPY(info_out, &tonal->info[pos], 1); + if (!info_out->valid) + return; tonality_max = tonality_avg = info_out->tonality; tonality_count = 1; /* Look at the neighbouring frames and pick largest bandwidth found (to be safe). */ @@ -393,14 +406,6 @@ void tonality_get_info(TonalityAnalysisState *tonal, AnalysisInfo *info_out, int info_out->music_prob_max = prob_max;
/* printf("%f %f %f %f %f\n", prob_min, prob_max, prob_avg/prob_count, vad_prob, info_out->music_prob); */ - tonal->read_subframe += len/(tonal->Fs/400); - while (tonal->read_subframe>=8) - { - tonal->read_subframe -= 8; - tonal->read_pos++; - } - if (tonal->read_pos>=DETECT_SIZE) - tonal->read_pos-=DETECT_SIZE; }
static const float std_feature_bias[9] = { @@ -420,6 +425,24 @@ static const float std_feature_bias[9] = { #define SCALE_ENER(e) (e) #endif
+#ifdef FIXED_POINT +static int is_digital_silence32(const opus_val32* pcm, int frame_size, int channels, int lsb_depth) +{ + int silence = 0; + opus_val32 sample_max = 0; +#ifdef MLP_TRAINING + return 0; +#endif + sample_max = celt_maxabs32(pcm, frame_size*channels); + + silence = (sample_max == 0); + (void)lsb_depth; + return silence; +} +#else +#define is_digital_silence32(pcm, frame_size, channels, lsb_depth) is_digital_silence(pcm, frame_size, channels, lsb_depth) +#endif + static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt_mode, const void *x, int len, int offset, int c1, int c2, int C, int lsb_depth, downmix_func downmix) { int i, b; @@ -464,8 +487,14 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt float layer_out[MAX_NEURONS]; float below_max_pitch; float above_max_pitch; + int is_silence; SAVE_STACK;
+ if (!tonal->initialized) + { + tonal->mem_fill = 240; + tonal->initialized = 1; + } alpha = 1.f/IMIN(10, 1+tonal->count); alphaE = 1.f/IMIN(25, 1+tonal->count); /* Noise floor related decay for bandwidth detection: -2.2 dB/second */ @@ -483,8 +512,6 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt }
kfft = celt_mode->mdct.kfft[0]; - if (tonal->count==0) - tonal->mem_fill = 240; tonal->hp_ener_accum += (float)downmix_and_resample(downmix, x, &tonal->inmem[tonal->mem_fill], tonal->downmix_state, IMIN(len, ANALYSIS_BUF_SIZE-tonal->mem_fill), offset, c1, c2, C, tonal->Fs); @@ -500,6 +527,8 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt if (tonal->write_pos>=DETECT_SIZE) tonal->write_pos-=DETECT_SIZE;
+ is_silence = is_digital_silence32(tonal->inmem, ANALYSIS_BUF_SIZE, 1, lsb_depth); + ALLOC(in, 480, kiss_fft_cpx); ALLOC(out, 480, kiss_fft_cpx); ALLOC(tonality, 240, float); @@ -518,6 +547,16 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt &tonal->inmem[240], tonal->downmix_state, remaining, offset+ANALYSIS_BUF_SIZE-tonal->mem_fill, c1, c2, C, tonal->Fs); tonal->mem_fill = 240 + remaining; + if (is_silence) + { + /* On silence, copy the previous analysis. */ + int prev_pos = tonal->write_pos-2; + if (prev_pos < 0) + prev_pos += DETECT_SIZE; + OPUS_COPY(info, &tonal->info[prev_pos], 1); + RESTORE_STACK; + return; + } opus_fft(kfft, in, out, tonal->arch); #ifndef FIXED_POINT /* If there's any NaN on the input, the entire output will be NaN, so we only need to check one value. */ @@ -654,7 +693,7 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt tonal->lowE[b] = logE[b]; tonal->highE[b] = MIN32(tonal->lowE[b]+15, tonal->highE[b]); } - relativeE += (logE[b]-tonal->lowE[b])/(1e-15f + (tonal->highE[b]-tonal->lowE[b])); + relativeE += (logE[b]-tonal->lowE[b])/(1e-5f + (tonal->highE[b]-tonal->lowE[b]));
L1=L2=0; for (i=0;i<NB_FRAMES;i++) @@ -896,9 +935,7 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt
/* Probability of speech or music vs noise */ info->activity_probability = frame_probs[1]; - /* It seems like the RNN tends to have a bias towards speech and this - warping of the probabilities compensates for it. */ - info->music_prob = MAX16(1.f-10.f*(1.f-frame_probs[0]), MIN16(10.f*frame_probs[0], .12f+.69f*frame_probs[0]*(2.f-frame_probs[0]))); + info->music_prob = frame_probs[0];
/*printf("%f %f %f\n", frame_probs[0], frame_probs[1], info->music_prob);*/ #ifdef MLP_TRAINING @@ -940,7 +977,6 @@ void run_analysis(TonalityAnalysisState *analysis, const CELTMode *celt_mode, co analysis->analysis_offset -= frame_size; }
- analysis_info->valid = 0; tonality_get_info(analysis, analysis_info, frame_size); }
diff --git a/media/libopus/src/analysis.h b/media/libopus/src/analysis.h index 289c845e824a6..0b66555f2153b 100644 --- a/media/libopus/src/analysis.h +++ b/media/libopus/src/analysis.h @@ -74,6 +74,7 @@ typedef struct { int read_pos; int read_subframe; float hp_ener_accum; + int initialized; float rnn_state[MAX_NEURONS]; opus_val32 downmix_state[3]; AnalysisInfo info[DETECT_SIZE]; diff --git a/media/libopus/src/mapping_matrix.h b/media/libopus/src/mapping_matrix.h index 9c20483e7a4cf..98bc82df3eba5 100644 --- a/media/libopus/src/mapping_matrix.h +++ b/media/libopus/src/mapping_matrix.h @@ -53,7 +53,7 @@ opus_int32 mapping_matrix_get_size(int rows, int cols); opus_int16 *mapping_matrix_get_data(const MappingMatrix *matrix);
void mapping_matrix_init( - MappingMatrix * const st, + MappingMatrix * const matrix, int rows, int cols, int gain, diff --git a/media/libopus/src/mlp.c b/media/libopus/src/mlp.c index f43a704ec7894..964c6a98f6d43 100644 --- a/media/libopus/src/mlp.c +++ b/media/libopus/src/mlp.c @@ -69,22 +69,29 @@ static OPUS_INLINE float sigmoid_approx(float x) return .5f + .5f*tansig_approx(.5f*x); }
-void compute_dense(const DenseLayer *layer, float *output, const float *input) +static void gemm_accum(float *out, const opus_int8 *weights, int rows, int cols, int col_stride, const float *x) { int i, j; + for (i=0;i<rows;i++) + { + for (j=0;j<cols;j++) + out[i] += weights[j*col_stride + i]*x[j]; + } +} + +void compute_dense(const DenseLayer *layer, float *output, const float *input) +{ + int i; int N, M; int stride; M = layer->nb_inputs; N = layer->nb_neurons; stride = N; for (i=0;i<N;i++) - { - /* Compute update gate. */ - float sum = layer->bias[i]; - for (j=0;j<M;j++) - sum += layer->input_weights[j*stride + i]*input[j]; - output[i] = WEIGHTS_SCALE*sum; - } + output[i] = layer->bias[i]; + gemm_accum(output, layer->input_weights, N, M, stride, input); + for (i=0;i<N;i++) + output[i] *= WEIGHTS_SCALE; if (layer->sigmoid) { for (i=0;i<N;i++) output[i] = sigmoid_approx(output[i]); @@ -96,45 +103,41 @@ void compute_dense(const DenseLayer *layer, float *output, const float *input)
void compute_gru(const GRULayer *gru, float *state, const float *input) { - int i, j; + int i; int N, M; int stride; + float tmp[MAX_NEURONS]; float z[MAX_NEURONS]; float r[MAX_NEURONS]; float h[MAX_NEURONS]; M = gru->nb_inputs; N = gru->nb_neurons; stride = 3*N; + /* Compute update gate. */ for (i=0;i<N;i++) - { - /* Compute update gate. */ - float sum = gru->bias[i]; - for (j=0;j<M;j++) - sum += gru->input_weights[j*stride + i]*input[j]; - for (j=0;j<N;j++) - sum += gru->recurrent_weights[j*stride + i]*state[j]; - z[i] = sigmoid_approx(WEIGHTS_SCALE*sum); - } + z[i] = gru->bias[i]; + gemm_accum(z, gru->input_weights, N, M, stride, input); + gemm_accum(z, gru->recurrent_weights, N, N, stride, state); for (i=0;i<N;i++) - { - /* Compute reset gate. */ - float sum = gru->bias[N + i]; - for (j=0;j<M;j++) - sum += gru->input_weights[N + j*stride + i]*input[j]; - for (j=0;j<N;j++) - sum += gru->recurrent_weights[N + j*stride + i]*state[j]; - r[i] = sigmoid_approx(WEIGHTS_SCALE*sum); - } + z[i] = sigmoid_approx(WEIGHTS_SCALE*z[i]); + + /* Compute reset gate. */ for (i=0;i<N;i++) - { - /* Compute output. */ - float sum = gru->bias[2*N + i]; - for (j=0;j<M;j++) - sum += gru->input_weights[2*N + j*stride + i]*input[j]; - for (j=0;j<N;j++) - sum += gru->recurrent_weights[2*N + j*stride + i]*state[j]*r[j]; - h[i] = z[i]*state[i] + (1-z[i])*tansig_approx(WEIGHTS_SCALE*sum); - } + r[i] = gru->bias[N + i]; + gemm_accum(r, &gru->input_weights[N], N, M, stride, input); + gemm_accum(r, &gru->recurrent_weights[N], N, N, stride, state); + for (i=0;i<N;i++) + r[i] = sigmoid_approx(WEIGHTS_SCALE*r[i]); + + /* Compute output. */ + for (i=0;i<N;i++) + h[i] = gru->bias[2*N + i]; + for (i=0;i<N;i++) + tmp[i] = state[i] * r[i]; + gemm_accum(h, &gru->input_weights[2*N], N, M, stride, input); + gemm_accum(h, &gru->recurrent_weights[2*N], N, N, stride, tmp); + for (i=0;i<N;i++) + h[i] = z[i]*state[i] + (1-z[i])*tansig_approx(WEIGHTS_SCALE*h[i]); for (i=0;i<N;i++) state[i] = h[i]; } diff --git a/media/libopus/src/mlp_data.c b/media/libopus/src/mlp_data.c index b4b3ecb28ea1d..ae4178df764eb 100644 --- a/media/libopus/src/mlp_data.c +++ b/media/libopus/src/mlp_data.c @@ -7,648 +7,648 @@ #include "mlp.h"
static const opus_int8 layer0_weights[800] = { - 21, -8, -5, 3, -16, 13, 3, -24, - -18, 14, 9, 2, 5, -2, 2, -3, - -5, 35, 10, 10, -8, 2, 1, 3, - -26, -61, 9, 4, -8, 18, 3, -5, - 47, -34, -6, 35, 35, 30, 40, -40, - 11, -39, 11, -14, 14, -24, -8, -8, - 2, -23, -100, 1, 19, -14, 4, 7, - 13, -26, 47, -4, 44, 5, 27, -1, - 57, -1, -36, 34, -20, -60, 25, -73, - 24, -70, 20, -4, -6, 68, -16, 13, - -24, 40, -42, -18, 0, 10, 12, -56, - -6, 38, 21, 5, -116, 19, 11, -14, - 3, 26, 14, 23, 1, 35, -16, -2, - -4, 55, 23, 16, 22, 45, -71, -27, - -20, 8, -47, -47, -46, -14, -50, -82, - 36, 45, 54, -32, -6, 14, -2, -24, - 3, 23, -27, -8, 1, 70, 15, -4, - -7, 21, 17, -126, 5, -47, -53, -6, - 34, 25, -1, 10, 17, -37, 38, -1, - 30, 25, -35, 112, -21, 8, -10, -3, - 15, 18, -14, -8, -20, 11, 24, 37, - -35, 50, 52, 16, 9, 15, -26, 43, - -3, -9, -26, 126, 7, 33, 55, -88, - 9, 28, 5, -19, -76, 32, 3, 11, - 10, -54, 2, -13, 3, 94, 52, 106, - 26, 74, 44, -99, 58, -44, 50, 15, - 29, 25, 50, -84, 28, 1, -30, 11, - 8, 20, -67, 4, 11, -25, -39, -33, - -83, -15, -9, 18, -2, -24, 18, 77, - -39, -80, 25, -8, 52, -88, -21, 81, - 29, -23, -31, 69, -28, 0, 12, 47, - 15, 20, 34, -53, 5, 111, -39, -7, - 1, 56, 6, 3, 7, -67, -6, -31, - 107, -6, 12, -97, 36, -18, -34, -6, - -9, -63, 10, -9, 3, 12, -80, -87, - 17, -9, 39, 126, 13, 15, 19, -6, - 29, 11, 10, -30, 26, -54, 31, -47, - 25, -40, -24, 23, 16, -27, -32, 30, - -22, -59, -9, 65, -86, -21, 120, -25, - -52, -12, 34, -50, 25, -17, 30, -4, - 95, 4, 9, 61, 25, -6, 11, -33, - -8, -3, 26, 37, -28, 19, -17, 36, - 11, -8, 8, -89, 2, -68, -95, 18, - 22, 36, 9, -8, -48, 54, -26, -6, - 30, -28, 10, -18, 2, -11, 7, 2, - 17, -5, 27, -21, 9, 15, 10, -18, - -10, 0, -9, 19, 10, -48, -35, -32, - 15, 24, 25, -6, 3, 51, -15, 9, - 19, -17, 6, 8, -9, 13, 14, -31, - -24, 10, -23, 21, 16, 18, -8, 35, - 18, -18, -18, -26, 25, 10, 55, 9, - 3, -24, -15, 2, -28, 20, -45, -14, - 15, -19, -8, 10, 6, 40, -31, -45, - 40, 53, 40, 27, -15, -31, -30, 10, - 38, 50, 28, 71, -21, 20, 1, 23, - 22, 14, 5, -48, 39, 78, -7, -6, - 9, 50, 88, -15, 55, 36, 32, -22, - -60, 13, 31, -36, -71, -2, 52, 37, - 7, 46, -23, -43, 19, -49, -34, 15, - 60, -66, 36, 2, -57, -32, 64, -53, - -36, 49, -10, 21, -2, 23, -21, 22, - -3, -15, -6, 18, -12, -32, -11, -11, - -32, 24, 36, 37, -7, 30, -22, -12, - 22, -63, 26, 20, -16, -30, -13, -18, - -10, 45, 10, -24, -2, -26, 28, 18, - 36, 44, -40, -5, -14, -4, 18, -18, - -1, 18, -40, 15, 29, 15, 12, 3, - 25, -51, 8, -17, 9, -19, 22, -33, - -22, 39, 61, -15, 55, -24, 10, 32, - 12, 9, 29, 5, -33, -33, 5, 0, - 35, 105, -14, 39, 4, 43, 36, 52, - 50, -39, 45, -51, 27, 7, 65, -34, - 108, 127, 42, 26, 73, 19, 9, 17, - -62, 16, 11, 52, 85, -46, 10, -95, - 64, 53, 90, -8, -54, -5, -77, -45, - 127, -4, 54, -3, -19, 66, 40, -127, - 53, 22, -26, 24, 20, -36, -2, 101, - 1, 35, -1, -8, 5, -36, -16, 33, - 6, -73, -21, -23, -32, -21, -4, -46, - -42, -66, -16, -8, 0, -20, -21, 37, - -128, -128, -127, 126, -128, -127, 127, -3, - 127, 122, 127, 126, -127, -128, 127, -127, - 127, -124, 126, -126, -127, -128, 125, -127, - -38, -123, 125, -128, -128, 126, 125, 127, - -127, -123, -127, 127, -73, -113, 127, -17, - 127, 126, 127, 126, -126, -126, 127, -127, - 127, -125, 121, -126, -25, -127, 127, -126, - 26, -126, 71, -28, -128, 20, 20, 71, - -87, -93, 39, 116, 111, -85, 70, -26, - 62, 23, -15, 18, 4, 32, 114, -55, - 8, -116, 85, -67, -110, -49, 11, -5, - -128, -41, 61, 70, -29, 115, 127, 51, - 127, 127, 127, -128, -127, 127, -128, -127, - -126, -128, -126, -127, 127, 126, -128, 127, - -126, 125, -55, 127, 127, 127, -125, 115, - -128, -126, -128, -127, 127, -128, -128, 127, - 28, -127, -120, -127, 127, -127, -127, 9, - -26, -118, 73, 39, 124, 78, -126, 123, - 10, -127, -105, -64, 118, -84, -127, 61, - 77, 104, -128, -127, 94, -17, -28, 36 + -30, -9, 2, -12, 5, -1, 8, 9, + 9, 8, -13, 18, -17, -34, -5, 17, + -11, 0, -4, 10, 2, 10, 15, -8, + 2, -1, 0, 5, 13, -3, -16, 1, + -5, 3, 7, -28, -13, 6, 36, -3, + 19, -60, -17, -28, 7, -11, -30, -7, + 2, -42, -21, -3, 6, -22, 33, -9, + 7, -30, 21, -14, 24, -11, -20, -18, + -5, -12, 12, -49, -50, -49, 16, 9, + -37, -1, 9, 34, -13, -31, -31, 12, + 16, 44, -42, 2, -9, 8, -18, -6, + 9, 36, 19, 11, 13, 12, -21, 3, + -28, -12, 3, 33, 25, -14, 11, 1, + -94, -39, 18, -12, -11, -15, -7, 49, + 52, 10, -43, 9, 57, 8, 21, -6, + 14, -15, 44, -8, 7, -30, -13, -2, + -9, 25, -2, -127, 18, -11, -52, 26, + -27, 27, 10, -10, 7, 43, 6, -24, + 41, 10, -18, -27, 10, 17, 9, 10, + -17, -10, 20, -6, 22, 55, 35, -80, + 36, 25, -24, -36, 15, 9, -19, 88, + 19, 64, -51, -35, 17, 0, -7, 41, + -16, 27, 4, 15, -1, 18, -16, 47, + -39, -54, -8, 13, -25, -20, 102, -18, + -5, 44, 11, -28, 71, 2, -51, -5, + 5, 2, -83, -9, -29, 8, 21, -53, + 58, -37, -7, 13, 38, 9, 34, -1, + -41, 21, 4, -24, -36, -33, -21, 32, + 75, -2, 1, -68, -1, 47, -29, 32, + 20, 12, -65, -87, 5, 16, -12, 24, + 40, 15, 7, 19, -26, -17, 17, 6, + -2, -37, -30, -9, 32, -127, -39, 0, + -31, -27, 4, -22, 23, -6, -77, 35, + -61, 32, -37, -24, 13, -11, -1, -40, + -3, 17, -7, 13, 11, 59, -19, 10, + 6, -18, 0, 13, 3, -6, -23, 19, + 11, -17, 13, -1, -80, 40, -53, 69, + -29, -54, 0, -4, 33, -25, -2, 38, + 35, 36, -15, 46, 2, -13, -16, -8, + -8, 12, -24, -9, -55, -5, -9, 32, + 11, 7, 12, -18, -10, -86, -38, 54, + 37, -25, 18, -43, 7, -27, -27, -54, + 13, 9, 22, 70, 6, 35, -7, 23, + -15, -44, -6, 7, -66, -85, 32, 40, + -19, -9, -7, 12, -15, 7, 2, 6, + -35, 11, 28, 0, 26, 14, 1, 1, + 4, 12, 18, 35, 22, -18, -3, 14, + -1, 7, 14, -8, -14, -3, 4, -3, + -19, -7, -1, -25, -27, 25, -26, -2, + 33, -22, -27, -25, 4, -9, 7, 21, + 26, -30, 10, -9, -20, 11, 27, 10, + 5, -18, 14, -4, 2, -17, -5, -7, + -9, -13, 15, 29, 1, -10, -16, -10, + 35, 36, -7, -22, -44, 17, 30, 22, + 21, -1, 22, -11, 32, -8, -7, 5, + -10, 5, 30, -20, 29, -20, -34, 12, + -4, -6, 6, -13, 10, -5, -68, -1, + 24, 9, 19, -24, -64, 31, 19, 27, + -26, 75, -45, 41, 39, -42, 8, 6, + 23, -30, 16, -25, 30, 34, 8, -38, + -3, 18, 16, -31, 22, -4, -9, 1, + 20, 9, 38, -32, 0, -45, 0, -6, + -13, 11, -25, -32, -22, 31, -24, -11, + -11, -4, -4, 20, -34, 22, 20, 9, + -25, 27, -5, 28, -29, 29, 6, 21, + -6, -18, 54, 4, -46, 23, 21, -14, + -31, 36, -41, -24, 4, 22, 10, 11, + 7, 36, -32, -13, -52, -17, 24, 28, + -37, -36, -1, 24, 9, -38, 35, 48, + 18, 2, -1, 45, 10, 39, 24, -38, + 13, 8, -16, 8, 25, 11, 7, -29, + -11, 7, 20, -30, -38, -45, 14, -18, + -28, -9, 65, 61, 22, -53, -38, -16, + 36, 46, 20, -39, 32, -61, -6, -6, + -36, -33, -18, -28, 56, 101, 45, 11, + -28, -23, -29, -61, 20, -47, 2, 48, + 27, -17, 1, 40, 1, 3, -51, 15, + 35, 28, 22, 35, 53, -61, -29, 12, + -6, -21, 10, 3, -20, 2, -25, 1, + -6, 31, 11, -3, 1, -10, -52, 6, + 126, -105, 122, 127, -128, 127, 127, -128, + 127, 108, 12, 127, 48, -128, -36, -128, + 127, 127, -128, -128, 127, 89, -128, 127, + -128, -128, -128, 127, 127, -128, -128, -93, + -82, 20, 125, 65, -82, 127, 38, -74, + 81, 88, -88, 79, 51, -47, -111, -26, + 14, 83, -88, -112, 24, 35, -101, 98, + -99, -48, -45, 46, 83, -60, -79, 45, + -20, -41, 9, 4, 52, 54, 93, -10, + 4, 13, 3, 123, 6, 94, -111, -69, + -14, -31, 10, 12, 53, -79, -11, -21, + -2, -44, -72, 92, 65, -57, 56, -38, + 127, -56, -128, 127, 127, -128, 86, 117, + -75, -128, 127, -19, -99, -112, 127, -128, + 127, -48, 114, 118, -128, -128, 117, -17, + -6, 121, -128, 127, -128, 82, 54, -106, + 127, 127, -33, 100, -39, -23, 18, -78, + -34, -29, -1, -30, 127, -26, 127, -128, + 126, -128, 27, -23, -79, -120, -127, 127, + 72, 66, 29, 7, -66, -56, -117, -128 };
static const opus_int8 layer0_bias[32] = { - -39, 28, -7, -12, -36, -35, -49, 48, - 38, -17, 44, 15, -45, -18, -45, 9, - 11, 4, -25, 38, 12, -31, -90, -70, - -17, 27, 7, -73, 42, -103, 78, 99 + 51, -16, 1, 13, -5, -6, -16, -7, + 11, -6, 106, 26, 28, -14, 21, -29, + 7, 18, -18, -17, 21, -17, -9, 20, + -25, -3, -34, 48, 11, -13, -31, -20 };
static const opus_int8 layer1_weights[2304] = { - 29, -37, -21, -34, 19, -32, 44, -43, - 51, -5, -14, 37, -32, 74, 127, -29, - -75, -49, -5, -106, -64, 24, -11, 26, - 23, 25, -6, -1, -48, -16, -26, 29, - 24, -3, 50, -23, -45, -59, -11, -10, - -9, 51, 42, 16, -27, -79, 72, 7, - 55, -15, 5, -15, -24, -1, 48, -29, - -44, 26, -20, -40, 57, -15, 21, 45, - -4, -25, 13, 24, -26, 12, -2, 20, - 48, -60, 45, 37, 74, 27, 13, 0, - 126, 5, 68, 110, 7, 74, 51, 65, - -21, 32, 27, -30, 11, -3, -43, 73, - 31, 43, 119, -51, 13, -80, 32, -23, - 37, 69, 101, -33, -35, 50, -47, 126, - -84, 64, 88, 28, 57, 56, -28, -102, - 0, -15, -57, 1, -34, 25, 59, 36, - -11, 26, -42, 14, -4, -24, -37, 63, - -18, 2, -32, -9, -37, -15, -9, 9, - -41, -36, 105, 20, 14, -14, 64, 92, - 68, -83, -7, 20, 86, 22, 38, 8, - -63, -6, -13, -56, 61, 55, 50, -33, - -9, 22, -22, 77, 44, -33, 44, -20, - 77, 33, 34, -78, -53, 31, -108, 33, - -23, -54, 63, 34, -9, 43, -17, 15, - -15, 15, -3, -50, 15, -26, -6, -35, - -52, 57, 0, -10, 67, -57, -47, 36, - -64, 19, -19, -29, -97, -15, -49, 69, - -18, 84, 122, 4, -81, 18, -85, -4, - -40, 99, -46, 11, -10, -29, -51, -59, - 112, -103, 29, -45, 5, 43, 94, 24, - -4, -37, 27, -54, -24, 30, 43, 40, - -10, 13, 18, 75, 51, 11, -14, -7, - 34, 80, -119, 73, -47, -68, 50, 79, - 42, -2, -53, 22, -9, -21, -4, 88, - 97, -5, -28, 16, -64, -1, -25, 9, - -20, -63, 10, 57, -3, 127, -2, -26, - 8, 66, -48, -118, 47, -73, 15, 51, - -29, 28, 72, 41, -2, 48, 75, -24, - -47, 44, 8, -39, 70, -73, -44, 56, - -14, -62, 30, 74, 31, -98, 13, 8, - 83, -36, -7, -8, 62, 13, -29, -20, - 21, -66, 53, -49, -24, -14, 19, 101, - -47, -51, 65, -52, 25, -32, -38, 39, - -56, 41, 49, 22, 10, 21, 1, 38, - -18, 48, 36, 55, -39, -10, -4, 3, - 17, -27, -81, 61, 1, 8, -32, 35, - 29, 85, -33, -56, 16, 3, -48, 35, - 56, -40, 14, -65, 3, -70, -29, 84, - 51, 75, -52, 56, -55, 0, -13, -58, - 6, 3, 22, 31, -34, 20, -6, 26, - -121, 85, -75, 11, -34, -23, 46, -11, - 0, 9, 20, 39, 59, -12, 38, 14, - 6, -33, -15, -86, 39, -48, -5, 4, - 29, -28, 52, -8, -51, 52, 60, -11, - -22, 81, 81, 17, -127, -28, 27, -40, - -36, -57, 43, 52, 51, -38, -10, 23, - -44, -72, -63, 3, 20, -68, -72, -38, - 26, -45, 19, -75, -18, 4, 14, 15, - -47, 104, -9, 51, 25, 16, -95, 64, - -11, -2, -5, 39, 52, -40, 77, 44, - 11, -29, -37, 5, -58, -38, -28, 36, - 50, 2, -26, -3, -16, -11, -11, 16, - -14, -47, -3, -3, -48, 45, 40, -14, - 3, -67, -4, 19, -25, 14, -34, 48, - -66, 67, 70, 20, 52, -21, 21, 28, - 16, 70, -114, -11, 29, 9, -52, -52, - -39, 44, 17, 11, -15, -111, 84, -20, - -23, -60, 15, -39, 48, 10, -31, -24, - -38, 4, -42, -25, -70, -3, -75, -40, - -3, -19, 33, -14, 18, -14, -5, -16, - 46, -56, 38, -1, 2, 9, 17, -41, - -44, 11, -23, 28, -32, 8, -1, 57, - -5, 44, -64, -21, -54, 47, 22, -19, - -12, -24, -48, -4, -42, -46, -17, 52, - -39, -33, 79, -26, 20, 21, 9, -5, - -127, -31, 26, -86, -20, -115, 27, 33, - 33, 72, 30, 57, -17, 2, 71, 58, - -52, -10, 20, -79, -3, 40, -106, 17, - 34, 68, -17, 31, -27, 23, 17, 18, - 21, 25, 15, 41, -51, 30, -3, 1, - -4, -60, -13, -59, 53, -42, -34, -29, - -22, -50, 27, -70, -58, -21, -59, -27, - -28, 45, -66, 12, 85, -61, 0, -39, - -73, -75, -29, -42, -47, -88, -46, 27, - -43, 112, 83, -51, -36, -64, 13, 74, - -9, 2, 25, 38, -18, -64, -81, -23, - -12, 40, 18, -38, -121, -36, -6, -73, - -16, -59, 28, -26, -2, -69, -6, -7, - 43, -21, 61, 0, 1, 0, 13, 18, - -18, -21, -3, 18, 42, 0, 67, -35, - 39, 15, -97, -87, 103, 65, 86, 20, - -11, -17, 9, -9, 15, 15, -35, 52, - 34, -105, -85, 10, -36, -68, -64, 60, - -85, 51, -54, -39, -19, 77, 0, 35, - -20, 35, -78, 41, -11, 49, 14, 17, - -31, 1, 41, -1, 10, -25, -90, -12, - -9, -12, -26, 6, 34, 22, 31, 25, - 6, 27, -26, 5, -35, 29, 18, -12, - 54, -42, -22, -14, -6, 36, -14, -16, - 35, 69, 75, 7, -113, 44, -2, -18, - 3, -15, 50, -28, -36, -9, -25, 47, - 127, -6, -35, 35, -46, 17, 116, -62, - -17, -98, -105, 77, -99, -17, 41, 16, - -7, 17, -89, 37, -16, -72, -3, -29, - 50, 30, -43, -7, -72, 125, 51, 59, - -73, 37, 61, 2, -19, -11, 4, 46, - 33, 51, 74, 88, -51, 68, 124, 27, - 97, -51, 16, -3, -6, -12, -30, 28, - 33, 3, -59, 22, 72, 53, 24, -29, - -4, -65, 89, -59, 92, 121, 12, 11, - 111, -20, 12, -85, -123, -33, -65, 70, - 68, 127, 2, -25, -104, 57, -74, -94, - -128, -27, 28, -7, -126, -123, -2, -57, - -57, 76, 55, -43, -44, -92, 1, 29, - 12, 10, 15, 10, 88, 0, -65, -57, - -66, 14, -10, -10, 36, 19, -49, -4, - 33, 3, 99, -49, -28, 41, 21, 37, - 46, 62, 16, 43, -58, 119, -32, 34, - 27, 13, -46, -1, -4, 23, 31, -21, - 108, 4, 107, 37, 26, -48, 70, 18, - 30, -18, -101, 77, -91, -117, -74, 16, - -116, 43, -24, 26, -19, -49, 34, -54, - 101, -14, 15, 12, 80, -9, 110, 42, - 8, -30, 53, -42, 34, -8, 60, -89, - 7, 41, 21, -94, 51, -1, -22, -37, - 22, 12, 49, -1, 55, 30, 5, -26, - -12, 4, -29, -16, -118, -12, -48, 85, - -44, -5, -27, -13, -84, -39, -63, -83, - 44, 5, -62, -52, -110, -8, -24, -36, - -22, -52, 20, -10, 42, 117, -19, -30, - 21, -16, -38, 92, 35, -5, -7, 45, - -69, -57, -69, 20, 18, 14, 107, -36, - -37, 43, 25, -38, -44, -104, 46, 8, - 93, -9, 54, 39, -48, -28, 21, 2, - 24, 11, -5, -14, -2, -10, 28, 105, - 5, -60, -65, -38, 121, 5, -33, -60, - 44, 68, 21, -69, -9, 7, 55, -26, - -75, 19, -76, 0, 10, -101, -56, -64, - 19, -68, 14, 19, 9, -49, 23, -1, - 19, -52, -15, -67, -63, -18, 24, -40, - -44, -11, -6, 43, 62, 67, -27, 5, - -57, 6, 25, -14, 19, 53, 24, -29, - -64, -26, -50, -19, 28, -15, -29, -56, - 6, -40, 35, 54, -6, -45, -17, 41, - 106, -42, -47, 43, -22, 20, -2, -126, - -29, 72, 85, -32, -30, 43, -6, 14, - 31, -84, 4, 7, 16, -47, -37, -33, - -14, -60, -52, -55, -44, 41, 39, -114, - -52, 24, -100, 55, -6, 40, 102, 48, - -1, 55, -55, -35, -27, 51, -1, 6, - -10, -16, -38, 29, 37, 55, 18, 22, - 28, -58, 13, 60, -60, 18, 6, -8, - 31, -52, 14, 2, 16, 30, -22, -39, - 0, 35, -29, 7, -48, 41, 78, 24, - 30, 1, -89, 72, 27, -33, -33, -12, - 61, -82, 123, 36, -12, -25, 55, 37, - 66, 27, -19, 37, 10, 44, -14, -17, - -20, 30, 20, 2, 21, 15, 37, 35, - 3, -40, 6, 12, 4, 22, -21, -79, - 29, 3, -55, -77, -31, 13, -19, -24, - 10, -38, 9, -78, 24, -50, -15, 31, - 30, -4, -33, 25, 27, 10, -24, 43, - -7, 78, -2, 27, 69, -23, 10, 79, - -19, -69, -3, 6, 25, 71, -42, -4, - -10, -21, -43, 18, 63, 6, 15, -41, - -7, 77, 37, -47, -7, 41, -34, 40, - 6, 25, 25, -74, -32, 4, 43, -26, - -8, 44, -5, 39, -4, -12, -9, -90, - -51, 38, 32, 42, 28, -42, 13, 4, - 30, 18, 54, -13, -11, 3, -2, 58, - 30, -53, 5, -76, 4, -14, -13, 16, - 10, -108, 6, -114, 28, -93, -65, -40, - 21, 28, -31, -85, -52, 29, 9, -10, - -12, -26, -27, -82, 43, 0, -75, -6, - 29, -4, 64, -12, -5, 25, 14, -2, - -54, -127, 81, -35, 14, -59, -75, 69, - -29, -65, 43, -88, -21, 34, -87, -48, - 51, 2, 8, -37, 25, 10, -25, -7, - -37, -39, -8, 28, 55, -72, -26, 16, - -30, 41, -49, 32, 37, -7, -12, 23, - 38, -61, -13, 28, 16, 4, -16, -122, - 37, 8, 17, 3, -79, 23, -17, 28, - -28, -31, -14, -39, 114, -49, -15, -47, - -14, 7, -7, -79, 98, -72, 19, -26, - 65, -44, -60, -56, 18, -20, -35, 19, - -72, 8, 78, -84, 40, -3, 46, 40, - 3, -31, 16, 38, -58, 48, 34, 0, - -75, -25, -12, -25, -5, -15, 18, -11, - 6, 34, 20, 21, -6, -19, -34, 22, - -18, -48, 69, 122, -16, 1, 12, 11, - 80, 31, 28, -34, 23, 27, -19, 10, - 63, 81, 66, 91, 10, 2, 123, 126, - 126, 74, 21, 75, 9, -15, 36, 29, - 34, -54, 101, -57, -51, -61, 47, 66, - 41, 38, -124, 56, -36, 48, 51, -7, - -11, -6, 30, -55, 48, 3, -18, -20, - 24, 24, 0, -55, 62, 3, -74, -49, - 2, -13, -31, -3, -12, 42, -33, 5, - -24, -39, 117, -81, -31, -39, 0, 2, - 6, 25, 77, 13, 6, 10, 26, -21, - -127, 35, 7, -26, -69, -19, -21, -25, - 111, -34, -3, 29, 6, -31, -44, 73, - -1, 6, -4, 2, 99, 25, 92, 34, - 40, 5, -94, 21, 47, 126, 61, -5, - 2, -37, 4, 21, -27, 32, -18, -10, - 70, -40, -15, 38, 19, 30, 12, -19, - -11, -2, -50, 22, -33, 3, 33, -39, - -19, 87, -67, -27, -11, -117, 36, 104, - 11, -56, -29, -6, 5, 14, -5, 44, - 38, 9, 24, 16, 127, 47, -6, -9, - 63, -58, -106, -19, 62, -30, 29, -23, - 69, 4, -31, 3, 14, -101, 5, 3, - 31, -6, -88, 28, 13, 0, 42, 0, - 6, 60, 54, -11, 5, -34, -33, -24, - -5, 42, 19, -63, 10, 32, -9, -32, - 25, 26, -28, -5, -7, -45, 32, 11, - -12, 31, -26, -33, -46, -76, 40, -5, - 3, -5, 3, -18, -12, 93, 17, 62, - -121, -14, 42, 76, 24, 4, 34, 14, - 41, 18, -10, 93, 91, -62, 58, -55, - 88, -64, -9, 23, 25, 45, -2, 70, - 43, 9, 103, 22, 48, 46, -13, 9, - -27, -37, 35, -51, -54, -10, 57, -35, - -2, -1, 7, -3, -37, 5, 9, 3, - 27, -7, 50, 5, -50, 22, 21, -13, - 22, 43, 10, -18, 37, -20, -38, -32, - -2, 27, 1, -67, -41, 60, -28, -33, - -50, -38, 76, -18, 23, -16, -25, 0, - -8, -71, -10, -12, 20, -34, 40, -19, - 12, -42, 14, 11, -28, 37, -33, 4, - 41, 19, 65, 85, -26, 23, -50, 38, - 3, -34, 64, 43, 1, 16, 34, 35, - -15, -27, 20, -1, 50, 0, -30, -50, - 14, -60, -69, 10, -57, -45, -32, -14, - 32, -16, 46, -61, -46, 1, -40, -75, - -28, -16, -73, -50, -13, -14, 9, -78, - 5, -44, -9, -25, -79, -16, -46, 92, - -70, 61, -20, 12, -43, 3, -19, 40, - 11, 25, 32, -58, 58, 45, 28, 1, - 13, -27, -53, 30, -30, -31, -52, 10, - 17, 68, -6, -44, -8, 25, 33, 48, - 81, -43, -10, 67, 29, 23, 11, 20, - -39, -28, 31, 18, -72, 29, 22, -11, - -71, 39, -10, -121, -20, -8, -40, 125, - -7, -43, 10, 49, 12, 38, 43, -79, - -72, -41, -48, -60, -41, 5, -17, 35, - 95, 35, 124, -11, 2, 70, -60, -25, - 0, -27, 76, -19, -94, 40, -96, 65, - -9, -31, -8, -35, 27, -44, 64, -60, - -12, -72, 12, -56, 8, -45, -5, -27, - -6, 50, 30, -20, -18, 64, -108, -15, - -43, 44, 11, -14, -8, -21, -24, 42, - 51, 47, -3, 17, -17, -24, 33, -28, - 25, -15, -33, -21, 6, -13, 39, 19, - 7, 116, 37, 53, 105, 4, 15, -56, - 10, 12, -92, -30, 117, 4, 32, -13, - -17, -21, 43, 29, -25, -38, 51, 32, - 74, -41, -15, 29, -5, -114, 35, -36, - 46, 51, 15, 16, -39, 24, 17, 3, - -26, 40, -37, 34, 43, 20, -61, -14, - 31, -29, 34, 25, -22, 25, -39, 39, - -33, -10, -56, -61, -6, -48, -114, -96, - -12, 3, 82, 45, 8, -2, -4, -28, - -42, -58, -50, -34, -54, -26, -64, -16, - -82, 49, -28, 0, -30, -20, -64, -68, - -18, 18, -44, -34, -42, -61, -17, 14, - -28, 8, 27, -49, -18, 45, -41, 11, - -2, 10, -8, -17, -24, -28, -42, 12, - 79, 46, 30, -26, 5, 3, 3, 58, - 12, -73, 23, 17, 5, 2, 20, 36, - 56, -33, 80, 71, 17, 87, 40, -21, - 26, 6, 48, -71, 76, 15, -47, 32, - 87, 30, 58, -11, 65, -43, 91, 54, - -31, 8, 34, 25, -14, 37, -30, 20, - -35, 4, -75, 56, -29, 22, 64, 48, - 47, -78, -74, 22, 11, -62, -28, 62, - -30, 12, -25, -31, 41, -42, 22, 23, - -8, -20, 38, 21, -6, 52, 23, 5, - -20, 32, 3, 16, 26, 50, 3, -4, - 48, -77, -3, -4, 21, 23, 30, 11, - -1, 9, -56, -100, 39, 5, -25, 35, - 95, 44, 22, 75, 19, -20, 126, -31, - -8, -24, 37, 35, -32, -4, 20, 47, - 7, -84, 2, 10, 7, 7, 75, -64, - 46, 36, -77, -1, -38, -19, -52, 39, - 26, 41, 82, 38, 67, 62, -6, -25, - -16, -35, -5, -14, 32, 15, -3, -38, - 28, 43, -59, 7, 58, 26, -63, -56 + 22, -1, -7, 7, 29, -27, -31, -17, + -13, 33, 44, -8, 11, 33, 24, 78, + 15, 19, 30, -2, -24, 5, 49, 5, + 36, 29, -14, -11, -48, -33, 21, -42, + -38, -12, 55, -37, 54, -8, 1, 36, + 17, 0, 51, 31, 59, 7, -12, 53, + 4, 32, -14, 48, 5, -10, -16, -8, + 1, -16, -56, -24, -6, 18, -2, 23, + 6, 46, -6, -10, 20, 35, -44, -15, + -49, 36, 16, 5, -7, -79, -67, 12, + 70, -3, -79, -54, -85, -24, 47, -22, + 33, 21, 69, -1, 11, 22, 14, -16, + -16, -22, -28, -11, 11, -41, 31, -26, + -33, -19, -4, 27, 32, -50, 5, -10, + -38, -22, -8, 35, -31, 1, -41, -15, + -11, 44, 28, -17, -41, -23, 17, 2, + -23, -26, -13, -13, -17, 6, 14, -31, + -25, 9, -19, 39, -8, 4, 31, -1, + -45, -11, -28, -92, -46, -15, 21, 118, + -22, 45, -51, 11, -20, -20, -15, 13, + -21, -97, -29, -32, -23, -42, 94, 1, + 23, -8, 63, -3, -46, 19, -26, 32, + -40, -74, -26, 26, -4, -13, 30, -20, + -30, -25, -14, -31, -45, -43, 4, -60, + -48, -12, -34, 2, 2, 3, 13, 15, + 11, 16, 5, 46, -9, -55, -16, -57, + 29, 14, 38, -50, -2, -44, -11, -8, + 52, -27, -38, -7, 20, 47, 17, -59, + 0, 47, 46, -63, 35, -17, 19, 33, + 68, -19, 2, 15, -16, 28, -16, -103, + 26, -35, 47, -39, -60, 30, 31, -23, + -52, -13, 116, 47, -25, 30, 40, 30, + -22, 2, 12, -27, -18, 31, -10, 27, + -8, -66, 12, 14, 4, -26, -28, -13, + 3, 13, -26, -51, 37, 5, 2, -21, + 47, 3, 13, 25, -41, -27, -8, -4, + 5, -76, -33, 28, 10, 9, -46, -74, + 19, 28, 25, 31, 54, -55, 68, 38, + -24, -32, 2, 4, 68, 11, -1, 99, + 5, 16, -2, -74, 40, 26, -26, 33, + 31, -1, -68, 14, -6, 25, 9, 29, + 60, 61, 7, -7, 0, -24, 7, 77, + 4, -1, 16, -7, 13, -15, -19, 28, + -31, -24, -16, 37, 24, 13, 30, 10, + -30, 11, 11, -10, 22, 60, 28, 45, + -3, -40, -62, -5, -102, 9, -32, -27, + -54, 21, 15, -5, 37, -43, -11, 37, + -19, 47, -64, -128, -27, -114, 21, -66, + 59, 46, -3, -12, -87, -9, 4, 19, + -113, -36, 78, 57, -26, -38, -77, -10, + 6, 6, -75, 25, -97, -11, 33, -46, + 1, 13, -21, -33, -20, 16, -6, -3, + -11, -4, -27, 38, 8, -41, -2, -33, + 18, 19, -26, 1, -29, -22, -4, -14, + -55, -11, -80, -3, 11, 34, 90, 51, + 11, 17, 43, 36, 127, -32, 29, 103, + 9, 27, 13, 64, 56, 70, -14, 3, + -12, 10, 37, 3, 12, -22, -10, 46, + 28, 10, 20, 26, -24, 18, 9, 7, + 14, 34, -5, -7, 31, -14, -56, 11, + -18, -8, -17, -7, -10, -40, 10, -33, + -32, -43, 5, 9, 11, -4, 10, 50, + -12, -5, 46, 9, 7, 1, 11, 15, + 91, -17, 7, -50, 23, 6, -30, -99, + 0, -17, 14, 8, -10, -25, -30, -69, + -62, 31, 127, 114, -23, 101, -5, -54, + -6, -22, 7, -56, 39, 18, -29, 0, + 46, 8, -79, 4, -21, 18, -32, 62, + -12, -8, -12, -58, 31, -32, 17, 6, + -24, 25, 24, 9, -4, -19, 45, 6, + 17, -14, 5, -27, 16, -4, -41, 25, + -36, 5, 15, 12, 50, 27, 25, 23, + -44, -69, -9, -19, -48, -8, 4, 12, + -6, 13, -19, -30, -36, 26, 37, -1, + -3, -30, -42, -14, -10, -20, 26, -54, + -27, -44, 4, 73, -26, 90, 32, -69, + -29, -16, 3, 103, 15, -17, 37, 24, + -23, -31, 33, -37, -64, 25, 13, -81, + -28, -32, 27, 5, -35, -23, 15, -22, + 19, -7, 9, 30, 19, -23, 27, -13, + 43, 29, -29, -6, 9, -40, -33, -33, + -32, 9, 11, -48, -8, -23, -52, 46, + 17, -22, -42, 35, -15, -41, 16, 34, + 31, -42, -19, -11, 55, 7, -39, 89, + -11, -33, 20, -14, 22, 32, 3, -17, + -6, 14, 34, 1, 55, -21, -90, -8, + 18, 27, 13, -29, 21, 15, -33, -51, + -9, -11, 4, -16, -18, 23, -4, -4, + 48, 1, 7, 29, -14, -12, -16, 17, + 35, 8, 0, -7, -2, 9, 8, 17, + -6, 53, -32, -21, -50, 5, 99, -60, + -5, -53, 10, -31, 12, -5, 7, 80, + 36, 18, -31, 9, 98, 36, -63, -35, + 4, -13, -28, -24, 28, -13, 18, 16, + -1, -18, -34, 10, 20, 7, 4, 29, + 11, 25, -7, 36, 14, 45, 24, 1, + -16, 30, 6, 35, -6, -11, -24, 13, + -1, 27, 39, 20, 48, -11, -4, -13, + 28, 11, -31, -18, 31, -29, 22, -2, + -20, -16, 5, 30, -12, -28, -3, 93, + -16, 23, 18, -29, 6, -54, -37, 28, + -3, -3, -47, -3, -36, -55, -3, 41, + -10, 47, -2, 23, 42, -7, -71, -27, + 83, -64, 7, -24, 8, 26, -17, 15, + 12, 31, -30, -38, -13, -33, -56, 4, + -17, 20, 18, 1, -30, -5, -6, -31, + -14, -37, 0, 22, 10, -30, 37, -17, + 18, 6, 5, 23, -36, -32, 14, 18, + -13, -61, -52, -69, 44, -30, 16, 18, + -4, -25, 14, 81, 26, -8, -23, -59, + 52, -104, 17, 119, -32, 26, 17, 1, + 23, 45, 29, -64, -57, -14, 73, 21, + -13, -13, 9, -68, -7, -52, 3, 24, + -39, 44, -15, 27, 14, 19, -9, -28, + -11, 5, 3, -34, -2, 2, 22, -6, + -23, 4, 3, 13, -22, -13, -10, -18, + 29, 6, 44, -13, -24, -8, 2, 30, + 14, 43, 6, 17, -73, -6, -7, 20, + -80, -7, -7, -28, 15, -69, -38, -5, + -100, -35, 15, -79, 23, 29, -18, -27, + 21, -66, -37, 8, -22, -39, 48, 4, + -13, 1, -9, 11, -29, 22, 6, -49, + 32, -14, 47, -18, -4, 44, -52, -74, + 43, 30, 23, -14, 5, 0, -27, 4, + -7, 10, -4, 10, 1, -16, 11, -18, + -2, -5, 2, -11, 0, -20, -4, 38, + 74, 59, 39, 64, -10, 26, -3, -40, + -68, 3, -30, -51, 8, -19, -27, -46, + 51, 52, 54, 36, 90, 92, 14, 13, + -5, 0, 16, -62, 16, 11, -47, -37, + -6, -5, 21, 54, -57, 32, 42, -6, + 62, -9, 16, 21, 24, 9, -10, -4, + 33, 50, 13, -15, 1, -35, -48, 18, + -11, -17, -67, -13, 21, 38, -44, 36, + -16, 29, 17, 5, -10, 18, 17, -32, + 2, 8, 22, -56, -15, -32, 40, 43, + 19, 46, -7, -100, -96, 19, 53, 24, + 21, -26, -48, -101, -82, 61, 38, -85, + -28, -34, -1, 63, -5, -5, 39, 39, + -38, 32, -12, -28, 20, 40, -8, 2, + 31, 12, -35, -13, 20, -25, 30, 8, + 3, -13, -9, -20, 2, -13, 24, 37, + -10, 33, 6, 20, -16, -24, -6, -6, + -19, -5, 22, 21, 10, 11, -4, -39, + -1, 6, 49, 41, -15, -57, 21, -62, + 77, -69, -13, 0, -74, 1, -7, -38, + -8, 6, 63, 28, 4, 26, -52, 82, + 63, 13, 45, -33, 44, -52, -65, -21, + -46, -49, 64, -17, 32, 24, 68, -39, + -16, -5, -26, 28, 5, -61, -28, 2, + 24, 11, -12, -33, 9, -37, -3, -28, + 22, -37, -12, 19, 0, -18, -2, 14, + 1, 4, 8, -9, -2, 43, -17, -2, + -66, -31, 56, -40, -87, -36, -2, -4, + -42, -45, -1, 31, -43, -15, 27, 63, + -11, 32, -10, -33, 27, -19, 4, 15, + -26, -34, 29, -4, -39, -65, 14, -20, + -21, -17, -36, 13, 59, 47, -38, -33, + 13, -37, -8, -37, -7, -6, -76, -31, + -12, -46, 7, 24, -21, -30, -14, 9, + 15, -12, -13, 47, -27, -25, -1, -39, + 0, 20, -9, 6, 7, 4, 3, 7, + 39, 50, 22, -7, 14, -20, 1, 70, + -28, 29, -41, 10, -16, -5, -28, -2, + -37, 32, -18, 17, 62, -11, -20, -50, + 36, 21, -62, -12, -56, 52, 50, 17, + 3, 48, 44, -41, -25, 3, 16, -3, + 0, 33, -6, 15, 27, 34, -25, 22, + 9, 17, -11, 36, 16, -2, 12, 21, + -52, 45, -2, -10, 46, 21, -18, 67, + -28, -13, 30, 37, 42, 16, -9, 11, + 75, 7, -64, -40, -10, 29, 57, -23, + 5, 53, -77, 3, -17, -5, 47, -55, + -35, -36, -13, 52, -53, -71, 52, -111, + -23, -26, -28, 29, -43, 55, -19, 43, + -19, 54, -12, -33, -44, -39, -19, -10, + -31, -10, 21, 38, -57, -20, 2, -25, + 8, -6, 50, 12, 15, 25, -25, 15, + -30, -6, 9, 25, 37, 19, -4, 31, + -22, 2, 4, 2, 36, 7, 3, -34, + -80, 36, -10, -2, -5, 31, -36, 49, + -70, 20, -36, 21, 24, 25, -46, -51, + 36, -58, -48, -40, -10, 55, 71, 47, + 10, -1, 1, 2, -46, -68, 16, 13, + 0, -74, -29, 73, -52, -18, -11, 7, + -44, -82, -32, -70, -28, -1, -39, -68, + -6, -41, 12, -22, -16, 40, -11, -25, + 51, -9, 21, 4, 4, -34, 7, -78, + 16, 6, -38, -30, -2, -44, 32, 0, + 22, 64, 5, -72, -2, -14, -10, -16, + -8, -25, 12, 102, -58, 37, -10, -23, + 15, 49, 7, -7, 2, -20, -32, 45, + -6, 48, 28, 30, 33, -1, 22, -6, + 30, 65, -17, 29, 74, 37, -26, -10, + 15, -24, 19, -66, 22, -10, -31, -1, + -18, -9, 11, 37, -4, 45, 5, 41, + 17, 1, 1, 24, -58, 41, 5, -51, + 14, 8, 43, 16, -10, -1, 45, 32, + -64, 3, -33, -25, -3, -27, -68, 12, + 23, -11, -13, -37, -40, 4, -21, -12, + 32, -23, -19, 76, 41, -23, -24, -44, + -65, -1, -15, 1, 71, 63, 5, 20, + -3, 21, -23, 31, -32, 18, -2, 27, + 31, 46, -5, -39, -5, -35, 18, -18, + -40, -10, 3, 12, 2, -2, -22, 40, + 5, -6, 60, 36, 3, 29, -27, 10, + 25, -54, 5, 26, 39, 35, -24, -37, + 30, -91, 28, -4, -21, -27, -39, -6, + 5, 12, -128, 38, -16, 29, -95, -29, + 82, -2, 35, 2, 12, 8, -22, 10, + 80, -47, 2, -25, -73, -79, 16, -30, + -32, -66, 48, 21, -45, -11, -47, 14, + -27, -17, -7, 15, -44, -14, -44, -26, + -32, 26, -23, 17, -7, -28, 26, -6, + 28, 6, -26, 2, 13, -14, -23, -14, + 19, 46, 16, 2, -33, -21, 28, -17, + -42, 44, -37, 1, -39, 28, 84, -46, + 15, 10, 13, -44, 72, -26, 26, 32, + -28, -12, -83, 2, 10, -30, -44, -10, + -28, 53, 45, 65, 0, -25, 57, 36, + -33, 6, 29, 44, -53, 11, 19, -2, + -27, 35, 32, 49, 4, 23, 38, 36, + 24, 10, 51, -39, 4, -7, 26, 37, + -35, 11, -47, -18, 28, 16, -35, 42, + 17, -21, -41, 28, 14, -12, 11, -45, + 7, -43, -15, 18, -5, 38, -40, -50, + -30, -21, 9, -98, 13, 12, 23, 75, + -56, -7, -3, -4, -1, -34, 12, -49, + 11, 26, -18, -28, -17, 33, 13, -14, + 40, 24, -72, -37, 10, 17, -6, 22, + 16, 16, -6, -12, -30, -14, 10, 40, + -23, 12, 15, -3, -15, 13, -56, -4, + -30, 1, -3, -17, 27, 50, -5, 64, + -36, -19, 7, 29, 22, 25, 9, -16, + -58, -69, -40, -61, -71, -14, 42, 93, + 26, 11, -6, -58, -11, 70, -52, 19, + 9, -30, -33, 11, -37, -47, -21, -22, + -40, 10, 47, 4, -23, 17, 48, 41, + -48, 14, 10, 15, 34, -23, -2, -47, + 23, -32, -13, -10, -26, -26, -4, 16, + 38, -14, 0, -12, -7, -7, 20, 44, + -1, -32, -27, -16, 4, -6, -18, 14, + 5, 4, -29, 28, 7, -7, 15, -11, + -20, -45, -36, 16, 84, 34, -59, -30, + 22, 126, 8, 68, 79, -17, 21, -68, + 37, 5, 15, 63, 49, 127, -90, 85, + 43, 7, 16, 9, 6, -45, -57, -43, + 57, 11, -23, -11, -29, 60, -26, 0, + 7, 42, -24, 10, 23, -25, 8, -7, + -40, 19, -17, 35, 4, 27, -39, -91, + 27, -36, 34, 2, 16, -24, 25, 7, + -21, 5, 17, 10, -22, -30, 9, -17, + -61, -26, 33, 21, 58, -51, -14, 69, + -38, 20, 7, 80, -4, -65, -6, -27, + 53, -12, 47, -1, -15, 1, 60, 102, + -79, -4, 12, 9, 22, 37, -8, -4, + 37, 2, -3, -15, -16, -11, -5, 19, + -6, -43, 20, -25, -18, 10, -27, 0, + -28, -27, -11, 10, -18, -2, -4, -16, + 26, 14, -6, 7, -6, 1, 53, -2, + -29, 23, 9, -30, -6, -4, -6, 56, + 70, 0, -33, -20, -17, -9, -24, 46, + -5, -105, 47, -46, -51, 20, 20, -53, + -81, -1, -7, 75, -5, -21, -65, 12, + -52, 22, -50, -12, 49, 54, 76, -81, + 10, 45, -41, -59, 18, -19, 25, 14, + -31, -53, -5, 12, 31, 84, -23, 2, + 7, 2, 10, -32, 39, -2, -12, 1, + -9, 0, -10, -11, 9, 15, -8, -2, + 2, -1, 10, 14, -5, -40, 19, -7, + -7, 26, -4, 2, 1, -27, 35, 32, + 21, -31, 26, 43, -9, 4, -32, 40, + -62, -52, 36, 22, 38, 22, 36, -96, + 6, -10, -23, -49, 15, -33, -18, -3, + 0, 41, 21, -19, 21, 23, -39, -23, + -6, 6, 47, 56, 4, 74, 0, -98, + 29, -47, -14, -36, 21, -22, 22, 16, + 13, 12, 16, -5, 13, 17, -13, -15, + 1, -34, -26, 26, 12, 32, 27, 13, + -67, 27, 2, 8, 10, 18, 16, 20, + -17, -17, 57, -64, 5, 14, 19, 31, + -18, -44, -46, -16, 4, -25, 17, -126, + -24, 39, 4, 8, 55, -25, -34, 39, + -16, 3, 9, 71, 72, -31, -55, 6, + 10, -25, 32, -85, -21, 18, -8, 15, + 12, -27, -7, 1, -21, -2, -5, 48, + -16, 18, 1, -22, -26, 16, 14, -31, + 27, -6, -15, -21, 4, -14, 18, -36 };
static const opus_int8 layer1_recur_weights[1728] = { - -41, 5, 25, 16, -9, 22, 19, 19, - -16, 56, -32, 68, 95, 62, 124, 81, - 30, 112, -24, 30, -12, 104, 49, 24, - -10, 33, 31, 38, 10, 71, -16, 29, - 13, 14, 38, -7, 79, -25, -35, 6, - 9, -90, -16, -109, -49, 35, -15, -127, - 85, 12, -6, 16, 27, 26, 82, 10, - -79, -36, 42, -88, 50, -26, -7, -87, - 127, 19, -96, -75, -3, 6, 8, -4, - 84, -30, -26, 70, -9, -123, -13, -2, - 64, -125, -49, -99, 126, 67, 94, -20, - 54, 110, -15, -48, -91, -1, 64, 4, - 31, -1, 52, -55, 16, 52, 21, 127, - -124, 10, 31, 127, 41, -53, 68, 40, - 16, 48, -19, -69, -16, -100, -29, -97, - -2, 47, -16, 40, 80, 60, 82, -18, - -42, 15, -43, 42, 123, -28, 38, 18, - 35, -8, 38, -119, 103, 33, 9, -25, - 120, -110, -50, -30, 2, -67, -42, -33, - -85, 38, 59, -55, 71, 97, -29, -64, - 14, 32, 1, -128, -26, -121, -33, -8, - 2, -65, 22, 85, -55, -57, 17, 37, - 2, -78, 28, -54, 17, -31, 31, 26, - -8, 25, 23, -52, -15, -58, -18, 4, - -23, -27, 4, 5, -85, 34, 29, -1, - -80, -8, 1, 22, -32, 22, -27, 95, - -55, -70, -127, -46, -58, -7, 38, -4, - 127, -14, -7, 71, 62, 43, -57, -54, - 60, -58, -28, -43, -50, 127, 101, 15, - 25, 49, -53, 17, -81, -60, 83, -32, - 46, 57, -59, 19, 49, -12, -109, 20, - -19, -50, -7, 14, 79, 59, -30, -57, - -5, -60, 13, 5, 85, -33, -89, 9, - 127, 13, -38, 127, 57, 99, 14, -26, - -105, 3, -38, -77, 41, -19, 28, -31, - 23, -88, -22, -60, -29, 14, -84, 9, - 8, -1, -21, 49, 58, 15, -4, -6, - 100, -9, -26, -54, 94, 84, 25, 25, - 27, 49, -1, 0, -104, -5, 33, -10, - 40, 54, 15, 62, -1, -39, -54, 18, - 41, 15, -17, -84, -29, 31, -10, -65, - -47, 1, -66, -17, -43, 34, 5, -61, - 94, 107, 37, 55, 46, 57, 63, -66, - -14, 13, -82, 7, 10, -11, 72, 123, - 102, 1, -112, -71, 121, 56, -24, -24, - 127, 5, -24, -49, 104, -27, 56, -15, - 2, 76, 107, 24, 83, 86, 90, 45, - 116, 124, 48, 29, 102, 36, 10, 55, - 29, -29, 12, -84, -18, -50, -8, 17, - -28, -52, -64, -3, 118, 54, 51, 45, - -59, 47, -1, -35, 22, -10, 12, -79, - -24, 4, 60, 92, -67, 125, -90, 29, - -48, 64, -104, 23, -12, -51, -53, -37, - -66, 21, 113, 75, 37, 9, -20, 0, - 5, -75, 32, 60, 12, 35, -68, -16, - 48, -22, 40, -19, 40, 77, -51, 63, - 23, 85, 8, 9, -41, -59, 98, 9, - -24, -48, 47, 4, 48, 48, 4, 91, - -69, 21, 21, 70, 22, 15, 57, 111, - -64, -18, -8, 49, 43, -26, 7, -82, - 111, -21, 1, -52, 59, -82, 106, 5, - -5, -45, 35, -15, -2, 57, 62, 57, - 68, -6, -27, -51, 50, 60, -21, -12, - -127, 34, 89, -117, -59, -83, -76, 80, - -59, -29, 56, -18, 27, -70, -67, 46, - -92, -87, 12, -116, 71, -72, 4, -51, - -64, 70, 6, -104, -67, 42, 3, -5, - 98, 41, -20, -1, 64, -32, -58, 51, - -69, -126, 46, -21, -75, -27, -52, 52, - -12, -17, 28, -1, -7, -21, -3, 88, - 68, 7, 3, 67, -7, 59, 33, 25, - -4, -45, -38, 46, 72, -24, -92, -25, - -108, 43, -35, -90, 3, -6, 22, -80, - 91, -35, 111, 8, -54, 21, -125, 31, - -77, -121, -17, -56, -18, -125, -126, 36, - -24, 35, 1, 0, 25, -20, 14, 12, - 3, 90, -87, 17, -54, -60, -58, -9, - 22, -35, 32, 12, 5, 17, -92, 3, - 8, -54, -128, -22, -75, -41, -22, 127, - 73, -9, -6, 12, -71, 106, -54, 120, - -17, -51, 94, 13, -24, -67, -7, 35, - -69, 27, -48, -77, 56, -60, -48, 64, - 38, 88, -20, 20, -123, 42, -91, 55, - -98, -41, 78, -107, 120, -82, -91, 17, - 21, 31, 7, 31, 67, 32, -42, -9, - 126, 49, -41, -103, -66, -8, -32, -64, - 18, -56, 25, -14, 35, 35, -29, -18, - -49, 2, 75, -46, -86, 47, -71, -14, - 18, 28, 15, 40, 33, -18, -45, 60, - -52, 3, 43, 61, -115, -52, -1, 21, - -28, 27, 17, -33, -125, 29, -9, 126, - 91, 37, -37, 106, -39, 61, -122, 5, - -125, -123, 23, 35, -22, 12, 81, 20, - -36, 76, 34, 63, 53, -64, 46, 24, - 41, 122, -22, 61, -14, -21, 10, 94, - 27, -27, 78, 3, 2, 15, 14, 20, - -3, -15, -11, -128, -35, -58, 8, -43, - 83, -26, 48, 44, 8, -14, -10, 56, - -48, 12, -39, -40, -17, 66, 69, 33, - -34, -16, -32, 48, -86, 2, 21, 2, - 51, 31, -39, 57, -20, 16, -24, 66, - 65, -6, 64, -13, 2, 73, -85, -7, - -127, -53, 49, -68, -44, 26, 79, -6, - 78, 17, -34, 45, 33, 16, 17, 56, - -76, 28, 44, 12, 15, 35, 21, 66, - -47, 53, 27, -13, 13, -30, 55, -31, - 67, -63, -4, 51, -40, 49, 51, 14, - -38, -62, -49, 50, 26, 3, -16, -39, - 42, 7, 30, -27, 108, -73, -29, -6, - 29, 42, 19, -77, -40, -17, 57, -19, - 90, 70, -72, -40, -30, 65, 84, -4, - 2, 9, 33, -73, 73, 81, 8, -21, - -22, -57, -5, -58, -32, 14, 34, 10, - 38, 7, 41, 0, -25, 38, 3, -125, - 62, -25, -20, 13, 20, 14, -9, -27, - 13, 31, -128, -85, 72, -63, -49, -18, - 81, 47, 37, 63, -10, -10, -66, 4, - -116, 53, 14, 49, 6, 37, 38, -4, - -47, 64, 15, 0, -110, -19, 45, 7, - -37, 20, 21, 22, 51, 17, -39, 71, - -59, -1, -35, -8, -73, -106, -30, 5, - -68, -18, -36, 35, -21, -17, -1, 4, - -24, -28, 5, 4, 11, -50, 27, 84, - -16, -60, -86, -12, -31, -8, 43, 52, - 94, 14, 29, 46, -34, 6, -2, 51, - -36, -56, -9, -48, -8, 26, 78, 3, - -31, -46, 25, 14, -8, -9, -47, 1, - -23, 65, 42, -5, 104, 96, -70, 18, - -69, 84, -2, -28, -19, -35, 5, -49, - -88, -117, 9, 82, -71, -58, 33, 82, - 17, 40, -93, 32, 5, 21, 38, -23, - -77, -40, 48, -8, -10, 22, -27, -47, - -49, 46, 67, -17, 81, -61, 92, 54, - 8, -71, 127, 23, -61, 51, 13, 32, - -35, -52, -32, -4, -47, 20, 0, -62, - -126, 3, -17, -127, 18, -70, 11, -29, - -87, -27, -19, -13, -9, -128, -26, 69, - -67, -29, 66, 49, 1, -119, -73, -7, - -55, -9, 48, -45, -27, 26, 57, 12, - 9, 51, -98, -14, -21, -37, 88, 23, - -37, 65, -11, 69, -7, -34, 16, 33, - 36, 94, 56, 5, 63, -38, 25, -55, - -81, -74, 21, 30, -4, -16, 52, 37, - 4, 8, -48, 8, 127, -75, -56, -79, - -76, 61, 17, -27, -63, -56, -53, 39, - -109, -50, -77, -7, -100, -88, 23, -108, - -120, 120, -87, -122, -87, 36, 63, -65, - 3, -32, 84, 55, 71, 126, 10, 37, - 29, 16, 45, 40, 75, -5, 40, -105, - -7, -15, -25, 12, -78, 46, -9, -114, - 90, 50, -41, -23, 6, -58, 75, 19, - 62, -33, -38, -24, 66, 22, 66, -4, - 124, 29, -55, -29, 42, -17, -123, -79, - -8, -3, -2, 19, 59, -33, -39, 41, - 51, 0, 45, -15, 67, 8, -42, 2, - -20, -49, 95, -32, 5, -56, 37, 21, - -11, -18, -8, 53, 17, 43, 14, 81, - -90, -40, 69, -33, 59, 28, -8, 44, - 47, -11, -26, -92, 31, 86, 12, -39, - 9, -28, -22, -6, -42, -4, -23, 6, - -57, 109, -46, -12, 10, -77, -66, -24, - -26, 119, 78, 43, -17, -14, -45, 73, - -4, 13, -44, -78, 26, -64, -60, -99, - -104, 31, -16, -93, -64, 48, -17, 108, - -71, 12, 34, -63, 24, 14, -28, -48, - 1, 94, -29, -27, 2, -5, -53, 18, - 56, 91, -19, -28, 45, -38, -55, -106, - -10, 41, 49, -38, -4, 1, -84, -37, - -77, 4, -66, 19, 56, 41, -82, 114, - 97, -50, 83, -38, 31, -126, -22, -94, - -86, 44, 37, 35, 11, 60, 49, 3, - 26, 18, 124, -64, 50, -72, 17, -80, - 16, 30, 113, 34, -19, 32, 63, -30, - 95, -88, 55, 126, 127, 107, 49, 83, - -17, -75, 1, -107, 27, 20, 115, 31, - 57, -11, -36, 41, 91, 31, 58, -38, - -12, 4, 39, 38, 37, 13, -73, 33, - 11, 43, 35, 23, -86, 36, -10, 19, - 34, -10, -35, -8, 47, -105, -60, 75, - -25, 127, 14, 106, 81, -9, -46, 21, - 35, 42, -6, 3, 118, 78, 37, 33, - 22, 98, 46, 50, -23, 81, 122, 18, - 30, 64, 105, 101, -116, -33, -66, 18, - -59, -99, -125, -79, 19, 127, 120, -98, - 13, 27, 32, 26, 3, 20, 120, 10, - 29, 91, 51, 78, 28, -61, 34, -12, - 54, -19, 51, -17, 29, 56, 53, -124, - -10, -97, 9, -10, -9, 2, 9, 33, - 33, 44, -47, 36, 52, -54, 63, 88, - -11, 70, 68, 113, 11, 127, 65, 88, - 126, -12, 28, 81, 57, 123, 71, 26, - 5, 117, 16, 16, -9, 92, 50, -35, - 27, 27, -47, 39, 46, 13, 19, 61, - 106, 74, -31, 52, 94, 22, -40, -72, - 57, 10, 45, 25, 5, -5, 36, -7, - -43, 40, 40, -81, -36, -47, 8, -18, - 63, 31, -48, 58, -49, -19, 25, -5, - 63, -76, 9, -2, 1, 127, 19, -24, - 32, 36, 23, 25, -49, 104, 13, 3, - 75, 12, -31, 38, 122, 20, 49, 35, - -14, 16, 44, 101, -12, 119, 50, -48, - -7, -11, 15, -103, -9, -39, 4, -54, - -67, 32, 30, 47, 40, 60, 9, -17, - -31, 47, 13, 127, -21, -4, 50, 28, - 34, -4, -72, -24, -2, -41, 3, 26, - -34, -90, 82, 1, -83, 47, 40, -8, - -4, 4, -65, -10, 115, 43, 104, 42, - 32, 85, -78, 12, 59, 71, 113, 42, - -20, 50, -29, 61, 6, 104, 74, 65, - -73, 12, 93, 77, 21, 24, -14, 84, - 58, 105, 37, 37, 85, -53, 76, -95, - 26, -17, -51, -64, -75, -19, -1, 27, - 25, -49, 46, 73, 19, -13, -98, -8, - 1, -37, -69, -81, 28, 2, 7, -40, - -47, 55, 29, 53, 33, 103, -53, -15, - 19, -9, 7, 120, -21, 28, 27, 13 + 20, 67, -99, 12, 41, -25, 49, -44, + 35, 81, 110, 47, 34, -66, -14, 14, + -60, 34, 29, -73, 10, 41, 35, 89, + 7, -35, 22, 7, 27, -20, -6, 56, + 26, 66, 6, 33, -55, 53, 1, -21, + 14, 17, 68, 55, 59, 0, 18, -9, + 5, -41, 6, -5, -114, -12, 29, 42, + -23, 10, 81, -27, 20, -53, -30, -62, + 40, 95, 25, -4, 3, 18, -8, -15, + -29, -82, 2, -57, -3, -61, -29, -29, + 49, 2, -55, 5, -69, -99, -49, -51, + 6, -25, 12, 89, 44, -33, 5, 41, + 1, 23, -37, -37, -28, -48, 3, 4, + -41, -30, -57, -35, -39, -1, -13, -56, + -5, 50, 49, 41, -4, -4, 33, -22, + -1, 33, 34, 18, 40, -42, 12, 1, + -6, -2, 18, 17, 39, 44, 11, 65, + -60, -45, 10, 91, 21, 9, -62, -11, + 8, 69, 37, 24, -30, 21, 26, -27, + 1, -28, 24, 66, -8, 6, -71, 34, + 24, 44, 58, -78, -19, 57, 17, -60, + 1, 12, -3, -1, -40, 22, 11, -5, + 25, 12, 1, 72, 79, 7, -50, 23, + 18, 13, 21, -11, -20, 5, 77, -94, + 24, 15, 57, -51, 3, 36, 53, -1, + 4, 14, 30, -31, 22, 40, 32, -11, + -34, -36, -59, 58, 25, 21, -54, -23, + 40, 46, 18, 0, 12, 54, -96, -99, + -59, 5, 119, -38, 50, 55, 12, -16, + 67, 0, 34, 35, 39, 35, -1, 69, + 24, 27, -30, -35, -4, -70, 2, -44, + -7, -6, 19, -9, 60, 44, -21, -10, + 37, 43, -16, -3, 30, -15, -65, 31, + -55, 18, -98, 76, 64, 25, 24, -18, + -7, -68, -10, 38, 27, -60, 36, 33, + 16, 30, 34, -39, -37, 31, 12, 53, + -54, 14, -26, -49, -128, -13, -5, -22, + -11, -85, 55, -8, -51, -11, -33, -10, + -31, -76, -41, 23, 44, -40, -54, -127, + -101, 19, -23, -15, 15, 27, 58, -60, + 8, 14, -33, 1, 48, -9, -11, -123, + 3, 53, 23, 4, -28, 22, 2, -29, + -67, 36, 12, 7, 55, -21, 88, 20, + -1, -21, -17, 3, 41, 32, -10, -14, + -5, -57, 67, 57, 21, 23, -2, -27, + -73, -24, 120, 21, 18, -35, 42, -7, + 3, -45, -25, 76, -34, 50, 11, -54, + -91, 3, -113, -20, -5, 47, 15, -47, + 17, 27, -3, -26, -7, 10, 7, 74, + -40, 64, -7, -5, -24, -49, -24, -3, + -10, 27, -17, -8, -3, 14, -27, 33, + 13, 39, 28, -7, -38, 29, 16, 44, + 19, 55, -3, 9, -13, -57, 43, 43, + 31, 0, -93, -17, 19, -56, 4, -12, + -25, 37, -85, -13, -118, 33, -17, 56, + 71, -80, -4, 6, -11, -18, 47, -52, + 25, 9, 48, -107, 1, 21, 20, -3, + 10, -16, -4, 24, 17, 31, -61, -18, + -50, 24, -10, 12, 71, 26, 11, -3, + 4, 1, 0, -7, -40, 18, 38, -34, + 38, 17, 8, -34, 2, 21, 123, -32, + -26, 43, 14, -34, -1, -9, 37, -16, + 6, -17, -62, 68, 22, 17, 11, -75, + 33, -80, 62, -9, -75, 76, 36, -41, + -8, -40, -11, -71, 40, -39, 62, -49, + -81, 16, -9, -52, 52, 61, 17, -103, + -27, -10, -8, -54, -57, 21, 23, -16, + -52, 36, 18, 10, -5, 8, 15, -29, + 5, -19, -37, 8, -53, 6, 19, -37, + 38, -17, 48, 10, 0, 81, 46, 70, + -29, 101, 11, 44, -44, -3, 24, 11, + 3, 14, -9, 11, 14, -45, 13, 46, + -3, -57, 68, 44, 63, 98, 25, -28, + -23, 15, 32, -10, 53, -6, -2, -9, + -6, 16, -107, -11, -11, -28, 59, 57, + -22, 38, 42, 83, 27, 5, 29, -30, + 12, -21, -13, 31, 38, -21, 58, -10, + -10, -15, -2, -5, 11, 12, -73, -28, + -38, 22, 2, -25, 73, -52, -12, -55, + 32, -63, 21, 51, 33, 52, -26, 55, + -26, -26, 57, -32, -4, -52, -61, 21, + -33, -91, -51, 69, -90, -53, -38, -44, + 12, -76, -20, 77, -45, -7, 86, 43, + -109, -33, -105, -40, -121, -10, 0, -72, + 45, -51, -75, -49, -38, -1, -62, 18, + -1, 30, -44, -14, -10, -67, 40, -10, + -34, 46, -64, -32, 29, -13, 33, 3, + -32, -5, 28, -27, -25, 93, 24, 68, + -40, 57, 23, -3, -21, -58, 17, -39, + -17, -22, -89, 11, 18, -46, 27, 24, + 46, 127, 61, 87, 31, 127, -36, 47, + -23, 47, 127, -24, 110, 122, 30, 100, + 0, 96, -12, 6, 50, 44, -13, 73, + 4, 55, -11, -15, 49, 42, -6, 20, + -35, 58, 18, 38, 42, 72, 19, -21, + 11, 9, -37, 7, 29, 31, 16, -17, + 13, -50, 19, 5, -23, 51, -16, -5, + 4, -24, 76, 10, -53, -28, -7, -65, + 74, 40, -16, -29, 32, -16, -49, -35, + -3, 59, -96, -50, -43, -43, -61, -15, + -8, -36, -34, -33, -14, 11, -3, -39, + 4, -114, -123, -11, -49, -21, 14, -56, + 1, 43, -63, 26, 40, 18, -10, -26, + -14, -15, -35, -35, -11, 32, -44, -67, + 2, 22, 7, 3, -9, -30, -51, -28, + 28, 6, -22, 16, 34, -25, -52, -54, + -8, -6, 5, 8, 20, -16, -17, -44, + 27, 3, 31, -5, -48, -1, -3, 116, + 11, 71, -31, -47, 109, 50, -22, -12, + -57, 32, 66, 8, -25, -93, -54, -10, + 19, -76, -34, 97, 48, -36, -18, -30, + -39, -26, -12, 28, 14, 12, -12, -31, + 38, 2, 10, 4, -40, 20, 16, -61, + 2, 64, 39, 5, 15, 33, 40, -61, + -49, 93, -10, 33, 28, -11, -27, -18, + 39, -62, -6, -6, 62, 11, -8, 38, + -67, 12, 27, 39, -27, 123, -18, -6, + -65, 83, -64, 20, 19, -11, 33, 24, + 17, 56, 78, 7, -15, 54, -101, -9, + 115, -96, 50, 51, 35, 34, 27, 37, + -40, -11, 8, -36, 42, -45, 2, -23, + 0, 67, -8, -9, -13, 50, -14, -27, + 4, 0, -8, -14, 30, -9, 29, 15, + 9, -38, 37, -8, 50, -46, 54, 41, + -11, -8, -11, -26, 39, 45, 14, -26, + -17, -27, 69, 38, 39, 98, 66, 0, + 42, 123, -101, -19, -83, 117, -32, 56, + 10, 12, -88, 79, -53, 56, 63, 95, + -62, 9, 36, -13, -79, -16, 37, -46, + 35, -34, 14, 17, -54, 5, 21, -7, + 7, 63, 56, 15, 27, -76, -25, 4, + -26, -63, 28, -67, -52, 43, -47, -70, + 40, -12, 40, -66, -37, 0, 35, 37, + -53, 4, -17, -51, 11, 21, 14, -34, + -4, 24, -42, 29, 22, 7, 28, 12, + 37, 39, -39, -19, 65, -60, -50, -2, + 1, 82, 39, 19, -23, -43, -22, -67, + -35, -34, 32, 102, 81, 127, 36, 67, + -45, 1, -67, -52, -4, 35, 20, 28, + 71, 86, -35, -9, -83, -34, 12, 9, + -23, 2, 14, 28, -23, 7, -25, 45, + 7, 17, -37, 0, -19, 31, 26, 40, + -27, -16, 17, 5, -21, 23, 24, 96, + -55, 52, -19, -14, -6, 1, 50, -34, + 86, -53, 38, 2, -52, -36, -13, 60, + -85, -120, 32, 7, -12, 22, 70, -7, + -94, 38, -76, -31, -20, 15, -28, 7, + 6, 40, 53, 88, 3, 38, 18, -8, + -22, -23, 51, 37, -9, 13, -32, 25, + -21, 27, 31, 20, 18, -9, -13, 1, + 21, -24, -13, 39, 15, -11, -29, -36, + 18, 15, 8, 27, 21, -94, -1, -22, + 49, 66, -1, 6, -3, -40, -18, 6, + 28, 12, 33, -59, 62, 60, -48, 90, + -1, 108, 9, 18, -2, 27, 77, -65, + 82, -48, -38, -19, -11, 127, 50, 66, + 18, -13, -22, 60, -38, 40, -14, -26, + -13, 38, 67, 57, 30, 33, 26, 36, + 38, -17, 27, -28, 20, 12, -64, 18, + 5, -33, -27, 13, -26, 32, 35, -5, + -48, -14, 92, 43, -47, -14, 40, 11, + 51, 66, 22, -63, -16, -61, 4, -28, + 27, 20, -33, -30, -21, -29, -53, 31, + -40, 24, 43, -4, -19, 21, 67, 20, + 100, -16, -93, 78, -6, -18, -52, -37, + -9, 66, -31, -8, 26, 18, 4, 24, + -22, 17, -2, -13, 27, 0, 8, -18, + -25, 5, -21, -24, -7, 18, -93, 21, + 7, 2, -75, 69, 50, -5, -15, -17, + 60, -42, 55, 1, -4, 3, 10, 46, + 16, -13, 45, -7, -10, -44, -108, 49, + 2, -15, -64, -12, -72, 32, -38, -45, + 10, -54, 13, -13, -27, -36, -64, 58, + -62, -101, 88, -86, -71, -39, -9, -128, + 32, 15, -4, 54, -16, -39, -26, -36, + 46, 48, -64, -10, 19, 30, -13, 34, + -8, 50, 60, -22, -6, -11, -30, 5, + 50, 32, 56, 0, 25, 6, 68, 11, + -29, 45, -9, -12, 4, 1, 18, -49, + 0, -38, -19, 90, 29, 35, 51, 8, + -48, 96, -1, -12, -9, -32, -63, -65, + -7, 38, 89, 28, -85, -28, -23, -25, + -128, 56, 79, -36, 99, -6, -37, 7, + -13, -69, -46, -29, 25, 64, -21, 17, + 1, 42, -66, 1, 80, 26, -32, 21, + 15, 15, 6, 6, -10, 15, 127, 5, + 38, 27, 87, -57, -25, 11, 72, -21, + -5, 11, -13, -66, 78, 36, -3, 41, + -21, 8, -33, 23, 73, 28, 57, -25, + -5, 4, -22, -47, 15, 4, -57, -72, + 33, 1, 18, 2, 53, -71, -99, -21, + -3, -111, 108, 71, -14, 82, 25, 61, + -48, 5, 9, -51, -20, -25, -3, 14, + -33, 14, -3, -34, 22, 12, -19, -38, + -16, 2, 21, 16, 26, -31, 75, 44, + -31, 16, 26, 66, 17, -9, -22, -22, + 22, -44, 22, 27, 2, 58, -14, 10, + -73, -42, 55, -25, -61, 72, -1, 30, + -58, -25, 63, 26, -48, -40, 26, -30, + 60, 8, -17, -1, -18, -20, 43, -20, + -4, -28, 127, -106, 29, 70, 64, -27, + 39, -33, -5, -88, -40, -52, 26, 44, + -17, 23, 2, -49, 22, -9, -8, 86, + 49, -43, -60, 1, 10, 45, 36, -53, + -4, 33, 38, 48, -72, 1, 19, 21, + -65, 4, -5, -62, 27, -25, 17, -6, + 6, -45, -39, -46, 4, 26, 127, -9, + 18, -33, -18, -3, 33, 2, -5, 15, + -26, -22, -117, -63, -17, -59, 61, -74, + 7, -47, -58, -128, -67, 15, -16, -128, + 12, 2, 20, 9, -48, -40, 43, 3, + -40, -16, -38, -6, -22, -28, -16, -59, + -22, 6, -5, 11, -12, -66, -40, 27, + -62, -44, -19, 38, -3, 39, -8, 40, + -24, 13, 21, 50, -60, -22, 53, -29, + -6, 1, 22, -59, 0, 17, -39, 115 };
static const opus_int8 layer1_bias[72] = { - 47, 0, -35, 34, 104, 95, 120, -3, - -5, 105, -41, 79, -27, 122, 46, 89, - 89, 34, 71, 94, 70, 68, 79, 18, - 44, 25, -15, -22, 18, -22, 9, -14, - -45, 5, 1, 20, 38, 22, 15, 24, - 28, -14, -2, 10, 8, -27, -18, -46, - -5, 34, -43, -33, 12, 13, 0, 0, - 9, -47, 28, 14, -18, 17, 8, 10, - -38, -23, -20, -11, 59, 45, 76, 24 + -42, 20, 16, 0, 105, 60, 1, -97, + 24, 60, 18, 13, 62, 25, 127, 34, + 79, 55, 118, 127, 95, 31, -4, 87, + 21, 12, 2, -14, 18, 23, 8, 17, + -1, -8, 5, 4, 24, 37, 21, 13, + 36, 13, 17, 18, 37, 30, 33, 1, + 8, -16, -11, -5, -31, -3, -5, 0, + 6, 3, 58, -7, -1, -16, 5, -13, + 16, 10, -2, -14, 11, -4, 3, -11 };
static const opus_int8 layer2_weights[48] = { - 122, -51, 118, -67, -23, -128, 126, -124, - 127, 12, 2, -68, 117, -80, 3, 127, - 71, 127, -128, -83, -15, 93, 13, 40, - 27, -127, 65, 101, 84, 16, 85, 117, - 127, -120, -59, -55, -128, -51, -128, -65, - 127, 1, 99, 127, -60, 127, -128, 50 + -113, -88, 31, -128, -126, -61, 85, -35, + 118, -128, -61, 127, -128, -17, -128, 127, + 104, -9, -128, 33, 45, 127, 5, 83, + 84, -128, -85, -128, -45, 48, -53, -128, + 46, 127, -17, 125, 117, -41, -117, -91, + -127, -68, -1, -89, -80, 32, 106, 7 };
static const opus_int8 layer2_bias[2] = { - 34, 115 + 14, 117 };
const DenseLayer layer0 = { diff --git a/media/libopus/src/opus.c b/media/libopus/src/opus.c index cdbd13a11cd78..538b5ea74ebee 100644 --- a/media/libopus/src/opus.c +++ b/media/libopus/src/opus.c @@ -252,7 +252,7 @@ int opus_packet_parse_impl(const unsigned char *data, opus_int32 len, /* Number of frames encoded in bits 0 to 5 */ ch = *data++; count = ch&0x3F; - if (count <= 0 || framesize*count > 5760) + if (count <= 0 || framesize*(opus_int32)count > 5760) return OPUS_INVALID_PACKET; len--; /* Padding flag is bit 6 */ diff --git a/media/libopus/src/opus_encoder.c b/media/libopus/src/opus_encoder.c index 1c5a8b3387356..253fe9e880b70 100644 --- a/media/libopus/src/opus_encoder.c +++ b/media/libopus/src/opus_encoder.c @@ -112,7 +112,7 @@ struct OpusEncoder { opus_val16 delay_buffer[MAX_ENCODER_BUFFER*2]; #ifndef DISABLE_FLOAT_API int detected_bandwidth; - int nb_no_activity_frames; + int nb_no_activity_ms_Q1; opus_val32 peak_signal_energy; #endif int nonfinal_frame; /* current frame is not the final in a packet */ @@ -837,7 +837,7 @@ static opus_int32 compute_equiv_rate(opus_int32 bitrate, int channels,
#ifndef DISABLE_FLOAT_API
-static int is_digital_silence(const opus_val16* pcm, int frame_size, int channels, int lsb_depth) +int is_digital_silence(const opus_val16* pcm, int frame_size, int channels, int lsb_depth) { int silence = 0; opus_val32 sample_max = 0; @@ -892,44 +892,29 @@ static opus_val32 compute_frame_energy(const opus_val16 *pcm, int frame_size, in #endif
/* Decides if DTX should be turned on (=1) or off (=0) */ -static int decide_dtx_mode(float activity_probability, /* probability that current frame contains speech/music */ - int *nb_no_activity_frames, /* number of consecutive frames with no activity */ - opus_val32 peak_signal_energy, /* peak energy of desired signal detected so far */ - const opus_val16 *pcm, /* input pcm signal */ - int frame_size, /* frame size */ - int channels, - int is_silence, /* only digital silence detected in this frame */ - int arch - ) -{ - opus_val32 noise_energy; - - if (!is_silence) - { - if (activity_probability < DTX_ACTIVITY_THRESHOLD) /* is noise */ - { - noise_energy = compute_frame_energy(pcm, frame_size, channels, arch); +static int decide_dtx_mode(opus_int activity, /* indicates if this frame contains speech/music */ + int *nb_no_activity_ms_Q1, /* number of consecutive milliseconds with no activity, in Q1 */ + int frame_size_ms_Q1 /* number of miliseconds in this update, in Q1 */ + )
- /* but is sufficiently quiet */ - is_silence = peak_signal_energy >= (PSEUDO_SNR_THRESHOLD * noise_energy); - } - } - - if (is_silence) +{ + if (!activity) { - /* The number of consecutive DTX frames should be within the allowed bounds */ - (*nb_no_activity_frames)++; - - if (*nb_no_activity_frames > NB_SPEECH_FRAMES_BEFORE_DTX) + /* The number of consecutive DTX frames should be within the allowed bounds. + Note that the allowed bound is defined in the SILK headers and assumes 20 ms + frames. As this function can be called with any frame length, a conversion to + milliseconds is done before the comparisons. */ + (*nb_no_activity_ms_Q1) += frame_size_ms_Q1; + if (*nb_no_activity_ms_Q1 > NB_SPEECH_FRAMES_BEFORE_DTX*20*2) { - if (*nb_no_activity_frames <= (NB_SPEECH_FRAMES_BEFORE_DTX + MAX_CONSECUTIVE_DTX)) + if (*nb_no_activity_ms_Q1 <= (NB_SPEECH_FRAMES_BEFORE_DTX + MAX_CONSECUTIVE_DTX)*20*2) /* Valid frame for DTX! */ return 1; else - (*nb_no_activity_frames) = NB_SPEECH_FRAMES_BEFORE_DTX; + (*nb_no_activity_ms_Q1) = NB_SPEECH_FRAMES_BEFORE_DTX*20*2; } } else - (*nb_no_activity_frames) = 0; + (*nb_no_activity_ms_Q1) = 0;
return 0; } @@ -1102,6 +1087,8 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ int analysis_read_subframe_bak=-1; int is_silence = 0; #endif + opus_int activity = VAD_NO_DECISION; + VARDECL(opus_val16, tmp_prefill);
ALLOC_STACK; @@ -1140,21 +1127,19 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ if (st->silk_mode.complexity >= 7 && st->Fs>=16000) #endif { - if (is_digital_silence(pcm, frame_size, st->channels, lsb_depth)) - { - is_silence = 1; - } else { - analysis_read_pos_bak = st->analysis.read_pos; - analysis_read_subframe_bak = st->analysis.read_subframe; - run_analysis(&st->analysis, celt_mode, analysis_pcm, analysis_size, frame_size, - c1, c2, analysis_channels, st->Fs, - lsb_depth, downmix, &analysis_info); - } + is_silence = is_digital_silence(pcm, frame_size, st->channels, lsb_depth); + analysis_read_pos_bak = st->analysis.read_pos; + analysis_read_subframe_bak = st->analysis.read_subframe; + run_analysis(&st->analysis, celt_mode, analysis_pcm, analysis_size, frame_size, + c1, c2, analysis_channels, st->Fs, + lsb_depth, downmix, &analysis_info);
/* Track the peak signal energy */ if (!is_silence && analysis_info.activity_probability > DTX_ACTIVITY_THRESHOLD) st->peak_signal_energy = MAX32(MULT16_32_Q15(QCONST16(0.999f, 15), st->peak_signal_energy), compute_frame_energy(pcm, frame_size, st->channels, st->arch)); + } else if (st->analysis.initialized) { + tonality_analysis_reset(&st->analysis); } #else (void)analysis_pcm; @@ -1171,6 +1156,20 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ if (!is_silence) st->voice_ratio = -1;
+ if (is_silence) + { + activity = !is_silence; + } else if (analysis_info.valid) + { + activity = analysis_info.activity_probability >= DTX_ACTIVITY_THRESHOLD; + if (!activity) + { + /* Mark as active if this noise frame is sufficiently loud */ + opus_val32 noise_energy = compute_frame_energy(pcm, frame_size, st->channels, st->arch); + activity = st->peak_signal_energy < (PSEUDO_SNR_THRESHOLD * noise_energy); + } + } + st->detected_bandwidth = 0; if (analysis_info.valid) { @@ -1338,6 +1337,14 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ equiv_rate = compute_equiv_rate(st->bitrate_bps, st->stream_channels, st->Fs/frame_size, st->use_vbr, 0, st->silk_mode.complexity, st->silk_mode.packetLossPercentage);
+ /* Allow SILK DTX if DTX is enabled but the generalized DTX cannot be used, + e.g. because of the complexity setting or sample rate. */ +#ifndef DISABLE_FLOAT_API + st->silk_mode.useDTX = st->use_dtx && !(analysis_info.valid || is_silence); +#else + st->silk_mode.useDTX = st->use_dtx; +#endif + /* Mode selection depending on application and signal type */ if (st->application == OPUS_APPLICATION_RESTRICTED_LOWDELAY) { @@ -1386,13 +1393,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ if (st->silk_mode.useInBandFEC && st->silk_mode.packetLossPercentage > (128-voice_est)>>4) st->mode = MODE_SILK_ONLY; /* When encoding voice and DTX is enabled but the generalized DTX cannot be used, - because of complexity and sampling frequency settings, switch to SILK DTX and - set the encoder to SILK mode */ -#ifndef DISABLE_FLOAT_API - st->silk_mode.useDTX = st->use_dtx && !(analysis_info.valid || is_silence); -#else - st->silk_mode.useDTX = st->use_dtx; -#endif + use SILK in order to make use of its DTX. */ if (st->silk_mode.useDTX && voice_est > 100) st->mode = MODE_SILK_ONLY; #endif @@ -1668,7 +1669,6 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ if (st->mode != MODE_CELT_ONLY) { opus_int32 total_bitRate, celt_rate; - opus_int activity; #ifdef FIXED_POINT const opus_int16 *pcm_silk; #else @@ -1676,14 +1676,6 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ ALLOC(pcm_silk, st->channels*frame_size, opus_int16); #endif
- activity = VAD_NO_DECISION; -#ifndef DISABLE_FLOAT_API - if( analysis_info.valid ) { - /* Inform SILK about the Opus VAD decision */ - activity = ( analysis_info.activity_probability >= DTX_ACTIVITY_THRESHOLD ); - } -#endif - /* Distribute bits between SILK and CELT */ total_bitRate = 8 * bytes_target * frame_rate; if( st->mode == MODE_HYBRID ) { @@ -2144,14 +2136,15 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ #ifndef DISABLE_FLOAT_API if (st->use_dtx && (analysis_info.valid || is_silence)) { - if (decide_dtx_mode(analysis_info.activity_probability, &st->nb_no_activity_frames, - st->peak_signal_energy, pcm, frame_size, st->channels, is_silence, st->arch)) + if (decide_dtx_mode(activity, &st->nb_no_activity_ms_Q1, 2*1000*frame_size/st->Fs)) { st->rangeFinal = 0; data[0] = gen_toc(st->mode, st->Fs/frame_size, curr_bandwidth, st->stream_channels); RESTORE_STACK; return 1; } + } else { + st->nb_no_activity_ms_Q1 = 0; } #endif
@@ -2629,7 +2622,6 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...) goto bad_arg; } st->variable_duration = value; - celt_encoder_ctl(celt_enc, OPUS_SET_EXPERT_FRAME_DURATION(value)); } break; case OPUS_GET_EXPERT_FRAME_DURATION_REQUEST: @@ -2726,7 +2718,33 @@ int opus_encoder_ctl(OpusEncoder *st, int request, ...) ret = celt_encoder_ctl(celt_enc, OPUS_SET_ENERGY_MASK(value)); } break; - + case OPUS_GET_IN_DTX_REQUEST: + { + opus_int32 *value = va_arg(ap, opus_int32*); + if (!value) + { + goto bad_arg; + } + if (st->silk_mode.useDTX && (st->prev_mode == MODE_SILK_ONLY || st->prev_mode == MODE_HYBRID)) { + /* DTX determined by Silk. */ + silk_encoder *silk_enc = (silk_encoder*)(void *)((char*)st+st->silk_enc_offset); + *value = silk_enc->state_Fxx[0].sCmn.noSpeechCounter >= NB_SPEECH_FRAMES_BEFORE_DTX; + /* Stereo: check second channel unless only the middle channel was encoded. */ + if(*value == 1 && st->silk_mode.nChannelsInternal == 2 && silk_enc->prev_decode_only_middle == 0) { + *value = silk_enc->state_Fxx[1].sCmn.noSpeechCounter >= NB_SPEECH_FRAMES_BEFORE_DTX; + } + } +#ifndef DISABLE_FLOAT_API + else if (st->use_dtx) { + /* DTX determined by Opus. */ + *value = st->nb_no_activity_ms_Q1 >= NB_SPEECH_FRAMES_BEFORE_DTX*20*2; + } +#endif + else { + *value = 0; + } + } + break; case CELT_GET_MODE_REQUEST: { const CELTMode ** value = va_arg(ap, const CELTMode**); diff --git a/media/libopus/src/opus_multistream_decoder.c b/media/libopus/src/opus_multistream_decoder.c index 562103cd0a317..a2837c3549505 100644 --- a/media/libopus/src/opus_multistream_decoder.c +++ b/media/libopus/src/opus_multistream_decoder.c @@ -251,8 +251,11 @@ int opus_multistream_decode_native( } packet_offset = 0; ret = opus_decode_native(dec, data, len, buf, frame_size, decode_fec, s!=st->layout.nb_streams-1, &packet_offset, soft_clip); - data += packet_offset; - len -= packet_offset; + if (!do_plc) + { + data += packet_offset; + len -= packet_offset; + } if (ret <= 0) { RESTORE_STACK; @@ -487,7 +490,7 @@ int opus_multistream_decoder_ctl_va_list(OpusMSDecoder *st, int request, OpusDecoder **value; stream_id = va_arg(ap, opus_int32); if (stream_id<0 || stream_id >= st->layout.nb_streams) - ret = OPUS_BAD_ARG; + goto bad_arg; value = va_arg(ap, OpusDecoder**); if (!value) { diff --git a/media/libopus/src/opus_multistream_encoder.c b/media/libopus/src/opus_multistream_encoder.c index 9cb9bf3458f7d..213e3eb2c2265 100644 --- a/media/libopus/src/opus_multistream_encoder.c +++ b/media/libopus/src/opus_multistream_encoder.c @@ -443,7 +443,8 @@ static int opus_multistream_encoder_init_impl( char *ptr;
if ((channels>255) || (channels<1) || (coupled_streams>streams) || - (streams<1) || (coupled_streams<0) || (streams>255-coupled_streams)) + (streams<1) || (coupled_streams<0) || (streams>255-coupled_streams) || + (streams+coupled_streams>channels)) return OPUS_BAD_ARG;
st->arch = opus_select_arch(); @@ -459,8 +460,7 @@ static int opus_multistream_encoder_init_impl( st->layout.mapping[i] = mapping[i]; if (!validate_layout(&st->layout)) return OPUS_BAD_ARG; - if (mapping_type == MAPPING_TYPE_SURROUND && - !validate_encoder_layout(&st->layout)) + if (!validate_encoder_layout(&st->layout)) return OPUS_BAD_ARG; if (mapping_type == MAPPING_TYPE_AMBISONICS && !validate_ambisonics(st->layout.nb_channels, NULL, NULL)) @@ -595,7 +595,8 @@ OpusMSEncoder *opus_multistream_encoder_create( int ret; OpusMSEncoder *st; if ((channels>255) || (channels<1) || (coupled_streams>streams) || - (streams<1) || (coupled_streams<0) || (streams>255-coupled_streams)) + (streams<1) || (coupled_streams<0) || (streams>255-coupled_streams) || + (streams+coupled_streams>channels)) { if (error) *error = OPUS_BAD_ARG; @@ -1249,7 +1250,7 @@ int opus_multistream_encoder_ctl_va_list(OpusMSEncoder *st, int request, OpusEncoder **value; stream_id = va_arg(ap, opus_int32); if (stream_id<0 || stream_id >= st->layout.nb_streams) - ret = OPUS_BAD_ARG; + goto bad_arg; value = va_arg(ap, OpusEncoder**); if (!value) { diff --git a/media/libopus/src/opus_private.h b/media/libopus/src/opus_private.h index 09783ceefcab7..5e2463f546fe7 100644 --- a/media/libopus/src/opus_private.h +++ b/media/libopus/src/opus_private.h @@ -135,6 +135,7 @@ typedef void (*opus_copy_channel_out_func)( typedef void (*downmix_func)(const void *, opus_val32 *, int, int, int, int, int); void downmix_float(const void *_x, opus_val32 *sub, int subframe, int offset, int c1, int c2, int C); void downmix_int(const void *_x, opus_val32 *sub, int subframe, int offset, int c1, int c2, int C); +int is_digital_silence(const opus_val16* pcm, int frame_size, int channels, int lsb_depth);
int encode_size(int size, unsigned char *data);
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit cb6f44feab79b27d4141bd7a4045f98f33f7148f Author: Tom Ritter tom@mozilla.com AuthorDate: Mon Apr 11 16:51:56 2022 +0000
Bug 1762614: Remove unneccessary files r=kinetik,a=dsmith
Differential Revision: https://phabricator.services.mozilla.com/D142718 --- media/libopus/celt/arm/celt_ne10_fft.c | 173 ----- media/libopus/celt/arm/celt_ne10_mdct.c | 258 ------- media/libopus/celt/x86/celt_lpc_sse.c | 89 --- .../libopus/silk/fixed/x86/burg_modified_FIX_sse.c | 377 --------- media/libopus/silk/fixed/x86/vector_ops_FIX_sse.c | 88 --- media/libopus/silk/x86/NSQ_del_dec_sse.c | 859 --------------------- media/libopus/silk/x86/NSQ_sse.c | 719 ----------------- media/libopus/silk/x86/VAD_sse.c | 277 ------- media/libopus/silk/x86/VQ_WMat_EC_sse.c | 142 ---- 9 files changed, 2982 deletions(-)
diff --git a/media/libopus/celt/arm/celt_ne10_fft.c b/media/libopus/celt/arm/celt_ne10_fft.c deleted file mode 100644 index b8c60abe98b83..0000000000000 --- a/media/libopus/celt/arm/celt_ne10_fft.c +++ /dev/null @@ -1,173 +0,0 @@ -/* Copyright (c) 2015 Xiph.Org Foundation - Written by Viswanath Puttagunta */ -/** - @file celt_ne10_fft.c - @brief ARM Neon optimizations for fft using NE10 library - */ - -/* - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef SKIP_CONFIG_H -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif -#endif - -#include <NE10_dsp.h> -#include "os_support.h" -#include "kiss_fft.h" -#include "stack_alloc.h" - -#if !defined(FIXED_POINT) -# define NE10_FFT_ALLOC_C2C_TYPE_NEON ne10_fft_alloc_c2c_float32_neon -# define NE10_FFT_CFG_TYPE_T ne10_fft_cfg_float32_t -# define NE10_FFT_STATE_TYPE_T ne10_fft_state_float32_t -# define NE10_FFT_DESTROY_C2C_TYPE ne10_fft_destroy_c2c_float32 -# define NE10_FFT_CPX_TYPE_T ne10_fft_cpx_float32_t -# define NE10_FFT_C2C_1D_TYPE_NEON ne10_fft_c2c_1d_float32_neon -#else -# define NE10_FFT_ALLOC_C2C_TYPE_NEON(nfft) ne10_fft_alloc_c2c_int32_neon(nfft) -# define NE10_FFT_CFG_TYPE_T ne10_fft_cfg_int32_t -# define NE10_FFT_STATE_TYPE_T ne10_fft_state_int32_t -# define NE10_FFT_DESTROY_C2C_TYPE ne10_fft_destroy_c2c_int32 -# define NE10_FFT_DESTROY_C2C_TYPE ne10_fft_destroy_c2c_int32 -# define NE10_FFT_CPX_TYPE_T ne10_fft_cpx_int32_t -# define NE10_FFT_C2C_1D_TYPE_NEON ne10_fft_c2c_1d_int32_neon -#endif - -#if defined(CUSTOM_MODES) - -/* nfft lengths in NE10 that support scaled fft */ -# define NE10_FFTSCALED_SUPPORT_MAX 4 -static const int ne10_fft_scaled_support[NE10_FFTSCALED_SUPPORT_MAX] = { - 480, 240, 120, 60 -}; - -int opus_fft_alloc_arm_neon(kiss_fft_state *st) -{ - int i; - size_t memneeded = sizeof(struct arch_fft_state); - - st->arch_fft = (arch_fft_state *)opus_alloc(memneeded); - if (!st->arch_fft) - return -1; - - for (i = 0; i < NE10_FFTSCALED_SUPPORT_MAX; i++) { - if(st->nfft == ne10_fft_scaled_support[i]) - break; - } - if (i == NE10_FFTSCALED_SUPPORT_MAX) { - /* This nfft length (scaled fft) is not supported in NE10 */ - st->arch_fft->is_supported = 0; - st->arch_fft->priv = NULL; - } - else { - st->arch_fft->is_supported = 1; - st->arch_fft->priv = (void *)NE10_FFT_ALLOC_C2C_TYPE_NEON(st->nfft); - if (st->arch_fft->priv == NULL) { - return -1; - } - } - return 0; -} - -void opus_fft_free_arm_neon(kiss_fft_state *st) -{ - NE10_FFT_CFG_TYPE_T cfg; - - if (!st->arch_fft) - return; - - cfg = (NE10_FFT_CFG_TYPE_T)st->arch_fft->priv; - if (cfg) - NE10_FFT_DESTROY_C2C_TYPE(cfg); - opus_free(st->arch_fft); -} -#endif - -void opus_fft_neon(const kiss_fft_state *st, - const kiss_fft_cpx *fin, - kiss_fft_cpx *fout) -{ - NE10_FFT_STATE_TYPE_T state; - NE10_FFT_CFG_TYPE_T cfg = &state; - VARDECL(NE10_FFT_CPX_TYPE_T, buffer); - SAVE_STACK; - ALLOC(buffer, st->nfft, NE10_FFT_CPX_TYPE_T); - - if (!st->arch_fft->is_supported) { - /* This nfft length (scaled fft) not supported in NE10 */ - opus_fft_c(st, fin, fout); - } - else { - memcpy((void *)cfg, st->arch_fft->priv, sizeof(NE10_FFT_STATE_TYPE_T)); - state.buffer = (NE10_FFT_CPX_TYPE_T *)&buffer[0]; -#if !defined(FIXED_POINT) - state.is_forward_scaled = 1; - - NE10_FFT_C2C_1D_TYPE_NEON((NE10_FFT_CPX_TYPE_T *)fout, - (NE10_FFT_CPX_TYPE_T *)fin, - cfg, 0); -#else - NE10_FFT_C2C_1D_TYPE_NEON((NE10_FFT_CPX_TYPE_T *)fout, - (NE10_FFT_CPX_TYPE_T *)fin, - cfg, 0, 1); -#endif - } - RESTORE_STACK; -} - -void opus_ifft_neon(const kiss_fft_state *st, - const kiss_fft_cpx *fin, - kiss_fft_cpx *fout) -{ - NE10_FFT_STATE_TYPE_T state; - NE10_FFT_CFG_TYPE_T cfg = &state; - VARDECL(NE10_FFT_CPX_TYPE_T, buffer); - SAVE_STACK; - ALLOC(buffer, st->nfft, NE10_FFT_CPX_TYPE_T); - - if (!st->arch_fft->is_supported) { - /* This nfft length (scaled fft) not supported in NE10 */ - opus_ifft_c(st, fin, fout); - } - else { - memcpy((void *)cfg, st->arch_fft->priv, sizeof(NE10_FFT_STATE_TYPE_T)); - state.buffer = (NE10_FFT_CPX_TYPE_T *)&buffer[0]; -#if !defined(FIXED_POINT) - state.is_backward_scaled = 0; - - NE10_FFT_C2C_1D_TYPE_NEON((NE10_FFT_CPX_TYPE_T *)fout, - (NE10_FFT_CPX_TYPE_T *)fin, - cfg, 1); -#else - NE10_FFT_C2C_1D_TYPE_NEON((NE10_FFT_CPX_TYPE_T *)fout, - (NE10_FFT_CPX_TYPE_T *)fin, - cfg, 1, 0); -#endif - } - RESTORE_STACK; -} diff --git a/media/libopus/celt/arm/celt_ne10_mdct.c b/media/libopus/celt/arm/celt_ne10_mdct.c deleted file mode 100644 index 293c3efd7a242..0000000000000 --- a/media/libopus/celt/arm/celt_ne10_mdct.c +++ /dev/null @@ -1,258 +0,0 @@ -/* Copyright (c) 2015 Xiph.Org Foundation - Written by Viswanath Puttagunta */ -/** - @file celt_ne10_mdct.c - @brief ARM Neon optimizations for mdct using NE10 library - */ - -/* - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef SKIP_CONFIG_H -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif -#endif - -#include "kiss_fft.h" -#include "_kiss_fft_guts.h" -#include "mdct.h" -#include "stack_alloc.h" - -void clt_mdct_forward_neon(const mdct_lookup *l, - kiss_fft_scalar *in, - kiss_fft_scalar * OPUS_RESTRICT out, - const opus_val16 *window, - int overlap, int shift, int stride, int arch) -{ - int i; - int N, N2, N4; - VARDECL(kiss_fft_scalar, f); - VARDECL(kiss_fft_cpx, f2); - const kiss_fft_state *st = l->kfft[shift]; - const kiss_twiddle_scalar *trig; - - SAVE_STACK; - - N = l->n; - trig = l->trig; - for (i=0;i<shift;i++) - { - N >>= 1; - trig += N; - } - N2 = N>>1; - N4 = N>>2; - - ALLOC(f, N2, kiss_fft_scalar); - ALLOC(f2, N4, kiss_fft_cpx); - - /* Consider the input to be composed of four blocks: [a, b, c, d] */ - /* Window, shuffle, fold */ - { - /* Temp pointers to make it really clear to the compiler what we're doing */ - const kiss_fft_scalar * OPUS_RESTRICT xp1 = in+(overlap>>1); - const kiss_fft_scalar * OPUS_RESTRICT xp2 = in+N2-1+(overlap>>1); - kiss_fft_scalar * OPUS_RESTRICT yp = f; - const opus_val16 * OPUS_RESTRICT wp1 = window+(overlap>>1); - const opus_val16 * OPUS_RESTRICT wp2 = window+(overlap>>1)-1; - for(i=0;i<((overlap+3)>>2);i++) - { - /* Real part arranged as -d-cR, Imag part arranged as -b+aR*/ - *yp++ = MULT16_32_Q15(*wp2, xp1[N2]) + MULT16_32_Q15(*wp1,*xp2); - *yp++ = MULT16_32_Q15(*wp1, *xp1) - MULT16_32_Q15(*wp2, xp2[-N2]); - xp1+=2; - xp2-=2; - wp1+=2; - wp2-=2; - } - wp1 = window; - wp2 = window+overlap-1; - for(;i<N4-((overlap+3)>>2);i++) - { - /* Real part arranged as a-bR, Imag part arranged as -c-dR */ - *yp++ = *xp2; - *yp++ = *xp1; - xp1+=2; - xp2-=2; - } - for(;i<N4;i++) - { - /* Real part arranged as a-bR, Imag part arranged as -c-dR */ - *yp++ = -MULT16_32_Q15(*wp1, xp1[-N2]) + MULT16_32_Q15(*wp2, *xp2); - *yp++ = MULT16_32_Q15(*wp2, *xp1) + MULT16_32_Q15(*wp1, xp2[N2]); - xp1+=2; - xp2-=2; - wp1+=2; - wp2-=2; - } - } - /* Pre-rotation */ - { - kiss_fft_scalar * OPUS_RESTRICT yp = f; - const kiss_twiddle_scalar *t = &trig[0]; - for(i=0;i<N4;i++) - { - kiss_fft_cpx yc; - kiss_twiddle_scalar t0, t1; - kiss_fft_scalar re, im, yr, yi; - t0 = t[i]; - t1 = t[N4+i]; - re = *yp++; - im = *yp++; - yr = S_MUL(re,t0) - S_MUL(im,t1); - yi = S_MUL(im,t0) + S_MUL(re,t1); - yc.r = yr; - yc.i = yi; - f2[i] = yc; - } - } - - opus_fft(st, f2, (kiss_fft_cpx *)f, arch); - - /* Post-rotate */ - { - /* Temp pointers to make it really clear to the compiler what we're doing */ - const kiss_fft_cpx * OPUS_RESTRICT fp = (kiss_fft_cpx *)f; - kiss_fft_scalar * OPUS_RESTRICT yp1 = out; - kiss_fft_scalar * OPUS_RESTRICT yp2 = out+stride*(N2-1); - const kiss_twiddle_scalar *t = &trig[0]; - /* Temp pointers to make it really clear to the compiler what we're doing */ - for(i=0;i<N4;i++) - { - kiss_fft_scalar yr, yi; - yr = S_MUL(fp->i,t[N4+i]) - S_MUL(fp->r,t[i]); - yi = S_MUL(fp->r,t[N4+i]) + S_MUL(fp->i,t[i]); - *yp1 = yr; - *yp2 = yi; - fp++; - yp1 += 2*stride; - yp2 -= 2*stride; - } - } - RESTORE_STACK; -} - -void clt_mdct_backward_neon(const mdct_lookup *l, - kiss_fft_scalar *in, - kiss_fft_scalar * OPUS_RESTRICT out, - const opus_val16 * OPUS_RESTRICT window, - int overlap, int shift, int stride, int arch) -{ - int i; - int N, N2, N4; - VARDECL(kiss_fft_scalar, f); - const kiss_twiddle_scalar *trig; - const kiss_fft_state *st = l->kfft[shift]; - - N = l->n; - trig = l->trig; - for (i=0;i<shift;i++) - { - N >>= 1; - trig += N; - } - N2 = N>>1; - N4 = N>>2; - - ALLOC(f, N2, kiss_fft_scalar); - - /* Pre-rotate */ - { - /* Temp pointers to make it really clear to the compiler what we're doing */ - const kiss_fft_scalar * OPUS_RESTRICT xp1 = in; - const kiss_fft_scalar * OPUS_RESTRICT xp2 = in+stride*(N2-1); - kiss_fft_scalar * OPUS_RESTRICT yp = f; - const kiss_twiddle_scalar * OPUS_RESTRICT t = &trig[0]; - for(i=0;i<N4;i++) - { - kiss_fft_scalar yr, yi; - yr = S_MUL(*xp2, t[i]) + S_MUL(*xp1, t[N4+i]); - yi = S_MUL(*xp1, t[i]) - S_MUL(*xp2, t[N4+i]); - yp[2*i] = yr; - yp[2*i+1] = yi; - xp1+=2*stride; - xp2-=2*stride; - } - } - - opus_ifft(st, (kiss_fft_cpx *)f, (kiss_fft_cpx*)(out+(overlap>>1)), arch); - - /* Post-rotate and de-shuffle from both ends of the buffer at once to make - it in-place. */ - { - kiss_fft_scalar * yp0 = out+(overlap>>1); - kiss_fft_scalar * yp1 = out+(overlap>>1)+N2-2; - const kiss_twiddle_scalar *t = &trig[0]; - /* Loop to (N4+1)>>1 to handle odd N4. When N4 is odd, the - middle pair will be computed twice. */ - for(i=0;i<(N4+1)>>1;i++) - { - kiss_fft_scalar re, im, yr, yi; - kiss_twiddle_scalar t0, t1; - re = yp0[0]; - im = yp0[1]; - t0 = t[i]; - t1 = t[N4+i]; - /* We'd scale up by 2 here, but instead it's done when mixing the windows */ - yr = S_MUL(re,t0) + S_MUL(im,t1); - yi = S_MUL(re,t1) - S_MUL(im,t0); - re = yp1[0]; - im = yp1[1]; - yp0[0] = yr; - yp1[1] = yi; - - t0 = t[(N4-i-1)]; - t1 = t[(N2-i-1)]; - /* We'd scale up by 2 here, but instead it's done when mixing the windows */ - yr = S_MUL(re,t0) + S_MUL(im,t1); - yi = S_MUL(re,t1) - S_MUL(im,t0); - yp1[0] = yr; - yp0[1] = yi; - yp0 += 2; - yp1 -= 2; - } - } - - /* Mirror on both sides for TDAC */ - { - kiss_fft_scalar * OPUS_RESTRICT xp1 = out+overlap-1; - kiss_fft_scalar * OPUS_RESTRICT yp1 = out; - const opus_val16 * OPUS_RESTRICT wp1 = window; - const opus_val16 * OPUS_RESTRICT wp2 = window+overlap-1; - - for(i = 0; i < overlap/2; i++) - { - kiss_fft_scalar x1, x2; - x1 = *xp1; - x2 = *yp1; - *yp1++ = MULT16_32_Q15(*wp2, x2) - MULT16_32_Q15(*wp1, x1); - *xp1-- = MULT16_32_Q15(*wp1, x2) + MULT16_32_Q15(*wp2, x1); - wp1++; - wp2--; - } - } - RESTORE_STACK; -} diff --git a/media/libopus/celt/x86/celt_lpc_sse.c b/media/libopus/celt/x86/celt_lpc_sse.c deleted file mode 100644 index 5478568849aa4..0000000000000 --- a/media/libopus/celt/x86/celt_lpc_sse.c +++ /dev/null @@ -1,89 +0,0 @@ -/* Copyright (c) 2014, Cisco Systems, INC - Written by XiangMingZhu WeiZhou MinPeng YanWang - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <xmmintrin.h> -#include <emmintrin.h> -#include <smmintrin.h> -#include "celt_lpc.h" -#include "stack_alloc.h" -#include "mathops.h" -#include "pitch.h" -#include "x86cpu.h" - -#if defined(FIXED_POINT) - -void celt_fir_sse4_1(const opus_val16 *x, - const opus_val16 *num, - opus_val16 *y, - int N, - int ord, - int arch) -{ - int i,j; - VARDECL(opus_val16, rnum); - - __m128i vecNoA; - opus_int32 noA ; - SAVE_STACK; - - ALLOC(rnum, ord, opus_val16); - for(i=0;i<ord;i++) - rnum[i] = num[ord-i-1]; - noA = EXTEND32(1) << SIG_SHIFT >> 1; - vecNoA = _mm_set_epi32(noA, noA, noA, noA); - - for (i=0;i<N-3;i+=4) - { - opus_val32 sums[4] = {0}; - __m128i vecSum, vecX; - - xcorr_kernel(rnum, x+i-ord, sums, ord, arch); - - vecSum = _mm_loadu_si128((__m128i *)sums); - vecSum = _mm_add_epi32(vecSum, vecNoA); - vecSum = _mm_srai_epi32(vecSum, SIG_SHIFT); - vecX = OP_CVTEPI16_EPI32_M64(x + i); - vecSum = _mm_add_epi32(vecSum, vecX); - vecSum = _mm_packs_epi32(vecSum, vecSum); - _mm_storel_epi64((__m128i *)(y + i), vecSum); - } - for (;i<N;i++) - { - opus_val32 sum = 0; - for (j=0;j<ord;j++) - sum = MAC16_16(sum, rnum[j], x[i+j-ord]); - y[i] = SATURATE16(ADD32(EXTEND32(x[i]), PSHR32(sum, SIG_SHIFT))); - } - - RESTORE_STACK; -} - -#endif diff --git a/media/libopus/silk/fixed/x86/burg_modified_FIX_sse.c b/media/libopus/silk/fixed/x86/burg_modified_FIX_sse.c deleted file mode 100644 index 3c3583c5fc37c..0000000000000 --- a/media/libopus/silk/fixed/x86/burg_modified_FIX_sse.c +++ /dev/null @@ -1,377 +0,0 @@ -/* Copyright (c) 2014, Cisco Systems, INC - Written by XiangMingZhu WeiZhou MinPeng YanWang - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <xmmintrin.h> -#include <emmintrin.h> -#include <smmintrin.h> - -#include "SigProc_FIX.h" -#include "define.h" -#include "tuning_parameters.h" -#include "pitch.h" -#include "celt/x86/x86cpu.h" - -#define MAX_FRAME_SIZE 384 /* subfr_length * nb_subfr = ( 0.005 * 16000 + 16 ) * 4 = 384 */ - -#define QA 25 -#define N_BITS_HEAD_ROOM 2 -#define MIN_RSHIFTS -16 -#define MAX_RSHIFTS (32 - QA) - -/* Compute reflection coefficients from input signal */ -void silk_burg_modified_sse4_1( - opus_int32 *res_nrg, /* O Residual energy */ - opus_int *res_nrg_Q, /* O Residual energy Q value */ - opus_int32 A_Q16[], /* O Prediction coefficients (length order) */ - const opus_int16 x[], /* I Input signal, length: nb_subfr * ( D + subfr_length ) */ - const opus_int32 minInvGain_Q30, /* I Inverse of max prediction gain */ - const opus_int subfr_length, /* I Input signal subframe length (incl. D preceding samples) */ - const opus_int nb_subfr, /* I Number of subframes stacked in x */ - const opus_int D, /* I Order */ - int arch /* I Run-time architecture */ -) -{ - opus_int k, n, s, lz, rshifts, rshifts_extra, reached_max_gain; - opus_int32 C0, num, nrg, rc_Q31, invGain_Q30, Atmp_QA, Atmp1, tmp1, tmp2, x1, x2; - const opus_int16 *x_ptr; - opus_int32 C_first_row[ SILK_MAX_ORDER_LPC ]; - opus_int32 C_last_row[ SILK_MAX_ORDER_LPC ]; - opus_int32 Af_QA[ SILK_MAX_ORDER_LPC ]; - opus_int32 CAf[ SILK_MAX_ORDER_LPC + 1 ]; - opus_int32 CAb[ SILK_MAX_ORDER_LPC + 1 ]; - opus_int32 xcorr[ SILK_MAX_ORDER_LPC ]; - - __m128i FIRST_3210, LAST_3210, ATMP_3210, TMP1_3210, TMP2_3210, T1_3210, T2_3210, PTR_3210, SUBFR_3210, X1_3210, X2_3210; - __m128i CONST1 = _mm_set1_epi32(1); - - silk_assert( subfr_length * nb_subfr <= MAX_FRAME_SIZE ); - - /* Compute autocorrelations, added over subframes */ - silk_sum_sqr_shift( &C0, &rshifts, x, nb_subfr * subfr_length ); - if( rshifts > MAX_RSHIFTS ) { - C0 = silk_LSHIFT32( C0, rshifts - MAX_RSHIFTS ); - silk_assert( C0 > 0 ); - rshifts = MAX_RSHIFTS; - } else { - lz = silk_CLZ32( C0 ) - 1; - rshifts_extra = N_BITS_HEAD_ROOM - lz; - if( rshifts_extra > 0 ) { - rshifts_extra = silk_min( rshifts_extra, MAX_RSHIFTS - rshifts ); - C0 = silk_RSHIFT32( C0, rshifts_extra ); - } else { - rshifts_extra = silk_max( rshifts_extra, MIN_RSHIFTS - rshifts ); - C0 = silk_LSHIFT32( C0, -rshifts_extra ); - } - rshifts += rshifts_extra; - } - CAb[ 0 ] = CAf[ 0 ] = C0 + silk_SMMUL( SILK_FIX_CONST( FIND_LPC_COND_FAC, 32 ), C0 ) + 1; /* Q(-rshifts) */ - silk_memset( C_first_row, 0, SILK_MAX_ORDER_LPC * sizeof( opus_int32 ) ); - if( rshifts > 0 ) { - for( s = 0; s < nb_subfr; s++ ) { - x_ptr = x + s * subfr_length; - for( n = 1; n < D + 1; n++ ) { - C_first_row[ n - 1 ] += (opus_int32)silk_RSHIFT64( - silk_inner_prod16_aligned_64( x_ptr, x_ptr + n, subfr_length - n, arch ), rshifts ); - } - } - } else { - for( s = 0; s < nb_subfr; s++ ) { - int i; - opus_int32 d; - x_ptr = x + s * subfr_length; - celt_pitch_xcorr(x_ptr, x_ptr + 1, xcorr, subfr_length - D, D, arch ); - for( n = 1; n < D + 1; n++ ) { - for ( i = n + subfr_length - D, d = 0; i < subfr_length; i++ ) - d = MAC16_16( d, x_ptr[ i ], x_ptr[ i - n ] ); - xcorr[ n - 1 ] += d; - } - for( n = 1; n < D + 1; n++ ) { - C_first_row[ n - 1 ] += silk_LSHIFT32( xcorr[ n - 1 ], -rshifts ); - } - } - } - silk_memcpy( C_last_row, C_first_row, SILK_MAX_ORDER_LPC * sizeof( opus_int32 ) ); - - /* Initialize */ - CAb[ 0 ] = CAf[ 0 ] = C0 + silk_SMMUL( SILK_FIX_CONST( FIND_LPC_COND_FAC, 32 ), C0 ) + 1; /* Q(-rshifts) */ - - invGain_Q30 = (opus_int32)1 << 30; - reached_max_gain = 0; - for( n = 0; n < D; n++ ) { - /* Update first row of correlation matrix (without first element) */ - /* Update last row of correlation matrix (without last element, stored in reversed order) */ - /* Update C * Af */ - /* Update C * flipud(Af) (stored in reversed order) */ - if( rshifts > -2 ) { - for( s = 0; s < nb_subfr; s++ ) { - x_ptr = x + s * subfr_length; - x1 = -silk_LSHIFT32( (opus_int32)x_ptr[ n ], 16 - rshifts ); /* Q(16-rshifts) */ - x2 = -silk_LSHIFT32( (opus_int32)x_ptr[ subfr_length - n - 1 ], 16 - rshifts ); /* Q(16-rshifts) */ - tmp1 = silk_LSHIFT32( (opus_int32)x_ptr[ n ], QA - 16 ); /* Q(QA-16) */ - tmp2 = silk_LSHIFT32( (opus_int32)x_ptr[ subfr_length - n - 1 ], QA - 16 ); /* Q(QA-16) */ - for( k = 0; k < n; k++ ) { - C_first_row[ k ] = silk_SMLAWB( C_first_row[ k ], x1, x_ptr[ n - k - 1 ] ); /* Q( -rshifts ) */ - C_last_row[ k ] = silk_SMLAWB( C_last_row[ k ], x2, x_ptr[ subfr_length - n + k ] ); /* Q( -rshifts ) */ - Atmp_QA = Af_QA[ k ]; - tmp1 = silk_SMLAWB( tmp1, Atmp_QA, x_ptr[ n - k - 1 ] ); /* Q(QA-16) */ - tmp2 = silk_SMLAWB( tmp2, Atmp_QA, x_ptr[ subfr_length - n + k ] ); /* Q(QA-16) */ - } - tmp1 = silk_LSHIFT32( -tmp1, 32 - QA - rshifts ); /* Q(16-rshifts) */ - tmp2 = silk_LSHIFT32( -tmp2, 32 - QA - rshifts ); /* Q(16-rshifts) */ - for( k = 0; k <= n; k++ ) { - CAf[ k ] = silk_SMLAWB( CAf[ k ], tmp1, x_ptr[ n - k ] ); /* Q( -rshift ) */ - CAb[ k ] = silk_SMLAWB( CAb[ k ], tmp2, x_ptr[ subfr_length - n + k - 1 ] ); /* Q( -rshift ) */ - } - } - } else { - for( s = 0; s < nb_subfr; s++ ) { - x_ptr = x + s * subfr_length; - x1 = -silk_LSHIFT32( (opus_int32)x_ptr[ n ], -rshifts ); /* Q( -rshifts ) */ - x2 = -silk_LSHIFT32( (opus_int32)x_ptr[ subfr_length - n - 1 ], -rshifts ); /* Q( -rshifts ) */ - tmp1 = silk_LSHIFT32( (opus_int32)x_ptr[ n ], 17 ); /* Q17 */ - tmp2 = silk_LSHIFT32( (opus_int32)x_ptr[ subfr_length - n - 1 ], 17 ); /* Q17 */ - - X1_3210 = _mm_set1_epi32( x1 ); - X2_3210 = _mm_set1_epi32( x2 ); - TMP1_3210 = _mm_setzero_si128(); - TMP2_3210 = _mm_setzero_si128(); - for( k = 0; k < n - 3; k += 4 ) { - PTR_3210 = OP_CVTEPI16_EPI32_M64( &x_ptr[ n - k - 1 - 3 ] ); - SUBFR_3210 = OP_CVTEPI16_EPI32_M64( &x_ptr[ subfr_length - n + k ] ); - FIRST_3210 = _mm_loadu_si128( (__m128i *)&C_first_row[ k ] ); - PTR_3210 = _mm_shuffle_epi32( PTR_3210, _MM_SHUFFLE( 0, 1, 2, 3 ) ); - LAST_3210 = _mm_loadu_si128( (__m128i *)&C_last_row[ k ] ); - ATMP_3210 = _mm_loadu_si128( (__m128i *)&Af_QA[ k ] ); - - T1_3210 = _mm_mullo_epi32( PTR_3210, X1_3210 ); - T2_3210 = _mm_mullo_epi32( SUBFR_3210, X2_3210 ); - - ATMP_3210 = _mm_srai_epi32( ATMP_3210, 7 ); - ATMP_3210 = _mm_add_epi32( ATMP_3210, CONST1 ); - ATMP_3210 = _mm_srai_epi32( ATMP_3210, 1 ); - - FIRST_3210 = _mm_add_epi32( FIRST_3210, T1_3210 ); - LAST_3210 = _mm_add_epi32( LAST_3210, T2_3210 ); - - PTR_3210 = _mm_mullo_epi32( ATMP_3210, PTR_3210 ); - SUBFR_3210 = _mm_mullo_epi32( ATMP_3210, SUBFR_3210 ); - - _mm_storeu_si128( (__m128i *)&C_first_row[ k ], FIRST_3210 ); - _mm_storeu_si128( (__m128i *)&C_last_row[ k ], LAST_3210 ); - - TMP1_3210 = _mm_add_epi32( TMP1_3210, PTR_3210 ); - TMP2_3210 = _mm_add_epi32( TMP2_3210, SUBFR_3210 ); - } - - TMP1_3210 = _mm_add_epi32( TMP1_3210, _mm_unpackhi_epi64(TMP1_3210, TMP1_3210 ) ); - TMP2_3210 = _mm_add_epi32( TMP2_3210, _mm_unpackhi_epi64(TMP2_3210, TMP2_3210 ) ); - TMP1_3210 = _mm_add_epi32( TMP1_3210, _mm_shufflelo_epi16(TMP1_3210, 0x0E ) ); - TMP2_3210 = _mm_add_epi32( TMP2_3210, _mm_shufflelo_epi16(TMP2_3210, 0x0E ) ); - - tmp1 += _mm_cvtsi128_si32( TMP1_3210 ); - tmp2 += _mm_cvtsi128_si32( TMP2_3210 ); - - for( ; k < n; k++ ) { - C_first_row[ k ] = silk_MLA( C_first_row[ k ], x1, x_ptr[ n - k - 1 ] ); /* Q( -rshifts ) */ - C_last_row[ k ] = silk_MLA( C_last_row[ k ], x2, x_ptr[ subfr_length - n + k ] ); /* Q( -rshifts ) */ - Atmp1 = silk_RSHIFT_ROUND( Af_QA[ k ], QA - 17 ); /* Q17 */ - tmp1 = silk_MLA( tmp1, x_ptr[ n - k - 1 ], Atmp1 ); /* Q17 */ - tmp2 = silk_MLA( tmp2, x_ptr[ subfr_length - n + k ], Atmp1 ); /* Q17 */ - } - - tmp1 = -tmp1; /* Q17 */ - tmp2 = -tmp2; /* Q17 */ - - { - __m128i xmm_tmp1, xmm_tmp2; - __m128i xmm_x_ptr_n_k_x2x0, xmm_x_ptr_n_k_x3x1; - __m128i xmm_x_ptr_sub_x2x0, xmm_x_ptr_sub_x3x1; - - xmm_tmp1 = _mm_set1_epi32( tmp1 ); - xmm_tmp2 = _mm_set1_epi32( tmp2 ); - - for( k = 0; k <= n - 3; k += 4 ) { - xmm_x_ptr_n_k_x2x0 = OP_CVTEPI16_EPI32_M64( &x_ptr[ n - k - 3 ] ); - xmm_x_ptr_sub_x2x0 = OP_CVTEPI16_EPI32_M64( &x_ptr[ subfr_length - n + k - 1 ] ); - - xmm_x_ptr_n_k_x2x0 = _mm_shuffle_epi32( xmm_x_ptr_n_k_x2x0, _MM_SHUFFLE( 0, 1, 2, 3 ) ); - - xmm_x_ptr_n_k_x2x0 = _mm_slli_epi32( xmm_x_ptr_n_k_x2x0, -rshifts - 1 ); - xmm_x_ptr_sub_x2x0 = _mm_slli_epi32( xmm_x_ptr_sub_x2x0, -rshifts - 1 ); - - /* equal shift right 4 bytes, xmm_x_ptr_n_k_x3x1 = _mm_srli_si128(xmm_x_ptr_n_k_x2x0, 4)*/ - xmm_x_ptr_n_k_x3x1 = _mm_shuffle_epi32( xmm_x_ptr_n_k_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ) ); - xmm_x_ptr_sub_x3x1 = _mm_shuffle_epi32( xmm_x_ptr_sub_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ) ); - - xmm_x_ptr_n_k_x2x0 = _mm_mul_epi32( xmm_x_ptr_n_k_x2x0, xmm_tmp1 ); - xmm_x_ptr_n_k_x3x1 = _mm_mul_epi32( xmm_x_ptr_n_k_x3x1, xmm_tmp1 ); - xmm_x_ptr_sub_x2x0 = _mm_mul_epi32( xmm_x_ptr_sub_x2x0, xmm_tmp2 ); - xmm_x_ptr_sub_x3x1 = _mm_mul_epi32( xmm_x_ptr_sub_x3x1, xmm_tmp2 ); - - xmm_x_ptr_n_k_x2x0 = _mm_srli_epi64( xmm_x_ptr_n_k_x2x0, 16 ); - xmm_x_ptr_n_k_x3x1 = _mm_slli_epi64( xmm_x_ptr_n_k_x3x1, 16 ); - xmm_x_ptr_sub_x2x0 = _mm_srli_epi64( xmm_x_ptr_sub_x2x0, 16 ); - xmm_x_ptr_sub_x3x1 = _mm_slli_epi64( xmm_x_ptr_sub_x3x1, 16 ); - - xmm_x_ptr_n_k_x2x0 = _mm_blend_epi16( xmm_x_ptr_n_k_x2x0, xmm_x_ptr_n_k_x3x1, 0xCC ); - xmm_x_ptr_sub_x2x0 = _mm_blend_epi16( xmm_x_ptr_sub_x2x0, xmm_x_ptr_sub_x3x1, 0xCC ); - - X1_3210 = _mm_loadu_si128( (__m128i *)&CAf[ k ] ); - PTR_3210 = _mm_loadu_si128( (__m128i *)&CAb[ k ] ); - - X1_3210 = _mm_add_epi32( X1_3210, xmm_x_ptr_n_k_x2x0 ); - PTR_3210 = _mm_add_epi32( PTR_3210, xmm_x_ptr_sub_x2x0 ); - - _mm_storeu_si128( (__m128i *)&CAf[ k ], X1_3210 ); - _mm_storeu_si128( (__m128i *)&CAb[ k ], PTR_3210 ); - } - - for( ; k <= n; k++ ) { - CAf[ k ] = silk_SMLAWW( CAf[ k ], tmp1, - silk_LSHIFT32( (opus_int32)x_ptr[ n - k ], -rshifts - 1 ) ); /* Q( -rshift ) */ - CAb[ k ] = silk_SMLAWW( CAb[ k ], tmp2, - silk_LSHIFT32( (opus_int32)x_ptr[ subfr_length - n + k - 1 ], -rshifts - 1 ) ); /* Q( -rshift ) */ - } - } - } - } - - /* Calculate nominator and denominator for the next order reflection (parcor) coefficient */ - tmp1 = C_first_row[ n ]; /* Q( -rshifts ) */ - tmp2 = C_last_row[ n ]; /* Q( -rshifts ) */ - num = 0; /* Q( -rshifts ) */ - nrg = silk_ADD32( CAb[ 0 ], CAf[ 0 ] ); /* Q( 1-rshifts ) */ - for( k = 0; k < n; k++ ) { - Atmp_QA = Af_QA[ k ]; - lz = silk_CLZ32( silk_abs( Atmp_QA ) ) - 1; - lz = silk_min( 32 - QA, lz ); - Atmp1 = silk_LSHIFT32( Atmp_QA, lz ); /* Q( QA + lz ) */ - - tmp1 = silk_ADD_LSHIFT32( tmp1, silk_SMMUL( C_last_row[ n - k - 1 ], Atmp1 ), 32 - QA - lz ); /* Q( -rshifts ) */ - tmp2 = silk_ADD_LSHIFT32( tmp2, silk_SMMUL( C_first_row[ n - k - 1 ], Atmp1 ), 32 - QA - lz ); /* Q( -rshifts ) */ - num = silk_ADD_LSHIFT32( num, silk_SMMUL( CAb[ n - k ], Atmp1 ), 32 - QA - lz ); /* Q( -rshifts ) */ - nrg = silk_ADD_LSHIFT32( nrg, silk_SMMUL( silk_ADD32( CAb[ k + 1 ], CAf[ k + 1 ] ), - Atmp1 ), 32 - QA - lz ); /* Q( 1-rshifts ) */ - } - CAf[ n + 1 ] = tmp1; /* Q( -rshifts ) */ - CAb[ n + 1 ] = tmp2; /* Q( -rshifts ) */ - num = silk_ADD32( num, tmp2 ); /* Q( -rshifts ) */ - num = silk_LSHIFT32( -num, 1 ); /* Q( 1-rshifts ) */ - - /* Calculate the next order reflection (parcor) coefficient */ - if( silk_abs( num ) < nrg ) { - rc_Q31 = silk_DIV32_varQ( num, nrg, 31 ); - } else { - rc_Q31 = ( num > 0 ) ? silk_int32_MAX : silk_int32_MIN; - } - - /* Update inverse prediction gain */ - tmp1 = ( (opus_int32)1 << 30 ) - silk_SMMUL( rc_Q31, rc_Q31 ); - tmp1 = silk_LSHIFT( silk_SMMUL( invGain_Q30, tmp1 ), 2 ); - if( tmp1 <= minInvGain_Q30 ) { - /* Max prediction gain exceeded; set reflection coefficient such that max prediction gain is exactly hit */ - tmp2 = ( (opus_int32)1 << 30 ) - silk_DIV32_varQ( minInvGain_Q30, invGain_Q30, 30 ); /* Q30 */ - rc_Q31 = silk_SQRT_APPROX( tmp2 ); /* Q15 */ - if( rc_Q31 > 0 ) { - /* Newton-Raphson iteration */ - rc_Q31 = silk_RSHIFT32( rc_Q31 + silk_DIV32( tmp2, rc_Q31 ), 1 ); /* Q15 */ - rc_Q31 = silk_LSHIFT32( rc_Q31, 16 ); /* Q31 */ - if( num < 0 ) { - /* Ensure adjusted reflection coefficients has the original sign */ - rc_Q31 = -rc_Q31; - } - } - invGain_Q30 = minInvGain_Q30; - reached_max_gain = 1; - } else { - invGain_Q30 = tmp1; - } - - /* Update the AR coefficients */ - for( k = 0; k < (n + 1) >> 1; k++ ) { - tmp1 = Af_QA[ k ]; /* QA */ - tmp2 = Af_QA[ n - k - 1 ]; /* QA */ - Af_QA[ k ] = silk_ADD_LSHIFT32( tmp1, silk_SMMUL( tmp2, rc_Q31 ), 1 ); /* QA */ - Af_QA[ n - k - 1 ] = silk_ADD_LSHIFT32( tmp2, silk_SMMUL( tmp1, rc_Q31 ), 1 ); /* QA */ - } - Af_QA[ n ] = silk_RSHIFT32( rc_Q31, 31 - QA ); /* QA */ - - if( reached_max_gain ) { - /* Reached max prediction gain; set remaining coefficients to zero and exit loop */ - for( k = n + 1; k < D; k++ ) { - Af_QA[ k ] = 0; - } - break; - } - - /* Update C * Af and C * Ab */ - for( k = 0; k <= n + 1; k++ ) { - tmp1 = CAf[ k ]; /* Q( -rshifts ) */ - tmp2 = CAb[ n - k + 1 ]; /* Q( -rshifts ) */ - CAf[ k ] = silk_ADD_LSHIFT32( tmp1, silk_SMMUL( tmp2, rc_Q31 ), 1 ); /* Q( -rshifts ) */ - CAb[ n - k + 1 ] = silk_ADD_LSHIFT32( tmp2, silk_SMMUL( tmp1, rc_Q31 ), 1 ); /* Q( -rshifts ) */ - } - } - - if( reached_max_gain ) { - for( k = 0; k < D; k++ ) { - /* Scale coefficients */ - A_Q16[ k ] = -silk_RSHIFT_ROUND( Af_QA[ k ], QA - 16 ); - } - /* Subtract energy of preceding samples from C0 */ - if( rshifts > 0 ) { - for( s = 0; s < nb_subfr; s++ ) { - x_ptr = x + s * subfr_length; - C0 -= (opus_int32)silk_RSHIFT64( silk_inner_prod16_aligned_64( x_ptr, x_ptr, D, arch ), rshifts ); - } - } else { - for( s = 0; s < nb_subfr; s++ ) { - x_ptr = x + s * subfr_length; - C0 -= silk_LSHIFT32( silk_inner_prod_aligned( x_ptr, x_ptr, D, arch ), -rshifts ); - } - } - /* Approximate residual energy */ - *res_nrg = silk_LSHIFT( silk_SMMUL( invGain_Q30, C0 ), 2 ); - *res_nrg_Q = -rshifts; - } else { - /* Return residual energy */ - nrg = CAf[ 0 ]; /* Q( -rshifts ) */ - tmp1 = (opus_int32)1 << 16; /* Q16 */ - for( k = 0; k < D; k++ ) { - Atmp1 = silk_RSHIFT_ROUND( Af_QA[ k ], QA - 16 ); /* Q16 */ - nrg = silk_SMLAWW( nrg, CAf[ k + 1 ], Atmp1 ); /* Q( -rshifts ) */ - tmp1 = silk_SMLAWW( tmp1, Atmp1, Atmp1 ); /* Q16 */ - A_Q16[ k ] = -Atmp1; - } - *res_nrg = silk_SMLAWW( nrg, silk_SMMUL( SILK_FIX_CONST( FIND_LPC_COND_FAC, 32 ), C0 ), -tmp1 );/* Q( -rshifts ) */ - *res_nrg_Q = -rshifts; - } -} diff --git a/media/libopus/silk/fixed/x86/vector_ops_FIX_sse.c b/media/libopus/silk/fixed/x86/vector_ops_FIX_sse.c deleted file mode 100644 index c1e90564d0ed7..0000000000000 --- a/media/libopus/silk/fixed/x86/vector_ops_FIX_sse.c +++ /dev/null @@ -1,88 +0,0 @@ -/* Copyright (c) 2014, Cisco Systems, INC - Written by XiangMingZhu WeiZhou MinPeng YanWang - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <xmmintrin.h> -#include <emmintrin.h> -#include <smmintrin.h> -#include "main.h" - -#include "SigProc_FIX.h" -#include "pitch.h" - -opus_int64 silk_inner_prod16_aligned_64_sse4_1( - const opus_int16 *inVec1, /* I input vector 1 */ - const opus_int16 *inVec2, /* I input vector 2 */ - const opus_int len /* I vector lengths */ -) -{ - opus_int i, dataSize8; - opus_int64 sum; - - __m128i xmm_tempa; - __m128i inVec1_76543210, acc1; - __m128i inVec2_76543210, acc2; - - sum = 0; - dataSize8 = len & ~7; - - acc1 = _mm_setzero_si128(); - acc2 = _mm_setzero_si128(); - - for( i = 0; i < dataSize8; i += 8 ) { - inVec1_76543210 = _mm_loadu_si128( (__m128i *)(&inVec1[i + 0] ) ); - inVec2_76543210 = _mm_loadu_si128( (__m128i *)(&inVec2[i + 0] ) ); - - /* only when all 4 operands are -32768 (0x8000), this results in wrap around */ - inVec1_76543210 = _mm_madd_epi16( inVec1_76543210, inVec2_76543210 ); - - xmm_tempa = _mm_cvtepi32_epi64( inVec1_76543210 ); - /* equal shift right 8 bytes */ - inVec1_76543210 = _mm_shuffle_epi32( inVec1_76543210, _MM_SHUFFLE( 0, 0, 3, 2 ) ); - inVec1_76543210 = _mm_cvtepi32_epi64( inVec1_76543210 ); - - acc1 = _mm_add_epi64( acc1, xmm_tempa ); - acc2 = _mm_add_epi64( acc2, inVec1_76543210 ); - } - - acc1 = _mm_add_epi64( acc1, acc2 ); - - /* equal shift right 8 bytes */ - acc2 = _mm_shuffle_epi32( acc1, _MM_SHUFFLE( 0, 0, 3, 2 ) ); - acc1 = _mm_add_epi64( acc1, acc2 ); - - _mm_storel_epi64( (__m128i *)&sum, acc1 ); - - for( ; i < len; i++ ) { - sum = silk_SMLABB( sum, inVec1[ i ], inVec2[ i ] ); - } - - return sum; -} diff --git a/media/libopus/silk/x86/NSQ_del_dec_sse.c b/media/libopus/silk/x86/NSQ_del_dec_sse.c deleted file mode 100644 index c5212bee8d3a1..0000000000000 --- a/media/libopus/silk/x86/NSQ_del_dec_sse.c +++ /dev/null @@ -1,859 +0,0 @@ -/* Copyright (c) 2014, Cisco Systems, INC - Written by XiangMingZhu WeiZhou MinPeng YanWang - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <xmmintrin.h> -#include <emmintrin.h> -#include <smmintrin.h> -#include "main.h" -#include "celt/x86/x86cpu.h" - -#include "stack_alloc.h" - -typedef struct { - opus_int32 sLPC_Q14[ MAX_SUB_FRAME_LENGTH + NSQ_LPC_BUF_LENGTH ]; - opus_int32 RandState[ DECISION_DELAY ]; - opus_int32 Q_Q10[ DECISION_DELAY ]; - opus_int32 Xq_Q14[ DECISION_DELAY ]; - opus_int32 Pred_Q15[ DECISION_DELAY ]; - opus_int32 Shape_Q14[ DECISION_DELAY ]; - opus_int32 sAR2_Q14[ MAX_SHAPE_LPC_ORDER ]; - opus_int32 LF_AR_Q14; - opus_int32 Seed; - opus_int32 SeedInit; - opus_int32 RD_Q10; -} NSQ_del_dec_struct; - -typedef struct { - opus_int32 Q_Q10; - opus_int32 RD_Q10; - opus_int32 xq_Q14; - opus_int32 LF_AR_Q14; - opus_int32 sLTP_shp_Q14; - opus_int32 LPC_exc_Q14; -} NSQ_sample_struct; - -typedef NSQ_sample_struct NSQ_sample_pair[ 2 ]; - -static OPUS_INLINE void silk_nsq_del_dec_scale_states_sse4_1( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - NSQ_del_dec_struct psDelDec[], /* I/O Delayed decision states */ - const opus_int32 x_Q3[], /* I Input in Q3 */ - opus_int32 x_sc_Q10[], /* O Input scaled with 1/Gain in Q10 */ - const opus_int16 sLTP[], /* I Re-whitened LTP state in Q0 */ - opus_int32 sLTP_Q15[], /* O LTP state matching scaled input */ - opus_int subfr, /* I Subframe number */ - opus_int nStatesDelayedDecision, /* I Number of del dec states */ - const opus_int LTP_scale_Q14, /* I LTP state scaling */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lag */ - const opus_int signal_type, /* I Signal type */ - const opus_int decisionDelay /* I Decision delay */ -); - -/******************************************/ -/* Noise shape quantizer for one subframe */ -/******************************************/ -static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1( - silk_nsq_state *NSQ, /* I/O NSQ state */ - NSQ_del_dec_struct psDelDec[], /* I/O Delayed decision states */ - opus_int signalType, /* I Signal type */ - const opus_int32 x_Q10[], /* I */ - opus_int8 pulses[], /* O */ - opus_int16 xq[], /* O */ - opus_int32 sLTP_Q15[], /* I/O LTP filter state */ - opus_int32 delayedGain_Q10[], /* I/O Gain delay buffer */ - const opus_int16 a_Q12[], /* I Short term prediction coefs */ - const opus_int16 b_Q14[], /* I Long term prediction coefs */ - const opus_int16 AR_shp_Q13[], /* I Noise shaping coefs */ - opus_int lag, /* I Pitch lag */ - opus_int32 HarmShapeFIRPacked_Q14, /* I */ - opus_int Tilt_Q14, /* I Spectral tilt */ - opus_int32 LF_shp_Q14, /* I */ - opus_int32 Gain_Q16, /* I */ - opus_int Lambda_Q10, /* I */ - opus_int offset_Q10, /* I */ - opus_int length, /* I Input length */ - opus_int subfr, /* I Subframe number */ - opus_int shapingLPCOrder, /* I Shaping LPC filter order */ - opus_int predictLPCOrder, /* I Prediction filter order */ - opus_int warping_Q16, /* I */ - opus_int nStatesDelayedDecision, /* I Number of states in decision tree */ - opus_int *smpl_buf_idx, /* I/O Index to newest samples in buffers */ - opus_int decisionDelay /* I */ -); - -void silk_NSQ_del_dec_sse4_1( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - SideInfoIndices *psIndices, /* I/O Quantization Indices */ - const opus_int32 x_Q3[], /* I Prefiltered input signal */ - opus_int8 pulses[], /* O Quantized pulse signal */ - const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ - const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ - const opus_int16 AR2_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ - const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ - const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ - const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ - const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ - const opus_int LTP_scale_Q14 /* I LTP state scaling */ -) -{ - opus_int i, k, lag, start_idx, LSF_interpolation_flag, Winner_ind, subfr; - opus_int last_smple_idx, smpl_buf_idx, decisionDelay; - const opus_int16 *A_Q12, *B_Q14, *AR_shp_Q13; - opus_int16 *pxq; - VARDECL( opus_int32, sLTP_Q15 ); - VARDECL( opus_int16, sLTP ); - opus_int32 HarmShapeFIRPacked_Q14; - opus_int offset_Q10; - opus_int32 RDmin_Q10, Gain_Q10; - VARDECL( opus_int32, x_sc_Q10 ); - VARDECL( opus_int32, delayedGain_Q10 ); - VARDECL( NSQ_del_dec_struct, psDelDec ); - NSQ_del_dec_struct *psDD; - SAVE_STACK; - - /* Set unvoiced lag to the previous one, overwrite later for voiced */ - lag = NSQ->lagPrev; - - silk_assert( NSQ->prev_gain_Q16 != 0 ); - - /* Initialize delayed decision states */ - ALLOC( psDelDec, psEncC->nStatesDelayedDecision, NSQ_del_dec_struct ); - silk_memset( psDelDec, 0, psEncC->nStatesDelayedDecision * sizeof( NSQ_del_dec_struct ) ); - for( k = 0; k < psEncC->nStatesDelayedDecision; k++ ) { - psDD = &psDelDec[ k ]; - psDD->Seed = ( k + psIndices->Seed ) & 3; - psDD->SeedInit = psDD->Seed; - psDD->RD_Q10 = 0; - psDD->LF_AR_Q14 = NSQ->sLF_AR_shp_Q14; - psDD->Shape_Q14[ 0 ] = NSQ->sLTP_shp_Q14[ psEncC->ltp_mem_length - 1 ]; - silk_memcpy( psDD->sLPC_Q14, NSQ->sLPC_Q14, NSQ_LPC_BUF_LENGTH * sizeof( opus_int32 ) ); - silk_memcpy( psDD->sAR2_Q14, NSQ->sAR2_Q14, sizeof( NSQ->sAR2_Q14 ) ); - } - - offset_Q10 = silk_Quantization_Offsets_Q10[ psIndices->signalType >> 1 ][ psIndices->quantOffsetType ]; - smpl_buf_idx = 0; /* index of oldest samples */ - - decisionDelay = silk_min_int( DECISION_DELAY, psEncC->subfr_length ); - - /* For voiced frames limit the decision delay to lower than the pitch lag */ - if( psIndices->signalType == TYPE_VOICED ) { - for( k = 0; k < psEncC->nb_subfr; k++ ) { - decisionDelay = silk_min_int( decisionDelay, pitchL[ k ] - LTP_ORDER / 2 - 1 ); - } - } else { - if( lag > 0 ) { - decisionDelay = silk_min_int( decisionDelay, lag - LTP_ORDER / 2 - 1 ); - } - } - - if( psIndices->NLSFInterpCoef_Q2 == 4 ) { - LSF_interpolation_flag = 0; - } else { - LSF_interpolation_flag = 1; - } - - ALLOC( sLTP_Q15, - psEncC->ltp_mem_length + psEncC->frame_length, opus_int32 ); - ALLOC( sLTP, psEncC->ltp_mem_length + psEncC->frame_length, opus_int16 ); - ALLOC( x_sc_Q10, psEncC->subfr_length, opus_int32 ); - ALLOC( delayedGain_Q10, DECISION_DELAY, opus_int32 ); - /* Set up pointers to start of sub frame */ - pxq = &NSQ->xq[ psEncC->ltp_mem_length ]; - NSQ->sLTP_shp_buf_idx = psEncC->ltp_mem_length; - NSQ->sLTP_buf_idx = psEncC->ltp_mem_length; - subfr = 0; - for( k = 0; k < psEncC->nb_subfr; k++ ) { - A_Q12 = &PredCoef_Q12[ ( ( k >> 1 ) | ( 1 - LSF_interpolation_flag ) ) * MAX_LPC_ORDER ]; - B_Q14 = <PCoef_Q14[ k * LTP_ORDER ]; - AR_shp_Q13 = &AR2_Q13[ k * MAX_SHAPE_LPC_ORDER ]; - - /* Noise shape parameters */ - silk_assert( HarmShapeGain_Q14[ k ] >= 0 ); - HarmShapeFIRPacked_Q14 = silk_RSHIFT( HarmShapeGain_Q14[ k ], 2 ); - HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (opus_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 ); - - NSQ->rewhite_flag = 0; - if( psIndices->signalType == TYPE_VOICED ) { - /* Voiced */ - lag = pitchL[ k ]; - - /* Re-whitening */ - if( ( k & ( 3 - silk_LSHIFT( LSF_interpolation_flag, 1 ) ) ) == 0 ) { - if( k == 2 ) { - /* RESET DELAYED DECISIONS */ - /* Find winner */ - RDmin_Q10 = psDelDec[ 0 ].RD_Q10; - Winner_ind = 0; - for( i = 1; i < psEncC->nStatesDelayedDecision; i++ ) { - if( psDelDec[ i ].RD_Q10 < RDmin_Q10 ) { - RDmin_Q10 = psDelDec[ i ].RD_Q10; - Winner_ind = i; - } - } - for( i = 0; i < psEncC->nStatesDelayedDecision; i++ ) { - if( i != Winner_ind ) { - psDelDec[ i ].RD_Q10 += ( silk_int32_MAX >> 4 ); - silk_assert( psDelDec[ i ].RD_Q10 >= 0 ); - } - } - - /* Copy final part of signals from winner state to output and long-term filter states */ - psDD = &psDelDec[ Winner_ind ]; - last_smple_idx = smpl_buf_idx + decisionDelay; - for( i = 0; i < decisionDelay; i++ ) { - last_smple_idx = ( last_smple_idx - 1 ) % DECISION_DELAY; - if( last_smple_idx < 0 ) last_smple_idx += DECISION_DELAY; - pulses[ i - decisionDelay ] = (opus_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 ); - pxq[ i - decisionDelay ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( - silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], Gains_Q16[ 1 ] ), 14 ) ); - NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay + i ] = psDD->Shape_Q14[ last_smple_idx ]; - } - - subfr = 0; - } - - /* Rewhiten with new A coefs */ - start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER / 2; - silk_assert( start_idx > 0 ); - - silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k * psEncC->subfr_length ], - A_Q12, psEncC->ltp_mem_length - start_idx, psEncC->predictLPCOrder, psEncC->arch ); - - NSQ->sLTP_buf_idx = psEncC->ltp_mem_length; - NSQ->rewhite_flag = 1; - } - } - - silk_nsq_del_dec_scale_states_sse4_1( psEncC, NSQ, psDelDec, x_Q3, x_sc_Q10, sLTP, sLTP_Q15, k, - psEncC->nStatesDelayedDecision, LTP_scale_Q14, Gains_Q16, pitchL, psIndices->signalType, decisionDelay ); - - silk_noise_shape_quantizer_del_dec_sse4_1( NSQ, psDelDec, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15, - delayedGain_Q10, A_Q12, B_Q14, AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ], - Gains_Q16[ k ], Lambda_Q10, offset_Q10, psEncC->subfr_length, subfr++, psEncC->shapingLPCOrder, - psEncC->predictLPCOrder, psEncC->warping_Q16, psEncC->nStatesDelayedDecision, &smpl_buf_idx, decisionDelay ); - - x_Q3 += psEncC->subfr_length; - pulses += psEncC->subfr_length; - pxq += psEncC->subfr_length; - } - - /* Find winner */ - RDmin_Q10 = psDelDec[ 0 ].RD_Q10; - Winner_ind = 0; - for( k = 1; k < psEncC->nStatesDelayedDecision; k++ ) { - if( psDelDec[ k ].RD_Q10 < RDmin_Q10 ) { - RDmin_Q10 = psDelDec[ k ].RD_Q10; - Winner_ind = k; - } - } - - /* Copy final part of signals from winner state to output and long-term filter states */ - psDD = &psDelDec[ Winner_ind ]; - psIndices->Seed = psDD->SeedInit; - last_smple_idx = smpl_buf_idx + decisionDelay; - Gain_Q10 = silk_RSHIFT32( Gains_Q16[ psEncC->nb_subfr - 1 ], 6 ); - for( i = 0; i < decisionDelay; i++ ) { - last_smple_idx = ( last_smple_idx - 1 ) % DECISION_DELAY; - if( last_smple_idx < 0 ) last_smple_idx += DECISION_DELAY; - pulses[ i - decisionDelay ] = (opus_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 ); - pxq[ i - decisionDelay ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( - silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], Gain_Q10 ), 8 ) ); - NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay + i ] = psDD->Shape_Q14[ last_smple_idx ]; - } - silk_memcpy( NSQ->sLPC_Q14, &psDD->sLPC_Q14[ psEncC->subfr_length ], NSQ_LPC_BUF_LENGTH * sizeof( opus_int32 ) ); - silk_memcpy( NSQ->sAR2_Q14, psDD->sAR2_Q14, sizeof( psDD->sAR2_Q14 ) ); - - /* Update states */ - NSQ->sLF_AR_shp_Q14 = psDD->LF_AR_Q14; - NSQ->lagPrev = pitchL[ psEncC->nb_subfr - 1 ]; - - /* Save quantized speech signal */ - silk_memmove( NSQ->xq, &NSQ->xq[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int16 ) ); - silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int32 ) ); - RESTORE_STACK; -} - -/******************************************/ -/* Noise shape quantizer for one subframe */ -/******************************************/ -static OPUS_INLINE void silk_noise_shape_quantizer_del_dec_sse4_1( - silk_nsq_state *NSQ, /* I/O NSQ state */ - NSQ_del_dec_struct psDelDec[], /* I/O Delayed decision states */ - opus_int signalType, /* I Signal type */ - const opus_int32 x_Q10[], /* I */ - opus_int8 pulses[], /* O */ - opus_int16 xq[], /* O */ - opus_int32 sLTP_Q15[], /* I/O LTP filter state */ - opus_int32 delayedGain_Q10[], /* I/O Gain delay buffer */ - const opus_int16 a_Q12[], /* I Short term prediction coefs */ - const opus_int16 b_Q14[], /* I Long term prediction coefs */ - const opus_int16 AR_shp_Q13[], /* I Noise shaping coefs */ - opus_int lag, /* I Pitch lag */ - opus_int32 HarmShapeFIRPacked_Q14, /* I */ - opus_int Tilt_Q14, /* I Spectral tilt */ - opus_int32 LF_shp_Q14, /* I */ - opus_int32 Gain_Q16, /* I */ - opus_int Lambda_Q10, /* I */ - opus_int offset_Q10, /* I */ - opus_int length, /* I Input length */ - opus_int subfr, /* I Subframe number */ - opus_int shapingLPCOrder, /* I Shaping LPC filter order */ - opus_int predictLPCOrder, /* I Prediction filter order */ - opus_int warping_Q16, /* I */ - opus_int nStatesDelayedDecision, /* I Number of states in decision tree */ - opus_int *smpl_buf_idx, /* I/O Index to newest samples in buffers */ - opus_int decisionDelay /* I */ -) -{ - opus_int i, j, k, Winner_ind, RDmin_ind, RDmax_ind, last_smple_idx; - opus_int32 Winner_rand_state; - opus_int32 LTP_pred_Q14, LPC_pred_Q14, n_AR_Q14, n_LTP_Q14; - opus_int32 n_LF_Q14, r_Q10, rr_Q10, rd1_Q10, rd2_Q10, RDmin_Q10, RDmax_Q10; - opus_int32 q1_Q0, q1_Q10, q2_Q10, exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10; - opus_int32 tmp1, tmp2, sLF_AR_shp_Q14; - opus_int32 *pred_lag_ptr, *shp_lag_ptr, *psLPC_Q14; - VARDECL( NSQ_sample_pair, psSampleState ); - NSQ_del_dec_struct *psDD; - NSQ_sample_struct *psSS; - - __m128i a_Q12_0123, a_Q12_4567, a_Q12_89AB, a_Q12_CDEF; - __m128i b_Q12_0123, b_sr_Q12_0123; - SAVE_STACK; - - silk_assert( nStatesDelayedDecision > 0 ); - ALLOC( psSampleState, nStatesDelayedDecision, NSQ_sample_pair ); - - shp_lag_ptr = &NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS / 2 ]; - pred_lag_ptr = &sLTP_Q15[ NSQ->sLTP_buf_idx - lag + LTP_ORDER / 2 ]; - Gain_Q10 = silk_RSHIFT( Gain_Q16, 6 ); - - a_Q12_0123 = OP_CVTEPI16_EPI32_M64( a_Q12 ); - a_Q12_4567 = OP_CVTEPI16_EPI32_M64( a_Q12 + 4 ); - - if( opus_likely( predictLPCOrder == 16 ) ) { - a_Q12_89AB = OP_CVTEPI16_EPI32_M64( a_Q12 + 8 ); - a_Q12_CDEF = OP_CVTEPI16_EPI32_M64( a_Q12 + 12 ); - } - - if( signalType == TYPE_VOICED ){ - b_Q12_0123 = OP_CVTEPI16_EPI32_M64( b_Q14 ); - b_sr_Q12_0123 = _mm_shuffle_epi32( b_Q12_0123, _MM_SHUFFLE( 0, 3, 2, 1 ) ); /* equal shift right 4 bytes */ - } - for( i = 0; i < length; i++ ) { - /* Perform common calculations used in all states */ - - /* Long-term prediction */ - if( signalType == TYPE_VOICED ) { - /* Unrolled loop */ - /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */ - LTP_pred_Q14 = 2; - { - __m128i tmpa, tmpb, pred_lag_ptr_tmp; - pred_lag_ptr_tmp = _mm_loadu_si128( (__m128i *)(&pred_lag_ptr[ -3 ] ) ); - pred_lag_ptr_tmp = _mm_shuffle_epi32( pred_lag_ptr_tmp, 0x1B ); - tmpa = _mm_mul_epi32( pred_lag_ptr_tmp, b_Q12_0123 ); - tmpa = _mm_srli_si128( tmpa, 2 ); - - pred_lag_ptr_tmp = _mm_shuffle_epi32( pred_lag_ptr_tmp, _MM_SHUFFLE( 0, 3, 2, 1 ) );/* equal shift right 4 bytes */ - pred_lag_ptr_tmp = _mm_mul_epi32( pred_lag_ptr_tmp, b_sr_Q12_0123 ); - pred_lag_ptr_tmp = _mm_srli_si128( pred_lag_ptr_tmp, 2 ); - pred_lag_ptr_tmp = _mm_add_epi32( pred_lag_ptr_tmp, tmpa ); - - tmpb = _mm_shuffle_epi32( pred_lag_ptr_tmp, _MM_SHUFFLE( 0, 0, 3, 2 ) );/* equal shift right 8 bytes */ - pred_lag_ptr_tmp = _mm_add_epi32( pred_lag_ptr_tmp, tmpb ); - LTP_pred_Q14 += _mm_cvtsi128_si32( pred_lag_ptr_tmp ); - - LTP_pred_Q14 = silk_SMLAWB( LTP_pred_Q14, pred_lag_ptr[ -4 ], b_Q14[ 4 ] ); - LTP_pred_Q14 = silk_LSHIFT( LTP_pred_Q14, 1 ); /* Q13 -> Q14 */ - pred_lag_ptr++; - } - } else { - LTP_pred_Q14 = 0; - } - - /* Long-term shaping */ - if( lag > 0 ) { - /* Symmetric, packed FIR coefficients */ - n_LTP_Q14 = silk_SMULWB( silk_ADD32( shp_lag_ptr[ 0 ], shp_lag_ptr[ -2 ] ), HarmShapeFIRPacked_Q14 ); - n_LTP_Q14 = silk_SMLAWT( n_LTP_Q14, shp_lag_ptr[ -1 ], HarmShapeFIRPacked_Q14 ); - n_LTP_Q14 = silk_SUB_LSHIFT32( LTP_pred_Q14, n_LTP_Q14, 2 ); /* Q12 -> Q14 */ - shp_lag_ptr++; - } else { - n_LTP_Q14 = 0; - } - { - __m128i tmpa, tmpb, psLPC_Q14_tmp, a_Q12_tmp; - - for( k = 0; k < nStatesDelayedDecision; k++ ) { - /* Delayed decision state */ - psDD = &psDelDec[ k ]; - - /* Sample state */ - psSS = psSampleState[ k ]; - - /* Generate dither */ - psDD->Seed = silk_RAND( psDD->Seed ); - - /* Pointer used in short term prediction and shaping */ - psLPC_Q14 = &psDD->sLPC_Q14[ NSQ_LPC_BUF_LENGTH - 1 + i ]; - /* Short-term prediction */ - silk_assert( predictLPCOrder == 10 || predictLPCOrder == 16 ); - /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */ - LPC_pred_Q14 = silk_RSHIFT( predictLPCOrder, 1 ); - - tmpb = _mm_setzero_si128(); - - /* step 1 */ - psLPC_Q14_tmp = _mm_loadu_si128( (__m128i *)(&psLPC_Q14[ -3 ] ) ); /* -3, -2 , -1, 0 */ - psLPC_Q14_tmp = _mm_shuffle_epi32( psLPC_Q14_tmp, 0x1B ); /* 0, -1, -2, -3 */ - tmpa = _mm_mul_epi32( psLPC_Q14_tmp, a_Q12_0123 ); /* 0, -1, -2, -3 * 0123 -> 0*0, 2*-2 */ - - tmpa = _mm_srli_epi64( tmpa, 16 ); - tmpb = _mm_add_epi32( tmpb, tmpa ); - - psLPC_Q14_tmp = _mm_shuffle_epi32( psLPC_Q14_tmp, _MM_SHUFFLE( 0, 3, 2, 1 ) ); /* equal shift right 4 bytes */ - a_Q12_tmp = _mm_shuffle_epi32( a_Q12_0123, _MM_SHUFFLE(0, 3, 2, 1 ) ); /* equal shift right 4 bytes */ - psLPC_Q14_tmp = _mm_mul_epi32( psLPC_Q14_tmp, a_Q12_tmp ); /* 1*-1, 3*-3 */ - psLPC_Q14_tmp = _mm_srli_epi64( psLPC_Q14_tmp, 16 ); - tmpb = _mm_add_epi32( tmpb, psLPC_Q14_tmp ); - - /* step 2 */ - psLPC_Q14_tmp = _mm_loadu_si128( (__m128i *)(&psLPC_Q14[ -7 ] ) ); - psLPC_Q14_tmp = _mm_shuffle_epi32( psLPC_Q14_tmp, 0x1B ); - tmpa = _mm_mul_epi32( psLPC_Q14_tmp, a_Q12_4567 ); - tmpa = _mm_srli_epi64( tmpa, 16 ); - tmpb = _mm_add_epi32( tmpb, tmpa ); - - psLPC_Q14_tmp = _mm_shuffle_epi32( psLPC_Q14_tmp, _MM_SHUFFLE( 0, 3, 2, 1 ) ); /* equal shift right 4 bytes */ - a_Q12_tmp = _mm_shuffle_epi32( a_Q12_4567, _MM_SHUFFLE(0, 3, 2, 1 ) ); /* equal shift right 4 bytes */ - psLPC_Q14_tmp = _mm_mul_epi32( psLPC_Q14_tmp, a_Q12_tmp ); - psLPC_Q14_tmp = _mm_srli_epi64( psLPC_Q14_tmp, 16 ); - tmpb = _mm_add_epi32( tmpb, psLPC_Q14_tmp ); - - if ( opus_likely( predictLPCOrder == 16 ) ) - { - /* step 3 */ - psLPC_Q14_tmp = _mm_loadu_si128( (__m128i *)(&psLPC_Q14[ -11 ] ) ); - psLPC_Q14_tmp = _mm_shuffle_epi32( psLPC_Q14_tmp, 0x1B ); - tmpa = _mm_mul_epi32( psLPC_Q14_tmp, a_Q12_89AB ); - tmpa = _mm_srli_epi64( tmpa, 16 ); - tmpb = _mm_add_epi32( tmpb, tmpa ); - - psLPC_Q14_tmp = _mm_shuffle_epi32( psLPC_Q14_tmp, _MM_SHUFFLE( 0, 3, 2, 1 ) ); /* equal shift right 4 bytes */ - a_Q12_tmp = _mm_shuffle_epi32( a_Q12_89AB, _MM_SHUFFLE(0, 3, 2, 1 ) );/* equal shift right 4 bytes */ - psLPC_Q14_tmp = _mm_mul_epi32( psLPC_Q14_tmp, a_Q12_tmp ); - psLPC_Q14_tmp = _mm_srli_epi64( psLPC_Q14_tmp, 16 ); - tmpb = _mm_add_epi32( tmpb, psLPC_Q14_tmp ); - - /* setp 4 */ - psLPC_Q14_tmp = _mm_loadu_si128( (__m128i *)(&psLPC_Q14[ -15 ] ) ); - psLPC_Q14_tmp = _mm_shuffle_epi32( psLPC_Q14_tmp, 0x1B ); - tmpa = _mm_mul_epi32( psLPC_Q14_tmp, a_Q12_CDEF ); - tmpa = _mm_srli_epi64( tmpa, 16 ); - tmpb = _mm_add_epi32( tmpb, tmpa ); - - psLPC_Q14_tmp = _mm_shuffle_epi32( psLPC_Q14_tmp, _MM_SHUFFLE( 0, 3, 2, 1 ) ); /* equal shift right 4 bytes */ - a_Q12_tmp = _mm_shuffle_epi32( a_Q12_CDEF, _MM_SHUFFLE(0, 3, 2, 1 ) ); /* equal shift right 4 bytes */ - psLPC_Q14_tmp = _mm_mul_epi32( psLPC_Q14_tmp, a_Q12_tmp ); - psLPC_Q14_tmp = _mm_srli_epi64( psLPC_Q14_tmp, 16 ); - tmpb = _mm_add_epi32( tmpb, psLPC_Q14_tmp ); - - /* add at last */ - /* equal shift right 8 bytes*/ - tmpa = _mm_shuffle_epi32( tmpb, _MM_SHUFFLE( 0, 0, 3, 2 ) ); - tmpb = _mm_add_epi32( tmpb, tmpa ); - LPC_pred_Q14 += _mm_cvtsi128_si32( tmpb ); - } - else - { - /* add at last */ - tmpa = _mm_shuffle_epi32( tmpb, _MM_SHUFFLE( 0, 0, 3, 2 ) ); /* equal shift right 8 bytes*/ - tmpb = _mm_add_epi32( tmpb, tmpa ); - LPC_pred_Q14 += _mm_cvtsi128_si32( tmpb ); - - LPC_pred_Q14 = silk_SMLAWB( LPC_pred_Q14, psLPC_Q14[ -8 ], a_Q12[ 8 ] ); - LPC_pred_Q14 = silk_SMLAWB( LPC_pred_Q14, psLPC_Q14[ -9 ], a_Q12[ 9 ] ); - } - - LPC_pred_Q14 = silk_LSHIFT( LPC_pred_Q14, 4 ); /* Q10 -> Q14 */ - - /* Noise shape feedback */ - silk_assert( ( shapingLPCOrder & 1 ) == 0 ); /* check that order is even */ - /* Output of lowpass section */ - tmp2 = silk_SMLAWB( psLPC_Q14[ 0 ], psDD->sAR2_Q14[ 0 ], warping_Q16 ); - /* Output of allpass section */ - tmp1 = silk_SMLAWB( psDD->sAR2_Q14[ 0 ], psDD->sAR2_Q14[ 1 ] - tmp2, warping_Q16 ); - psDD->sAR2_Q14[ 0 ] = tmp2; - n_AR_Q14 = silk_RSHIFT( shapingLPCOrder, 1 ); - n_AR_Q14 = silk_SMLAWB( n_AR_Q14, tmp2, AR_shp_Q13[ 0 ] ); - /* Loop over allpass sections */ - for( j = 2; j < shapingLPCOrder; j += 2 ) { - /* Output of allpass section */ - tmp2 = silk_SMLAWB( psDD->sAR2_Q14[ j - 1 ], psDD->sAR2_Q14[ j + 0 ] - tmp1, warping_Q16 ); - psDD->sAR2_Q14[ j - 1 ] = tmp1; - n_AR_Q14 = silk_SMLAWB( n_AR_Q14, tmp1, AR_shp_Q13[ j - 1 ] ); - /* Output of allpass section */ - tmp1 = silk_SMLAWB( psDD->sAR2_Q14[ j + 0 ], psDD->sAR2_Q14[ j + 1 ] - tmp2, warping_Q16 ); - psDD->sAR2_Q14[ j + 0 ] = tmp2; - n_AR_Q14 = silk_SMLAWB( n_AR_Q14, tmp2, AR_shp_Q13[ j ] ); - } - psDD->sAR2_Q14[ shapingLPCOrder - 1 ] = tmp1; - n_AR_Q14 = silk_SMLAWB( n_AR_Q14, tmp1, AR_shp_Q13[ shapingLPCOrder - 1 ] ); - - n_AR_Q14 = silk_LSHIFT( n_AR_Q14, 1 ); /* Q11 -> Q12 */ - n_AR_Q14 = silk_SMLAWB( n_AR_Q14, psDD->LF_AR_Q14, Tilt_Q14 ); /* Q12 */ - n_AR_Q14 = silk_LSHIFT( n_AR_Q14, 2 ); /* Q12 -> Q14 */ - - n_LF_Q14 = silk_SMULWB( psDD->Shape_Q14[ *smpl_buf_idx ], LF_shp_Q14 ); /* Q12 */ - n_LF_Q14 = silk_SMLAWT( n_LF_Q14, psDD->LF_AR_Q14, LF_shp_Q14 ); /* Q12 */ - n_LF_Q14 = silk_LSHIFT( n_LF_Q14, 2 ); /* Q12 -> Q14 */ - - /* Input minus prediction plus noise feedback */ - /* r = x[ i ] - LTP_pred - LPC_pred + n_AR + n_Tilt + n_LF + n_LTP */ - tmp1 = silk_ADD32( n_AR_Q14, n_LF_Q14 ); /* Q14 */ - tmp2 = silk_ADD32( n_LTP_Q14, LPC_pred_Q14 ); /* Q13 */ - tmp1 = silk_SUB32( tmp2, tmp1 ); /* Q13 */ - tmp1 = silk_RSHIFT_ROUND( tmp1, 4 ); /* Q10 */ - - r_Q10 = silk_SUB32( x_Q10[ i ], tmp1 ); /* residual error Q10 */ - - /* Flip sign depending on dither */ - if ( psDD->Seed < 0 ) { - r_Q10 = -r_Q10; - } - r_Q10 = silk_LIMIT_32( r_Q10, -(31 << 10), 30 << 10 ); - - /* Find two quantization level candidates and measure their rate-distortion */ - q1_Q10 = silk_SUB32( r_Q10, offset_Q10 ); - q1_Q0 = silk_RSHIFT( q1_Q10, 10 ); - if( q1_Q0 > 0 ) { - q1_Q10 = silk_SUB32( silk_LSHIFT( q1_Q0, 10 ), QUANT_LEVEL_ADJUST_Q10 ); - q1_Q10 = silk_ADD32( q1_Q10, offset_Q10 ); - q2_Q10 = silk_ADD32( q1_Q10, 1024 ); - rd1_Q10 = silk_SMULBB( q1_Q10, Lambda_Q10 ); - rd2_Q10 = silk_SMULBB( q2_Q10, Lambda_Q10 ); - } else if( q1_Q0 == 0 ) { - q1_Q10 = offset_Q10; - q2_Q10 = silk_ADD32( q1_Q10, 1024 - QUANT_LEVEL_ADJUST_Q10 ); - rd1_Q10 = silk_SMULBB( q1_Q10, Lambda_Q10 ); - rd2_Q10 = silk_SMULBB( q2_Q10, Lambda_Q10 ); - } else if( q1_Q0 == -1 ) { - q2_Q10 = offset_Q10; - q1_Q10 = silk_SUB32( q2_Q10, 1024 - QUANT_LEVEL_ADJUST_Q10 ); - rd1_Q10 = silk_SMULBB( -q1_Q10, Lambda_Q10 ); - rd2_Q10 = silk_SMULBB( q2_Q10, Lambda_Q10 ); - } else { /* q1_Q0 < -1 */ - q1_Q10 = silk_ADD32( silk_LSHIFT( q1_Q0, 10 ), QUANT_LEVEL_ADJUST_Q10 ); - q1_Q10 = silk_ADD32( q1_Q10, offset_Q10 ); - q2_Q10 = silk_ADD32( q1_Q10, 1024 ); - rd1_Q10 = silk_SMULBB( -q1_Q10, Lambda_Q10 ); - rd2_Q10 = silk_SMULBB( -q2_Q10, Lambda_Q10 ); - } - rr_Q10 = silk_SUB32( r_Q10, q1_Q10 ); - rd1_Q10 = silk_RSHIFT( silk_SMLABB( rd1_Q10, rr_Q10, rr_Q10 ), 10 ); - rr_Q10 = silk_SUB32( r_Q10, q2_Q10 ); - rd2_Q10 = silk_RSHIFT( silk_SMLABB( rd2_Q10, rr_Q10, rr_Q10 ), 10 ); - - if( rd1_Q10 < rd2_Q10 ) { - psSS[ 0 ].RD_Q10 = silk_ADD32( psDD->RD_Q10, rd1_Q10 ); - psSS[ 1 ].RD_Q10 = silk_ADD32( psDD->RD_Q10, rd2_Q10 ); - psSS[ 0 ].Q_Q10 = q1_Q10; - psSS[ 1 ].Q_Q10 = q2_Q10; - } else { - psSS[ 0 ].RD_Q10 = silk_ADD32( psDD->RD_Q10, rd2_Q10 ); - psSS[ 1 ].RD_Q10 = silk_ADD32( psDD->RD_Q10, rd1_Q10 ); - psSS[ 0 ].Q_Q10 = q2_Q10; - psSS[ 1 ].Q_Q10 = q1_Q10; - } - - /* Update states for best quantization */ - - /* Quantized excitation */ - exc_Q14 = silk_LSHIFT32( psSS[ 0 ].Q_Q10, 4 ); - if ( psDD->Seed < 0 ) { - exc_Q14 = -exc_Q14; - } - - /* Add predictions */ - LPC_exc_Q14 = silk_ADD32( exc_Q14, LTP_pred_Q14 ); - xq_Q14 = silk_ADD32( LPC_exc_Q14, LPC_pred_Q14 ); - - /* Update states */ - sLF_AR_shp_Q14 = silk_SUB32( xq_Q14, n_AR_Q14 ); - psSS[ 0 ].sLTP_shp_Q14 = silk_SUB32( sLF_AR_shp_Q14, n_LF_Q14 ); - psSS[ 0 ].LF_AR_Q14 = sLF_AR_shp_Q14; - psSS[ 0 ].LPC_exc_Q14 = LPC_exc_Q14; - psSS[ 0 ].xq_Q14 = xq_Q14; - - /* Update states for second best quantization */ - - /* Quantized excitation */ - exc_Q14 = silk_LSHIFT32( psSS[ 1 ].Q_Q10, 4 ); - if ( psDD->Seed < 0 ) { - exc_Q14 = -exc_Q14; - } - - - /* Add predictions */ - LPC_exc_Q14 = silk_ADD32( exc_Q14, LTP_pred_Q14 ); - xq_Q14 = silk_ADD32( LPC_exc_Q14, LPC_pred_Q14 ); - - /* Update states */ - sLF_AR_shp_Q14 = silk_SUB32( xq_Q14, n_AR_Q14 ); - psSS[ 1 ].sLTP_shp_Q14 = silk_SUB32( sLF_AR_shp_Q14, n_LF_Q14 ); - psSS[ 1 ].LF_AR_Q14 = sLF_AR_shp_Q14; - psSS[ 1 ].LPC_exc_Q14 = LPC_exc_Q14; - psSS[ 1 ].xq_Q14 = xq_Q14; - } - } - *smpl_buf_idx = ( *smpl_buf_idx - 1 ) % DECISION_DELAY; - if( *smpl_buf_idx < 0 ) *smpl_buf_idx += DECISION_DELAY; - last_smple_idx = ( *smpl_buf_idx + decisionDelay ) % DECISION_DELAY; - - /* Find winner */ - RDmin_Q10 = psSampleState[ 0 ][ 0 ].RD_Q10; - Winner_ind = 0; - for( k = 1; k < nStatesDelayedDecision; k++ ) { - if( psSampleState[ k ][ 0 ].RD_Q10 < RDmin_Q10 ) { - RDmin_Q10 = psSampleState[ k ][ 0 ].RD_Q10; - Winner_ind = k; - } - } - - /* Increase RD values of expired states */ - Winner_rand_state = psDelDec[ Winner_ind ].RandState[ last_smple_idx ]; - for( k = 0; k < nStatesDelayedDecision; k++ ) { - if( psDelDec[ k ].RandState[ last_smple_idx ] != Winner_rand_state ) { - psSampleState[ k ][ 0 ].RD_Q10 = silk_ADD32( psSampleState[ k ][ 0 ].RD_Q10, silk_int32_MAX >> 4 ); - psSampleState[ k ][ 1 ].RD_Q10 = silk_ADD32( psSampleState[ k ][ 1 ].RD_Q10, silk_int32_MAX >> 4 ); - silk_assert( psSampleState[ k ][ 0 ].RD_Q10 >= 0 ); - } - } - - /* Find worst in first set and best in second set */ - RDmax_Q10 = psSampleState[ 0 ][ 0 ].RD_Q10; - RDmin_Q10 = psSampleState[ 0 ][ 1 ].RD_Q10; - RDmax_ind = 0; - RDmin_ind = 0; - for( k = 1; k < nStatesDelayedDecision; k++ ) { - /* find worst in first set */ - if( psSampleState[ k ][ 0 ].RD_Q10 > RDmax_Q10 ) { - RDmax_Q10 = psSampleState[ k ][ 0 ].RD_Q10; - RDmax_ind = k; - } - /* find best in second set */ - if( psSampleState[ k ][ 1 ].RD_Q10 < RDmin_Q10 ) { - RDmin_Q10 = psSampleState[ k ][ 1 ].RD_Q10; - RDmin_ind = k; - } - } - - /* Replace a state if best from second set outperforms worst in first set */ - if( RDmin_Q10 < RDmax_Q10 ) { - silk_memcpy( ( (opus_int32 *)&psDelDec[ RDmax_ind ] ) + i, - ( (opus_int32 *)&psDelDec[ RDmin_ind ] ) + i, sizeof( NSQ_del_dec_struct ) - i * sizeof( opus_int32) ); - silk_memcpy( &psSampleState[ RDmax_ind ][ 0 ], &psSampleState[ RDmin_ind ][ 1 ], sizeof( NSQ_sample_struct ) ); - } - - /* Write samples from winner to output and long-term filter states */ - psDD = &psDelDec[ Winner_ind ]; - if( subfr > 0 || i >= decisionDelay ) { - pulses[ i - decisionDelay ] = (opus_int8)silk_RSHIFT_ROUND( psDD->Q_Q10[ last_smple_idx ], 10 ); - xq[ i - decisionDelay ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( - silk_SMULWW( psDD->Xq_Q14[ last_smple_idx ], delayedGain_Q10[ last_smple_idx ] ), 8 ) ); - NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - decisionDelay ] = psDD->Shape_Q14[ last_smple_idx ]; - sLTP_Q15[ NSQ->sLTP_buf_idx - decisionDelay ] = psDD->Pred_Q15[ last_smple_idx ]; - } - NSQ->sLTP_shp_buf_idx++; - NSQ->sLTP_buf_idx++; - - /* Update states */ - for( k = 0; k < nStatesDelayedDecision; k++ ) { - psDD = &psDelDec[ k ]; - psSS = &psSampleState[ k ][ 0 ]; - psDD->LF_AR_Q14 = psSS->LF_AR_Q14; - psDD->sLPC_Q14[ NSQ_LPC_BUF_LENGTH + i ] = psSS->xq_Q14; - psDD->Xq_Q14[ *smpl_buf_idx ] = psSS->xq_Q14; - psDD->Q_Q10[ *smpl_buf_idx ] = psSS->Q_Q10; - psDD->Pred_Q15[ *smpl_buf_idx ] = silk_LSHIFT32( psSS->LPC_exc_Q14, 1 ); - psDD->Shape_Q14[ *smpl_buf_idx ] = psSS->sLTP_shp_Q14; - psDD->Seed = silk_ADD32_ovflw( psDD->Seed, silk_RSHIFT_ROUND( psSS->Q_Q10, 10 ) ); - psDD->RandState[ *smpl_buf_idx ] = psDD->Seed; - psDD->RD_Q10 = psSS->RD_Q10; - } - delayedGain_Q10[ *smpl_buf_idx ] = Gain_Q10; - } - /* Update LPC states */ - for( k = 0; k < nStatesDelayedDecision; k++ ) { - psDD = &psDelDec[ k ]; - silk_memcpy( psDD->sLPC_Q14, &psDD->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH * sizeof( opus_int32 ) ); - } - RESTORE_STACK; -} - -static OPUS_INLINE void silk_nsq_del_dec_scale_states_sse4_1( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - NSQ_del_dec_struct psDelDec[], /* I/O Delayed decision states */ - const opus_int32 x_Q3[], /* I Input in Q3 */ - opus_int32 x_sc_Q10[], /* O Input scaled with 1/Gain in Q10 */ - const opus_int16 sLTP[], /* I Re-whitened LTP state in Q0 */ - opus_int32 sLTP_Q15[], /* O LTP state matching scaled input */ - opus_int subfr, /* I Subframe number */ - opus_int nStatesDelayedDecision, /* I Number of del dec states */ - const opus_int LTP_scale_Q14, /* I LTP state scaling */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lag */ - const opus_int signal_type, /* I Signal type */ - const opus_int decisionDelay /* I Decision delay */ -) -{ - opus_int i, k, lag; - opus_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q23; - NSQ_del_dec_struct *psDD; - __m128i xmm_inv_gain_Q23, xmm_x_Q3_x2x0, xmm_x_Q3_x3x1; - - lag = pitchL[ subfr ]; - inv_gain_Q31 = silk_INVERSE32_varQ( silk_max( Gains_Q16[ subfr ], 1 ), 47 ); - - silk_assert( inv_gain_Q31 != 0 ); - - /* Calculate gain adjustment factor */ - if( Gains_Q16[ subfr ] != NSQ->prev_gain_Q16 ) { - gain_adj_Q16 = silk_DIV32_varQ( NSQ->prev_gain_Q16, Gains_Q16[ subfr ], 16 ); - } else { - gain_adj_Q16 = (opus_int32)1 << 16; - } - - /* Scale input */ - inv_gain_Q23 = silk_RSHIFT_ROUND( inv_gain_Q31, 8 ); - - /* prepare inv_gain_Q23 in packed 4 32-bits */ - xmm_inv_gain_Q23 = _mm_set1_epi32(inv_gain_Q23); - - for( i = 0; i < psEncC->subfr_length - 3; i += 4 ) { - xmm_x_Q3_x2x0 = _mm_loadu_si128( (__m128i *)(&(x_Q3[ i ] ) ) ); - /* equal shift right 4 bytes*/ - xmm_x_Q3_x3x1 = _mm_shuffle_epi32( xmm_x_Q3_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ) ); - - xmm_x_Q3_x2x0 = _mm_mul_epi32( xmm_x_Q3_x2x0, xmm_inv_gain_Q23 ); - xmm_x_Q3_x3x1 = _mm_mul_epi32( xmm_x_Q3_x3x1, xmm_inv_gain_Q23 ); - - xmm_x_Q3_x2x0 = _mm_srli_epi64( xmm_x_Q3_x2x0, 16 ); - xmm_x_Q3_x3x1 = _mm_slli_epi64( xmm_x_Q3_x3x1, 16 ); - - xmm_x_Q3_x2x0 = _mm_blend_epi16( xmm_x_Q3_x2x0, xmm_x_Q3_x3x1, 0xCC ); - - _mm_storeu_si128( (__m128i *)(&(x_sc_Q10[ i ])), xmm_x_Q3_x2x0 ); - } - - for( ; i < psEncC->subfr_length; i++ ) { - x_sc_Q10[ i ] = silk_SMULWW( x_Q3[ i ], inv_gain_Q23 ); - } - - /* Save inverse gain */ - NSQ->prev_gain_Q16 = Gains_Q16[ subfr ]; - - /* After rewhitening the LTP state is un-scaled, so scale with inv_gain_Q16 */ - if( NSQ->rewhite_flag ) { - if( subfr == 0 ) { - /* Do LTP downscaling */ - inv_gain_Q31 = silk_LSHIFT( silk_SMULWB( inv_gain_Q31, LTP_scale_Q14 ), 2 ); - } - for( i = NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2; i < NSQ->sLTP_buf_idx; i++ ) { - silk_assert( i < MAX_FRAME_LENGTH ); - sLTP_Q15[ i ] = silk_SMULWB( inv_gain_Q31, sLTP[ i ] ); - } - } - - /* Adjust for changing gain */ - if( gain_adj_Q16 != (opus_int32)1 << 16 ) { - /* Scale long-term shaping state */ - { - __m128i xmm_gain_adj_Q16, xmm_sLTP_shp_Q14_x2x0, xmm_sLTP_shp_Q14_x3x1; - - /* prepare gain_adj_Q16 in packed 4 32-bits */ - xmm_gain_adj_Q16 = _mm_set1_epi32( gain_adj_Q16 ); - - for( i = NSQ->sLTP_shp_buf_idx - psEncC->ltp_mem_length; i < NSQ->sLTP_shp_buf_idx - 3; i += 4 ) - { - xmm_sLTP_shp_Q14_x2x0 = _mm_loadu_si128( (__m128i *)(&(NSQ->sLTP_shp_Q14[ i ] ) ) ); - /* equal shift right 4 bytes*/ - xmm_sLTP_shp_Q14_x3x1 = _mm_shuffle_epi32( xmm_sLTP_shp_Q14_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ) ); - - xmm_sLTP_shp_Q14_x2x0 = _mm_mul_epi32( xmm_sLTP_shp_Q14_x2x0, xmm_gain_adj_Q16 ); - xmm_sLTP_shp_Q14_x3x1 = _mm_mul_epi32( xmm_sLTP_shp_Q14_x3x1, xmm_gain_adj_Q16 ); - - xmm_sLTP_shp_Q14_x2x0 = _mm_srli_epi64( xmm_sLTP_shp_Q14_x2x0, 16 ); - xmm_sLTP_shp_Q14_x3x1 = _mm_slli_epi64( xmm_sLTP_shp_Q14_x3x1, 16 ); - - xmm_sLTP_shp_Q14_x2x0 = _mm_blend_epi16( xmm_sLTP_shp_Q14_x2x0, xmm_sLTP_shp_Q14_x3x1, 0xCC ); - - _mm_storeu_si128( (__m128i *)(&(NSQ->sLTP_shp_Q14[ i ] ) ), xmm_sLTP_shp_Q14_x2x0 ); - } - - for( ; i < NSQ->sLTP_shp_buf_idx; i++ ) { - NSQ->sLTP_shp_Q14[ i ] = silk_SMULWW( gain_adj_Q16, NSQ->sLTP_shp_Q14[ i ] ); - } - - /* Scale long-term prediction state */ - if( signal_type == TYPE_VOICED && NSQ->rewhite_flag == 0 ) { - for( i = NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2; i < NSQ->sLTP_buf_idx - decisionDelay; i++ ) { - sLTP_Q15[ i ] = silk_SMULWW( gain_adj_Q16, sLTP_Q15[ i ] ); - } - } - - for( k = 0; k < nStatesDelayedDecision; k++ ) { - psDD = &psDelDec[ k ]; - - /* Scale scalar states */ - psDD->LF_AR_Q14 = silk_SMULWW( gain_adj_Q16, psDD->LF_AR_Q14 ); - - /* Scale short-term prediction and shaping states */ - for( i = 0; i < NSQ_LPC_BUF_LENGTH; i++ ) { - psDD->sLPC_Q14[ i ] = silk_SMULWW( gain_adj_Q16, psDD->sLPC_Q14[ i ] ); - } - for( i = 0; i < MAX_SHAPE_LPC_ORDER; i++ ) { - psDD->sAR2_Q14[ i ] = silk_SMULWW( gain_adj_Q16, psDD->sAR2_Q14[ i ] ); - } - for( i = 0; i < DECISION_DELAY; i++ ) { - psDD->Pred_Q15[ i ] = silk_SMULWW( gain_adj_Q16, psDD->Pred_Q15[ i ] ); - psDD->Shape_Q14[ i ] = silk_SMULWW( gain_adj_Q16, psDD->Shape_Q14[ i ] ); - } - } - } - } -} diff --git a/media/libopus/silk/x86/NSQ_sse.c b/media/libopus/silk/x86/NSQ_sse.c deleted file mode 100644 index 6a9e6e96cfab8..0000000000000 --- a/media/libopus/silk/x86/NSQ_sse.c +++ /dev/null @@ -1,719 +0,0 @@ -/* Copyright (c) 2014, Cisco Systems, INC - Written by XiangMingZhu WeiZhou MinPeng YanWang - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <xmmintrin.h> -#include <emmintrin.h> -#include <smmintrin.h> -#include "main.h" -#include "celt/x86/x86cpu.h" -#include "stack_alloc.h" - -static OPUS_INLINE void silk_nsq_scale_states_sse4_1( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - const opus_int32 x_Q3[], /* I input in Q3 */ - opus_int32 x_sc_Q10[], /* O input scaled with 1/Gain */ - const opus_int16 sLTP[], /* I re-whitened LTP state in Q0 */ - opus_int32 sLTP_Q15[], /* O LTP state matching scaled input */ - opus_int subfr, /* I subframe number */ - const opus_int LTP_scale_Q14, /* I */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lag */ - const opus_int signal_type /* I Signal type */ -); - -static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1( - silk_nsq_state *NSQ, /* I/O NSQ state */ - opus_int signalType, /* I Signal type */ - const opus_int32 x_sc_Q10[], /* I */ - opus_int8 pulses[], /* O */ - opus_int16 xq[], /* O */ - opus_int32 sLTP_Q15[], /* I/O LTP state */ - const opus_int16 a_Q12[], /* I Short term prediction coefs */ - const opus_int16 b_Q14[], /* I Long term prediction coefs */ - const opus_int16 AR_shp_Q13[], /* I Noise shaping AR coefs */ - opus_int lag, /* I Pitch lag */ - opus_int32 HarmShapeFIRPacked_Q14, /* I */ - opus_int Tilt_Q14, /* I Spectral tilt */ - opus_int32 LF_shp_Q14, /* I */ - opus_int32 Gain_Q16, /* I */ - opus_int offset_Q10, /* I */ - opus_int length, /* I Input length */ - opus_int32 table[][4] /* I */ -); - -void silk_NSQ_sse4_1( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - SideInfoIndices *psIndices, /* I/O Quantization Indices */ - const opus_int32 x_Q3[], /* I Prefiltered input signal */ - opus_int8 pulses[], /* O Quantized pulse signal */ - const opus_int16 PredCoef_Q12[ 2 * MAX_LPC_ORDER ], /* I Short term prediction coefs */ - const opus_int16 LTPCoef_Q14[ LTP_ORDER * MAX_NB_SUBFR ], /* I Long term prediction coefs */ - const opus_int16 AR2_Q13[ MAX_NB_SUBFR * MAX_SHAPE_LPC_ORDER ], /* I Noise shaping coefs */ - const opus_int HarmShapeGain_Q14[ MAX_NB_SUBFR ], /* I Long term shaping coefs */ - const opus_int Tilt_Q14[ MAX_NB_SUBFR ], /* I Spectral tilt */ - const opus_int32 LF_shp_Q14[ MAX_NB_SUBFR ], /* I Low frequency shaping coefs */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I Quantization step sizes */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lags */ - const opus_int Lambda_Q10, /* I Rate/distortion tradeoff */ - const opus_int LTP_scale_Q14 /* I LTP state scaling */ -) -{ - opus_int k, lag, start_idx, LSF_interpolation_flag; - const opus_int16 *A_Q12, *B_Q14, *AR_shp_Q13; - opus_int16 *pxq; - VARDECL( opus_int32, sLTP_Q15 ); - VARDECL( opus_int16, sLTP ); - opus_int32 HarmShapeFIRPacked_Q14; - opus_int offset_Q10; - VARDECL( opus_int32, x_sc_Q10 ); - - opus_int32 table[ 64 ][ 4 ]; - opus_int32 tmp1; - opus_int32 q1_Q10, q2_Q10, rd1_Q20, rd2_Q20; - - SAVE_STACK; - - NSQ->rand_seed = psIndices->Seed; - - /* Set unvoiced lag to the previous one, overwrite later for voiced */ - lag = NSQ->lagPrev; - - silk_assert( NSQ->prev_gain_Q16 != 0 ); - - offset_Q10 = silk_Quantization_Offsets_Q10[ psIndices->signalType >> 1 ][ psIndices->quantOffsetType ]; - - /* 0 */ - q1_Q10 = offset_Q10; - q2_Q10 = offset_Q10 + ( 1024 - QUANT_LEVEL_ADJUST_Q10 ); - rd1_Q20 = q1_Q10 * Lambda_Q10; - rd2_Q20 = q2_Q10 * Lambda_Q10; - - table[ 32 ][ 0 ] = q1_Q10; - table[ 32 ][ 1 ] = q2_Q10; - table[ 32 ][ 2 ] = 2 * (q1_Q10 - q2_Q10); - table[ 32 ][ 3 ] = (rd1_Q20 - rd2_Q20) + (q1_Q10 * q1_Q10 - q2_Q10 * q2_Q10); - - /* -1 */ - q1_Q10 = offset_Q10 - ( 1024 - QUANT_LEVEL_ADJUST_Q10 ); - q2_Q10 = offset_Q10; - rd1_Q20 = - q1_Q10 * Lambda_Q10; - rd2_Q20 = q2_Q10 * Lambda_Q10; - - table[ 31 ][ 0 ] = q1_Q10; - table[ 31 ][ 1 ] = q2_Q10; - table[ 31 ][ 2 ] = 2 * (q1_Q10 - q2_Q10); - table[ 31 ][ 3 ] = (rd1_Q20 - rd2_Q20) + (q1_Q10 * q1_Q10 - q2_Q10 * q2_Q10); - - /* > 0 */ - for (k = 1; k <= 31; k++) - { - tmp1 = offset_Q10 + silk_LSHIFT( k, 10 ); - - q1_Q10 = tmp1 - QUANT_LEVEL_ADJUST_Q10; - q2_Q10 = tmp1 - QUANT_LEVEL_ADJUST_Q10 + 1024; - rd1_Q20 = q1_Q10 * Lambda_Q10; - rd2_Q20 = q2_Q10 * Lambda_Q10; - - table[ 32 + k ][ 0 ] = q1_Q10; - table[ 32 + k ][ 1 ] = q2_Q10; - table[ 32 + k ][ 2 ] = 2 * (q1_Q10 - q2_Q10); - table[ 32 + k ][ 3 ] = (rd1_Q20 - rd2_Q20) + (q1_Q10 * q1_Q10 - q2_Q10 * q2_Q10); - } - - /* < -1 */ - for (k = -32; k <= -2; k++) - { - tmp1 = offset_Q10 + silk_LSHIFT( k, 10 ); - - q1_Q10 = tmp1 + QUANT_LEVEL_ADJUST_Q10; - q2_Q10 = tmp1 + QUANT_LEVEL_ADJUST_Q10 + 1024; - rd1_Q20 = - q1_Q10 * Lambda_Q10; - rd2_Q20 = - q2_Q10 * Lambda_Q10; - - table[ 32 + k ][ 0 ] = q1_Q10; - table[ 32 + k ][ 1 ] = q2_Q10; - table[ 32 + k ][ 2 ] = 2 * (q1_Q10 - q2_Q10); - table[ 32 + k ][ 3 ] = (rd1_Q20 - rd2_Q20) + (q1_Q10 * q1_Q10 - q2_Q10 * q2_Q10); - } - - if( psIndices->NLSFInterpCoef_Q2 == 4 ) { - LSF_interpolation_flag = 0; - } else { - LSF_interpolation_flag = 1; - } - - ALLOC( sLTP_Q15, - psEncC->ltp_mem_length + psEncC->frame_length, opus_int32 ); - ALLOC( sLTP, psEncC->ltp_mem_length + psEncC->frame_length, opus_int16 ); - ALLOC( x_sc_Q10, psEncC->subfr_length, opus_int32 ); - /* Set up pointers to start of sub frame */ - NSQ->sLTP_shp_buf_idx = psEncC->ltp_mem_length; - NSQ->sLTP_buf_idx = psEncC->ltp_mem_length; - pxq = &NSQ->xq[ psEncC->ltp_mem_length ]; - for( k = 0; k < psEncC->nb_subfr; k++ ) { - A_Q12 = &PredCoef_Q12[ (( k >> 1 ) | ( 1 - LSF_interpolation_flag )) * MAX_LPC_ORDER ]; - B_Q14 = <PCoef_Q14[ k * LTP_ORDER ]; - AR_shp_Q13 = &AR2_Q13[ k * MAX_SHAPE_LPC_ORDER ]; - - /* Noise shape parameters */ - silk_assert( HarmShapeGain_Q14[ k ] >= 0 ); - HarmShapeFIRPacked_Q14 = silk_RSHIFT( HarmShapeGain_Q14[ k ], 2 ); - HarmShapeFIRPacked_Q14 |= silk_LSHIFT( (opus_int32)silk_RSHIFT( HarmShapeGain_Q14[ k ], 1 ), 16 ); - - NSQ->rewhite_flag = 0; - if( psIndices->signalType == TYPE_VOICED ) { - /* Voiced */ - lag = pitchL[ k ]; - - /* Re-whitening */ - if( ( k & ( 3 - silk_LSHIFT( LSF_interpolation_flag, 1 ) ) ) == 0 ) { - /* Rewhiten with new A coefs */ - start_idx = psEncC->ltp_mem_length - lag - psEncC->predictLPCOrder - LTP_ORDER / 2; - silk_assert( start_idx > 0 ); - - silk_LPC_analysis_filter( &sLTP[ start_idx ], &NSQ->xq[ start_idx + k * psEncC->subfr_length ], - A_Q12, psEncC->ltp_mem_length - start_idx, psEncC->predictLPCOrder, psEncC->arch ); - - NSQ->rewhite_flag = 1; - NSQ->sLTP_buf_idx = psEncC->ltp_mem_length; - } - } - - silk_nsq_scale_states_sse4_1( psEncC, NSQ, x_Q3, x_sc_Q10, sLTP, sLTP_Q15, k, LTP_scale_Q14, Gains_Q16, pitchL, psIndices->signalType ); - - if ( opus_likely( ( 10 == psEncC->shapingLPCOrder ) && ( 16 == psEncC->predictLPCOrder) ) ) - { - silk_noise_shape_quantizer_10_16_sse4_1( NSQ, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15, A_Q12, B_Q14, - AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ], Gains_Q16[ k ], - offset_Q10, psEncC->subfr_length, &(table[32]) ); - } - else - { - silk_noise_shape_quantizer( NSQ, psIndices->signalType, x_sc_Q10, pulses, pxq, sLTP_Q15, A_Q12, B_Q14, - AR_shp_Q13, lag, HarmShapeFIRPacked_Q14, Tilt_Q14[ k ], LF_shp_Q14[ k ], Gains_Q16[ k ], Lambda_Q10, - offset_Q10, psEncC->subfr_length, psEncC->shapingLPCOrder, psEncC->predictLPCOrder, psEncC->arch ); - } - - x_Q3 += psEncC->subfr_length; - pulses += psEncC->subfr_length; - pxq += psEncC->subfr_length; - } - - /* Update lagPrev for next frame */ - NSQ->lagPrev = pitchL[ psEncC->nb_subfr - 1 ]; - - /* Save quantized speech and noise shaping signals */ - silk_memmove( NSQ->xq, &NSQ->xq[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int16 ) ); - silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int32 ) ); - RESTORE_STACK; -} - -/***********************************/ -/* silk_noise_shape_quantizer_10_16 */ -/***********************************/ -static OPUS_INLINE void silk_noise_shape_quantizer_10_16_sse4_1( - silk_nsq_state *NSQ, /* I/O NSQ state */ - opus_int signalType, /* I Signal type */ - const opus_int32 x_sc_Q10[], /* I */ - opus_int8 pulses[], /* O */ - opus_int16 xq[], /* O */ - opus_int32 sLTP_Q15[], /* I/O LTP state */ - const opus_int16 a_Q12[], /* I Short term prediction coefs */ - const opus_int16 b_Q14[], /* I Long term prediction coefs */ - const opus_int16 AR_shp_Q13[], /* I Noise shaping AR coefs */ - opus_int lag, /* I Pitch lag */ - opus_int32 HarmShapeFIRPacked_Q14, /* I */ - opus_int Tilt_Q14, /* I Spectral tilt */ - opus_int32 LF_shp_Q14, /* I */ - opus_int32 Gain_Q16, /* I */ - opus_int offset_Q10, /* I */ - opus_int length, /* I Input length */ - opus_int32 table[][4] /* I */ -) -{ - opus_int i; - opus_int32 LTP_pred_Q13, LPC_pred_Q10, n_AR_Q12, n_LTP_Q13; - opus_int32 n_LF_Q12, r_Q10, q1_Q0, q1_Q10, q2_Q10; - opus_int32 exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10; - opus_int32 tmp1, tmp2, sLF_AR_shp_Q14; - opus_int32 *psLPC_Q14, *shp_lag_ptr, *pred_lag_ptr; - - __m128i xmm_tempa, xmm_tempb; - - __m128i xmm_one; - - __m128i psLPC_Q14_hi_01234567, psLPC_Q14_hi_89ABCDEF; - __m128i psLPC_Q14_lo_01234567, psLPC_Q14_lo_89ABCDEF; - __m128i a_Q12_01234567, a_Q12_89ABCDEF; - - __m128i sAR2_Q14_hi_76543210, sAR2_Q14_lo_76543210; - __m128i AR_shp_Q13_76543210; - - shp_lag_ptr = &NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS / 2 ]; - pred_lag_ptr = &sLTP_Q15[ NSQ->sLTP_buf_idx - lag + LTP_ORDER / 2 ]; - Gain_Q10 = silk_RSHIFT( Gain_Q16, 6 ); - - /* Set up short term AR state */ - psLPC_Q14 = &NSQ->sLPC_Q14[ NSQ_LPC_BUF_LENGTH - 1 ]; - - sLF_AR_shp_Q14 = NSQ->sLF_AR_shp_Q14; - xq_Q14 = psLPC_Q14[ 0 ]; - LTP_pred_Q13 = 0; - - /* load a_Q12 */ - xmm_one = _mm_set_epi8( 1, 0, 3, 2, 5, 4, 7, 6, 9, 8, 11, 10, 13, 12, 15, 14 ); - - /* load a_Q12[0] - a_Q12[7] */ - a_Q12_01234567 = _mm_loadu_si128( (__m128i *)(&a_Q12[ 0 ] ) ); - /* load a_Q12[ 8 ] - a_Q12[ 15 ] */ - a_Q12_89ABCDEF = _mm_loadu_si128( (__m128i *)(&a_Q12[ 8 ] ) ); - - a_Q12_01234567 = _mm_shuffle_epi8( a_Q12_01234567, xmm_one ); - a_Q12_89ABCDEF = _mm_shuffle_epi8( a_Q12_89ABCDEF, xmm_one ); - - /* load AR_shp_Q13 */ - AR_shp_Q13_76543210 = _mm_loadu_si128( (__m128i *)(&AR_shp_Q13[0] ) ); - - /* load psLPC_Q14 */ - xmm_one = _mm_set_epi8(15, 14, 11, 10, 7, 6, 3, 2, 13, 12, 9, 8, 5, 4, 1, 0 ); - - xmm_tempa = _mm_loadu_si128( (__m128i *)(&psLPC_Q14[-16]) ); - xmm_tempb = _mm_loadu_si128( (__m128i *)(&psLPC_Q14[-12]) ); - - xmm_tempa = _mm_shuffle_epi8( xmm_tempa, xmm_one ); - xmm_tempb = _mm_shuffle_epi8( xmm_tempb, xmm_one ); - - psLPC_Q14_hi_89ABCDEF = _mm_unpackhi_epi64( xmm_tempa, xmm_tempb ); - psLPC_Q14_lo_89ABCDEF = _mm_unpacklo_epi64( xmm_tempa, xmm_tempb ); - - xmm_tempa = _mm_loadu_si128( (__m128i *)(&psLPC_Q14[ -8 ]) ); - xmm_tempb = _mm_loadu_si128( (__m128i *)(&psLPC_Q14[ -4 ]) ); - - xmm_tempa = _mm_shuffle_epi8( xmm_tempa, xmm_one ); - xmm_tempb = _mm_shuffle_epi8( xmm_tempb, xmm_one ); - - psLPC_Q14_hi_01234567 = _mm_unpackhi_epi64( xmm_tempa, xmm_tempb ); - psLPC_Q14_lo_01234567 = _mm_unpacklo_epi64( xmm_tempa, xmm_tempb ); - - /* load sAR2_Q14 */ - xmm_tempa = _mm_loadu_si128( (__m128i *)(&(NSQ->sAR2_Q14[ 0 ]) ) ); - xmm_tempb = _mm_loadu_si128( (__m128i *)(&(NSQ->sAR2_Q14[ 4 ]) ) ); - - xmm_tempa = _mm_shuffle_epi8( xmm_tempa, xmm_one ); - xmm_tempb = _mm_shuffle_epi8( xmm_tempb, xmm_one ); - - sAR2_Q14_hi_76543210 = _mm_unpackhi_epi64( xmm_tempa, xmm_tempb ); - sAR2_Q14_lo_76543210 = _mm_unpacklo_epi64( xmm_tempa, xmm_tempb ); - - /* prepare 1 in 8 * 16bit */ - xmm_one = _mm_set1_epi16(1); - - for( i = 0; i < length; i++ ) - { - /* Short-term prediction */ - __m128i xmm_hi_07, xmm_hi_8F, xmm_lo_07, xmm_lo_8F; - - /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */ - LPC_pred_Q10 = 8; /* silk_RSHIFT( predictLPCOrder, 1 ); */ - - /* shift psLPC_Q14 */ - psLPC_Q14_hi_89ABCDEF = _mm_alignr_epi8( psLPC_Q14_hi_01234567, psLPC_Q14_hi_89ABCDEF, 2 ); - psLPC_Q14_lo_89ABCDEF = _mm_alignr_epi8( psLPC_Q14_lo_01234567, psLPC_Q14_lo_89ABCDEF, 2 ); - - psLPC_Q14_hi_01234567 = _mm_srli_si128( psLPC_Q14_hi_01234567, 2 ); - psLPC_Q14_lo_01234567 = _mm_srli_si128( psLPC_Q14_lo_01234567, 2 ); - - psLPC_Q14_hi_01234567 = _mm_insert_epi16( psLPC_Q14_hi_01234567, (xq_Q14 >> 16), 7 ); - psLPC_Q14_lo_01234567 = _mm_insert_epi16( psLPC_Q14_lo_01234567, (xq_Q14), 7 ); - - /* high part, use pmaddwd, results in 4 32-bit */ - xmm_hi_07 = _mm_madd_epi16( psLPC_Q14_hi_01234567, a_Q12_01234567 ); - xmm_hi_8F = _mm_madd_epi16( psLPC_Q14_hi_89ABCDEF, a_Q12_89ABCDEF ); - - /* low part, use pmulhw, results in 8 16-bit, note we need simulate unsigned * signed, _mm_srai_epi16(psLPC_Q14_lo_01234567, 15) */ - xmm_tempa = _mm_cmpgt_epi16( _mm_setzero_si128(), psLPC_Q14_lo_01234567 ); - xmm_tempb = _mm_cmpgt_epi16( _mm_setzero_si128(), psLPC_Q14_lo_89ABCDEF ); - - xmm_tempa = _mm_and_si128( xmm_tempa, a_Q12_01234567 ); - xmm_tempb = _mm_and_si128( xmm_tempb, a_Q12_89ABCDEF ); - - xmm_lo_07 = _mm_mulhi_epi16( psLPC_Q14_lo_01234567, a_Q12_01234567 ); - xmm_lo_8F = _mm_mulhi_epi16( psLPC_Q14_lo_89ABCDEF, a_Q12_89ABCDEF ); - - xmm_lo_07 = _mm_add_epi16( xmm_lo_07, xmm_tempa ); - xmm_lo_8F = _mm_add_epi16( xmm_lo_8F, xmm_tempb ); - - xmm_lo_07 = _mm_madd_epi16( xmm_lo_07, xmm_one ); - xmm_lo_8F = _mm_madd_epi16( xmm_lo_8F, xmm_one ); - - /* accumulate */ - xmm_hi_07 = _mm_add_epi32( xmm_hi_07, xmm_hi_8F ); - xmm_lo_07 = _mm_add_epi32( xmm_lo_07, xmm_lo_8F ); - - xmm_hi_07 = _mm_add_epi32( xmm_hi_07, xmm_lo_07 ); - - xmm_hi_07 = _mm_add_epi32( xmm_hi_07, _mm_unpackhi_epi64(xmm_hi_07, xmm_hi_07 ) ); - xmm_hi_07 = _mm_add_epi32( xmm_hi_07, _mm_shufflelo_epi16(xmm_hi_07, 0x0E ) ); - - LPC_pred_Q10 += _mm_cvtsi128_si32( xmm_hi_07 ); - - /* Long-term prediction */ - if ( opus_likely( signalType == TYPE_VOICED ) ) { - /* Unrolled loop */ - /* Avoids introducing a bias because silk_SMLAWB() always rounds to -inf */ - LTP_pred_Q13 = 2; - { - __m128i b_Q14_3210, b_Q14_0123, pred_lag_ptr_0123; - - b_Q14_3210 = OP_CVTEPI16_EPI32_M64( b_Q14 ); - b_Q14_0123 = _mm_shuffle_epi32( b_Q14_3210, 0x1B ); - - /* loaded: [0] [-1] [-2] [-3] */ - pred_lag_ptr_0123 = _mm_loadu_si128( (__m128i *)(&pred_lag_ptr[ -3 ] ) ); - /* shuffle to [-3] [-2] [-1] [0] and to new xmm */ - xmm_tempa = _mm_shuffle_epi32( pred_lag_ptr_0123, 0x1B ); - /*64-bit multiply, a[2] * b[-2], a[0] * b[0] */ - xmm_tempa = _mm_mul_epi32( xmm_tempa, b_Q14_3210 ); - /* right shift 2 bytes (16 bits), zero extended */ - xmm_tempa = _mm_srli_si128( xmm_tempa, 2 ); - - /* a[1] * b[-1], a[3] * b[-3] */ - pred_lag_ptr_0123 = _mm_mul_epi32( pred_lag_ptr_0123, b_Q14_0123 ); - pred_lag_ptr_0123 = _mm_srli_si128( pred_lag_ptr_0123, 2 ); - - pred_lag_ptr_0123 = _mm_add_epi32( pred_lag_ptr_0123, xmm_tempa ); - /* equal shift right 8 bytes*/ - xmm_tempa = _mm_shuffle_epi32( pred_lag_ptr_0123, _MM_SHUFFLE( 0, 0, 3, 2 ) ); - xmm_tempa = _mm_add_epi32( xmm_tempa, pred_lag_ptr_0123 ); - - LTP_pred_Q13 += _mm_cvtsi128_si32( xmm_tempa ); - - LTP_pred_Q13 = silk_SMLAWB( LTP_pred_Q13, pred_lag_ptr[ -4 ], b_Q14[ 4 ] ); - pred_lag_ptr++; - } - } - - /* Noise shape feedback */ - NSQ->sAR2_Q14[ 9 ] = NSQ->sAR2_Q14[ 8 ]; - NSQ->sAR2_Q14[ 8 ] = _mm_cvtsi128_si32( _mm_srli_si128(_mm_unpackhi_epi16( sAR2_Q14_lo_76543210, sAR2_Q14_hi_76543210 ), 12 ) ); - - sAR2_Q14_hi_76543210 = _mm_slli_si128( sAR2_Q14_hi_76543210, 2 ); - sAR2_Q14_lo_76543210 = _mm_slli_si128( sAR2_Q14_lo_76543210, 2 ); - - sAR2_Q14_hi_76543210 = _mm_insert_epi16( sAR2_Q14_hi_76543210, (xq_Q14 >> 16), 0 ); - sAR2_Q14_lo_76543210 = _mm_insert_epi16( sAR2_Q14_lo_76543210, (xq_Q14), 0 ); - - /* high part, use pmaddwd, results in 4 32-bit */ - xmm_hi_07 = _mm_madd_epi16( sAR2_Q14_hi_76543210, AR_shp_Q13_76543210 ); - - /* low part, use pmulhw, results in 8 16-bit, note we need simulate unsigned * signed,_mm_srai_epi16(sAR2_Q14_lo_76543210, 15) */ - xmm_tempa = _mm_cmpgt_epi16( _mm_setzero_si128(), sAR2_Q14_lo_76543210 ); - xmm_tempa = _mm_and_si128( xmm_tempa, AR_shp_Q13_76543210 ); - - xmm_lo_07 = _mm_mulhi_epi16( sAR2_Q14_lo_76543210, AR_shp_Q13_76543210 ); - xmm_lo_07 = _mm_add_epi16( xmm_lo_07, xmm_tempa ); - - xmm_lo_07 = _mm_madd_epi16( xmm_lo_07, xmm_one ); - - /* accumulate */ - xmm_hi_07 = _mm_add_epi32( xmm_hi_07, xmm_lo_07 ); - - xmm_hi_07 = _mm_add_epi32( xmm_hi_07, _mm_unpackhi_epi64(xmm_hi_07, xmm_hi_07 ) ); - xmm_hi_07 = _mm_add_epi32( xmm_hi_07, _mm_shufflelo_epi16(xmm_hi_07, 0x0E ) ); - - n_AR_Q12 = 5 + _mm_cvtsi128_si32( xmm_hi_07 ); - - n_AR_Q12 = silk_SMLAWB( n_AR_Q12, NSQ->sAR2_Q14[ 8 ], AR_shp_Q13[ 8 ] ); - n_AR_Q12 = silk_SMLAWB( n_AR_Q12, NSQ->sAR2_Q14[ 9 ], AR_shp_Q13[ 9 ] ); - - n_AR_Q12 = silk_LSHIFT32( n_AR_Q12, 1 ); /* Q11 -> Q12 */ - n_AR_Q12 = silk_SMLAWB( n_AR_Q12, sLF_AR_shp_Q14, Tilt_Q14 ); - - n_LF_Q12 = silk_SMULWB( NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - 1 ], LF_shp_Q14 ); - n_LF_Q12 = silk_SMLAWT( n_LF_Q12, sLF_AR_shp_Q14, LF_shp_Q14 ); - - silk_assert( lag > 0 || signalType != TYPE_VOICED ); - - /* Combine prediction and noise shaping signals */ - tmp1 = silk_SUB32( silk_LSHIFT32( LPC_pred_Q10, 2 ), n_AR_Q12 ); /* Q12 */ - tmp1 = silk_SUB32( tmp1, n_LF_Q12 ); /* Q12 */ - if( lag > 0 ) { - /* Symmetric, packed FIR coefficients */ - n_LTP_Q13 = silk_SMULWB( silk_ADD32( shp_lag_ptr[ 0 ], shp_lag_ptr[ -2 ] ), HarmShapeFIRPacked_Q14 ); - n_LTP_Q13 = silk_SMLAWT( n_LTP_Q13, shp_lag_ptr[ -1 ], HarmShapeFIRPacked_Q14 ); - n_LTP_Q13 = silk_LSHIFT( n_LTP_Q13, 1 ); - shp_lag_ptr++; - - tmp2 = silk_SUB32( LTP_pred_Q13, n_LTP_Q13 ); /* Q13 */ - tmp1 = silk_ADD_LSHIFT32( tmp2, tmp1, 1 ); /* Q13 */ - tmp1 = silk_RSHIFT_ROUND( tmp1, 3 ); /* Q10 */ - } else { - tmp1 = silk_RSHIFT_ROUND( tmp1, 2 ); /* Q10 */ - } - - r_Q10 = silk_SUB32( x_sc_Q10[ i ], tmp1 ); /* residual error Q10 */ - - /* Generate dither */ - NSQ->rand_seed = silk_RAND( NSQ->rand_seed ); - - /* Flip sign depending on dither */ - tmp2 = -r_Q10; - if ( NSQ->rand_seed < 0 ) r_Q10 = tmp2; - - r_Q10 = silk_LIMIT_32( r_Q10, -(31 << 10), 30 << 10 ); - - /* Find two quantization level candidates and measure their rate-distortion */ - q1_Q10 = silk_SUB32( r_Q10, offset_Q10 ); - q1_Q0 = silk_RSHIFT( q1_Q10, 10 ); - - q1_Q10 = table[q1_Q0][0]; - q2_Q10 = table[q1_Q0][1]; - - if (r_Q10 * table[q1_Q0][2] - table[q1_Q0][3] < 0) - { - q1_Q10 = q2_Q10; - } - - pulses[ i ] = (opus_int8)silk_RSHIFT_ROUND( q1_Q10, 10 ); - - /* Excitation */ - exc_Q14 = silk_LSHIFT( q1_Q10, 4 ); - - tmp2 = -exc_Q14; - if ( NSQ->rand_seed < 0 ) exc_Q14 = tmp2; - - /* Add predictions */ - LPC_exc_Q14 = silk_ADD_LSHIFT32( exc_Q14, LTP_pred_Q13, 1 ); - xq_Q14 = silk_ADD_LSHIFT32( LPC_exc_Q14, LPC_pred_Q10, 4 ); - - /* Update states */ - psLPC_Q14++; - *psLPC_Q14 = xq_Q14; - sLF_AR_shp_Q14 = silk_SUB_LSHIFT32( xq_Q14, n_AR_Q12, 2 ); - - NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx ] = silk_SUB_LSHIFT32( sLF_AR_shp_Q14, n_LF_Q12, 2 ); - sLTP_Q15[ NSQ->sLTP_buf_idx ] = silk_LSHIFT( LPC_exc_Q14, 1 ); - NSQ->sLTP_shp_buf_idx++; - NSQ->sLTP_buf_idx++; - - /* Make dither dependent on quantized signal */ - NSQ->rand_seed = silk_ADD32_ovflw( NSQ->rand_seed, pulses[ i ] ); - } - - NSQ->sLF_AR_shp_Q14 = sLF_AR_shp_Q14; - - /* Scale XQ back to normal level before saving */ - psLPC_Q14 = &NSQ->sLPC_Q14[ NSQ_LPC_BUF_LENGTH ]; - - /* write back sAR2_Q14 */ - xmm_tempa = _mm_unpackhi_epi16( sAR2_Q14_lo_76543210, sAR2_Q14_hi_76543210 ); - xmm_tempb = _mm_unpacklo_epi16( sAR2_Q14_lo_76543210, sAR2_Q14_hi_76543210 ); - _mm_storeu_si128( (__m128i *)(&NSQ->sAR2_Q14[ 4 ]), xmm_tempa ); - _mm_storeu_si128( (__m128i *)(&NSQ->sAR2_Q14[ 0 ]), xmm_tempb ); - - /* xq[ i ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( psLPC_Q14[ i ], Gain_Q10 ), 8 ) ); */ - { - __m128i xmm_Gain_Q10; - __m128i xmm_xq_Q14_3210, xmm_xq_Q14_x3x1, xmm_xq_Q14_7654, xmm_xq_Q14_x7x5; - - /* prepare (1 << 7) in packed 4 32-bits */ - xmm_tempa = _mm_set1_epi32( (1 << 7) ); - - /* prepare Gain_Q10 in packed 4 32-bits */ - xmm_Gain_Q10 = _mm_set1_epi32( Gain_Q10 ); - - /* process xq */ - for (i = 0; i < length - 7; i += 8) - { - xmm_xq_Q14_3210 = _mm_loadu_si128( (__m128i *)(&(psLPC_Q14[ i + 0 ] ) ) ); - xmm_xq_Q14_7654 = _mm_loadu_si128( (__m128i *)(&(psLPC_Q14[ i + 4 ] ) ) ); - - /* equal shift right 4 bytes*/ - xmm_xq_Q14_x3x1 = _mm_shuffle_epi32( xmm_xq_Q14_3210, _MM_SHUFFLE( 0, 3, 2, 1 ) ); - /* equal shift right 4 bytes*/ - xmm_xq_Q14_x7x5 = _mm_shuffle_epi32( xmm_xq_Q14_7654, _MM_SHUFFLE( 0, 3, 2, 1 ) ); - - xmm_xq_Q14_3210 = _mm_mul_epi32( xmm_xq_Q14_3210, xmm_Gain_Q10 ); - xmm_xq_Q14_x3x1 = _mm_mul_epi32( xmm_xq_Q14_x3x1, xmm_Gain_Q10 ); - xmm_xq_Q14_7654 = _mm_mul_epi32( xmm_xq_Q14_7654, xmm_Gain_Q10 ); - xmm_xq_Q14_x7x5 = _mm_mul_epi32( xmm_xq_Q14_x7x5, xmm_Gain_Q10 ); - - xmm_xq_Q14_3210 = _mm_srli_epi64( xmm_xq_Q14_3210, 16 ); - xmm_xq_Q14_x3x1 = _mm_slli_epi64( xmm_xq_Q14_x3x1, 16 ); - xmm_xq_Q14_7654 = _mm_srli_epi64( xmm_xq_Q14_7654, 16 ); - xmm_xq_Q14_x7x5 = _mm_slli_epi64( xmm_xq_Q14_x7x5, 16 ); - - xmm_xq_Q14_3210 = _mm_blend_epi16( xmm_xq_Q14_3210, xmm_xq_Q14_x3x1, 0xCC ); - xmm_xq_Q14_7654 = _mm_blend_epi16( xmm_xq_Q14_7654, xmm_xq_Q14_x7x5, 0xCC ); - - /* silk_RSHIFT_ROUND(xq, 8) */ - xmm_xq_Q14_3210 = _mm_add_epi32( xmm_xq_Q14_3210, xmm_tempa ); - xmm_xq_Q14_7654 = _mm_add_epi32( xmm_xq_Q14_7654, xmm_tempa ); - - xmm_xq_Q14_3210 = _mm_srai_epi32( xmm_xq_Q14_3210, 8 ); - xmm_xq_Q14_7654 = _mm_srai_epi32( xmm_xq_Q14_7654, 8 ); - - /* silk_SAT16 */ - xmm_xq_Q14_3210 = _mm_packs_epi32( xmm_xq_Q14_3210, xmm_xq_Q14_7654 ); - - /* save to xq */ - _mm_storeu_si128( (__m128i *)(&xq[ i ] ), xmm_xq_Q14_3210 ); - } - } - for ( ; i < length; i++) - { - xq[i] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( psLPC_Q14[ i ], Gain_Q10 ), 8 ) ); - } - - /* Update LPC synth buffer */ - silk_memcpy( NSQ->sLPC_Q14, &NSQ->sLPC_Q14[ length ], NSQ_LPC_BUF_LENGTH * sizeof( opus_int32 ) ); -} - -static OPUS_INLINE void silk_nsq_scale_states_sse4_1( - const silk_encoder_state *psEncC, /* I Encoder State */ - silk_nsq_state *NSQ, /* I/O NSQ state */ - const opus_int32 x_Q3[], /* I input in Q3 */ - opus_int32 x_sc_Q10[], /* O input scaled with 1/Gain */ - const opus_int16 sLTP[], /* I re-whitened LTP state in Q0 */ - opus_int32 sLTP_Q15[], /* O LTP state matching scaled input */ - opus_int subfr, /* I subframe number */ - const opus_int LTP_scale_Q14, /* I */ - const opus_int32 Gains_Q16[ MAX_NB_SUBFR ], /* I */ - const opus_int pitchL[ MAX_NB_SUBFR ], /* I Pitch lag */ - const opus_int signal_type /* I Signal type */ -) -{ - opus_int i, lag; - opus_int32 gain_adj_Q16, inv_gain_Q31, inv_gain_Q23; - __m128i xmm_inv_gain_Q23, xmm_x_Q3_x2x0, xmm_x_Q3_x3x1; - - lag = pitchL[ subfr ]; - inv_gain_Q31 = silk_INVERSE32_varQ( silk_max( Gains_Q16[ subfr ], 1 ), 47 ); - silk_assert( inv_gain_Q31 != 0 ); - - /* Calculate gain adjustment factor */ - if( Gains_Q16[ subfr ] != NSQ->prev_gain_Q16 ) { - gain_adj_Q16 = silk_DIV32_varQ( NSQ->prev_gain_Q16, Gains_Q16[ subfr ], 16 ); - } else { - gain_adj_Q16 = (opus_int32)1 << 16; - } - - /* Scale input */ - inv_gain_Q23 = silk_RSHIFT_ROUND( inv_gain_Q31, 8 ); - - /* prepare inv_gain_Q23 in packed 4 32-bits */ - xmm_inv_gain_Q23 = _mm_set1_epi32(inv_gain_Q23); - - for( i = 0; i < psEncC->subfr_length - 3; i += 4 ) { - xmm_x_Q3_x2x0 = _mm_loadu_si128( (__m128i *)(&(x_Q3[ i ] ) ) ); - - /* equal shift right 4 bytes*/ - xmm_x_Q3_x3x1 = _mm_shuffle_epi32( xmm_x_Q3_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ) ); - - xmm_x_Q3_x2x0 = _mm_mul_epi32( xmm_x_Q3_x2x0, xmm_inv_gain_Q23 ); - xmm_x_Q3_x3x1 = _mm_mul_epi32( xmm_x_Q3_x3x1, xmm_inv_gain_Q23 ); - - xmm_x_Q3_x2x0 = _mm_srli_epi64( xmm_x_Q3_x2x0, 16 ); - xmm_x_Q3_x3x1 = _mm_slli_epi64( xmm_x_Q3_x3x1, 16 ); - - xmm_x_Q3_x2x0 = _mm_blend_epi16( xmm_x_Q3_x2x0, xmm_x_Q3_x3x1, 0xCC ); - - _mm_storeu_si128( (__m128i *)(&(x_sc_Q10[ i ] ) ), xmm_x_Q3_x2x0 ); - } - - for( ; i < psEncC->subfr_length; i++ ) { - x_sc_Q10[ i ] = silk_SMULWW( x_Q3[ i ], inv_gain_Q23 ); - } - - /* Save inverse gain */ - NSQ->prev_gain_Q16 = Gains_Q16[ subfr ]; - - /* After rewhitening the LTP state is un-scaled, so scale with inv_gain_Q16 */ - if( NSQ->rewhite_flag ) { - if( subfr == 0 ) { - /* Do LTP downscaling */ - inv_gain_Q31 = silk_LSHIFT( silk_SMULWB( inv_gain_Q31, LTP_scale_Q14 ), 2 ); - } - for( i = NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2; i < NSQ->sLTP_buf_idx; i++ ) { - silk_assert( i < MAX_FRAME_LENGTH ); - sLTP_Q15[ i ] = silk_SMULWB( inv_gain_Q31, sLTP[ i ] ); - } - } - - /* Adjust for changing gain */ - if( gain_adj_Q16 != (opus_int32)1 << 16 ) { - /* Scale long-term shaping state */ - __m128i xmm_gain_adj_Q16, xmm_sLTP_shp_Q14_x2x0, xmm_sLTP_shp_Q14_x3x1; - - /* prepare gain_adj_Q16 in packed 4 32-bits */ - xmm_gain_adj_Q16 = _mm_set1_epi32(gain_adj_Q16); - - for( i = NSQ->sLTP_shp_buf_idx - psEncC->ltp_mem_length; i < NSQ->sLTP_shp_buf_idx - 3; i += 4 ) - { - xmm_sLTP_shp_Q14_x2x0 = _mm_loadu_si128( (__m128i *)(&(NSQ->sLTP_shp_Q14[ i ] ) ) ); - /* equal shift right 4 bytes*/ - xmm_sLTP_shp_Q14_x3x1 = _mm_shuffle_epi32( xmm_sLTP_shp_Q14_x2x0, _MM_SHUFFLE( 0, 3, 2, 1 ) ); - - xmm_sLTP_shp_Q14_x2x0 = _mm_mul_epi32( xmm_sLTP_shp_Q14_x2x0, xmm_gain_adj_Q16 ); - xmm_sLTP_shp_Q14_x3x1 = _mm_mul_epi32( xmm_sLTP_shp_Q14_x3x1, xmm_gain_adj_Q16 ); - - xmm_sLTP_shp_Q14_x2x0 = _mm_srli_epi64( xmm_sLTP_shp_Q14_x2x0, 16 ); - xmm_sLTP_shp_Q14_x3x1 = _mm_slli_epi64( xmm_sLTP_shp_Q14_x3x1, 16 ); - - xmm_sLTP_shp_Q14_x2x0 = _mm_blend_epi16( xmm_sLTP_shp_Q14_x2x0, xmm_sLTP_shp_Q14_x3x1, 0xCC ); - - _mm_storeu_si128( (__m128i *)(&(NSQ->sLTP_shp_Q14[ i ] ) ), xmm_sLTP_shp_Q14_x2x0 ); - } - - for( ; i < NSQ->sLTP_shp_buf_idx; i++ ) { - NSQ->sLTP_shp_Q14[ i ] = silk_SMULWW( gain_adj_Q16, NSQ->sLTP_shp_Q14[ i ] ); - } - - /* Scale long-term prediction state */ - if( signal_type == TYPE_VOICED && NSQ->rewhite_flag == 0 ) { - for( i = NSQ->sLTP_buf_idx - lag - LTP_ORDER / 2; i < NSQ->sLTP_buf_idx; i++ ) { - sLTP_Q15[ i ] = silk_SMULWW( gain_adj_Q16, sLTP_Q15[ i ] ); - } - } - - NSQ->sLF_AR_shp_Q14 = silk_SMULWW( gain_adj_Q16, NSQ->sLF_AR_shp_Q14 ); - - /* Scale short-term prediction and shaping states */ - for( i = 0; i < NSQ_LPC_BUF_LENGTH; i++ ) { - NSQ->sLPC_Q14[ i ] = silk_SMULWW( gain_adj_Q16, NSQ->sLPC_Q14[ i ] ); - } - for( i = 0; i < MAX_SHAPE_LPC_ORDER; i++ ) { - NSQ->sAR2_Q14[ i ] = silk_SMULWW( gain_adj_Q16, NSQ->sAR2_Q14[ i ] ); - } - } -} diff --git a/media/libopus/silk/x86/VAD_sse.c b/media/libopus/silk/x86/VAD_sse.c deleted file mode 100644 index 4e90f4410d81f..0000000000000 --- a/media/libopus/silk/x86/VAD_sse.c +++ /dev/null @@ -1,277 +0,0 @@ -/* Copyright (c) 2014, Cisco Systems, INC - Written by XiangMingZhu WeiZhou MinPeng YanWang - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <xmmintrin.h> -#include <emmintrin.h> -#include <smmintrin.h> - -#include "main.h" -#include "stack_alloc.h" - -/* Weighting factors for tilt measure */ -static const opus_int32 tiltWeights[ VAD_N_BANDS ] = { 30000, 6000, -12000, -12000 }; - -/***************************************/ -/* Get the speech activity level in Q8 */ -/***************************************/ -opus_int silk_VAD_GetSA_Q8_sse4_1( /* O Return value, 0 if success */ - silk_encoder_state *psEncC, /* I/O Encoder state */ - const opus_int16 pIn[] /* I PCM input */ -) -{ - opus_int SA_Q15, pSNR_dB_Q7, input_tilt; - opus_int decimated_framelength1, decimated_framelength2; - opus_int decimated_framelength; - opus_int dec_subframe_length, dec_subframe_offset, SNR_Q7, i, b, s; - opus_int32 sumSquared, smooth_coef_Q16; - opus_int16 HPstateTmp; - VARDECL( opus_int16, X ); - opus_int32 Xnrg[ VAD_N_BANDS ]; - opus_int32 NrgToNoiseRatio_Q8[ VAD_N_BANDS ]; - opus_int32 speech_nrg, x_tmp; - opus_int X_offset[ VAD_N_BANDS ]; - opus_int ret = 0; - silk_VAD_state *psSilk_VAD = &psEncC->sVAD; - - SAVE_STACK; - - /* Safety checks */ - silk_assert( VAD_N_BANDS == 4 ); - silk_assert( MAX_FRAME_LENGTH >= psEncC->frame_length ); - silk_assert( psEncC->frame_length <= 512 ); - silk_assert( psEncC->frame_length == 8 * silk_RSHIFT( psEncC->frame_length, 3 ) ); - - /***********************/ - /* Filter and Decimate */ - /***********************/ - decimated_framelength1 = silk_RSHIFT( psEncC->frame_length, 1 ); - decimated_framelength2 = silk_RSHIFT( psEncC->frame_length, 2 ); - decimated_framelength = silk_RSHIFT( psEncC->frame_length, 3 ); - /* Decimate into 4 bands: - 0 L 3L L 3L 5L - - -- - -- -- - 8 8 2 4 4 - - [0-1 kHz| temp. |1-2 kHz| 2-4 kHz | 4-8 kHz | - - They're arranged to allow the minimal ( frame_length / 4 ) extra - scratch space during the downsampling process */ - X_offset[ 0 ] = 0; - X_offset[ 1 ] = decimated_framelength + decimated_framelength2; - X_offset[ 2 ] = X_offset[ 1 ] + decimated_framelength; - X_offset[ 3 ] = X_offset[ 2 ] + decimated_framelength2; - ALLOC( X, X_offset[ 3 ] + decimated_framelength1, opus_int16 ); - - /* 0-8 kHz to 0-4 kHz and 4-8 kHz */ - silk_ana_filt_bank_1( pIn, &psSilk_VAD->AnaState[ 0 ], - X, &X[ X_offset[ 3 ] ], psEncC->frame_length ); - - /* 0-4 kHz to 0-2 kHz and 2-4 kHz */ - silk_ana_filt_bank_1( X, &psSilk_VAD->AnaState1[ 0 ], - X, &X[ X_offset[ 2 ] ], decimated_framelength1 ); - - /* 0-2 kHz to 0-1 kHz and 1-2 kHz */ - silk_ana_filt_bank_1( X, &psSilk_VAD->AnaState2[ 0 ], - X, &X[ X_offset[ 1 ] ], decimated_framelength2 ); - - /*********************************************/ - /* HP filter on lowest band (differentiator) */ - /*********************************************/ - X[ decimated_framelength - 1 ] = silk_RSHIFT( X[ decimated_framelength - 1 ], 1 ); - HPstateTmp = X[ decimated_framelength - 1 ]; - for( i = decimated_framelength - 1; i > 0; i-- ) { - X[ i - 1 ] = silk_RSHIFT( X[ i - 1 ], 1 ); - X[ i ] -= X[ i - 1 ]; - } - X[ 0 ] -= psSilk_VAD->HPstate; - psSilk_VAD->HPstate = HPstateTmp; - - /*************************************/ - /* Calculate the energy in each band */ - /*************************************/ - for( b = 0; b < VAD_N_BANDS; b++ ) { - /* Find the decimated framelength in the non-uniformly divided bands */ - decimated_framelength = silk_RSHIFT( psEncC->frame_length, silk_min_int( VAD_N_BANDS - b, VAD_N_BANDS - 1 ) ); - - /* Split length into subframe lengths */ - dec_subframe_length = silk_RSHIFT( decimated_framelength, VAD_INTERNAL_SUBFRAMES_LOG2 ); - dec_subframe_offset = 0; - - /* Compute energy per sub-frame */ - /* initialize with summed energy of last subframe */ - Xnrg[ b ] = psSilk_VAD->XnrgSubfr[ b ]; - for( s = 0; s < VAD_INTERNAL_SUBFRAMES; s++ ) { - __m128i xmm_X, xmm_acc; - sumSquared = 0; - - xmm_acc = _mm_setzero_si128(); - - for( i = 0; i < dec_subframe_length - 7; i += 8 ) - { - xmm_X = _mm_loadu_si128( (__m128i *)&(X[ X_offset[ b ] + i + dec_subframe_offset ] ) ); - xmm_X = _mm_srai_epi16( xmm_X, 3 ); - xmm_X = _mm_madd_epi16( xmm_X, xmm_X ); - xmm_acc = _mm_add_epi32( xmm_acc, xmm_X ); - } - - xmm_acc = _mm_add_epi32( xmm_acc, _mm_unpackhi_epi64( xmm_acc, xmm_acc ) ); - xmm_acc = _mm_add_epi32( xmm_acc, _mm_shufflelo_epi16( xmm_acc, 0x0E ) ); - - sumSquared += _mm_cvtsi128_si32( xmm_acc ); - - for( ; i < dec_subframe_length; i++ ) { - /* The energy will be less than dec_subframe_length * ( silk_int16_MIN / 8 ) ^ 2. */ - /* Therefore we can accumulate with no risk of overflow (unless dec_subframe_length > 128) */ - x_tmp = silk_RSHIFT( - X[ X_offset[ b ] + i + dec_subframe_offset ], 3 ); - sumSquared = silk_SMLABB( sumSquared, x_tmp, x_tmp ); - - /* Safety check */ - silk_assert( sumSquared >= 0 ); - } - - /* Add/saturate summed energy of current subframe */ - if( s < VAD_INTERNAL_SUBFRAMES - 1 ) { - Xnrg[ b ] = silk_ADD_POS_SAT32( Xnrg[ b ], sumSquared ); - } else { - /* Look-ahead subframe */ - Xnrg[ b ] = silk_ADD_POS_SAT32( Xnrg[ b ], silk_RSHIFT( sumSquared, 1 ) ); - } - - dec_subframe_offset += dec_subframe_length; - } - psSilk_VAD->XnrgSubfr[ b ] = sumSquared; - } - - /********************/ - /* Noise estimation */ - /********************/ - silk_VAD_GetNoiseLevels( &Xnrg[ 0 ], psSilk_VAD ); - - /***********************************************/ - /* Signal-plus-noise to noise ratio estimation */ - /***********************************************/ - sumSquared = 0; - input_tilt = 0; - for( b = 0; b < VAD_N_BANDS; b++ ) { - speech_nrg = Xnrg[ b ] - psSilk_VAD->NL[ b ]; - if( speech_nrg > 0 ) { - /* Divide, with sufficient resolution */ - if( ( Xnrg[ b ] & 0xFF800000 ) == 0 ) { - NrgToNoiseRatio_Q8[ b ] = silk_DIV32( silk_LSHIFT( Xnrg[ b ], 8 ), psSilk_VAD->NL[ b ] + 1 ); - } else { - NrgToNoiseRatio_Q8[ b ] = silk_DIV32( Xnrg[ b ], silk_RSHIFT( psSilk_VAD->NL[ b ], 8 ) + 1 ); - } - - /* Convert to log domain */ - SNR_Q7 = silk_lin2log( NrgToNoiseRatio_Q8[ b ] ) - 8 * 128; - - /* Sum-of-squares */ - sumSquared = silk_SMLABB( sumSquared, SNR_Q7, SNR_Q7 ); /* Q14 */ - - /* Tilt measure */ - if( speech_nrg < ( (opus_int32)1 << 20 ) ) { - /* Scale down SNR value for small subband speech energies */ - SNR_Q7 = silk_SMULWB( silk_LSHIFT( silk_SQRT_APPROX( speech_nrg ), 6 ), SNR_Q7 ); - } - input_tilt = silk_SMLAWB( input_tilt, tiltWeights[ b ], SNR_Q7 ); - } else { - NrgToNoiseRatio_Q8[ b ] = 256; - } - } - - /* Mean-of-squares */ - sumSquared = silk_DIV32_16( sumSquared, VAD_N_BANDS ); /* Q14 */ - - /* Root-mean-square approximation, scale to dBs, and write to output pointer */ - pSNR_dB_Q7 = (opus_int16)( 3 * silk_SQRT_APPROX( sumSquared ) ); /* Q7 */ - - /*********************************/ - /* Speech Probability Estimation */ - /*********************************/ - SA_Q15 = silk_sigm_Q15( silk_SMULWB( VAD_SNR_FACTOR_Q16, pSNR_dB_Q7 ) - VAD_NEGATIVE_OFFSET_Q5 ); - - /**************************/ - /* Frequency Tilt Measure */ - /**************************/ - psEncC->input_tilt_Q15 = silk_LSHIFT( silk_sigm_Q15( input_tilt ) - 16384, 1 ); - - /**************************************************/ - /* Scale the sigmoid output based on power levels */ - /**************************************************/ - speech_nrg = 0; - for( b = 0; b < VAD_N_BANDS; b++ ) { - /* Accumulate signal-without-noise energies, higher frequency bands have more weight */ - speech_nrg += ( b + 1 ) * silk_RSHIFT( Xnrg[ b ] - psSilk_VAD->NL[ b ], 4 ); - } - - /* Power scaling */ - if( speech_nrg <= 0 ) { - SA_Q15 = silk_RSHIFT( SA_Q15, 1 ); - } else if( speech_nrg < 32768 ) { - if( psEncC->frame_length == 10 * psEncC->fs_kHz ) { - speech_nrg = silk_LSHIFT_SAT32( speech_nrg, 16 ); - } else { - speech_nrg = silk_LSHIFT_SAT32( speech_nrg, 15 ); - } - - /* square-root */ - speech_nrg = silk_SQRT_APPROX( speech_nrg ); - SA_Q15 = silk_SMULWB( 32768 + speech_nrg, SA_Q15 ); - } - - /* Copy the resulting speech activity in Q8 */ - psEncC->speech_activity_Q8 = silk_min_int( silk_RSHIFT( SA_Q15, 7 ), silk_uint8_MAX ); - - /***********************************/ - /* Energy Level and SNR estimation */ - /***********************************/ - /* Smoothing coefficient */ - smooth_coef_Q16 = silk_SMULWB( VAD_SNR_SMOOTH_COEF_Q18, silk_SMULWB( (opus_int32)SA_Q15, SA_Q15 ) ); - - if( psEncC->frame_length == 10 * psEncC->fs_kHz ) { - smooth_coef_Q16 >>= 1; - } - - for( b = 0; b < VAD_N_BANDS; b++ ) { - /* compute smoothed energy-to-noise ratio per band */ - psSilk_VAD->NrgRatioSmth_Q8[ b ] = silk_SMLAWB( psSilk_VAD->NrgRatioSmth_Q8[ b ], - NrgToNoiseRatio_Q8[ b ] - psSilk_VAD->NrgRatioSmth_Q8[ b ], smooth_coef_Q16 ); - - /* signal to noise ratio in dB per band */ - SNR_Q7 = 3 * ( silk_lin2log( psSilk_VAD->NrgRatioSmth_Q8[b] ) - 8 * 128 ); - /* quality = sigmoid( 0.25 * ( SNR_dB - 16 ) ); */ - psEncC->input_quality_bands_Q15[ b ] = silk_sigm_Q15( silk_RSHIFT( SNR_Q7 - 16 * 128, 4 ) ); - } - - RESTORE_STACK; - return( ret ); -} diff --git a/media/libopus/silk/x86/VQ_WMat_EC_sse.c b/media/libopus/silk/x86/VQ_WMat_EC_sse.c deleted file mode 100644 index 74d6c6d0ec6e4..0000000000000 --- a/media/libopus/silk/x86/VQ_WMat_EC_sse.c +++ /dev/null @@ -1,142 +0,0 @@ -/* Copyright (c) 2014, Cisco Systems, INC - Written by XiangMingZhu WeiZhou MinPeng YanWang - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <xmmintrin.h> -#include <emmintrin.h> -#include <smmintrin.h> -#include "main.h" -#include "celt/x86/x86cpu.h" - -/* Entropy constrained matrix-weighted VQ, hard-coded to 5-element vectors, for a single input data vector */ -void silk_VQ_WMat_EC_sse4_1( - opus_int8 *ind, /* O index of best codebook vector */ - opus_int32 *rate_dist_Q14, /* O best weighted quant error + mu * rate */ - opus_int *gain_Q7, /* O sum of absolute LTP coefficients */ - const opus_int16 *in_Q14, /* I input vector to be quantized */ - const opus_int32 *W_Q18, /* I weighting matrix */ - const opus_int8 *cb_Q7, /* I codebook */ - const opus_uint8 *cb_gain_Q7, /* I codebook effective gain */ - const opus_uint8 *cl_Q5, /* I code length for each codebook vector */ - const opus_int mu_Q9, /* I tradeoff betw. weighted error and rate */ - const opus_int32 max_gain_Q7, /* I maximum sum of absolute LTP coefficients */ - opus_int L /* I number of vectors in codebook */ -) -{ - opus_int k, gain_tmp_Q7; - const opus_int8 *cb_row_Q7; - opus_int16 diff_Q14[ 5 ]; - opus_int32 sum1_Q14, sum2_Q16; - - __m128i C_tmp1, C_tmp2, C_tmp3, C_tmp4, C_tmp5; - /* Loop over codebook */ - *rate_dist_Q14 = silk_int32_MAX; - cb_row_Q7 = cb_Q7; - for( k = 0; k < L; k++ ) { - gain_tmp_Q7 = cb_gain_Q7[k]; - - diff_Q14[ 0 ] = in_Q14[ 0 ] - silk_LSHIFT( cb_row_Q7[ 0 ], 7 ); - - C_tmp1 = OP_CVTEPI16_EPI32_M64( &in_Q14[ 1 ] ); - C_tmp2 = OP_CVTEPI8_EPI32_M32( &cb_row_Q7[ 1 ] ); - C_tmp2 = _mm_slli_epi32( C_tmp2, 7 ); - C_tmp1 = _mm_sub_epi32( C_tmp1, C_tmp2 ); - - diff_Q14[ 1 ] = _mm_extract_epi16( C_tmp1, 0 ); - diff_Q14[ 2 ] = _mm_extract_epi16( C_tmp1, 2 ); - diff_Q14[ 3 ] = _mm_extract_epi16( C_tmp1, 4 ); - diff_Q14[ 4 ] = _mm_extract_epi16( C_tmp1, 6 ); - - /* Weighted rate */ - sum1_Q14 = silk_SMULBB( mu_Q9, cl_Q5[ k ] ); - - /* Penalty for too large gain */ - sum1_Q14 = silk_ADD_LSHIFT32( sum1_Q14, silk_max( silk_SUB32( gain_tmp_Q7, max_gain_Q7 ), 0 ), 10 ); - - silk_assert( sum1_Q14 >= 0 ); - - /* first row of W_Q18 */ - C_tmp3 = _mm_loadu_si128( (__m128i *)(&W_Q18[ 1 ] ) ); - C_tmp4 = _mm_mul_epi32( C_tmp3, C_tmp1 ); - C_tmp4 = _mm_srli_si128( C_tmp4, 2 ); - - C_tmp1 = _mm_shuffle_epi32( C_tmp1, _MM_SHUFFLE( 0, 3, 2, 1 ) ); /* shift right 4 bytes */ - C_tmp3 = _mm_shuffle_epi32( C_tmp3, _MM_SHUFFLE( 0, 3, 2, 1 ) ); /* shift right 4 bytes */ - - C_tmp5 = _mm_mul_epi32( C_tmp3, C_tmp1 ); - C_tmp5 = _mm_srli_si128( C_tmp5, 2 ); - - C_tmp5 = _mm_add_epi32( C_tmp4, C_tmp5 ); - C_tmp5 = _mm_slli_epi32( C_tmp5, 1 ); - - C_tmp5 = _mm_add_epi32( C_tmp5, _mm_shuffle_epi32( C_tmp5, _MM_SHUFFLE( 0, 0, 0, 2 ) ) ); - sum2_Q16 = _mm_cvtsi128_si32( C_tmp5 ); - - sum2_Q16 = silk_SMLAWB( sum2_Q16, W_Q18[ 0 ], diff_Q14[ 0 ] ); - sum1_Q14 = silk_SMLAWB( sum1_Q14, sum2_Q16, diff_Q14[ 0 ] ); - - /* second row of W_Q18 */ - sum2_Q16 = silk_SMULWB( W_Q18[ 7 ], diff_Q14[ 2 ] ); - sum2_Q16 = silk_SMLAWB( sum2_Q16, W_Q18[ 8 ], diff_Q14[ 3 ] ); - sum2_Q16 = silk_SMLAWB( sum2_Q16, W_Q18[ 9 ], diff_Q14[ 4 ] ); - sum2_Q16 = silk_LSHIFT( sum2_Q16, 1 ); - sum2_Q16 = silk_SMLAWB( sum2_Q16, W_Q18[ 6 ], diff_Q14[ 1 ] ); - sum1_Q14 = silk_SMLAWB( sum1_Q14, sum2_Q16, diff_Q14[ 1 ] ); - - /* third row of W_Q18 */ - sum2_Q16 = silk_SMULWB( W_Q18[ 13 ], diff_Q14[ 3 ] ); - sum2_Q16 = silk_SMLAWB( sum2_Q16, W_Q18[ 14 ], diff_Q14[ 4 ] ); - sum2_Q16 = silk_LSHIFT( sum2_Q16, 1 ); - sum2_Q16 = silk_SMLAWB( sum2_Q16, W_Q18[ 12 ], diff_Q14[ 2 ] ); - sum1_Q14 = silk_SMLAWB( sum1_Q14, sum2_Q16, diff_Q14[ 2 ] ); - - /* fourth row of W_Q18 */ - sum2_Q16 = silk_SMULWB( W_Q18[ 19 ], diff_Q14[ 4 ] ); - sum2_Q16 = silk_LSHIFT( sum2_Q16, 1 ); - sum2_Q16 = silk_SMLAWB( sum2_Q16, W_Q18[ 18 ], diff_Q14[ 3 ] ); - sum1_Q14 = silk_SMLAWB( sum1_Q14, sum2_Q16, diff_Q14[ 3 ] ); - - /* last row of W_Q18 */ - sum2_Q16 = silk_SMULWB( W_Q18[ 24 ], diff_Q14[ 4 ] ); - sum1_Q14 = silk_SMLAWB( sum1_Q14, sum2_Q16, diff_Q14[ 4 ] ); - - silk_assert( sum1_Q14 >= 0 ); - - /* find best */ - if( sum1_Q14 < *rate_dist_Q14 ) { - *rate_dist_Q14 = sum1_Q14; - *ind = (opus_int8)k; - *gain_Q7 = gain_tmp_Q7; - } - - /* Go to next cbk vector */ - cb_row_Q7 += LTP_ORDER; - } -}
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit 520de8913f9849ee5d333ed9f50a4be25cfb51bc Author: Paul Adenot paul@paul.cx AuthorDate: Fri Apr 22 13:19:01 2022 +0000
Bug 1762620 - Only pad audio buffers when doing up mixing. r=alwu,a=dsmith
Differential Revision: https://phabricator.services.mozilla.com/D143623 --- dom/media/AudioConverter.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dom/media/AudioConverter.cpp b/dom/media/AudioConverter.cpp index d2eb7335a997f..1f5860804318e 100644 --- a/dom/media/AudioConverter.cpp +++ b/dom/media/AudioConverter.cpp @@ -156,8 +156,10 @@ static void dumbUpDownMix(TYPE* aOut, int32_t aOutChannels, const TYPE* aIn, for (int32_t j = 0; j < commonChannels; j++) { aOut[i * aOutChannels + j] = aIn[i * aInChannels + j]; } - for (int32_t j = 0; j < aInChannels - aOutChannels; j++) { - aOut[i * aOutChannels + j] = 0; + if (aOutChannels > aInChannels) { + for (int32_t j = 0; j < aInChannels - aOutChannels; j++) { + aOut[i * aOutChannels + j] = 0; + } } } }
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit e2fd91626feb67446dd800bbdc67d7cd1cee2264 Author: ffxbld ffxbld@mozilla.com AuthorDate: Mon Apr 25 10:56:14 2022 +0000
No Bug, mozilla-esr91 repo-update HSTS HPKP remote-settings - a=repo-update,r=dsmith
Differential Revision: https://phabricator.services.mozilla.com/D144550 --- security/manager/ssl/StaticHPKPins.h | 2 +- security/manager/ssl/nsSTSPreloadList.inc | 213 +++++------ .../dumps/security-state/intermediates.json | 414 ++++++++++++++++----- 3 files changed, 416 insertions(+), 213 deletions(-)
diff --git a/security/manager/ssl/StaticHPKPins.h b/security/manager/ssl/StaticHPKPins.h index b0b96b7582b50..dee77f2461883 100644 --- a/security/manager/ssl/StaticHPKPins.h +++ b/security/manager/ssl/StaticHPKPins.h @@ -1149,4 +1149,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
static const int32_t kUnknownId = -1;
-static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1659005507277000); +static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1659351116755000); diff --git a/security/manager/ssl/nsSTSPreloadList.inc b/security/manager/ssl/nsSTSPreloadList.inc index 39befbccb303e..173dd2a5501a7 100644 --- a/security/manager/ssl/nsSTSPreloadList.inc +++ b/security/manager/ssl/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/
#include <stdint.h> -const PRTime gPreloadListExpirationTime = INT64_C(1661424700337000); +const PRTime gPreloadListExpirationTime = INT64_C(1661770309221000); %% 0--1.de, 1 0-1.party, 1 @@ -320,7 +320,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1661424700337000); 0rap.tk, 1 0verall.tk, 1 0vi.org, 1 -0vo.moe, 1 0wx.cat, 1 0wx.es, 1 0wx.eu, 1 @@ -496,6 +495,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1661424700337000); 110bu.com, 1 110bv.com, 1 110ce.com, 1 +110cl.com, 1 110eh.com, 1 110ej.com, 1 110ek.com, 1 @@ -516,6 +516,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1661424700337000); 110kp.com, 1 110lh.com, 1 110lj.com, 1 +110na.com, 1 110ne.com, 1 110nf.com, 1 110ng.com, 1 @@ -1779,7 +1780,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1661424700337000); 233try.com, 1 233v2.com, 1 233vps.com, 1 -233yes.com, 1 2340365.com, 0 23436565.com, 1 2345666365.com, 0 @@ -2519,7 +2519,6 @@ const PRTime gPreloadListExpirationTime = INT64_C(1661424700337000); 375ks.com, 1 377625.com, 1 377632.com, 1 -3778vip.com, 0 377ks.com, 1 377zzz.com, 1 37879.com, 0 @@ -5235,6 +5234,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1661424700337000); 91d85.com, 1 91fldz.com, 1 91imh.com, 1 +91milk.net, 1 91news.tk, 1 91tianmi.com, 0 924322.com, 1 @@ -6364,6 +6364,7 @@ academiaeureka.tk, 1 academiaoposicionescorreos.com, 1 academiasdemodelos.com, 1 academica.nl, 1 +academichealthscience.net, 1 academichelp.gq, 1 academicperks.org, 1 academie-de-police.ch, 0 @@ -7061,7 +7062,6 @@ adrenalinhunters.tk, 1 adresults.com, 1 adresults.nl, 1 adrian-riemer.tk, 1 -adrian.web.id, 1 adrian2023.com, 1 adrianadelrossi.com, 1 adrianagonzalez.tk, 1 @@ -7434,6 +7434,7 @@ afbrtv.com, 1 afbrunswick.com, 1 afbryt.com, 1 afc-capital.mx, 1 +afcmrsfeedback.org, 0 afcmrstest.org, 1 afcurgentcarelyndhurst.com, 0 afdah.se, 1 @@ -7985,7 +7986,6 @@ ahealthyjourney.ca, 1 ahegaoroulette.com, 1 ahelos.tk, 1 ahenkerp.com, 1 -ahero4all.org, 1 ahg-offices.fr, 1 ahhcomfortshoes.com, 1 ahidta.gov, 1 @@ -9361,7 +9361,6 @@ allopurinal.tk, 1 allopurinol.gq, 1 allopurinol100mg.tk, 1 allopurinol300mg.ml, 1 -alloutsec.com, 1 alloverthehill.com, 1 allpedia.tk, 1 allphaseclean.com, 1 @@ -9551,7 +9550,6 @@ alphaantileak.net, 1 alphabet-z.xyz, 1 alphabeta.com, 1 alphabetmobilier.com, 1 -alphabetsigns.com, 1 alphabouncycastles.co.uk, 1 alphabytes.uk, 0 alphachannel.tk, 1 @@ -10321,7 +10319,6 @@ anamterminal.tk, 1 ananas.gq, 1 anandchowdhary.com, 1 anangeix.tk, 1 -ananiev.ml, 1 anankecosmetics.com, 1 anantshri.info, 1 ananyagupta.tk, 1 @@ -12878,6 +12875,7 @@ astarfrommosul.ga, 1 astarfrommosul.ml, 1 astarmathsandphysics.com, 1 astateoftrance.tk, 1 +astaxanthin.de, 1 asteelflash.com, 1 astellaria.ee, 1 astengox.com, 1 @@ -13163,7 +13161,6 @@ atmoz.tk, 1 atmydesk.tech, 1 atnis.com, 1 atnteam.tk, 1 -ato4sound.com, 1 atolm.net, 1 atom-china.org, 1 atom.solutions, 1 @@ -13494,7 +13491,6 @@ author24.biz, 1 author24.info, 1 authorise.computer, 1 authorise.network, 1 -authoritysolutions.com, 1 authorize.computer, 1 authorize.network, 1 authsrv.nl.eu.org, 1 @@ -14095,6 +14091,7 @@ avtoucheba.tk, 1 avtours.gr, 1 avtoveles.by, 1 avtovikup.ml, 1 +avtovokzaly.ru, 1 avtoyurist.cf, 1 avtoyurist.ga, 1 avtoyurist.gq, 1 @@ -14945,7 +14942,6 @@ bagwrap.com, 1 bah.im, 0 bahadirh.ml, 1 bahaiprayers.io, 1 -bahana.net, 1 baharmusic24.tk, 1 bahiastudios.com, 1 bahnenimbild.de, 1 @@ -14974,10 +14970,10 @@ bailong.kr.ua, 1 bailonga.com, 1 baindayman.com, 1 baircentral.com, 1 -bairrosonline.com, 1 bairuo.top, 0 bait55.ru, 1 baitable.ml, 1 +baithe.co.za, 1 baitulongbaycruises.com, 1 baity.net, 1 baixadordemusica.tk, 1 @@ -16677,7 +16673,6 @@ besiktasmtsk.com, 1 besnard.me, 1 besnik.de, 0 besnik.tk, 1 -besola.de, 1 besole.ch, 1 besolov.tk, 1 besox.be, 1 @@ -17756,6 +17751,7 @@ biletturk.tk, 1 biletvkrym.ga, 1 biletyplus.by, 1 biletyplus.com, 1 +biletyplus.ru, 1 biletyplus.ua, 1 bilgehan.net, 1 bilgiliksel.com, 1 @@ -18590,7 +18586,6 @@ blackswan.tk, 1 blackswirl.com, 1 blackteam.org, 1 blacktemplars.tk, 1 -blackthrone.tk, 1 blacktown.eu, 1 blacktownbuildingsupplies.com.au, 1 blacktubes.cf, 1 @@ -20363,6 +20358,7 @@ brillio.com, 1 brimspark.com, 1 brimspark.systems, 1 brindesgrafica.com.br, 1 +brindespegassus.com.br, 1 brindisireport.it, 1 brindocorp.tk, 1 bring-heaven.com, 1 @@ -21389,7 +21385,6 @@ bustany.org, 1 buster.me.uk, 1 bustickets.ph, 1 bustillodeloro.tk, 1 -bustimes.org, 1 bustingbrackets.com, 1 bustmold.com, 1 bustmovesest.ga, 1 @@ -21853,6 +21848,7 @@ cacaumidade.com.br, 1 cachacasantaterezinha.com.br, 1 cachaceros.tk, 1 cache-checker.com, 1 +cachedview.nl, 1 cachethome.com, 1 cachetur.no, 1 cackette.com, 0 @@ -21956,6 +21952,7 @@ caffect.com, 1 caffein.cf, 1 caffeinate.co.uk, 1 caffeinatedengineers.com, 1 +caffeinefiend.org, 1 caffelatte.tk, 1 cafferata.tk, 1 caffewasyl.pl, 1 @@ -23310,7 +23307,6 @@ castlekingdomstockport.co.uk, 1 castlekingkent.co.uk, 1 castlemania.tk, 1 castleoblivion.tk, 1 -castleparty.co.uk, 1 castles-in-the-sky.co.uk, 1 castleswa.com.au, 1 castorio.tk, 1 @@ -23418,6 +23414,7 @@ catl.st, 1 catland.club, 1 catlettsburgky.gov, 1 catlicking.com, 1 +catlovingcare.com, 1 catmash.tk, 0 catme.org, 1 catmoose.ca, 1 @@ -24280,7 +24277,6 @@ charliez0.tk, 1 charlotte-touati.ch, 1 charlotteanne.tk, 1 charlottecountyva.gov, 1 -charlotteomnes.com, 1 charlottesvillegolfcommunities.com, 1 charlottesvillehorsefarms.com, 1 charlotteswimmingpoolbuilder.com, 1 @@ -24339,7 +24335,6 @@ chatdrop.org, 1 chateau-belvoir.com, 1 chateau-de-fresnois.com, 1 chateau-de-fresnois.fr, 1 -chateau-de-lisle.fr, 1 chateau-patris.com, 1 chateauconstellation.ch, 0 chateauderoncourt.fr, 1 @@ -24940,7 +24935,6 @@ chrissx.ga, 1 chrissytechaira.tk, 1 christ.cm, 1 christadelphians.eu, 1 -christchurchbouncycastles.co.uk, 1 christcostum.tk, 1 christec.net, 1 christengroei.tk, 1 @@ -25371,7 +25365,7 @@ cisa.gov, 1 cisamexico.com, 1 ciscoasanetflow.com, 1 ciscocyberthreatdefense.com, 1 -ciscodude.net, 1 +ciscodude.net, 0 ciscom.tk, 1 cisconetflowleader.com, 1 cisconetflowpartners.com, 1 @@ -25433,7 +25427,6 @@ citruspi.com, 1 citruspi.io, 1 citrusui.me, 1 citsc.de, 1 -city-forums.ml, 1 city-glas.com, 1 city-home.tk, 1 city-nn.com, 1 @@ -26313,6 +26306,7 @@ cncollege.tk, 1 cncr.ga, 1 cncrans.ch, 0 cncs.gob.do, 1 +cncs.gov.pt, 1 cnet-hosting.com, 1 cnetw.xyz, 1 cnexchange.com, 1 @@ -26637,7 +26631,6 @@ coincity.ga, 1 coinclickz.fun, 1 coincoele.com.br, 1 coincoin.eu.org, 1 -coincolors.co, 1 coinf.it, 1 coinflux.com, 1 coinforce.com, 1 @@ -26877,7 +26870,6 @@ combron.be, 1 combron.co.uk, 1 combron.com, 1 combron.nl, 1 -combustibilaspen.ro, 1 comcenter.com, 1 comchezmeme.com, 1 comcol.nl, 1 @@ -28094,7 +28086,6 @@ cowleycountyks.gov, 1 coworkanywhere.ch, 1 coworking-luzern.ch, 1 coworking-space.tk, 1 -coworking.tk, 1 coxcapitalmanagement.com, 1 coxxs.me, 1 coxxs.moe, 1 @@ -28845,6 +28836,7 @@ csasummit.org, 1 csbya.com, 1 csca.me, 0 cscau.com, 0 +cscdn.net, 1 csci571.com, 1 csd-sevnica.si, 1 csd-slovenije.si, 1 @@ -28892,7 +28884,6 @@ cskentertainment.co.uk, 1 cslbuild.com, 1 csmainframe.com, 1 csnet.live, 1 -csodaorszagovoda.hu, 1 csokolade.hu, 1 csokolozos-jatekok.tk, 1 csosa.gov, 1 @@ -29023,7 +29014,6 @@ cucek.tk, 1 cuchichi.es, 1 cuckoo.ee, 1 cuddlecat.io, 1 -cuddlecomfort.com, 1 cuddlingyaks.com, 1 cuddlybeardaycare.com.au, 1 cudesa.gq, 1 @@ -29193,7 +29183,6 @@ curvemedia.co, 1 curveprotect.cz, 1 curvissa.co.uk, 1 curvyjessi.com, 1 -curvylove.de, 1 curvysarah.com, 1 cuscocontable.com, 1 cuscoloko.com.br, 1 @@ -29214,6 +29203,7 @@ custombobbleheads.com, 1 custombuttonco.com, 1 customcodeit.com.au, 0 customcompleteautomotive.com, 1 +customd.com, 0 customdissertation.com, 1 customerbuilders.com, 1 customerfocus.co.za, 1 @@ -29361,7 +29351,6 @@ cyberboy.tk, 1 cyberburek.tk, 1 cybercareers.gov, 1 cybercat-tver.tk, 1 -cybercave.tk, 1 cyberclaw.tk, 1 cybercloud.cc, 1 cybercrew.cc, 1 @@ -29808,6 +29797,7 @@ dailysomething.site, 1 dailysuperheroes.com, 1 dailytrip.de, 1 dailyusbusiness.tk, 1 +dailyw88.com, 1 dailywarteg.com, 1 dailywork.ga, 1 dailyxenang.com, 1 @@ -30227,7 +30217,6 @@ darkgrid.eu, 1 darkhall.tk, 1 darkhuntersworld.tk, 1 darkillusion.us, 1 -darkishgreen.com, 1 darkknights.tk, 1 darklang.com, 1 darklaunch.com, 1 @@ -30454,7 +30443,6 @@ datenreiter.cf, 1 datenreiter.gq, 1 datenreiter.org, 1 datensalat.info, 1 -datenschutz-consult.de, 1 datenschutz-gruenwald.de, 1 datenschutz-individuell.de, 1 datenschutz-isny.de, 1 @@ -30993,7 +30981,6 @@ deconstructind.ro, 1 decor-live.ru, 1 decor-prazdnik.ru, 1 decorarei.com, 1 -decorarmicasa.com, 1 decoratingadvice.co.uk, 1 decorations-elmotamaiz.com, 1 decorativeconcretewa.com.au, 1 @@ -31148,7 +31135,6 @@ defreitas.no, 1 deftek.com, 1 defterikebir.tk, 1 deftig-und-fein.de, 1 -deftnerd.com, 1 defunct-engineers.ml, 1 defuse.ca, 1 degala.tk, 1 @@ -31821,7 +31807,6 @@ desynced.rocks, 1 det-te.ch, 1 detakhukum.com, 1 detale.eu, 1 -detalhecomercio.com.br, 1 detalika.ru, 1 detao.org, 1 detc.tk, 1 @@ -34180,6 +34165,7 @@ dosyanet.tk, 1 dot.sb, 1 dot42.no, 1 dota2free.tk, 1 +dota2huds.com, 1 dotadotaman.tk, 1 dotbox.org, 1 dotcircle.co, 1 @@ -34394,6 +34380,7 @@ drach.xyz, 1 dracheisolation.tk, 1 drachenleder.de, 1 dracisvet.cz, 1 +dracoon.team, 1 dracox.com, 0 dracula.city, 1 draft.cards, 1 @@ -34568,6 +34555,7 @@ dreamqueen.tk, 1 dreamreality.tk, 1 dreams-2-reality.com, 1 dreamsea.tk, 1 +dreamsinbits.com, 1 dreamsindigital.tk, 1 dreamsjob.cf, 1 dreamsofalostsoul.tk, 1 @@ -35619,7 +35607,7 @@ e3learning.institute, 1 e3li.org, 1 e3q.de, 1 e4.chat, 1 -e42.org, 1 +e42.org, 0 e4work.com.br, 1 e5197.co, 1 e5tv.hu, 1 @@ -37928,7 +37916,6 @@ emporiopurochile.com.br, 1 empowerdb.com, 1 empoweren.com, 1 empowernation.org, 1 -empowersimcoe.ca, 0 empoweryou.ca, 1 emprechtinger.com, 1 emprego.pt, 1 @@ -38094,7 +38081,6 @@ energiecentrale.gent, 1 energieconsultonline.nl, 1 energiekeurplus.nl, 1 energielabelbinneneenweek.nl, 1 -energija-visiems.lt, 1 energikompetens.se, 1 energoproff.com, 1 energozrouti.cz, 1 @@ -38601,6 +38587,7 @@ er-music.com, 1 er.pl, 1 er.tl, 1 era-tec.de, 1 +era.fi, 1 erafat.com, 1 erandymoreira.cf, 1 erandymoreira.ga, 1 @@ -38634,7 +38621,6 @@ erektion1.gq, 1 eremnews.com, 1 erenvakfi.org, 1 erethon.com, 1 -erevan-news.tk, 1 erfgoedeisden.tk, 1 erfolgsmaschine.ch, 0 ergaomnes.cz, 1 @@ -38846,7 +38832,6 @@ esb68888.com, 1 esb777.cc, 1 esb777.com, 1 esb777.me, 1 -esb777.net, 1 esb777.us, 1 esb888.net, 1 esb8886.com, 1 @@ -39360,7 +39345,6 @@ eucybernet.eu, 1 eudireto.com, 1 eudore.org, 1 euexia.fr, 1 -eugenetech.org, 1 eugeniocorso.com, 1 eugenioperez.tk, 1 eugostodefilmesbrasileiros.tk, 1 @@ -39568,7 +39552,6 @@ eveil-et-savoirs.com, 1 evelienzorgt.nl, 1 evelin.tk, 1 evelyndayman.com, 1 -evemarketer.com, 1 evendesign.gq, 1 evenementenhoekvanholland.nl, 1 evenfall.tk, 1 @@ -39684,6 +39667,7 @@ eviadc.com, 1 eviction.cf, 1 evidecor.com.br, 1 evidence-based.review, 1 +evidencebased.net, 1 evidenceusa.com.br, 1 evidenciamidiasdigitais.com.br, 1 evidencija.ba, 1 @@ -40265,6 +40249,7 @@ f1fever.net, 1 f1grandprix.tk, 1 f1iran.com, 1 f1minute.com, 1 +f1nal-lap.be, 1 f1simulator.tk, 1 f1sport.tk, 1 f1tv-streams.live, 1 @@ -41178,6 +41163,7 @@ fbi.gov, 1 fbigame.com, 1 fbihr.gov, 1 fbiic.gov, 1 +fbijobs.gov, 1 fbo.gov, 1 fbo.network, 1 fboerman.nl, 1 @@ -41877,7 +41863,6 @@ filizaker.tk, 1 filleritemsindia.com, 1 fillmorecountyne.gov, 1 fillmysuitca.se, 1 -fillo.sk, 1 fillu.de, 1 film-colleges.com, 1 film-op-tv.nl, 1 @@ -42078,7 +42063,6 @@ finkelstein.fr, 1 finlandcook.online, 1 finlandcook.top, 1 finlito.tk, 1 -finmarket.tk, 1 finn-svoboda.cf, 1 finn-thorben.me, 1 finn.io, 1 @@ -43058,6 +43042,7 @@ fonte-trading.com, 1 fontein.de, 1 fontela.es, 1 fontnegar.ir, 1 +fonts2u.com, 1 fonts4free.net, 1 foo, 1 foo.fo, 1 @@ -43289,7 +43274,6 @@ forefrontcloud.com, 1 foreign-language-colleges.com, 1 foreignpharmacydirectory.com, 1 foreignxchange.com.au, 1 -forellenpark.com, 1 foremail.tk, 1 forenschmiede.tk, 1 forensic-system.com, 0 @@ -43524,7 +43508,6 @@ forumotomobil.com, 0 forumpakistan.tk, 1 forumpenaguru.com, 1 forumrowerowe.org, 1 -forumrussia.tk, 1 forums4everyone.tk, 1 forumsampdoria.tk, 1 forumsrussia.ga, 1 @@ -44019,7 +44002,6 @@ free-ss.site, 1 free-traff.cf, 1 free-watching.ga, 1 free-webtv.tk, 1 -free.ac.cn, 0 free6to12yo.gq, 1 free8.xyz, 1 freeaf.gq, 1 @@ -44634,7 +44616,6 @@ fujikochan.tk, 1 fujiwarashinzo.com, 1 fujiyakimono.com, 1 fukabori-kaidora.com, 1 -fukakukeiba.com, 1 fukase-seed.com, 1 fukikaeru.com, 1 fukn.jp, 1 @@ -45173,6 +45154,7 @@ gadecs.com, 1 gadget-freak.cf, 1 gadget-tips.com, 1 gadgetflashers.ga, 1 +gadgetflip.com, 1 gadgetfreak.cf, 1 gadgetgi.ga, 1 gadgethacks.com, 1 @@ -45610,7 +45592,6 @@ garciam.gt, 1 garciaortiz.com, 1 garda-see.mobi, 1 gardarika.tk, 1 -gardedenfantspourtous.fr, 1 garden-land.ga, 1 garden-life.org, 1 garden4less.co.uk, 1 @@ -46400,7 +46381,6 @@ germansoldiers.net, 1 germanssky.de, 1 germantownwi.gov, 1 germantrip.tk, 1 -germany-board.tk, 1 germanytravel.ga, 1 germanytravelguide.ml, 1 germfr.ee, 1 @@ -46906,6 +46886,7 @@ giochistem.it, 1 giocolive.com, 1 gioielleriamolena.com, 1 giongcaosu.com, 1 +giordano.com, 1 giordanomultiservice.it, 1 giorgia.tk, 1 giovannarossi.tk, 1 @@ -47458,9 +47439,9 @@ goand.run, 1 goapunks.net, 0 goarmy.eu, 1 goatbot.xyz, 1 +goatcloud.com, 0 goatstore.ca, 1 goatstudio.sg, 1 -goaudits.com, 1 gobarrelroll.com, 1 gobi.tk, 1 gobiernousa.gov, 1 @@ -48018,7 +47999,6 @@ goxyshuk.duckdns.org, 1 goyahkles-spirit-to.tk, 1 goyumoilexpeller.com, 1 gozadera.es, 1 -gozenhost.com, 1 gpalabs.com, 1 gpastore.com.br, 1 gpbdev.ru, 1 @@ -48531,7 +48511,7 @@ grepular.com, 1 gresak.io, 0 gresb.com, 1 gresik.info, 1 -gressnet.id, 1 +gressnet.id, 0 greta-birkner.de, 1 gretaraccontastorie.com, 1 gretathemes.com, 1 @@ -49771,6 +49751,7 @@ hanisirfan.cf, 1 hanjl.com, 1 hanjuapp.com, 1 hanke.se, 1 +hankoreas.com, 1 hankr.com, 1 hanksacservice.com, 1 hanksservice.com, 1 @@ -50761,6 +50742,7 @@ heatherleysephotography.com, 1 heathersmithcommercial.com, 1 heatingequipment.tk, 1 heaven-boutique.de, 0 +heaven.moe, 1 heavenlybeauty.tk, 1 heavenlyseals.com, 1 heavenlysmokenc.com, 1 @@ -52112,6 +52094,7 @@ home-portal.tk, 1 home-remedies.tk, 1 home-sagita.tk, 1 homeable.io, 1 +homeadore.com, 1 homeadvice.ga, 1 homeadvice.tk, 1 homeandliving.it, 1 @@ -52975,6 +52958,7 @@ hrmn.xyz, 1 hrndz.io, 1 hro.to, 1 hrobert.hu, 1 +hroling.nl, 1 hromaticworld.tk, 1 hroschyk.cz, 1 hrpage.ml, 1 @@ -53848,7 +53832,6 @@ icesemulator.com, 1 iceshadow.tk, 1 icetiger.eu, 1 icetravellers.com, 0 -icetwister.com, 1 icewoman.net, 1 icewood-bois.com, 1 ich-finde-wikipedia-toll.tk, 1 @@ -54099,6 +54082,8 @@ ie.search.yahoo.com, 0 iechistore.com, 1 ieeeaast.org, 1 ieeedeis.org, 1 +ieeesb.nl, 1 +ieeesbe.nl, 1 ieeespmb.org, 1 iegat.com, 1 iegatpracticetest.com, 1 @@ -54281,7 +54266,6 @@ ihk-onlinewahl2021.de, 1 ihkk.net, 1 ihls.world, 0 ihmphila.org, 1 -ihoey.com, 1 ihorizon.jp, 1 ihorvorotnov.com, 1 ihost.md, 1 @@ -55055,7 +55039,6 @@ indonesian-news.tk, 1 indonesianadventure.id, 1 indonesiatrip.tk, 1 indoor-kletterwald.de, 1 -indoorpaintball.co.uk, 1 indopress.tk, 1 indorsie.com, 1 indospot.ml, 1 @@ -55224,6 +55207,7 @@ infocusvr.net, 1 infodesigners.eu, 1 infodesk.at, 1 infoduv.fr, 1 +infofamouspeople.com, 1 infofp.tk, 1 infogai.tk, 1 infogamesports.tk, 1 @@ -55581,6 +55565,7 @@ innovum.cz, 1 innowire.tk, 1 innsalzachsingles.de, 1 innvisiondesign.net, 1 +innwan.com, 1 inoa8.com, 1 inoder.com, 1 inoio.de, 1 @@ -55598,7 +55583,6 @@ inpas.co.uk, 1 inpatec.com, 1 inpdp.tk, 1 inpector.de, 1 -inphi.com, 1 inprint.id, 1 inprosy.com, 1 inprotec.com.co, 1 @@ -56897,6 +56881,7 @@ it-xperts.be, 1 it-zt.at, 1 it.search.yahoo.com, 0 it1b.com, 1 +it4sure.nl, 1 it82.com, 1 itabenar.tk, 1 itactiq.com, 1 @@ -57766,7 +57751,6 @@ jarnobogaert.com, 0 jarnobogaert.xyz, 1 jarnskog.tk, 1 jarofthread.com, 1 -jaroku.com, 1 jarondl.net, 1 jaroslavc.eu, 1 jarovske-udoli.cz, 1 @@ -58352,6 +58336,7 @@ jewelleryoutlook.com, 1 jewelleryrack.com, 1 jewelry-directories.tk, 1 jewelrycoverers.ga, 1 +jewishboyscouts.com, 1 jewishinseattle.org, 1 jewishmusic.tk, 1 jewishphilanthropies.org, 1 @@ -59181,6 +59166,7 @@ jpilan.com, 1 jpinfo.tk, 1 jplennard.com, 1 jpm-inc.jp, 1 +jpmelos.com, 1 jpmelos.com.br, 1 jpmguitarshop.com.br, 1 jpn-ks.co.jp, 1 @@ -59378,7 +59364,6 @@ julia-pink.org, 1 julia.school, 1 juliaexclusiv.com, 1 juliajuice.net, 1 -juliakhairaton.com, 0 julian-miller.de, 1 julian-post.de, 0 julian-uphoff.de, 1 @@ -59827,7 +59812,7 @@ k8r.eu, 1 k8slot.com, 0 k8v02.com, 0 k8v03.com, 0 -k8v05.com, 0 +k8v05.com, 1 k8v08.com, 1 k8v21.com, 0 k8v27.com, 0 @@ -60122,6 +60107,7 @@ kamiyo.tk, 1 kamlunglelystad.tk, 1 kamnob.com, 1 kamokiminoyu.net, 1 +kamp-kisten.nl, 1 kampffische.tk, 1 kamppailusali.fi, 1 kampunginggris-ue.com, 1 @@ -60203,7 +60189,6 @@ kanz.jp, 1 kanzashi.com, 1 kanzlei-hhh.de, 1 kanzlei-oehler.com, 1 -kanzlei-sixt.de, 1 kanzshop.com, 1 kaosintesta.tk, 1 kap-kirche.de, 1 @@ -61713,7 +61698,6 @@ kkcinemas.in, 1 kkcsc.co.jp, 1 kkgn.nl, 1 kki.org, 1 -kkicreative.com, 1 kkiskra.tk, 1 kkk0011.com, 0 kkk101.com, 0 @@ -62795,7 +62779,6 @@ kryshodel.ml, 1 krystal-framework.ml, 1 krytykawszystkiego.com, 1 krytykawszystkiego.pl, 1 -kryx.de, 1 ks-19.com, 1 ks-29.com, 1 ks-39.com, 1 @@ -63109,7 +63092,6 @@ kup-sluzbu.cz, 1 kupaa.ink, 1 kupferschmids.ch, 1 kupferstichshop.com, 1 -kupibilet.ru, 1 kupid.com, 1 kupil.ru, 1 kupimlot.ru, 1 @@ -63371,6 +63353,7 @@ la-bolle.fr, 0 la-boutique-langlois.fr, 1 la-buns.com, 1 la-casa.tk, 1 +la-cave-a-nodo.fr, 0 la-clairiere-arlon.be, 1 la-compagnie-des-elfes.fr, 1 la-fenice-neheim.de, 1 @@ -63631,7 +63614,6 @@ lagroza.tk, 1 laguiadelocioenuruguay.com, 1 laguiadelpapa.com, 1 laguinguette.fr, 1 -lagunakitchenandbath.com, 1 lagunaklub.tk, 1 laguterbaru.gq, 1 lahabra.gov, 1 @@ -63926,6 +63908,7 @@ lanyards.com.au, 1 lanyardsfactory.com.au, 0 lanzalex.com, 1 lanzamientovirtual.es, 1 +laobayy.com, 1 laoctavadireccion.tk, 1 laodongkynghi.info, 1 laolaweb.tk, 1 @@ -65177,6 +65160,7 @@ lenyip.works, 1 leo-boutique.fr, 1 leo-music.tk, 1 leoandpeto.com, 1 +leob.in, 0 leochedibracchio.com, 1 leocollo.com, 1 leodraxler.at, 1 @@ -66478,7 +66462,6 @@ littlemaple.tk, 1 littlemaster.tk, 1 littlenicky.org, 1 littlenina.nz, 0 -littlenlargeevents.co.uk, 1 littleorangecookbook.com, 1 littlepigcreek.com.au, 1 littlepincha.fr, 0 @@ -66811,6 +66794,7 @@ locald.at, 1 localegroup.com, 0 localexpert.realestate, 1 localhorst.duckdns.org, 1 +localhost.cat, 1 localized.tk, 1 localizejs.com, 1 localizestaging.com, 1 @@ -67447,7 +67431,6 @@ lothlorien.ca, 0 lotimena.com, 1 lotl.ru, 1 lotn.mobi, 1 -lotn.nl, 1 lotnonline.com, 1 lotnonline.net, 1 lotnonline.nl, 1 @@ -67655,6 +67638,7 @@ lrumeq.com, 1 lrv-grobbendonk.tk, 1 ls-alarm.de, 1 ls-mapping-team.de, 1 +ls-rp.es, 1 lsal.me, 1 lsbricks.com, 1 lsc-dillingen.de, 1 @@ -67699,6 +67683,7 @@ ltmw.xyz, 1 ltn-tom-morel.fr, 1 ltonlinestore.in, 0 ltransferts.com, 1 +lts-tec.de, 1 ltservers.net, 1 lty.space, 1 lu-rp.es, 1 @@ -67829,7 +67814,6 @@ ludum-polus.xyz, 1 ludum.pl, 1 ludunwayoo.com, 1 ludwig.im, 1 -ludwiggrill.de, 1 ludwigjohnson.se, 1 ludwigpro.net, 1 luedeke-bremen.eu, 1 @@ -67926,7 +67910,6 @@ lukloveswhisky.pl, 1 lukmanulhakim.id, 1 lukonet.com, 1 luksusy.pl, 0 -lukull-pizza.de, 1 lule-kendo.tk, 1 lullugun.net, 1 luls.tk, 1 @@ -68290,6 +68273,7 @@ m9721.com, 0 m9728.co, 1 m9t.ch, 1 ma-canne-a-peche.fr, 1 +ma-eir.nl, 1 ma-paroisse.ch, 1 ma-queue.com, 1 ma-ze-linux.tk, 1 @@ -68784,7 +68768,7 @@ mailexx.gq, 1 mailexx.ml, 1 mailfence.com, 1 mailflank.com, 0 -mailgun.com, 1 +mailgun.com, 0 mailhardener.com, 1 mailinabox.email, 1 mailinabox.ml, 1 @@ -70722,6 +70706,7 @@ mcsoneca.tk, 1 mcsports.es, 1 mcsrvstat.us, 1 mcstaralliance.com, 1 +mcsteve.com, 1 mctea.tk, 1 mctherealm.net, 1 mctitan.net, 1 @@ -71237,7 +71222,6 @@ mediataput.ga, 1 mediathekview.de, 1 mediation-mv.de, 1 mediationculturelleclp.ch, 0 -mediatorzy.waw.pl, 1 mediaukkies.nl, 1 mediawax.be, 1 mediaweb.com.ve, 1 @@ -73611,6 +73595,7 @@ mobisuper.com.au, 1 mobitracker.co, 1 mobius.network, 1 mobizat.com, 1 +mobizma.com, 1 moblkar.com, 1 mobmp4.info, 1 mobobe.com, 1 @@ -73990,7 +73975,6 @@ mongla88.net, 1 mongolbox.tk, 1 mongolie.net, 1 mongolito.tk, 1 -mongooselock.com.ua, 1 monicahq.com, 1 monicanaranjo.tk, 1 monicapotter.tk, 1 @@ -74848,6 +74832,8 @@ mtehe-square.com, 1 mteleport.net, 1 mtf.rip, 1 mtfgnettoyage.fr, 1 +mtgeni.us, 1 +mtgenius.com, 1 mtgoptex.com, 1 mtgsuomi.fi, 1 mthode.org, 1 @@ -74879,7 +74865,6 @@ mtrip.com, 0 mtrx.tech, 1 mts-energia.eu, 1 mtsoftware.com.au, 1 -mtsolar.es, 1 mtthwbrd.com, 1 mtv.re, 1 mtvernonlisbonpd-ia.gov, 1 @@ -75519,7 +75504,6 @@ mybuddytheplumber.com, 1 mybuildingcertifier.com.au, 1 mycaelis.fr, 1 mycam.gq, 1 -mycamshowhub.com, 1 mycamshowhub.to, 1 mycard.moe, 1 mycardplace.com, 1 @@ -76190,6 +76174,7 @@ n-design-service.de, 1 n-design.de, 1 n-doc.com, 1 n-doc.de, 1 +n-gram.it, 1 n-laboratory.jp, 1 n-linear.org, 1 n-m.lu, 1 @@ -76768,7 +76753,6 @@ naturalbladdercontrol.tk, 1 naturalcosmetics.cf, 1 naturaldisasters.tk, 1 naturalezafengshui.com, 1 -naturalfit.co.uk, 1 naturalflowerpower.com, 1 naturalkitchen.co.uk, 1 naturalspacesdomes.com, 1 @@ -79632,7 +79616,6 @@ nxth.io, 1 nya-cloud.com, 1 nya.as, 1 nya.one, 1 -nyadora.com, 1 nyadora.moe, 1 nyahururu.tk, 1 nyaken.tk, 1 @@ -80222,7 +80205,6 @@ ogretmenimsanat.com, 0 ogurishun.tk, 1 oguya.ch, 1 ogyaa.jp, 0 -oh-leg.com, 1 oh-my-lash.nl, 1 oh14.de, 0 ohai.su, 1 @@ -80265,7 +80247,6 @@ ohreally.de, 1 ohs.on.ca, 1 ohsocool.org, 1 ohsohairy.co.uk, 1 -ohyooo.com, 1 ohype.ga, 1 ohype.gq, 1 oi-wiki.org, 1 @@ -80570,6 +80551,7 @@ omandatapark.com, 1 omangrid.com, 1 omanhr.cf, 1 omanko.porn, 0 +omaosurveys.org, 0 omarans.com, 1 omarbaba.shop, 1 omarh.net, 1 @@ -80821,7 +80803,6 @@ oninpresento.ga, 1 onionbot.ga, 1 onionbot.me, 1 onionflix.net, 1 -onionplay.eu, 1 onionscan.org, 1 onionshare.org, 1 onionsocial.com, 1 @@ -81150,6 +81131,7 @@ opendata.cz, 1 opendataincubator.eu, 1 opendecide.com, 1 opendolls.com, 1 +opendoorcounselingpa.com, 1 openevic.info, 1 openfir.st, 1 openfitapi-falke.azurewebsites.net, 1 @@ -81586,7 +81568,6 @@ ornua.com, 1 oro.roma.it, 1 orocojuco.com, 1 oroconews.com.br, 1 -orodelsalento.com, 1 orologeria.roma.it, 1 orovillelaw.com, 1 oroygrana.com, 1 @@ -82135,7 +82116,6 @@ ozonstyle.ga, 1 ozonytron.com, 1 ozonytron.de, 1 ozonytron.eu, 1 -ozoz.cc, 1 oztorah.com, 1 ozudogru.com, 1 ozvolvo.org, 1 @@ -82617,7 +82597,6 @@ pangea-it.com, 1 pangeaservices.com, 1 panghu.me, 1 pangoly.com, 1 -panhandlemenshealth.com, 1 panheelstraat.tk, 1 panic-away.tk, 1 panic.tk, 1 @@ -83049,7 +83028,6 @@ passionbyd.com, 0 passiondesigns.web.id, 1 passionebenessere.com, 1 passionegriglia.com, 1 -passionpictures.eu, 1 passions-art.com, 1 passive-work.gq, 1 passiveseinkommen.tk, 1 @@ -84359,6 +84337,7 @@ pgmsp.net, 1 pgmtechnologies.com, 1 pgnetwork.net, 1 pgp.lol, 1 +pgp.network, 1 pgpaintanddesign.com, 1 pgpmail.cc, 1 pgprosupplies.com, 1 @@ -84920,7 +84899,6 @@ pilatescenteraz.com, 1 pilatespt.nl, 1 pilatesstation.co.th, 1 pildat.org, 1 -pilesyk.tk, 1 pili-serv.ovh, 1 piliszek.net, 1 pill.id, 1 @@ -85658,7 +85636,6 @@ plumberlewisvilletexas.com, 1 plumbermountedgecombe.co.za, 1 plumberumhlangarocks.co.za, 1 plumbingandheatingspecialistnw.com, 1 -plumbingglenvista.co.za, 1 plumbingkingsllc.com, 1 plumbingshop.tk, 1 pluminate.com, 1 @@ -85961,6 +85938,7 @@ pogljad-brest.tk, 1 pogodavolgograd.tk, 1 pogodok.tk, 1 pogomate.com, 1 +pogoswine.com, 1 pogotowie-komputerowe.tk, 1 pogotowiekomputeroweolsztyn.pl, 1 pogrebisky.net, 1 @@ -86242,7 +86220,6 @@ poolcuepro.com, 0 poolheatingsolutionswa.com.au, 1 poolinstallers.co.za, 1 poolmans.se, 0 -poolpowershop.de, 1 poolsafely.gov, 1 poolsafety.gov, 1 poolsonline.tk, 1 @@ -87080,6 +87057,7 @@ prestigerepairs.com.au, 1 prestigesigns.net, 1 prestigesoundandlight.co.uk, 1 prestigeworldwidepr.com, 1 +prestigiouskitchen.com, 1 prestonapp.com, 1 prestonbrant.com, 1 prestopizzas63.fr, 1 @@ -87251,7 +87229,6 @@ priorityelectric-camarillo.com, 1 priorityelectric-dosvientos.com, 1 priorityelectric-hiddenhills.com, 1 priorityelectric-lakesherwood.com, 1 -priorityelectric-malibu.com, 1 priorityelectric-moorpark.com, 1 priorityelectric-newburypark.com, 1 priorityelectric-oakpark.com, 1 @@ -87462,7 +87439,6 @@ prod-simplesend-api.azurewebsites.net, 1 prodampro.ru, 1 prodatalabs.com, 1 prodct.info, 1 -prodegree.com, 1 prodentalsantacruz.es, 1 prodesigntools.com, 1 prodesk.bg, 1 @@ -87884,7 +87860,6 @@ protection.ga, 1 protectionformula.com.ua, 1 protectwrap.ml, 1 protege.moi, 1 -protegetudescanso.com, 1 proteh.com.ua, 1 protein-riegel-test.de, 1 proteinreport.org, 1 @@ -88191,7 +88166,6 @@ psylab.cc, 0 psylab.re, 0 psylliums.com, 1 psynapse.net.au, 1 -psyshell.tk, 1 psytrance-pro.com, 1 pszinfo.hu, 1 pt-d.ru, 1 @@ -88387,7 +88361,6 @@ purecbdvapors.com, 1 puredayshop.com.tw, 1 puredisinfecting.com, 1 puredisinfection.com, 1 -puredns.org, 1 purefoot.jp, 1 purefreefrom.co.uk, 0 purelife.photography, 1 @@ -89969,7 +89942,6 @@ ravada-vdi.com, 1 ravagers.tk, 1 ravages.tk, 1 ravasco-football-team.herokuapp.com, 1 -ravchat.com, 1 raveboy.dyndns.org, 1 ravefm.tk, 1 ravelin.com, 1 @@ -89992,6 +89964,7 @@ ravihotel.com, 0 ravijuhend.ee, 1 ravik.tk, 1 ravimiamet.ee, 1 +ravindran.me, 1 raviparekh.co.uk, 1 ravis.org, 1 ravkr.duckdns.org, 1 @@ -90274,6 +90247,7 @@ realestateboston.tk, 1 realestatecentralcoast.info, 1 realestateexecutives.tk, 1 realestategreenville.tk, 1 +realestateonehowell.com, 1 realestatesales.gov, 1 realfamilyincest.com, 1 realfreedom.city, 0 @@ -90640,7 +90614,6 @@ reducealcoholism.com, 1 reducto.tk, 1 redunion.tk, 1 redwater.co.uk, 1 -redwaterhost.com, 1 redwaymu.cf, 1 redweek.com, 1 redwhey.com, 1 @@ -90795,7 +90768,6 @@ rehab.cf, 1 rehab.cn.ua, 1 rehabili-shigoto.com, 1 rehabphilippines.com, 1 -rehabreviews.com, 1 rehabthailand.com, 1 rehabthailand.org, 1 rehau-ua.com, 1 @@ -91542,6 +91514,7 @@ rexburgid.gov, 1 rexcutty.com, 1 rexdf.net, 1 rexeroofing.com, 1 +rexfinland.fi, 1 rexled.fi, 1 rexograph.com, 1 rexskz.info, 1 @@ -92215,6 +92188,7 @@ rochow.me, 1 rocis.gov, 1 rock-base.tk, 1 rocka.me, 1 +rockagogo.com, 1 rockandroll.tk, 1 rockbankland.com.au, 1 rockbridge.tk, 1 @@ -93653,7 +93627,6 @@ safebits.eu, 1 safebits.fr, 1 safebits.it, 1 safeboard.ml, 1 -safebuyerscheme.co.uk, 1 safecar.gov, 1 safecash.id, 1 safecso.cf, 1 @@ -93883,6 +93856,7 @@ salaire-minimum.com, 1 salalfoundation.ca, 1 salamanders.tk, 1 salamence.tk, 1 +salandalairconditioning.com, 1 salariominimo.com.co, 1 salarycalculatoruk.co.uk, 1 salas.cf, 1 @@ -94308,7 +94282,6 @@ santa-fell-from.space, 1 santabarbaraca.gov, 1 santackergaard.nl, 1 santaclaracounty.gov, 1 -santacruzdescargas.tk, 1 santafesilversaddlemotel.com, 1 santaijia.com, 0 santamargarita.tk, 1 @@ -95283,7 +95256,6 @@ scribbler.tk, 1 scripo-bay.com, 1 script.google.com, 1 scripter.co, 1 -scriptgates.ru, 1 scripthost.org, 1 scriptjunkie.us, 1 scriptline.ga, 1 @@ -95607,6 +95579,7 @@ secure.advancepayroll.com.au, 1 secure.facebook.com, 0 securebot.ga, 1 securecloudplatform.nl, 1 +securecomms.cz, 1 secureddocumentshredding.com, 1 securedrop.org, 1 secureenduserconnection.se, 1 @@ -96051,6 +96024,7 @@ sentry.io, 1 sentry.nu, 1 sentrybay.com, 1 sentworks.com, 1 +senu.pro, 1 senzaparole.de, 1 senzei.tk, 1 seo-analyse.com, 1 @@ -96181,7 +96155,6 @@ septentrionalist.org, 1 septfinance.ch, 0 septicrepairspecialists.com, 1 septics.ga, 1 -septictankpumpingservices.com, 1 septonol.tk, 1 septs.blog, 1 sepulcharium.tk, 1 @@ -96469,7 +96442,7 @@ sewavillamurah.tk, 1 sewfarsewgood.uk, 1 sewing-machines.com.ua, 1 sewing-world.ru, 1 -sewinginsight.com, 1 +sewinginsight.com, 0 sewoo.co.uk, 1 seworld.ml, 1 sex-chat-geld-verdienen.com, 1 @@ -97366,6 +97339,7 @@ shoppingturbo.ga, 1 shoppingunique.ga, 1 shoppingurban.ga, 1 shoppingvariety.ga, 1 +shoppingvrimini.ru, 1 shoppingwaterfront.ga, 1 shoppingwinner.ga, 1 shoppingworth.ga, 1 @@ -98357,7 +98331,6 @@ sitz.ch, 1 sitzungsdienst.net, 1 siulam-wingchun.org, 1 siusto.com, 1 -sivale.mx, 1 sivaru.tk, 1 sivizius.eu, 1 sivutoimisto.fi, 1 @@ -98693,6 +98666,7 @@ skyscapecanopies.com, 1 skyscnr.com, 1 skyseo.cf, 1 skysoftbg.com, 1 +skysuite.nl, 1 skytec.host, 1 skyterraathome.com, 1 skyterraembrace.com, 1 @@ -98821,6 +98795,7 @@ slmail.me, 1 sln.cloud, 1 slneighbors.org, 1 slo-tech.com, 1 +sloancom.com, 1 sloanrealtygroup.com, 1 sloboda.tk, 1 slobrowink.com, 1 @@ -98974,7 +98949,6 @@ smartcover.tk, 1 smartcpa.ca, 1 smartdb.jp, 1 smartdigital.ga, 1 -smartdigitech.co.za, 1 smarteco.tk, 1 smartedukasi.co.id, 1 smarterskies.gov, 1 @@ -99076,7 +99050,6 @@ smhotels.com.ph, 1 smi-a.me, 1 smialnumenor.tk, 1 smiatek.name, 1 -smiblog.tk, 1 smicenter.tk, 1 smicompact.com, 1 smictecniservi.com, 1 @@ -99801,7 +99774,6 @@ somersetscr.nhs.uk, 1 somersetwellbeing.nhs.uk, 1 someserver.cf, 1 something-else.cf, 1 -somethingsimilar.com, 1 somethingsketchy.net, 1 somewherenews.cf, 1 somewherenews.ga, 1 @@ -100662,7 +100634,6 @@ spom.net, 1 sponc.de, 1 sponec.com, 1 spongebobwiki.tk, 1 -spongepowered.org, 1 sponsor.software, 1 spoofhaus.com, 1 spookbook.net, 1 @@ -101649,7 +101620,6 @@ steiners.party, 1 steinibox.de, 1 steinmassl.org, 1 steinmetz.cloud, 1 -steklein.de, 1 stekosouthamerica.com, 1 stelfox.net, 1 stelga.ca, 1 @@ -101698,6 +101668,7 @@ stensund.se, 1 stenvallmcclain.tk, 1 stenzhorn-cloud.de, 1 step2web-cms.info, 1 +stepanvanek.cz, 1 steparovi.cz, 1 steph.ninja, 1 steph3n.me, 1 @@ -101826,6 +101797,7 @@ steviate.de, 1 stevie-ray.me, 1 stewards.tk, 1 stewart.tk, 1 +stewartswines.com, 1 stewonet.nl, 1 stewpolley.com, 1 steyaert.be, 0 @@ -101848,6 +101820,7 @@ stichtingsticky.nl, 0 stichtingwwtoegankelijk.nl, 1 stick2bike.de, 1 stickandpoketattookit.com, 1 +stickeramoi.com, 1 stickerparadise.me, 1 stickers-garage.com, 1 stickertrade.me, 1 @@ -101920,7 +101893,6 @@ stirblaut.de, 1 stirling.co, 1 stisidores.org, 1 stitch.money, 1 -stitchfiddle.com, 1 stitchinprogress.com, 1 stjohncamden.com, 1 stjohnin.com, 1 @@ -102257,7 +102229,6 @@ strategicenvironmentalassessment.gov.scot, 1 strategiclivingblog.com, 1 strategicmind.com, 1 strategicpartnersmedia.com, 1 -strategiczni.pl, 1 strategie-zone.de, 1 stratego-belgie.tk, 1 strategybusiness.ga, 1 @@ -102533,7 +102504,6 @@ studiogears.com, 1 studiograou.com, 1 studiohelder.fr, 0 studiohomebase.amsterdam, 1 -studiokicca.com, 1 studiolegalemarchi.tk, 1 studiolegalepaternostro.it, 1 studiolu.tk, 1 @@ -103587,7 +103557,6 @@ swingerclub.in, 1 swingle.ga, 1 swingmonkey.com, 1 swingstel.tk, 1 -swingtimeinthegardens.com, 1 swingular.com, 1 swingz.com.au, 1 swipedon.com, 1 @@ -104169,6 +104138,7 @@ taipak-krasnoyar.tk, 1 taipei-101.tk, 1 taishokudaiko.com, 1 taishon.nagoya, 1 +taitmacleod.com, 1 taiwan-kitchen.com, 1 taiwan.dating, 1 taiwanhotspring.net, 1 @@ -105848,6 +105818,7 @@ textundblog.de, 1 texus.me, 1 texy.info, 1 teycos.com, 1 +teysens.com, 1 tezcam.tk, 1 tezwifi.com, 1 tf-network.de, 1 @@ -107231,6 +107202,7 @@ thomspooren.nl, 0 thomwiggers.nl, 1 thooka.com, 1 thoplam.com, 1 +thor.edu, 1 thor.re, 1 thorbes.ga, 1 thorbiswebsitedesign.com, 1 @@ -107461,7 +107433,6 @@ tiener-herentals.be, 1 tienerdienst-johanneskapel.tk, 1 tienic.com, 1 tiens-ib.cz, 1 -tierarzt-karlsruhe-durlach.de, 1 tierarztpraxis-illerwinkel.de, 1 tierarztpraxis-weinert.de, 1 tiergear.com.au, 1 @@ -108096,7 +108067,6 @@ toekomstperspectief.be, 1 toepferei-langerwehe.de, 1 toepferwerk.de, 1 toerschaatsenknsb.nl, 1 -toest.bg, 1 toetsplatform.be, 1 tofa-koeln.de, 1 tofe.io, 1 @@ -111311,6 +111281,7 @@ unfabulous.tk, 1 unfallrechtler.de, 1 unfamousrecords.tk, 1 unfathomable.blue, 1 +unfc.nl, 1 unferno.tech, 1 unfettered.net, 0 unfixed-soul.tk, 1 @@ -111592,7 +111563,6 @@ unsee.cc, 1 unseeliefilms.com, 1 unseeliepress.com, 1 unseen.is, 1 -unseen.tw, 1 unser-gartenforum.de, 1 unsourirealecole.fr, 1 unstable.network, 1 @@ -112283,6 +112253,7 @@ va11hal.la, 1 va11halla.ddns.net, 1 vaabogados.legal, 1 vaaddress.co, 1 +vaaes.org, 0 vaan-arbeidsrecht.nl, 1 vaartjesboten.nl, 1 vaat.io, 1 @@ -113947,6 +113918,7 @@ vissanum.com, 1 visscher.codes, 1 vista-calculator.ru, 1 vista-research-group.com, 1 +vistaalmar.es, 1 vistastylebuilder.com, 0 vistb.me, 1 vistec-support.de, 1 @@ -114078,6 +114050,7 @@ vivo.vn, 1 vivoitaliankitchen.com, 1 vivoldi.com, 1 vivoregularizafacil.com.br, 1 +vivoseg.com, 0 vivreenisrael.com, 1 vivy.com, 1 viwsec.com.br, 1 @@ -114181,7 +114154,7 @@ vmccnc.com, 1 vmconnected.co.uk, 1 vmem.jp, 0 vmf365.tk, 1 -vmgirls.com, 1 +vmgirls.com, 0 vmhomedesign.com, 0 vmhydro.ru, 0 vmis.nl, 1 @@ -114280,7 +114253,6 @@ voiceofserbia.tk, 1 voicesoflabor.com, 1 voicesofspirit.at, 1 voicesuk.co.uk, 1 -voicr.nl, 1 voicu.ch, 0 voidancerecords.com, 1 voidbot.ai, 1 @@ -115026,6 +114998,7 @@ waldgourmet.de, 1 waldo.tk, 1 waldparkerwoelfe.tk, 1 waldportoregon.gov, 1 +waldur.nl, 1 waldvogel.family, 1 walent.in, 1 walentin.co, 1 @@ -115215,7 +115188,7 @@ wardpieters.xyz, 1 wardslager.com, 1 warebouncycastles.co.uk, 1 warehost.de, 0 -warekit.io, 1 +warekit.io, 0 warekon.com, 1 warekon.dk, 1 warenghem.com, 1 @@ -116083,6 +116056,7 @@ wego.ca, 1 wegonnagetsued.org, 1 wegotcookies.com, 1 wegrzynek.org, 1 +wegrzynek.pl, 1 wegvielfalt.de, 1 wehealasone.gov.ph, 1 weho.gov, 1 @@ -116359,7 +116333,6 @@ westshoresrealty.com, 1 westside-pediatrics.com, 1 westsidechildrenstherapy.com, 1 westskinlaser.com, 1 -westsuburbanbank.com, 1 westthorntonlabour.co.uk, 0 westvilleplumber.co.za, 1 westvirginiahealth.tk, 1 @@ -116652,7 +116625,6 @@ whoneedstobeprimaried.today, 1 whonix.org, 1 whoopee.my, 1 whooshkaa.com, 1 -whoownsmyavailability.com, 1 whoreofwallstreet.tk, 1 whorepresentsme.us, 1 whosapeach.tk, 1 @@ -116768,7 +116740,6 @@ wijkbudget.gent, 1 wijkdezwaenebloeme.tk, 1 wijkstation.nl, 1 wijnbesteld.nl, 1 -wijnimportjanssen.nl, 1 wijnlandkroatie.nl, 1 wijnservices.nl, 0 wijsaantwerk.be, 1 @@ -117891,7 +117862,6 @@ wot-tudasbazis.hu, 1 wot-zadrot.com, 1 wotcheats.ru, 1 woti.dedyn.io, 1 -wotsunduk.ru, 1 wotzadrot.com, 1 woudenberg.nl, 0 woudenbergsedrukkerij.nl, 1 @@ -118319,7 +118289,7 @@ wxster.com, 1 wxw.moe, 1 wxxcxd88.com, 1 wxzm.sx, 1 -wy188.cc, 1 +wy188.cc, 0 wy6.org, 1 wyam.io, 1 wyatttauber.com, 1 @@ -120210,7 +120180,6 @@ yilanju.com, 1 yilconstruction.ca, 1 yiluup.com, 0 yimgo.fr, 0 -yin8888.tv, 0 yinduyy.com, 0 yinfor.com, 1 ying.gift, 1 @@ -120534,7 +120503,6 @@ yourpalmbeachcountyrealtor.com, 1 yourpalstore.com, 1 yourpersonalfrance.com, 1 yourrenaissancemedspa.com, 1 -yourscotlandtour.co.uk, 1 yourskin.nl, 1 yoursoul.gq, 1 yoursoulmate.tk, 1 @@ -121837,6 +121805,7 @@ zionnationalpark.net, 1 zionsvillelocksmiths.com, 1 ziontech.eu.org, 1 zionvps.com, 0 +zip.ch, 1 zipalerts.com, 1 ziparcfhive.ga, 1 zipkey.de, 1 @@ -122114,6 +122083,7 @@ zoom-eco.net, 1 zoom.earth, 1 zoomative.com, 1 zoomcar.pro, 1 +zoomek.com, 1 zoomgov.com, 1 zooom.azurewebsites.net, 1 zooom2.azurewebsites.net, 1 @@ -122250,7 +122220,6 @@ zumba-oostende.be, 1 zumba.com, 1 zumberak.tk, 1 zumtaedanceschool.co.za, 1 -zumub.com, 1 zumwildenaffen.com, 1 zund-app.com, 1 zundapp.one, 1 diff --git a/services/settings/dumps/security-state/intermediates.json b/services/settings/dumps/security-state/intermediates.json index 7d1583c3a029c..a5388caaabdef 100644 --- a/services/settings/dumps/security-state/intermediates.json +++ b/services/settings/dumps/security-state/intermediates.json @@ -1,5 +1,329 @@ { "data": [ + { + "schema": 1650855463114, + "derHash": "8Hu73gdvm0DFfMS+/t6Xyh9Tua4UfwNdKEy/U/NDL7g=", + "subject": "CN=CFCA OV OCA,O=China Financial Certification Authority,C=CN", + "subjectDN": "MFUxCzAJBgNVBAYTAkNOMTAwLgYDVQQKDCdDaGluYSBGaW5hbmNpYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxFDASBgNVBAMMC0NGQ0EgT1YgT0NB", + "whitelist": false, + "attachment": { + "hash": "bc37658d1568750ae385b92be54ede64df31899d30f67211fd1e015c9dc7803b", + "size": 1963, + "filename": "uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=.pem", + "location": "security-state-staging/intermediates/8a832b56-3f0a-4b5f-8966-8a1da5242863.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=", + "crlite_enrolled": false, + "id": "b2b776e5-2b2f-4c8e-819d-026b8d3855d2", + "last_modified": 1650877037744 + }, + { + "schema": 1650812270542, + "derHash": "Bp3y+JGdkgnQxSSla6EYHfbRu/xKphyfAdCS4tXDof0=", + "subject": "CN=MSFT BALT RS256 CA,O=Microsoft Corporation,C=US", + "subjectDN": "MEoxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xGzAZBgNVBAMTEk1TRlQgQkFMVCBSUzI1NiBDQQ==", + "whitelist": false, + "attachment": { + "hash": "b68175bda43c438ac536ee134774227b69c8479a249c97fc24ebcdc2efe126fa", + "size": 2028, + "filename": "pDM-S2FkRzB_xtTd9uAioSOPn-QW1bRg8ecQtY4-I1A=.pem", + "location": "security-state-staging/intermediates/ca4850cd-a81e-479d-ba75-2a7072c7f60d.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "pDM+S2FkRzB/xtTd9uAioSOPn+QW1bRg8ecQtY4+I1A=", + "crlite_enrolled": true, + "id": "f18528dd-6f56-46ab-942c-d0660c571a8d", + "last_modified": 1650855462570 + }, + { + "schema": 1650790673425, + "derHash": "dYlNTJTCLXKW7hn7RHYjJYwlkbFwMSiLs4aiCqHw4KY=", + "subject": "CN=NetLock Közjegyzői (Class A) Tanúsítványkiadó,OU=Tanúsítványkiadók (Certification Services),O=NetLock Kft.,L=Budapest,C=HU", + "subjectDN": "MIGuMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE8MDoGA1UEAwwzTmV0TG9jayBLw7Z6amVneXrFkWkgKENsYXNzIEEpIFRhbsO6c8OtdHbDoW55a2lhZMOz", + "whitelist": false, + "attachment": { + "hash": "4327de015aac627d028d4696e3b582048933e2f87d179c261b01897e32b67a1d", + "size": 2190, + "filename": "RWiIGgLo9cnu9JGiGhnz5uw6FBH1Y5qDY4qGsl5Q9EM=.pem", + "location": "security-state-staging/intermediates/27099d75-dfc0-441a-a1de-81e112a1d6e5.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "RWiIGgLo9cnu9JGiGhnz5uw6FBH1Y5qDY4qGsl5Q9EM=", + "crlite_enrolled": false, + "id": "a76d3004-9787-484d-a4d9-2e5555cd8b56", + "last_modified": 1650812270014 + }, + { + "schema": 1650661069134, + "derHash": "lp4yAFIOssaalmdYfm3U0LI/KPUQzBMXZwqO02E+vq0=", + "subject": "CN=DigitalTrust High Assurance CA G4 [Run by the Issuer],O=Digital Trust L.L.C.,C=AE", + "subjectDN": "MG0xCzAJBgNVBAYTAkFFMR0wGwYDVQQKExREaWdpdGFsIFRydXN0IEwuTC5DLjE/MD0GA1UEAww2RGlnaXRhbFRydXN0IEhpZ2ggQXNzdXJhbmNlIENBIEc0ICBbUnVuIGJ5IHRoZSBJc3N1ZXJd", + "whitelist": false, + "attachment": { + "hash": "e74dd2a02806fa7c508188e10a5f0c0712f1cfbccde8988e042626a766beecb4", + "size": 2507, + "filename": "LFyh5Bg1aFs3y7w1j2dwtnxqDbovX0i8cL9gYJC6PXw=.pem", + "location": "security-state-staging/intermediates/df91fee1-b72c-4071-bb40-85741d9a30db.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "LFyh5Bg1aFs3y7w1j2dwtnxqDbovX0i8cL9gYJC6PXw=", + "crlite_enrolled": false, + "id": "82e3caed-61a5-46f8-b0a5-e0e5548b3eaa", + "last_modified": 1650769066440 + }, + { + "schema": 1650553057777, + "derHash": "ODDbjqFSC2zfV+HgCl8Sl74R2eZDDINgcXYhL/hdLbg=", + "subject": "CN=TrustCor Enhanced Secure Site (CA2),OU=TrustCor Network,O=TrustCor Systems S. de R.L.,ST=Panama,C=PA", + "subjectDN": "MIGNMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xGTAXBgNVBAsMEFRydXN0Q29yIE5ldHdvcmsxLDAqBgNVBAMMI1RydXN0Q29yIEVuaGFuY2VkIFNlY3VyZSBTaXRlIChDQTIp", + "whitelist": false, + "attachment": { + "hash": "26631969fe5fbc543132a914eb2829ace13e9b418495495a837a47d8936c69b6", + "size": 2564, + "filename": "gTvKBlqs6VknFEiItiUhp5K_Oy0UnzZd7vVB6Ko3ZeE=.pem", + "location": "security-state-staging/intermediates/e49aa502-2469-4f4f-b00b-3d32c9f282e8.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "gTvKBlqs6VknFEiItiUhp5K/Oy0UnzZd7vVB6Ko3ZeE=", + "crlite_enrolled": false, + "id": "7f04f0ef-3fdc-4bfa-9cc5-c76e75f35add", + "last_modified": 1650661068590 + }, + { + "schema": 1650552524914, + "derHash": "iVeNcml6wlq8b204I4dEOWVBKsdEjxA8mx0Rq2OlVc0=", + "subject": "CN=GlobalSign Atlas R3 AlphaSSL CA 2022 Q3,O=Globalsign nv-sa,C=BE", + "subjectDN": "MFoxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxzaWduIG52LXNhMTAwLgYDVQQDEydHbG9iYWxTaWduIEF0bGFzIFIzIEFscGhhU1NMIENBIDIwMjIgUTM=", + "whitelist": false, + "attachment": { + "hash": "a80efbadc5730df2fa0157410ddb8d9b249da87dcb056e54b148b01e32fca2dc", + "size": 1642, + "filename": "u2PPfToTfxlnHMc8HYHgBrctBMaW9JogX77Hhq-zklU=.pem", + "location": "security-state-staging/intermediates/1a77e1c3-b927-44ab-96bf-2e72de1a7f04.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "u2PPfToTfxlnHMc8HYHgBrctBMaW9JogX77Hhq+zklU=", + "crlite_enrolled": false, + "id": "342d2e93-b4c7-4592-958a-ad2b8e43a772", + "last_modified": 1650553057229 + }, + { + "schema": 1650552522984, + "derHash": "qLKkUYqCoMwKYLL7iLlGVXrbT6WEWOx2gKd7sOUzTY0=", + "subject": "CN=GlobalSign Atlas ECCR5 DV ACME CA 2022 Q3,O=GlobalSign nv-sa,C=BE", + "subjectDN": "MFwxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTIwMAYDVQQDEylHbG9iYWxTaWduIEF0bGFzIEVDQ1I1IERWIEFDTUUgQ0EgMjAyMiBRMw==", + "whitelist": false, + "attachment": { + "hash": "b68666da50c073d1a8847151f9a236a66ca0857536769a5018002d926683f749", + "size": 1195, + "filename": "TevF5ohME1f-tSSfuVGlGBS73B9YmpAiEHCMSCfHeIw=.pem", + "location": "security-state-staging/intermediates/2a4369e4-03bd-4e4e-baaa-020ef0879241.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "TevF5ohME1f+tSSfuVGlGBS73B9YmpAiEHCMSCfHeIw=", + "crlite_enrolled": false, + "id": "d2cb52cc-1cbb-46b2-9d66-bee7fa46e823", + "last_modified": 1650553057220 + }, + { + "schema": 1650552521921, + "derHash": "KekwU3adTRurhBuPXCYDvtXguC8zlnCGlWaJIUbokUE=", + "subject": "CN=GlobalSign Atlas R3 OV TLS CA 2022 Q3,O=GlobalSign nv-sa,C=BE", + "subjectDN": "MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIE9WIFRMUyBDQSAyMDIyIFEz", + "whitelist": false, + "attachment": { + "hash": "b08a91fa2723f41383dda1dddc9ee5f8cad013137a51866aed652c3d5c4dfbd9", + "size": 1642, + "filename": "wn6PW6g02WtaumkExzEzNw1bo4Mzu0_IX3rY3SmY9t0=.pem", + "location": "security-state-staging/intermediates/ce376919-b9f5-4dd5-96e0-282cf246eb19.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "wn6PW6g02WtaumkExzEzNw1bo4Mzu0/IX3rY3SmY9t0=", + "crlite_enrolled": false, + "id": "6bd389d2-bf1e-4c0b-b78e-970beaaeb339", + "last_modified": 1650553057211 + }, + { + "schema": 1650552520053, + "derHash": "DtWqAGHQm3A+GzFQ+2Nnhwu/JFzO7U/gjy2+QgFyOo0=", + "subject": "CN=GlobalSign Atlas R46 EV TLS CA 2022 Q3,O=GlobalSign nv-sa,C=BE", + "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIFI0NiBFViBUTFMgQ0EgMjAyMiBRMw==", + "whitelist": false, + "attachment": { + "hash": "81b835c34d222b602141a4c129500f2b1835fab3796a3c9532d5dfb2cb487b46", + "size": 2324, + "filename": "ZZ_BfqFFbhO7SSCmu78v8N2CE5ykK9-zz37sWEIWEXI=.pem", + "location": "security-state-staging/intermediates/6916706c-a910-4b05-9dc3-be264f846783.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "ZZ/BfqFFbhO7SSCmu78v8N2CE5ykK9+zz37sWEIWEXI=", + "crlite_enrolled": false, + "id": "2b253bb2-317f-47bb-a793-79a8ca184ca3", + "last_modified": 1650553057201 + }, + { + "schema": 1650552519107, + "derHash": "8G4sPQWvYIx7rLY2b3pHoBet7CL3Er1BczU5bLi1Vb4=", + "subject": "CN=GlobalSign Atlas R3 OV ACME CA 2022 Q3,O=GlobalSign nv-sa,C=BE", + "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIFIzIE9WIEFDTUUgQ0EgMjAyMiBRMw==", + "whitelist": false, + "attachment": { + "hash": "a722c9f25470083db4069d629e106f0ca8de6caeaeceffd3c3af14cde8bc7220", + "size": 1642, + "filename": "v-6TVbKbKyGXPLB9TKvsbakeEhe-pi-eaT9sF4mgGr0=.pem", + "location": "security-state-staging/intermediates/884d150d-14aa-4b66-86e5-b81eab371750.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "v+6TVbKbKyGXPLB9TKvsbakeEhe+pi+eaT9sF4mgGr0=", + "crlite_enrolled": false, + "id": "9090bd44-30a3-4269-9ea1-3973dddf9033", + "last_modified": 1650553057192 + }, + { + "schema": 1650552523929, + "derHash": "5MLYxuVOzhyZajBZcrGuCwZPEFvgbP1ylf0trjO5fho=", + "subject": "CN=GlobalSign Atlas ECCR5 OV ACME CA 2022 Q3,O=GlobalSign nv-sa,C=BE", + "subjectDN": "MFwxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTIwMAYDVQQDEylHbG9iYWxTaWduIEF0bGFzIEVDQ1I1IE9WIEFDTUUgQ0EgMjAyMiBRMw==", + "whitelist": false, + "attachment": { + "hash": "5cc2b94fc8e9c1b123bee963843ba94aff76a64649883767f1338c8d7f44f4e2", + "size": 1195, + "filename": "ipI_vvoPazVvEdDn9l8fFY4jeKtvuZSfWutFCu1kIkk=.pem", + "location": "security-state-staging/intermediates/74dbf254-96d5-401a-b9a0-4d408e850b5f.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "ipI/vvoPazVvEdDn9l8fFY4jeKtvuZSfWutFCu1kIkk=", + "crlite_enrolled": false, + "id": "ee7ae6b9-2371-4662-8209-79d4825ea154", + "last_modified": 1650553057183 + }, + { + "schema": 1650552518162, + "derHash": "615sGuMKD5uMV2kQW6nWiC5KzLpeLy9yrDiKL6yg/vM=", + "subject": "CN=GlobalSign Atlas R3 DV ACME CA 2022 Q3,O=GlobalSign nv-sa,C=BE", + "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIFIzIERWIEFDTUUgQ0EgMjAyMiBRMw==", + "whitelist": false, + "attachment": { + "hash": "48d7fb2872b9764b7517d7ec845608c055a064c655972e36e082a18069737f85", + "size": 1642, + "filename": "b5e0CjH-QPTCZha67VgJSQ3Uj1lumilZfgmxcw6hyi8=.pem", + "location": "security-state-staging/intermediates/a69121a6-44ac-4122-bd99-50cdfae0ac05.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "b5e0CjH+QPTCZha67VgJSQ3Uj1lumilZfgmxcw6hyi8=", + "crlite_enrolled": false, + "id": "e982faae-a5c3-4f6b-aa5e-e7c4b4e46e93", + "last_modified": 1650553057174 + }, + { + "schema": 1650552521002, + "derHash": "Etz/m2AmnjtUbD/7fnS6WOt+68v1lWdx94T3pYLC6no=", + "subject": "CN=GlobalSign Atlas R3 DV TLS CA 2022 Q3,O=GlobalSign nv-sa,C=BE", + "subjectDN": "MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFIzIERWIFRMUyBDQSAyMDIyIFEz", + "whitelist": false, + "attachment": { + "hash": "bcb43fbd11578b570d27776e300f87eb5525df0ecfb473a6e4050c9252faaaf8", + "size": 1642, + "filename": "0OyeXCoPbY19oU2881iW7i1bAu8Ni-HMKGN08r_G5XI=.pem", + "location": "security-state-staging/intermediates/b5d214b9-02bf-46d5-8c86-4000177b8e47.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "0OyeXCoPbY19oU2881iW7i1bAu8Ni+HMKGN08r/G5XI=", + "crlite_enrolled": false, + "id": "0102afe2-e620-4086-8721-bfcf4279d0af", + "last_modified": 1650553057165 + }, + { + "schema": 1650552515284, + "derHash": "DJJZS9OUtIh6HWbsXmMf+tO6Swf+LrbRXS9f7kyQxFQ=", + "subject": "CN=GlobalSign Atlas R6 EV TLS CA 2022 Q3,O=GlobalSign nv-sa,C=BE", + "subjectDN": "MFgxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS4wLAYDVQQDEyVHbG9iYWxTaWduIEF0bGFzIFI2IEVWIFRMUyBDQSAyMDIyIFEz", + "whitelist": false, + "attachment": { + "hash": "8586ac0ab17dd90efb094612944d800faae022383e152b1aaeba033a284bc974", + "size": 2333, + "filename": "r0fgmmfQcPt1Okq9xY0UwyyuDUtKFs2nVQY9k68RyzY=.pem", + "location": "security-state-staging/intermediates/e10cbedd-0720-4272-9958-97e576da4e17.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "r0fgmmfQcPt1Okq9xY0UwyyuDUtKFs2nVQY9k68RyzY=", + "crlite_enrolled": false, + "id": "0f272ddb-4d19-4947-ba8f-5f5bddcf5046", + "last_modified": 1650553057156 + }, + { + "schema": 1650552514303, + "derHash": "5sGNbQCMcSswF94a52WUGJgyVLAd5Ila6R87Kf9IJBc=", + "subject": "CN=GlobalSign Atlas ECCR5 DV TLS CA 2022 Q3,O=GlobalSign nv-sa,C=BE", + "subjectDN": "MFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIEF0bGFzIEVDQ1I1IERWIFRMUyBDQSAyMDIyIFEz", + "whitelist": false, + "attachment": { + "hash": "2a9c7dc537e9412fdafb13b4b2896b77ed6d2a7346610bce882f1ab2df5ac664", + "size": 1195, + "filename": "1OU4v4R9chWAHoW7_Lvqm0WW_68bV_okQ8VnVf6zQWY=.pem", + "location": "security-state-staging/intermediates/87b90dc7-c168-45d1-86f9-3a1dab597af5.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "1OU4v4R9chWAHoW7/Lvqm0WW/68bV/okQ8VnVf6zQWY=", + "crlite_enrolled": false, + "id": "005ef0fb-4b58-42d2-97cd-606c8ef01974", + "last_modified": 1650553057146 + }, + { + "schema": 1650552517202, + "derHash": "EAU3DtJ2sM7zkkTp5pnOSAe/mt4Fv6WfJjgJ+0YGtyw=", + "subject": "CN=Prodrive Technologies GCC R3 OV TLS CA 2022,O=Prodrive Technologies B.V.,C=NL", + "subjectDN": "MGgxCzAJBgNVBAYTAk5MMSMwIQYDVQQKExpQcm9kcml2ZSBUZWNobm9sb2dpZXMgQi5WLjE0MDIGA1UEAxMrUHJvZHJpdmUgVGVjaG5vbG9naWVzIEdDQyBSMyBPViBUTFMgQ0EgMjAyMg==", + "whitelist": false, + "attachment": { + "hash": "6340c990e40558efb9b4997feecb901894ab85f7fd56125b77a9af382a4b527f", + "size": 1662, + "filename": "tahHgXS9JtW4UDcnvNe8n5iWicFpEkCKocabIv7CHMA=.pem", + "location": "security-state-staging/intermediates/3d30febd-5714-457a-af91-9ac17d3d6918.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "tahHgXS9JtW4UDcnvNe8n5iWicFpEkCKocabIv7CHMA=", + "crlite_enrolled": false, + "id": "e9fd6e58-e869-4d61-bb86-61fd93c8abbd", + "last_modified": 1650553057137 + }, + { + "schema": 1650552513297, + "derHash": "5owzdvAQIZzKFOM38zGD752GHlc6nXYofzqq1NBPo48=", + "subject": "CN=GlobalSign Atlas ECCR5 OV TLS CA 2022 Q3,O=GlobalSign nv-sa,C=BE", + "subjectDN": "MFsxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTEwLwYDVQQDEyhHbG9iYWxTaWduIEF0bGFzIEVDQ1I1IE9WIFRMUyBDQSAyMDIyIFEz", + "whitelist": false, + "attachment": { + "hash": "b3e37a14bbfdd2d3f69e8f01b9a816d95a7479b8c14cf839df6fdfb1453ec883", + "size": 1195, + "filename": "ohmQ9W-FUxsSXCYCKjia3ARHzcJlH8EH06XNXd2hlWs=.pem", + "location": "security-state-staging/intermediates/a8f2ee36-6254-44e6-aa22-e580e522c69e.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "ohmQ9W+FUxsSXCYCKjia3ARHzcJlH8EH06XNXd2hlWs=", + "crlite_enrolled": false, + "id": "07905fa8-fe73-4334-805d-6a28fa6350b0", + "last_modified": 1650553057127 + }, + { + "schema": 1650552516241, + "derHash": "QAbN/22NUtwJD/U4K5wwzqjMUAXfLV6CA81nkheXdQ0=", + "subject": "CN=GlobalSign Atlas E46 EV TLS CA 2022 Q3,O=GlobalSign nv-sa,C=BE", + "subjectDN": "MFkxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS8wLQYDVQQDEyZHbG9iYWxTaWduIEF0bGFzIEU0NiBFViBUTFMgQ0EgMjAyMiBRMw==", + "whitelist": false, + "attachment": { + "hash": "5b93c9596b472129b6e4d110929b25bdb6fc53e792138971181cc78dd845f257", + "size": 1179, + "filename": "s9qNeP1oAz3ML21RIr9Nd_nR1L1bcapzMKpZ_2MqKe0=.pem", + "location": "security-state-staging/intermediates/c23322e4-6c40-459f-aa50-1c2e9702b06b.pem", + "mimetype": "application/x-pem-file" + }, + "pubKeyHash": "s9qNeP1oAz3ML21RIr9Nd/nR1L1bcapzMKpZ/2MqKe0=", + "crlite_enrolled": false, + "id": "961ef95e-bbf4-47de-89fb-52ef4fe4cdf6", + "last_modified": 1650553057118 + }, { "schema": 1650070130036, "derHash": "k45SZCUB3RbiPYrr+5frPDslYvUMMkFEw5CUayloSn4=", @@ -270,24 +594,6 @@ "id": "772a5e91-e4ab-4bc1-b2a7-9d88c0c7e9bf", "last_modified": 1649973509629 }, - { - "schema": 1649450920946, - "derHash": "Bp3y+JGdkgnQxSSla6EYHfbRu/xKphyfAdCS4tXDof0=", - "subject": "CN=MSFT BALT RS256 CA,O=Microsoft Corporation,C=US", - "subjectDN": "MEoxCzAJBgNVBAYTAlVTMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xGzAZBgNVBAMTEk1TRlQgQkFMVCBSUzI1NiBDQQ==", - "whitelist": false, - "attachment": { - "hash": "b68175bda43c438ac536ee134774227b69c8479a249c97fc24ebcdc2efe126fa", - "size": 2028, - "filename": "pDM-S2FkRzB_xtTd9uAioSOPn-QW1bRg8ecQtY4-I1A=.pem", - "location": "security-state-staging/intermediates/ca4850cd-a81e-479d-ba75-2a7072c7f60d.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "pDM+S2FkRzB/xtTd9uAioSOPn+QW1bRg8ecQtY4+I1A=", - "crlite_enrolled": false, - "id": "f18528dd-6f56-46ab-942c-d0660c571a8d", - "last_modified": 1649451442396 - }, { "schema": 1649450922017, "derHash": "lqfvtj/KOZPHS/dk03WWlX+Q8gja2p5J5iKCK6D3qIk=", @@ -684,24 +990,6 @@ "id": "c44d3056-f6b6-415c-8f13-43d0b71fb7b5", "last_modified": 1648522634480 }, - { - "schema": 1648514935769, - "derHash": "8Hu73gdvm0DFfMS+/t6Xyh9Tua4UfwNdKEy/U/NDL7g=", - "subject": "CN=CFCA OV OCA,O=China Financial Certification Authority,C=CN", - "subjectDN": "MFUxCzAJBgNVBAYTAkNOMTAwLgYDVQQKDCdDaGluYSBGaW5hbmNpYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxFDASBgNVBAMMC0NGQ0EgT1YgT0NB", - "whitelist": false, - "attachment": { - "hash": "bc37658d1568750ae385b92be54ede64df31899d30f67211fd1e015c9dc7803b", - "size": 1963, - "filename": "uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=.pem", - "location": "security-state-staging/intermediates/8a832b56-3f0a-4b5f-8966-8a1da5242863.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "uc0FPx73f1ObHGmGZOcevy371Uo9asVjdabpiS0lKgQ=", - "crlite_enrolled": true, - "id": "b2b776e5-2b2f-4c8e-819d-026b8d3855d2", - "last_modified": 1648522634468 - }, { "schema": 1648111717634, "derHash": "+RIKcdUGl7mZKnNXoKmg3cS/w1mPy08BZClkgk088nY=", @@ -7380,24 +7668,6 @@ "id": "26dd89a7-d444-4647-be98-393c4cd93ed5", "last_modified": 1643540242405 }, - { - "schema": 1643539723702, - "derHash": "lp4yAFIOssaalmdYfm3U0LI/KPUQzBMXZwqO02E+vq0=", - "subject": "CN=DigitalTrust High Assurance CA G4 [Run by the Issuer],O=Digital Trust L.L.C.,C=AE", - "subjectDN": "MG0xCzAJBgNVBAYTAkFFMR0wGwYDVQQKExREaWdpdGFsIFRydXN0IEwuTC5DLjE/MD0GA1UEAww2RGlnaXRhbFRydXN0IEhpZ2ggQXNzdXJhbmNlIENBIEc0ICBbUnVuIGJ5IHRoZSBJc3N1ZXJd", - "whitelist": false, - "attachment": { - "hash": "e74dd2a02806fa7c508188e10a5f0c0712f1cfbccde8988e042626a766beecb4", - "size": 2507, - "filename": "LFyh5Bg1aFs3y7w1j2dwtnxqDbovX0i8cL9gYJC6PXw=.pem", - "location": "security-state-staging/intermediates/df91fee1-b72c-4071-bb40-85741d9a30db.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "LFyh5Bg1aFs3y7w1j2dwtnxqDbovX0i8cL9gYJC6PXw=", - "crlite_enrolled": true, - "id": "82e3caed-61a5-46f8-b0a5-e0e5548b3eaa", - "last_modified": 1643540242395 - }, { "schema": 1643539751520, "derHash": "vb9XvRAWOncbKNCdTJAYjVlgcsaZvYJ0/kYo0SUOSb0=", @@ -10494,24 +10764,6 @@ "id": "9284e1ce-82d9-41fe-905b-061a3bc6e3f9", "last_modified": 1640617119199 }, - { - "schema": 1640614373653, - "derHash": "ODDbjqFSC2zfV+HgCl8Sl74R2eZDDINgcXYhL/hdLbg=", - "subject": "CN=TrustCor Enhanced Secure Site (CA2),OU=TrustCor Network,O=TrustCor Systems S. de R.L.,ST=Panama,C=PA", - "subjectDN": "MIGNMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xGTAXBgNVBAsMEFRydXN0Q29yIE5ldHdvcmsxLDAqBgNVBAMMI1RydXN0Q29yIEVuaGFuY2VkIFNlY3VyZSBTaXRlIChDQTIp", - "whitelist": false, - "attachment": { - "hash": "26631969fe5fbc543132a914eb2829ace13e9b418495495a837a47d8936c69b6", - "size": 2564, - "filename": "gTvKBlqs6VknFEiItiUhp5K_Oy0UnzZd7vVB6Ko3ZeE=.pem", - "location": "security-state-staging/intermediates/e49aa502-2469-4f4f-b00b-3d32c9f282e8.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "gTvKBlqs6VknFEiItiUhp5K/Oy0UnzZd7vVB6Ko3ZeE=", - "crlite_enrolled": true, - "id": "7f04f0ef-3fdc-4bfa-9cc5-c76e75f35add", - "last_modified": 1640617119189 - }, { "schema": 1640269085632, "derHash": "+RYG0bxSxhATbKqFarUAxIw7mTusSAjNgrxLeKvyQVY=", @@ -11520,24 +11772,6 @@ "id": "08d30c0e-cd9a-4c3e-b21d-ea273d69191b", "last_modified": 1636577884550 }, - { - "schema": 1636555797761, - "derHash": "dYlNTJTCLXKW7hn7RHYjJYwlkbFwMSiLs4aiCqHw4KY=", - "subject": "CN=NetLock Közjegyzői (Class A) Tanúsítványkiadó,OU=Tanúsítványkiadók (Certification Services),O=NetLock Kft.,L=Budapest,C=HU", - "subjectDN": "MIGuMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE8MDoGA1UEAwwzTmV0TG9jayBLw7Z6amVneXrFkWkgKENsYXNzIEEpIFRhbsO6c8OtdHbDoW55a2lhZMOz", - "whitelist": false, - "attachment": { - "hash": "4327de015aac627d028d4696e3b582048933e2f87d179c261b01897e32b67a1d", - "size": 2190, - "filename": "RWiIGgLo9cnu9JGiGhnz5uw6FBH1Y5qDY4qGsl5Q9EM=.pem", - "location": "security-state-staging/intermediates/27099d75-dfc0-441a-a1de-81e112a1d6e5.pem", - "mimetype": "application/x-pem-file" - }, - "pubKeyHash": "RWiIGgLo9cnu9JGiGhnz5uw6FBH1Y5qDY4qGsl5Q9EM=", - "crlite_enrolled": true, - "id": "a76d3004-9787-484d-a4d9-2e5555cd8b56", - "last_modified": 1636556282950 - }, { "schema": 1636555800810, "derHash": "NyuPTOc77fyIcYxAe7az5tj5p5vpVxkNDnEBx7DvmjI=",
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit 54ec83b3d10df28e9a79a9f8148dab0c14a273fe Author: Andrew McCreight continuation@gmail.com AuthorDate: Wed Apr 20 14:50:37 2022 +0000
Bug 1764778 - Check media.webspeech.synth.enabled in AllocPSpeechSynthesisParent. r=eeejay,a=dsmith
Differential Revision: https://phabricator.services.mozilla.com/D143952 --- dom/ipc/ContentParent.cpp | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp index 492f9582ba54e..9e11d81a395de 100644 --- a/dom/ipc/ContentParent.cpp +++ b/dom/ipc/ContentParent.cpp @@ -4368,6 +4368,9 @@ bool ContentParent::DeallocPBenchmarkStorageParent(
#ifdef MOZ_WEBSPEECH PSpeechSynthesisParent* ContentParent::AllocPSpeechSynthesisParent() { + if (!StaticPrefs::media_webspeech_synth_enabled()) { + return nullptr; + } return new mozilla::dom::SpeechSynthesisParent(); }
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit ba3151d51bab4048f50b949c243baab872d49a5e Author: Edgar Chen echen@mozilla.com AuthorDate: Wed Apr 20 15:37:47 2022 +0000
Bug 1746448; r=smaug,a=dsmith
Differential Revision: https://phabricator.services.mozilla.com/D143483 --- toolkit/components/windowwatcher/nsWindowWatcher.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/toolkit/components/windowwatcher/nsWindowWatcher.cpp b/toolkit/components/windowwatcher/nsWindowWatcher.cpp index 0a0083f4aecb6..b9d8809be3eef 100644 --- a/toolkit/components/windowwatcher/nsWindowWatcher.cpp +++ b/toolkit/components/windowwatcher/nsWindowWatcher.cpp @@ -1346,8 +1346,8 @@ nsresult nsWindowWatcher::OpenWindowInternal( } } // If a website opens a popup exit DOM fullscreen - if (StaticPrefs::full_screen_api_exit_on_windowOpen() && windowIsNew && - aCalledFromJS && !hasChromeParent && !isCallerChrome && parentWindow) { + if (StaticPrefs::full_screen_api_exit_on_windowOpen() && aCalledFromJS && + !hasChromeParent && !isCallerChrome && parentWindow) { Document::AsyncExitFullscreen(parentWindow->GetDoc()); }
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit b43a81f502f8890fa71787d1bfd083ead65d77a5 Author: Lee Salzman lsalzman@mozilla.com AuthorDate: Wed Apr 6 16:11:18 2022 +0000
Bug 1706441 - Check for non-empty span. r=gfx-reviewers,aosmond,a=dsmith
Differential Revision: https://phabricator.services.mozilla.com/D142429 --- gfx/wr/swgl/src/swgl_ext.h | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-)
diff --git a/gfx/wr/swgl/src/swgl_ext.h b/gfx/wr/swgl/src/swgl_ext.h index d3dee3cb88bea..b5cf845ed0a68 100644 --- a/gfx/wr/swgl/src/swgl_ext.h +++ b/gfx/wr/swgl/src/swgl_ext.h @@ -413,26 +413,36 @@ static P* blendTextureLinearDispatch(S sampler, vec2 uv, int span, swgl_LinearQuantizeScale)) - uv.x.x; if (uv_step.x > 0.0f && insideDist >= uv_step.x) { - int inside = int(end - buf); + int32_t inside = int(end - buf); if (filter == LINEAR_FILTER_DOWNSCALE) { - inside = clamp(int(insideDist * (0.5f / swgl_LinearQuantizeScale)) & - ~(swgl_StepSize - 1), - 0, inside); - blendTextureLinearDownscale<BLEND>(sampler, uv, inside, min_uv, max_uv, - color, buf); + inside = min(int(insideDist * (0.5f / swgl_LinearQuantizeScale)) & + ~(swgl_StepSize - 1), + inside); + if (inside > 0) { + blendTextureLinearDownscale<BLEND>(sampler, uv, inside, min_uv, + max_uv, color, buf); + buf += inside; + uv.x += (inside / swgl_StepSize) * uv_step.x; + } } else if (filter == LINEAR_FILTER_UPSCALE) { - inside = clamp(int(insideDist / uv_step.x) * swgl_StepSize, 0, inside); - blendTextureLinearUpscale<BLEND>(sampler, uv, inside, uv_step, min_uv, - max_uv, color, buf); + inside = min(int(insideDist / uv_step.x) * swgl_StepSize, inside); + if (inside > 0) { + blendTextureLinearUpscale<BLEND>(sampler, uv, inside, uv_step, min_uv, + max_uv, color, buf); + buf += inside; + uv.x += (inside / swgl_StepSize) * uv_step.x; + } } else { - inside = clamp(int(insideDist * (1.0f / swgl_LinearQuantizeScale)) & - ~(swgl_StepSize - 1), - 0, inside); - blendTextureLinearFast<BLEND>(sampler, uv, inside, min_uv, max_uv, - color, buf); + inside = min(int(insideDist * (1.0f / swgl_LinearQuantizeScale)) & + ~(swgl_StepSize - 1), + inside); + if (inside > 0) { + blendTextureLinearFast<BLEND>(sampler, uv, inside, min_uv, max_uv, + color, buf); + buf += inside; + uv.x += (inside / swgl_StepSize) * uv_step.x; + } } - buf += inside; - uv.x += (inside / swgl_StepSize) * uv_step.x; } } // If the fallback filter was requested, or if there are any samples left that
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit 9b1a5a12a081a1115244a4cfc3b0968e7b973a10 Author: Gijs Kruitbosch gijskruitbosch@gmail.com AuthorDate: Mon Apr 25 20:05:55 2022 +0000
Bug 1692655. r=nika,mtigley,smaug a=RyanVM
Differential Revision: https://phabricator.services.mozilla.com/D144618 --- browser/actors/AboutReaderParent.jsm | 7 +++ toolkit/components/reader/AboutReader.jsm | 7 ++- toolkit/components/reader/ReaderMode.jsm | 73 +++++++++---------------------- 3 files changed, 33 insertions(+), 54 deletions(-)
diff --git a/browser/actors/AboutReaderParent.jsm b/browser/actors/AboutReaderParent.jsm index 8c01daf1df2dd..8f45088d4bed1 100644 --- a/browser/actors/AboutReaderParent.jsm +++ b/browser/actors/AboutReaderParent.jsm @@ -157,6 +157,13 @@ class AboutReaderParent extends JSWindowActorParent { break; }
+ case "RedirectTo": { + gCachedArticles.set(message.data.newURL, message.data.article); + // This is setup as a query so we can navigate the page after we've + // cached the relevant info in the parent. + return true; + } + default: this.callListeners(message); break; diff --git a/toolkit/components/reader/AboutReader.jsm b/toolkit/components/reader/AboutReader.jsm index 0da0ab1b0ace9..73b00bfe6f92a 100644 --- a/toolkit/components/reader/AboutReader.jsm +++ b/toolkit/components/reader/AboutReader.jsm @@ -767,7 +767,12 @@ AboutReader.prototype = { try { article = await ReaderMode.downloadAndParseDocument(url); } catch (e) { - if (e && e.newURL) { + if (e?.newURL && this._actor) { + await this._actor.sendQuery("RedirectTo", { + newURL: e.newURL, + article: e.article, + }); + let readerURL = "about:reader?url=" + encodeURIComponent(e.newURL); this._win.location.replace(readerURL); return; diff --git a/toolkit/components/reader/ReaderMode.jsm b/toolkit/components/reader/ReaderMode.jsm index 7422b036ca652..e36816c10ed76 100644 --- a/toolkit/components/reader/ReaderMode.jsm +++ b/toolkit/components/reader/ReaderMode.jsm @@ -135,7 +135,7 @@ var ReaderMode = { });
let url = win.document.location.href; - let originalURL = ReaderMode.getOriginalUrl(url); + let originalURL = this.getOriginalUrl(url); let webNav = docShell.QueryInterface(Ci.nsIWebNavigation);
if (!Services.appinfo.sessionHistoryInParent) { @@ -219,7 +219,7 @@ var ReaderMode = { },
getOriginalUrlObjectForDisplay(url) { - let originalUrl = ReaderMode.getOriginalUrl(url); + let originalUrl = this.getOriginalUrl(url); if (originalUrl) { let uriObj; try { @@ -264,10 +264,11 @@ var ReaderMode = { * @resolves JS object representing the article, or null if no article is found. */ async downloadAndParseDocument(url) { - let doc = await this._downloadDocument(url); - if (!doc) { + let result = await this._downloadDocument(url); + if (!result?.doc) { return null; } + let { doc, newURL } = result; if ( !Readerable.shouldCheckUri(doc.documentURIObject) || !Readerable.shouldCheckUri(doc.baseURIObject, true) @@ -276,7 +277,14 @@ var ReaderMode = { return null; }
- return this._readerParse(doc); + let article = await this._readerParse(doc); + // If we have to redirect, reject to the caller with the parsed article, + // so we can update the URL before displaying it. + if (newURL) { + return Promise.reject({ newURL, article }); + } + // Otherwise, we can just continue with the article. + return article; },
_downloadDocument(url) { @@ -312,48 +320,6 @@ var ReaderMode = { return; }
- // Manually follow a meta refresh tag if one exists. - let meta = doc.querySelector("meta[http-equiv=refresh]"); - if (meta) { - let content = meta.getAttribute("content"); - if (content) { - let urlIndex = content.toUpperCase().indexOf("URL="); - if (urlIndex > -1) { - let baseURI = Services.io.newURI(url); - let newURI = Services.io.newURI( - content.substring(urlIndex + 4), - null, - baseURI - ); - let newURL = newURI.spec; - let ssm = Services.scriptSecurityManager; - let flags = - ssm.LOAD_IS_AUTOMATIC_DOCUMENT_REPLACEMENT | - ssm.DISALLOW_INHERIT_PRINCIPAL; - try { - ssm.checkLoadURIStrWithPrincipal( - doc.nodePrincipal, - newURL, - flags - ); - } catch (ex) { - let errorMsg = - "Reader mode disallowed meta refresh (reason: " + ex + ")."; - - if (Services.prefs.getBoolPref("reader.errors.includeURLs")) { - errorMsg += " Refresh target URI: '" + newURL + "'."; - } - reject(errorMsg); - return; - } - // Otherwise, pass an object indicating our new URL: - if (!baseURI.equalsExceptRef(newURI)) { - reject({ newURL }); - return; - } - } - } - } let responseURL = xhr.responseURL; let givenURL = url; // Convert these to real URIs to make sure the escaping (or lack @@ -369,14 +335,15 @@ var ReaderMode = { /* Ignore errors - we'll use what we had before */ }
+ // We treat redirects as download successes here: + histogram.add(DOWNLOAD_SUCCESS); + + let result = { doc }; if (responseURL != givenURL) { - // We were redirected without a meta refresh tag. - // Force redirect to the correct place: - reject({ newURL: xhr.responseURL }); - return; + result.newURL = xhr.responseURL; } - resolve(doc); - histogram.add(DOWNLOAD_SUCCESS); + + resolve(result); }; xhr.send(); });
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit b5eee973c99f788f0e6ee3def15e153219be6be3 Author: Andreas Farre farre@mozilla.com AuthorDate: Tue Apr 12 11:47:50 2022 +0000
Bug 1755081 - Allow more containers to participate in FeaturePolicy r=smaug,ckerschb a=RyanVM
Differential Revision: https://phabricator.services.mozilla.com/D142216 --- dom/base/Document.cpp | 19 +++++++++++++++++++ dom/base/nsObjectLoadingContent.cpp | 31 +++++++++++++++++++++++++++++++ dom/base/nsObjectLoadingContent.h | 6 ++++++ 3 files changed, 56 insertions(+)
diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp index 4152a6d69217a..5be50a0ba1876 100644 --- a/dom/base/Document.cpp +++ b/dom/base/Document.cpp @@ -3692,6 +3692,20 @@ nsresult Document::InitCSP(nsIChannel* aChannel) { return NS_OK; }
+static Document* GetInProcessParentDocumentFrom(BrowsingContext* aContext) { + BrowsingContext* parentContext = aContext->GetParent(); + if (!parentContext) { + return nullptr; + } + + WindowContext* windowContext = parentContext->GetCurrentWindowContext(); + if (!windowContext) { + return nullptr; + } + + return windowContext->GetDocument(); +} + already_AddRefeddom::FeaturePolicy Document::GetParentFeaturePolicy() { BrowsingContext* browsingContext = GetBrowsingContext(); if (!browsingContext) { @@ -3711,6 +3725,11 @@ already_AddRefeddom::FeaturePolicy Document::GetParentFeaturePolicy() { return do_AddRef(browsingContext->Canonical()->GetContainerFeaturePolicy()); }
+ if (Document* parentDocument = + GetInProcessParentDocumentFrom(browsingContext)) { + return do_AddRef(parentDocument->FeaturePolicy()); + } + WindowContext* windowContext = browsingContext->GetCurrentWindowContext(); if (!windowContext) { return nullptr; diff --git a/dom/base/nsObjectLoadingContent.cpp b/dom/base/nsObjectLoadingContent.cpp index db3297eb69e76..f8f4712c9e448 100644 --- a/dom/base/nsObjectLoadingContent.cpp +++ b/dom/base/nsObjectLoadingContent.cpp @@ -83,6 +83,7 @@ #include "mozilla/IMEStateManager.h" #include "mozilla/widget/IMEData.h" #include "mozilla/IntegerPrintfMacros.h" +#include "mozilla/dom/ContentChild.h" #include "mozilla/dom/HTMLObjectElementBinding.h" #include "mozilla/dom/HTMLEmbedElement.h" #include "mozilla/dom/HTMLObjectElement.h" @@ -362,6 +363,8 @@ already_AddRefed<nsIDocShell> nsObjectLoadingContent::SetupDocShell( return nullptr; }
+ MaybeStoreCrossOriginFeaturePolicy(); + return docShell.forget(); }
@@ -2364,3 +2367,31 @@ void nsObjectLoadingContent::SubdocumentIntrinsicSizeOrRatioChanged( sdf->SubdocumentIntrinsicSizeOrRatioChanged(); } } + +void nsObjectLoadingContent::MaybeStoreCrossOriginFeaturePolicy() { + MOZ_DIAGNOSTIC_ASSERT(mFrameLoader); + + // If the browsingContext is not ready (because docshell is dead), don't try + // to create one. + if (!mFrameLoader->IsRemoteFrame() && !mFrameLoader->GetExistingDocShell()) { + return; + } + + RefPtr<BrowsingContext> browsingContext = mFrameLoader->GetBrowsingContext(); + + if (!browsingContext || !browsingContext->IsContentSubframe()) { + return; + } + + nsCOMPtr<nsIContent> thisContent = AsContent(); + + if (!thisContent->IsInComposedDoc()) { + return; + } + + FeaturePolicy* featurePolicy = thisContent->OwnerDoc()->FeaturePolicy(); + + if (ContentChild* cc = ContentChild::GetSingleton()) { + Unused << cc->SendSetContainerFeaturePolicy(browsingContext, featurePolicy); + } +} diff --git a/dom/base/nsObjectLoadingContent.h b/dom/base/nsObjectLoadingContent.h index efe0b610be427..71c68ff5c9e20 100644 --- a/dom/base/nsObjectLoadingContent.h +++ b/dom/base/nsObjectLoadingContent.h @@ -490,6 +490,12 @@ class nsObjectLoadingContent : public nsImageLoadingContent, // Utility for firing an error event, if we're an <object>. void MaybeFireErrorEvent();
+ /** + * Store feature policy in container browsing context so that it can be + * accessed cross process. + */ + void MaybeStoreCrossOriginFeaturePolicy(); + // The final listener for mChannel (uriloader, pluginstreamlistener, etc.) nsCOMPtr<nsIStreamListener> mFinalListener;
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit 330014207d6fcecd96060169c8e88a1b28a00afb Author: Lee Salzman lsalzman@mozilla.com AuthorDate: Sat Apr 23 16:48:20 2022 +0000
Bug 1766056 - Fix YUV color matrix for SWGL slow and fast paths. r=jrmuizel, a=RyanVM
The brush_yuv_image slow path expected a YUV color matrix that applies scaling, whereas we set up a matrix for SWGL that had no scaling to support the fast path. To work around the fact that both paths have different scaling requirements, we pass the matrix with scaling down to the fast path and undo the scaling later when constructing SWGL's internal YUVMatrix from it. This allows both paths to just use the same matrix and avoids the footgun.
Differential Revision: https://phabricator.services.mozilla.com/D144479 --- gfx/wr/swgl/src/composite.h | 54 +++++++++++++++++++------------ gfx/wr/swgl/src/swgl_ext.h | 8 ++--- gfx/wr/webrender/res/brush_yuv_image.glsl | 3 -- gfx/wr/webrender/res/composite.glsl | 3 -- 4 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/gfx/wr/swgl/src/composite.h b/gfx/wr/swgl/src/composite.h index 1a74d6aef5441..050dd8a2b43d6 100644 --- a/gfx/wr/swgl/src/composite.h +++ b/gfx/wr/swgl/src/composite.h @@ -518,7 +518,8 @@ struct YUVMatrix { // [ yScale, g_from_u, g_from_v ] x ([cb] - ycbcr_bias ) // [ yScale, b_from_u, 0 ] ([cr] ) static YUVMatrix From(const vec3_scalar& ycbcr_bias, - const mat3_scalar& rgb_from_debiased_ycbcr) { + const mat3_scalar& rgb_from_debiased_ycbcr, + int rescale_factor = 0) { assert(ycbcr_bias.z == ycbcr_bias.y);
const auto rgb_from_y = rgb_from_debiased_ycbcr[0].y; @@ -528,14 +529,14 @@ struct YUVMatrix { if (rgb_from_debiased_ycbcr[0].x == 0.0) { // gbr-identity matrix? assert(rgb_from_debiased_ycbcr[0].x == 0); - assert(rgb_from_debiased_ycbcr[0].y == 1); + assert(rgb_from_debiased_ycbcr[0].y >= 1); assert(rgb_from_debiased_ycbcr[0].z == 0);
assert(rgb_from_debiased_ycbcr[1].x == 0); assert(rgb_from_debiased_ycbcr[1].y == 0); - assert(rgb_from_debiased_ycbcr[1].z == 1); + assert(rgb_from_debiased_ycbcr[1].z >= 1);
- assert(rgb_from_debiased_ycbcr[2].x == 1); + assert(rgb_from_debiased_ycbcr[2].x >= 1); assert(rgb_from_debiased_ycbcr[2].y == 0); assert(rgb_from_debiased_ycbcr[2].z == 0);
@@ -557,24 +558,30 @@ struct YUVMatrix { assert(rgb_from_debiased_ycbcr[2].z == 0.0);
return YUVMatrix({ycbcr_bias.x, ycbcr_bias.y}, rgb_from_y, br_from_y_mask, - r_from_v, g_from_u, g_from_v, b_from_u); + r_from_v, g_from_u, g_from_v, b_from_u, rescale_factor); }
- // Convert matrix coefficients to fixed-point representation. + // Convert matrix coefficients to fixed-point representation. If the matrix + // has a rescaling applied to it, then we need to take care to undo the + // scaling so that we can convert the coefficients to fixed-point range. The + // bias still requires shifting to apply the rescaling. The rescaling will be + // applied to the actual YCbCr sample data later by manually shifting it + // before applying this matrix. YUVMatrix(vec2_scalar yuv_bias, double yCoeff, int16_t br_yMask_, double rv, - double gu, double gv, double bu) - : br_uvCoeffs(zip(I16(int16_t(bu * (1 << 6) + 0.5)), - I16(int16_t(rv * (1 << 6) + 0.5)))), - gg_uvCoeffs(zip(I16(-int16_t(-gu * (1 << 6) + - 0.5)), // These are negative coeffs, so - // round them away from zero - I16(-int16_t(-gv * (1 << 6) + 0.5)))), - yCoeffs(uint16_t(yCoeff * (1 << (6 + 1)) + 0.5)), + double gu, double gv, double bu, int rescale_factor = 0) + : br_uvCoeffs(zip(I16(int16_t(bu * (1 << (6 - rescale_factor)) + 0.5)), + I16(int16_t(rv * (1 << (6 - rescale_factor)) + 0.5)))), + gg_uvCoeffs( + zip(I16(-int16_t(-gu * (1 << (6 - rescale_factor)) + + 0.5)), // These are negative coeffs, so + // round them away from zero + I16(-int16_t(-gv * (1 << (6 - rescale_factor)) + 0.5)))), + yCoeffs(uint16_t(yCoeff * (1 << (6 + 1 - rescale_factor)) + 0.5)), // We have a +0.5 fudge-factor for -ybias. // Without this, we get white=254 not 255. // This approximates rounding rather than truncation during `gg >>= 6`. - yBias(int16_t( ((yuv_bias.x * 255 * yCoeff) - 0.5 ) * (1<<6) )), - uvBias(int16_t(yuv_bias.y * 255 + 0.5)), + yBias(int16_t(((yuv_bias.x * 255 * yCoeff) - 0.5) * (1 << 6))), + uvBias(int16_t(yuv_bias.y * (255 << rescale_factor) + 0.5)), br_yMask(br_yMask_) { assert(yuv_bias.x >= 0); assert(yuv_bias.y >= 0); @@ -584,6 +591,7 @@ struct YUVMatrix { assert(rv > 0); assert(gu <= 0); assert(gv <= 0); + assert(rescale_factor <= 6); }
ALWAYS_INLINE PackedRGBA8 convert(V8<int16_t> yy, V8<int16_t> uv) const { @@ -865,11 +873,15 @@ static void linear_row_yuv(uint32_t* dest, int span, sampler2DRect samplerY, // If the source row has less than 2 pixels, it's not safe to use a linear // filter because it may overread the row. Just convert the single pixel // with nearest filtering and fill the row with it. - I16 yuv = CONVERT( - round_pixel((Float){texelFetch(samplerY, ivec2(srcUV)).x.x, - texelFetch(samplerU, ivec2(chromaUV)).x.x, - texelFetch(samplerV, ivec2(chromaUV)).x.x, 1.0f}), - I16); + Float yuvF = {texelFetch(samplerY, ivec2(srcUV)).x.x, + texelFetch(samplerU, ivec2(chromaUV)).x.x, + texelFetch(samplerV, ivec2(chromaUV)).x.x, 1.0f}; + // If this is an HDR LSB format, we need to renormalize the result. + if (colorDepth > 8) { + int rescaleFactor = 16 - colorDepth; + yuvF *= float(1 << rescaleFactor); + } + I16 yuv = CONVERT(round_pixel(yuvF), I16); commit_solid_span<BLEND>( dest, unpack(colorSpace.convert(V8<int16_t>(yuv.x), diff --git a/gfx/wr/swgl/src/swgl_ext.h b/gfx/wr/swgl/src/swgl_ext.h index b5cf845ed0a68..2cad7307a5b8f 100644 --- a/gfx/wr/swgl/src/swgl_ext.h +++ b/gfx/wr/swgl/src/swgl_ext.h @@ -1029,7 +1029,7 @@ static int blendYUV(P* buf, int span, S0 sampler0, vec2 uv0, } LINEAR_QUANTIZE_UV(sampler0, uv0, uv_step0, uv_rect0, min_uv0, max_uv0); const auto rgb_from_ycbcr = - YUVMatrix::From(ycbcr_bias, rgb_from_debiased_ycbcr); + YUVMatrix::From(ycbcr_bias, rgb_from_debiased_ycbcr, rescaleFactor); auto c = packColor(buf, color); auto* end = buf + span; for (; buf < end; buf += swgl_StepSize, uv0 += uv_step0) { @@ -1080,7 +1080,7 @@ static int blendYUV(P* buf, int span, S0 sampler0, vec2 uv0, LINEAR_QUANTIZE_UV(sampler0, uv0, uv_step0, uv_rect0, min_uv0, max_uv0); LINEAR_QUANTIZE_UV(sampler1, uv1, uv_step1, uv_rect1, min_uv1, max_uv1); const auto rgb_from_ycbcr = - YUVMatrix::From(ycbcr_bias, rgb_from_debiased_ycbcr); + YUVMatrix::From(ycbcr_bias, rgb_from_debiased_ycbcr, rescaleFactor); auto c = packColor(buf, color); auto* end = buf + span; for (; buf < end; buf += swgl_StepSize, uv0 += uv_step0, uv1 += uv_step1) { @@ -1142,7 +1142,7 @@ static void blendYUVFallback(P* buf, int span, S0 sampler0, vec2 uv0, const mat3_scalar& rgb_from_debiased_ycbcr, int rescaleFactor, C color) { const auto rgb_from_ycbcr = - YUVMatrix::From(ycbcr_bias, rgb_from_debiased_ycbcr); + YUVMatrix::From(ycbcr_bias, rgb_from_debiased_ycbcr, rescaleFactor); for (auto* end = buf + span; buf < end; buf += swgl_StepSize, uv0 += uv_step0, uv1 += uv_step1, uv2 += uv_step2) { commit_blend_span<BLEND>( @@ -1240,7 +1240,7 @@ static int blendYUV(uint32_t* buf, int span, sampler2DRect sampler0, vec2 uv0, (sampler0->format == TextureFormat::R16 ? 16 : 8) - rescaleFactor; // Finally, call the inner loop of CompositeYUV. const auto rgb_from_ycbcr = - YUVMatrix::From(ycbcr_bias, rgb_from_debiased_ycbcr); + YUVMatrix::From(ycbcr_bias, rgb_from_debiased_ycbcr, rescaleFactor); linear_row_yuv<BLEND>( buf, inside * swgl_StepSize, sampler0, force_scalar(uv0), uv_step0.x / swgl_StepSize, sampler1, sampler2, force_scalar(uv1), diff --git a/gfx/wr/webrender/res/brush_yuv_image.glsl b/gfx/wr/webrender/res/brush_yuv_image.glsl index a02bf30a7c3fb..628e52c0b61c7 100644 --- a/gfx/wr/webrender/res/brush_yuv_image.glsl +++ b/gfx/wr/webrender/res/brush_yuv_image.glsl @@ -58,9 +58,6 @@ void brush_vs( if (prim.channel_bit_depth > 8) { vRescaleFactor = 16 - prim.channel_bit_depth; } - // Since SWGL rescales filtered YUV values to 8bpc before yuv->rgb - // conversion, don't embed a 10bpc channel multiplier into the yuv matrix. - prim.channel_bit_depth = 8; #endif
YuvColorMatrixInfo mat_info = get_rgb_from_ycbcr_info(prim); diff --git a/gfx/wr/webrender/res/composite.glsl b/gfx/wr/webrender/res/composite.glsl index 017e933e7f8bf..79c4e8560c65e 100644 --- a/gfx/wr/webrender/res/composite.glsl +++ b/gfx/wr/webrender/res/composite.glsl @@ -96,9 +96,6 @@ void main(void) { if (prim.channel_bit_depth > 8) { vRescaleFactor = 16 - prim.channel_bit_depth; } - // Since SWGL rescales filtered YUV values to 8bpc before yuv->rgb - // conversion, don't embed a 10bpc channel multiplier into the yuv matrix. - prim.channel_bit_depth = 8; #endif
YuvColorMatrixInfo mat_info = get_rgb_from_ycbcr_info(prim);
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit d8df832e0b2872536363ffe5e45694b88bc79473 Author: Emilio Cobos Álvarez emilio@crisal.io AuthorDate: Tue Mar 29 12:15:52 2022 +0000
Bug 1760674. r=mak, a=RyanVM
Differential Revision: https://phabricator.services.mozilla.com/D141958 --- docshell/base/BaseHistory.cpp | 13 ------------- dom/base/Link.cpp | 10 +--------- 2 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/docshell/base/BaseHistory.cpp b/docshell/base/BaseHistory.cpp index 12ea1d9357231..7aff7607db2c0 100644 --- a/docshell/base/BaseHistory.cpp +++ b/docshell/base/BaseHistory.cpp @@ -116,10 +116,6 @@ void BaseHistory::RegisterVisitedCallback(nsIURI* aURI, Link* aLink) { // This will not catch a case where it is registered for two different URIs. MOZ_DIAGNOSTIC_ASSERT(!links->mLinks.Contains(aLink), "Already tracking this Link object!"); - // FIXME(emilio): We should consider changing this (see the entry.Remove() - // call in NotifyVisitedInThisProcess). - MOZ_DIAGNOSTIC_ASSERT(links->mStatus != VisitedStatus::Visited, - "We don't keep tracking known-visited links");
links->mLinks.AppendElement(aLink);
@@ -205,15 +201,6 @@ void BaseHistory::NotifyVisitedInThisProcess(nsIURI* aURI, for (Link* link : links.mLinks.BackwardRange()) { link->VisitedQueryFinished(visited); } - - // We never go from visited -> unvisited. - // - // FIXME(emilio): It seems unfortunate to remove a link to a visited uri and - // then re-add it to the document to trigger a new visited query. It shouldn't - // if we keep track of mStatus. - if (visited) { - entry.Remove(); - } }
void BaseHistory::SendPendingVisitedResultsToChildProcesses() { diff --git a/dom/base/Link.cpp b/dom/base/Link.cpp index b139b8260293e..72f00c030d5cd 100644 --- a/dom/base/Link.cpp +++ b/dom/base/Link.cpp @@ -60,25 +60,17 @@ bool Link::ElementHasHref() const {
void Link::VisitedQueryFinished(bool aVisited) { MOZ_ASSERT(mRegistered, "Setting the link state of an unregistered Link!"); - MOZ_ASSERT(mState == State::Unvisited, - "Why would we want to know our visited state otherwise?");
auto newState = aVisited ? State::Visited : State::Unvisited;
// Set our current state as appropriate. mState = newState;
- // We will be no longer registered if we're visited, as it'd be pointless, we - // never transition from visited -> unvisited. - if (aVisited) { - mRegistered = false; - } - MOZ_ASSERT(LinkState() == NS_EVENT_STATE_VISITED || LinkState() == NS_EVENT_STATE_UNVISITED, "Unexpected state obtained from LinkState()!");
- // Tell the element to update its visited state + // Tell the element to update its visited state. mElement->UpdateState(true);
if (StaticPrefs::layout_css_always_repaint_on_unvisited()) {
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit 9957e3e22c1dddd15e9dbb21e7d23d4a2ab1a204 Author: Toshihito Kikuchi tkikuchi@mozilla.com AuthorDate: Mon Feb 14 20:35:56 2022 +0000
Bug 1752466 - Block WRusr.dll to stop the deadlock issue. r=haik, a=RyanVM
Differential Revision: https://phabricator.services.mozilla.com/D138668 --- mozglue/dllservices/WindowsDllBlocklistDefs.in | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/mozglue/dllservices/WindowsDllBlocklistDefs.in b/mozglue/dllservices/WindowsDllBlocklistDefs.in index db379053cae5a..14c745788b103 100644 --- a/mozglue/dllservices/WindowsDllBlocklistDefs.in +++ b/mozglue/dllservices/WindowsDllBlocklistDefs.in @@ -242,6 +242,9 @@ ALL_PROCESSES += [ DllBlocklistEntry("WRDll.x64.dll", (1, 1, 0, 227)), DllBlocklistEntry("WRDll.x86.dll", (1, 1, 0, 227)),
+ # Webroot SecureAnywhere causes deadlocks, bug 1752466 + DllBlocklistEntry("WRusr.dll", (9, 0, 32, 49)), + # InfoWatch Device Monitor causes crashes, bug 1704276 DllBlocklistEntry("iwprn.dll", (6, 9, 11, 360)), DllBlocklistEntry("iwprn_x86.dll", (6, 9, 11, 360)),
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit cbc780482369134a9c29242192720d76c44dec82 Author: Edgar Chen echen@mozilla.com AuthorDate: Thu Apr 21 11:49:13 2022 +0000
Bug 1745915 - Add test for resizing a fullscreen window; r=smaug a=test-only
Differential Revision: https://phabricator.services.mozilla.com/D133742 --- dom/html/test/file_fullscreen-resize.html | 39 +++++++++++++++++++++++++++++++ dom/html/test/mochitest.ini | 1 + dom/html/test/test_fullscreen-api.html | 1 + 3 files changed, 41 insertions(+)
diff --git a/dom/html/test/file_fullscreen-resize.html b/dom/html/test/file_fullscreen-resize.html new file mode 100644 index 0000000000000..3050ba0d5d618 --- /dev/null +++ b/dom/html/test/file_fullscreen-resize.html @@ -0,0 +1,39 @@ +<!DOCTYPE HTML> +<html> +<!-- +https://bugzilla.mozilla.org/show_bug.cgi?id=1742421 +--> +<head> + <title>Test for Bug 1742421</title> + <script src="/tests/SimpleTest/SimpleTest.js"></script> + <script src="file_fullscreen-utils.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> +</head> +<body style="background-color: gray;"> +<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1742421">Mozilla Bug 1742421</a> +<p id="display"></p> +<div id="content" style="display: none"></div> +<pre id="test"> +<script type="application/javascript"> + +/** Test for Bug 1742421 **/ + +function begin() +{ + addFullscreenChangeContinuation("enter", () => { + opener.info("[resize] Entered fullscreen"); + // Do not use addFullscreenChangeContinuation for fullscreen exit given that + // it expects the window will be restored to the original size. + document.addEventListener("fullscreenchange", () => { + opener.ok(!document.fullscreenElement, "[resize] Should have left full-screen due to resize"); + opener.nextTest(); + }, { once: true }); + window.resizeBy(100,100); + }); + document.body.requestFullscreen(); +} + +</script> +</pre> +</body> +</html> diff --git a/dom/html/test/mochitest.ini b/dom/html/test/mochitest.ini index 0ee5715a2b030..ae8e256917908 100644 --- a/dom/html/test/mochitest.ini +++ b/dom/html/test/mochitest.ini @@ -471,6 +471,7 @@ support-files = file_fullscreen-table.html file_fullscreen-top-layer.html file_fullscreen-utils.js + file_fullscreen-resize.html [test_fullscreen_meta_viewport.html] support-files = file_fullscreen_meta_viewport.html
diff --git a/dom/html/test/test_fullscreen-api.html b/dom/html/test/test_fullscreen-api.html index 583c3bd755c6c..0da07aeb34b24 100644 --- a/dom/html/test/test_fullscreen-api.html +++ b/dom/html/test/test_fullscreen-api.html @@ -54,6 +54,7 @@ var gTestWindows = [ ["dom.security.featurePolicy.webidl.enabled", true]] }, { test: "file_fullscreen-async.html" }, { test: "file_fullscreen-sub-iframe.html" }, + { test: "file_fullscreen-resize.html" }, ];
var testWindow = null;
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.9esr-11.0-1 in repository tor-browser.
commit c801d6d34aec931da57d4f50490f6f52b3395ef0 Author: Stephen A Pohl spohl.mozilla.bugs@gmail.com AuthorDate: Tue Apr 26 17:07:49 2022 +0000
Bug 1684739: Only check if swipe tracking is enabled on macOS if the event is a scrollwheel event. r=mstange, a=RyanVM
Differential Revision: https://phabricator.services.mozilla.com/D144728 --- widget/cocoa/nsChildView.mm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index c38a5eb8bfcc8..c0363dd6632c3 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -2870,15 +2870,6 @@ NSEvent* gLastDragMouseDownEvent = nil; // [strong] }
- (bool)shouldConsiderStartingSwipeFromEvent:(NSEvent*)anEvent { - // This method checks whether the AppleEnableSwipeNavigateWithScrolls global - // preference is set. If it isn't, fluid swipe tracking is disabled, and a - // horizontal two-finger gesture is always a scroll (even in Safari). This - // preference can't (currently) be set from the Preferences UI -- only using - // 'defaults write'. - if (![NSEvent isSwipeTrackingFromScrollEventsEnabled]) { - return false; - } - // Only initiate horizontal tracking for gestures that have just begun -- // otherwise a scroll to one side of the page can have a swipe tacked on // to it. @@ -2888,6 +2879,15 @@ NSEvent* gLastDragMouseDownEvent = nil; // [strong] return false; }
+ // This method checks whether the AppleEnableSwipeNavigateWithScrolls global + // preference is set. If it isn't, fluid swipe tracking is disabled, and a + // horizontal two-finger gesture is always a scroll (even in Safari). This + // preference can't (currently) be set from the Preferences UI -- only using + // 'defaults write'. + if (![NSEvent isSwipeTrackingFromScrollEventsEnabled]) { + return false; + } + // Only initiate horizontal tracking for events whose horizontal element is // at least eight times larger than its vertical element. This minimizes // performance problems with vertical scrolls (by minimizing the possibility
tor-commits@lists.torproject.org
-
gitolite role