зеркало из https://github.com/mozilla/gecko-dev.git
Merge m-c to inbound. a=merge
This commit is contained in:
Ryan VanderMeulen
Коммит
59d0ec2789
|
|
@ -1158,4 +1158,4 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
|
|||
|
||||
static const int32_t kUnknownId = -1;
|
||||
|
||||
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1518376970709000);
|
||||
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1518464018329000);
|
||||
|
|
|
|||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -8,7 +8,7 @@
|
|||
/*****************************************************************************/
|
||||
|
||||
#include <stdint.h>
|
||||
const PRTime gPreloadListExpirationTime = INT64_C(1520796158151000);
|
||||
const PRTime gPreloadListExpirationTime = INT64_C(1520883205571000);
|
||||
%%
|
||||
0-1.party, 1
|
||||
0.me.uk, 1
|
||||
|
|
@ -383,6 +383,7 @@ const PRTime gPreloadListExpirationTime = INT64_C(1520796158151000);
|
|||
5c1fd0f31022cbc40af9f785847baaf9.space, 1
|
||||
5crowd.com, 1
|
||||
5ece.de, 1
|
||||
5francs.com, 1
|
||||
5gb.space, 1
|
||||
5h0r7.com, 1
|
||||
5kraceforals.com, 1
|
||||
|
|
@ -669,6 +670,7 @@ achtzehnterachter.de, 1
|
|||
acidbin.co, 1
|
||||
aciksite.com, 1
|
||||
ackis.duckdns.org, 1
|
||||
acksoft.fr, 1
|
||||
acksoftdemo.fr, 1
|
||||
aclu.org, 0
|
||||
acluva.org, 0
|
||||
|
|
@ -1798,7 +1800,7 @@ apk4fun.com, 1
|
|||
apkoyunlar.club, 1
|
||||
apl2bits.net, 1
|
||||
aplikaceproandroid.cz, 1
|
||||
aplis-online.de, 1
|
||||
aplis-online.de, 0
|
||||
aplpackaging.co.uk, 1
|
||||
aplu.fr, 1
|
||||
apmpproject.org, 1
|
||||
|
|
@ -1920,6 +1922,7 @@ arbitrary.ch, 1
|
|||
arboworks.com, 1
|
||||
arcadiaeng.com, 1
|
||||
arcaik.net, 1
|
||||
arcbit.io, 1
|
||||
arcbouncycastles.co.uk, 1
|
||||
arcenergy.co.uk, 1
|
||||
archii.ca, 1
|
||||
|
|
@ -3551,6 +3554,7 @@ blauerhunger.de, 1
|
|||
blayne.me, 1
|
||||
blayneallan.com, 1
|
||||
blazeit.io, 1
|
||||
blazor.nl, 1
|
||||
bleaching-tipps.de, 1
|
||||
bleche-onlineshop.de, 1
|
||||
blechinger.io, 1
|
||||
|
|
@ -4106,7 +4110,6 @@ bretcarmichael.com, 1
|
|||
brettabel.com, 1
|
||||
brettcornwall.com, 1
|
||||
brettelliff.com, 1
|
||||
brettpemberton.xyz, 1
|
||||
bretz-hufer.de, 1
|
||||
bretzner.fr, 1
|
||||
brevboxar.se, 1
|
||||
|
|
@ -5118,7 +5121,6 @@ chatbelgie.eu, 1
|
|||
chatbots.email, 1
|
||||
chatbots.systems, 1
|
||||
chatear.social, 1
|
||||
chateau-belvoir.com, 1
|
||||
chateau-de-lisle.fr, 1
|
||||
chateaudestrainchamps.com, 1
|
||||
chatfacile.org, 1
|
||||
|
|
@ -5430,7 +5432,6 @@ cinq-elements.net, 1
|
|||
cinsects.de, 1
|
||||
cinteo.com, 1
|
||||
cinto.cc, 1
|
||||
cio.gov, 1
|
||||
cioscloud.com, 1
|
||||
cip.md, 1
|
||||
cipartyhire.co.uk, 1
|
||||
|
|
@ -5698,7 +5699,7 @@ cnc-lehrgang.de, 1
|
|||
cncbazar365.com, 1
|
||||
cncfraises.fr, 1
|
||||
cncrans.ch, 1
|
||||
cnetw.xyz, 0
|
||||
cnetw.xyz, 1
|
||||
cni-certing.it, 1
|
||||
cnlic.com, 1
|
||||
cnrd.me, 1
|
||||
|
|
@ -6024,6 +6025,7 @@ conkret.mobi, 1
|
|||
conmedapps.com, 1
|
||||
connect-ed.network, 1
|
||||
connect.dating, 1
|
||||
connect.facebook.net, 1
|
||||
connectedcare.md, 1
|
||||
connectingconcepts.com, 1
|
||||
connectmath.com, 1
|
||||
|
|
@ -6498,7 +6500,6 @@ ctrld.me, 1
|
|||
ctyi.me, 1
|
||||
cuanhua3s.com, 1
|
||||
cub-bouncingcastles.co.uk, 1
|
||||
cube-cloud.com, 1
|
||||
cube.de, 1
|
||||
cubecraft.net, 1
|
||||
cubecraftstore.com, 1
|
||||
|
|
@ -7022,7 +7023,6 @@ dc562.org, 1
|
|||
dc585.info, 1
|
||||
dcautomacao.com.br, 1
|
||||
dcbouncycastles.co.uk, 1
|
||||
dcc.cat, 1
|
||||
dcc.moe, 1
|
||||
dccoffeeproducts.com, 1
|
||||
dcepler.net, 1
|
||||
|
|
@ -7372,7 +7372,6 @@ devdesco.com, 1
|
|||
devdom.io, 1
|
||||
devdoodle.net, 1
|
||||
devel.cz, 1
|
||||
develop.cool, 1
|
||||
developer.mydigipass.com, 0
|
||||
developerfair.com, 1
|
||||
developermail.io, 1
|
||||
|
|
@ -7489,7 +7488,6 @@ dicionariopopular.com, 1
|
|||
dick.red, 1
|
||||
dickieslife.com, 1
|
||||
dickpics.ru, 1
|
||||
dicoding.com, 1
|
||||
didacte.com, 1
|
||||
didche.net, 1
|
||||
diddens.de, 1
|
||||
|
|
@ -7981,7 +7979,6 @@ dotrox.net, 1
|
|||
dotsiam.com, 1
|
||||
doubleavineyards.com, 1
|
||||
doublefun.net, 1
|
||||
doublethink.online, 1
|
||||
doubleup.com.au, 1
|
||||
doubleyummy.uk, 1
|
||||
doucheba.gs, 1
|
||||
|
|
@ -8110,6 +8107,7 @@ drjenafernandez.com, 1
|
|||
drjoe.ca, 1
|
||||
drjuanitacollier.com, 1
|
||||
drkhsh.at, 1
|
||||
drkmtrx.xyz, 1
|
||||
drlangsdon.com, 1
|
||||
drlazarina.net, 1
|
||||
drms.us, 1
|
||||
|
|
@ -8247,6 +8245,7 @@ dustygroove.com, 1
|
|||
dustyspokesbnb.ca, 1
|
||||
dutch.desi, 1
|
||||
dutch1.nl, 1
|
||||
dutchessuganda.com, 1
|
||||
dutchrank.nl, 1
|
||||
dutchwanderers.nl, 1
|
||||
dutchweballiance.nl, 1
|
||||
|
|
@ -8501,7 +8500,6 @@ edited.de, 1
|
|||
edition-bambou.com, 1
|
||||
edition-sonblom.de, 1
|
||||
editoraacademiacrista.com.br, 1
|
||||
edlinus.cn, 1
|
||||
edmundcelis.com, 1
|
||||
edoss.co.za, 1
|
||||
edp-collaborative.com, 1
|
||||
|
|
@ -9001,6 +8999,7 @@ epicentre.works, 1
|
|||
epichouse.net, 1
|
||||
epicinflatables.co.uk, 1
|
||||
epickitty.co.uk, 1
|
||||
epicpages.com, 1
|
||||
epicsecure.de, 1
|
||||
epicsoft.de, 1
|
||||
epicvistas.com, 1
|
||||
|
|
@ -9061,6 +9060,7 @@ er.tl, 1
|
|||
erad.fr, 1
|
||||
erasmusplusrooms.com, 1
|
||||
erath.fr, 1
|
||||
erclab.kr, 1
|
||||
erdethamburgeronsdag.no, 1
|
||||
ereader.uno, 1
|
||||
erepublik-deutschland.de, 1
|
||||
|
|
@ -9670,7 +9670,6 @@ fangs.ink, 1
|
|||
fanjoe.be, 1
|
||||
fantasiapainter.com, 1
|
||||
fantasticcleaners.com.au, 1
|
||||
fantasticgardenersmelbourne.com.au, 1
|
||||
fantastichandymanmelbourne.com.au, 1
|
||||
fantasticpestcontrolmelbourne.com.au, 1
|
||||
fantasycastles.co.uk, 1
|
||||
|
|
@ -9741,6 +9740,7 @@ fastconfirm.com, 1
|
|||
fastforwardthemes.com, 1
|
||||
fastmail.com, 0
|
||||
fastonline.ro, 1
|
||||
fastpresence.com, 1
|
||||
fastrevision.com, 1
|
||||
fastwebsites.com.br, 1
|
||||
faszienrollen-info.de, 0
|
||||
|
|
@ -9927,6 +9927,7 @@ fierlafijn.net, 1
|
|||
fierman.eu, 0
|
||||
fierman.net, 0
|
||||
fierman.us, 0
|
||||
fifichachnil.paris, 1
|
||||
fifieldtech.com, 1
|
||||
fiftynorth.eu, 1
|
||||
fiftyonetielt.be, 1
|
||||
|
|
@ -11259,7 +11260,6 @@ ghcif.de, 1
|
|||
ghi.gov, 1
|
||||
ghislainphu.fr, 1
|
||||
ghostblog.info, 1
|
||||
ghrelinblocker.info, 1
|
||||
ghrelinblocker.org, 1
|
||||
ghuntley.com, 1
|
||||
giacomodrago.com, 1
|
||||
|
|
@ -11502,7 +11502,6 @@ golfhausmallorca.com, 1
|
|||
golfscape.com, 1
|
||||
golik.net.pl, 1
|
||||
golser.info, 1
|
||||
gomiblog.com, 1
|
||||
gondawa.com, 1
|
||||
gongjianwei.com, 1
|
||||
gongjuhao.com, 1
|
||||
|
|
@ -11705,6 +11704,7 @@ grenadierkorps.de, 1
|
|||
grepmaste.rs, 1
|
||||
grepular.com, 1
|
||||
gresak.io, 1
|
||||
grettogeek.com, 1
|
||||
greuel.online, 1
|
||||
greve.xyz, 1
|
||||
grey.house, 1
|
||||
|
|
@ -11855,7 +11855,6 @@ gume4you.com, 1
|
|||
gumi.ca, 1
|
||||
gummibande.noip.me, 1
|
||||
gunhunter.com, 1
|
||||
guniram.com, 1
|
||||
gunwatch.co.uk, 1
|
||||
guphi.net, 0
|
||||
gurkan.in, 1
|
||||
|
|
@ -12158,7 +12157,6 @@ hausverbrauch.de, 1
|
|||
hautarztzentrum.ch, 1
|
||||
hauteslatitudes.com, 1
|
||||
havasuhomepage.com, 1
|
||||
havasuinsurance.com, 1
|
||||
haveabounce.co.uk, 1
|
||||
haveforeningen-enghaven.dk, 1
|
||||
havefunbiking.com, 1
|
||||
|
|
@ -12407,7 +12405,6 @@ herrderzeit.de, 1
|
|||
herringsresidence.be, 1
|
||||
herrsmith.com, 1
|
||||
hertsbouncycastles.com, 1
|
||||
hertz.bj, 1
|
||||
herzig.cc, 1
|
||||
hesaplama.net, 1
|
||||
hessen-liebe.de, 1
|
||||
|
|
@ -14308,7 +14305,6 @@ jazzy.pro, 1
|
|||
jazzysumi.com, 1
|
||||
jballelectronics.com, 1
|
||||
jbbd.fr, 1
|
||||
jbelien.photography, 1
|
||||
jbradaric.me, 1
|
||||
jbrowndesign.me, 1
|
||||
jbs-jardins.ch, 1
|
||||
|
|
@ -14584,7 +14580,6 @@ johannes.wtf, 1
|
|||
johannespichler.com, 1
|
||||
johnbeil.com, 1
|
||||
johnblackbourn.com, 1
|
||||
johndong.net, 0
|
||||
johnfulgenzi.com, 1
|
||||
johngallias.com, 1
|
||||
johngo.tk, 1
|
||||
|
|
@ -14626,7 +14621,6 @@ jonathancarter.org, 1
|
|||
jonathandowning.uk, 0
|
||||
jonathandupree.com, 1
|
||||
jonathanmassacand.ch, 1
|
||||
jonathanreyes.com, 1
|
||||
jonathansanchez.pro, 1
|
||||
jonathanwisdom.com, 1
|
||||
jondevin.com, 1
|
||||
|
|
@ -15410,7 +15404,7 @@ kitchenpunx.com, 0
|
|||
kiteadventure.nl, 1
|
||||
kitegarage.eu, 1
|
||||
kiteschoolamsterdam.nl, 1
|
||||
kiteschooledam.nl, 1
|
||||
kiteschooledam.nl, 0
|
||||
kiteschoolijmuiden.nl, 1
|
||||
kiteschoolkatwijk.nl, 1
|
||||
kiteschoolnoordwijk.nl, 1
|
||||
|
|
@ -15452,7 +15446,6 @@ klanggut.at, 1
|
|||
klares-licht.de, 1
|
||||
klarika.com, 1
|
||||
klarmobil-empfehlen.de, 1
|
||||
klas.or.id, 1
|
||||
klasfauseweh.de, 1
|
||||
klatschreime.de, 1
|
||||
klausbrinch.dk, 1
|
||||
|
|
@ -16040,7 +16033,6 @@ largescaleforums.com, 1
|
|||
largeviewer.com, 1
|
||||
lariscus.eu, 1
|
||||
larptreff.de, 1
|
||||
larraz.es, 1
|
||||
larrysalibra.com, 1
|
||||
lars-ewald.com, 1
|
||||
lars-mense.de, 1
|
||||
|
|
@ -17228,8 +17220,6 @@ madeinorder.com, 1
|
|||
madeinstudio3.com, 1
|
||||
madeintucson.org, 1
|
||||
madeitwor.se, 1
|
||||
mademoiselle-emma.be, 1
|
||||
mademoiselle-emma.fr, 1
|
||||
mademoiselledemargaux.com, 1
|
||||
mader.jp, 1
|
||||
madesurveying.co.uk, 1
|
||||
|
|
@ -17511,6 +17501,7 @@ marianhoenscheid.de, 1
|
|||
mariannenan.nl, 1
|
||||
marianwehlus.de, 1
|
||||
mariaolesen.dk, 1
|
||||
marie-elisabeth.dk, 0
|
||||
marie.club, 1
|
||||
mariehane.com, 1
|
||||
mariemiramont.fr, 1
|
||||
|
|
@ -17628,7 +17619,7 @@ maskinkultur.com, 1
|
|||
maslife365.com, 1
|
||||
massage-vitalite.fr, 1
|
||||
massage4u.net, 1
|
||||
massagecupping.com, 1
|
||||
massagecupping.com, 0
|
||||
massdrop.com, 1
|
||||
masse.org, 1
|
||||
massflix.com, 1
|
||||
|
|
@ -18268,7 +18259,6 @@ midwestbloggers.org, 1
|
|||
midweststructuralrepair.com, 1
|
||||
mieuxgrandir.ch, 1
|
||||
miffy.me, 1
|
||||
mig5.net, 1
|
||||
miggy.org, 1
|
||||
mightymillionsraffle.com, 1
|
||||
miguel.pw, 1
|
||||
|
|
@ -18384,7 +18374,6 @@ mingram.net, 1
|
|||
mingwah.ch, 1
|
||||
mingy.ddns.net, 1
|
||||
mingyueli.com, 1
|
||||
minhanossasenhora.com.br, 1
|
||||
mini2.fi, 1
|
||||
minigames.com, 1
|
||||
minigolf-reisinger.com, 1
|
||||
|
|
@ -18713,6 +18702,7 @@ monolithindustries.com, 1
|
|||
monolithinteractive.com, 1
|
||||
monoseis-monotica.gr, 1
|
||||
monpc-pro.fr, 1
|
||||
monpermismoto.com, 1
|
||||
monpermisvoiture.com, 1
|
||||
monpetitforfait.com, 1
|
||||
monpetitmobile.com, 1
|
||||
|
|
@ -18840,6 +18830,7 @@ movie4k.life, 1
|
|||
movie4kto.site, 1
|
||||
movie4kto.stream, 1
|
||||
moviedeposit.com, 1
|
||||
moviefreeze.com, 1
|
||||
movieguys.org, 1
|
||||
movienang.com, 1
|
||||
moviepilot.com, 1
|
||||
|
|
@ -19000,7 +18991,6 @@ multibomasm.com.br, 1
|
|||
multicomhost.com, 1
|
||||
multigamecard.com, 1
|
||||
multigeist.de, 1
|
||||
multikalender.de, 1
|
||||
multimail.work, 1
|
||||
multimarques.com, 1
|
||||
multimedia-pool.com, 1
|
||||
|
|
@ -20026,6 +20016,7 @@ nitaonline.org, 1
|
|||
nitifilter.com, 1
|
||||
nitrix.me, 1
|
||||
nitrokey.com, 1
|
||||
nitropanel.com, 1
|
||||
nitropur.com, 1
|
||||
nitropur.de, 1
|
||||
nitrous-networks.com, 1
|
||||
|
|
@ -20070,7 +20061,6 @@ nodari.com.ar, 1
|
|||
nodariweb.com.ar, 1
|
||||
nodecompat.com, 1
|
||||
nodefiles.com, 1
|
||||
nodefoo.com, 1
|
||||
nodejs.de, 1
|
||||
nodelab-it.de, 1
|
||||
nodelia.com, 1
|
||||
|
|
@ -20122,6 +20112,7 @@ noop.ch, 1
|
|||
noordsee.de, 1
|
||||
noorsolidarity.com, 1
|
||||
nootropic.com, 1
|
||||
nootropicsource.com, 1
|
||||
nopaste.xyz, 1
|
||||
nopaynocure.com, 1
|
||||
nord-sud.be, 1
|
||||
|
|
@ -20302,7 +20293,6 @@ numm.fr, 1
|
|||
numwave.nl, 1
|
||||
nunnenmacher.net, 1
|
||||
nunomoura.com, 1
|
||||
nuovamoda.al, 1
|
||||
nup.pw, 1
|
||||
nupef.org.br, 1
|
||||
nuquery.com, 1
|
||||
|
|
@ -20657,6 +20647,7 @@ onlinelegalmarketing.com, 1
|
|||
onlinelegalmedia.com, 1
|
||||
onlinelighting.com.au, 1
|
||||
onlinemarketingtraining.co.uk, 1
|
||||
onlinepokerspelen.be, 1
|
||||
onlinerollout.de, 1
|
||||
onlinestoreninjas.com, 1
|
||||
onlineth.com, 0
|
||||
|
|
@ -21063,7 +21054,6 @@ palatin.at, 1
|
|||
palationtrade.com, 1
|
||||
palava.tv, 1
|
||||
palavatv.com, 1
|
||||
paleosquawk.com, 1
|
||||
palletflow.com, 1
|
||||
palli.ch, 1
|
||||
palmavile.us, 1
|
||||
|
|
@ -21155,6 +21145,7 @@ parfum-baza.ru, 1
|
|||
pariga.co.uk, 1
|
||||
paris-cyber.fr, 1
|
||||
parisescortgirls.com, 1
|
||||
parisfranceparking.com, 1
|
||||
parisfranceparking.de, 1
|
||||
parisfranceparking.fr, 1
|
||||
parisfranceparking.nl, 1
|
||||
|
|
@ -22359,6 +22350,7 @@ primordialsnooze.com, 1
|
|||
prinbanat.ngo, 1
|
||||
princeagency.com, 1
|
||||
princeofwhales.com, 1
|
||||
princesparktouch.com, 1
|
||||
princessbackpack.de, 1
|
||||
princessmargaretlotto.com, 1
|
||||
principaltoolbox.com, 1
|
||||
|
|
@ -22632,7 +22624,7 @@ psychoactive.com, 1
|
|||
psychoco.net, 1
|
||||
psychotherapie-kp.de, 1
|
||||
psydix.org, 1
|
||||
psyk.yt, 0
|
||||
psyk.yt, 1
|
||||
psylab.cc, 1
|
||||
psylab.re, 1
|
||||
psylab.vip, 1
|
||||
|
|
@ -23381,12 +23373,12 @@ remoteutilities.com, 1
|
|||
removedrepo.com, 1
|
||||
renascentia.asia, 1
|
||||
renaultclubticino.ch, 1
|
||||
rencaijia.com, 1
|
||||
renderloop.com, 1
|
||||
rene-schwarz.com, 1
|
||||
rene-stolp.de, 1
|
||||
renearends.nl, 1
|
||||
reneleu.ch, 1
|
||||
renem.net, 0
|
||||
renemayrhofer.com, 1
|
||||
renerehelse.no, 0
|
||||
renewablefreedom.org, 1
|
||||
|
|
@ -23433,6 +23425,7 @@ reprogramming-predators.com, 1
|
|||
reprogrammingpredators.com, 1
|
||||
reprozip.org, 1
|
||||
repsomelt.com, 1
|
||||
reptrax.com, 1
|
||||
republic.gr, 1
|
||||
republique.org, 1
|
||||
repugnant-conclusion.com, 1
|
||||
|
|
@ -23475,7 +23468,6 @@ restaurantmangal.ch, 1
|
|||
restauranttester.at, 1
|
||||
rester-a-domicile.ch, 1
|
||||
rester-autonome-chez-soi.ch, 1
|
||||
restioson.me, 1
|
||||
restoran-radovce.me, 1
|
||||
restoreresearchstudy.com, 1
|
||||
restoruns.com, 1
|
||||
|
|
@ -24185,7 +24177,6 @@ sailormoonevents.org, 0
|
|||
saimoe.moe, 1
|
||||
saimoe.org, 1
|
||||
sainetworks.net, 1
|
||||
saint-astier-triathlon.com, 1
|
||||
saintaardvarkthecarpeted.com, 1
|
||||
saintanthonyscorner.com, 1
|
||||
sainth.de, 1
|
||||
|
|
@ -24790,7 +24781,6 @@ securitystrata.com, 1
|
|||
securitystreak.com, 1
|
||||
securitytalk.pl, 1
|
||||
securitywatch.co.nz, 1
|
||||
securitywithnick.com, 1
|
||||
securitywithoutborders.org, 1
|
||||
securocloud.com, 1
|
||||
securon.io, 1
|
||||
|
|
@ -25539,7 +25529,6 @@ sjoorm.com, 1
|
|||
sjsc.fr, 1
|
||||
sk-net.cz, 1
|
||||
skalender.ch, 0
|
||||
skandiabanken.no, 1
|
||||
skanvordoff.ru, 1
|
||||
skaraborgsassistans.com, 0
|
||||
skarox.com, 1
|
||||
|
|
@ -25747,7 +25736,6 @@ smartvideo.io, 1
|
|||
smartviewing.com, 1
|
||||
smartwelve.com, 1
|
||||
smartwritingservice.com, 1
|
||||
smartwurk.nl, 1
|
||||
smash-gg.club, 1
|
||||
smatch.com, 1
|
||||
smb445.com, 1
|
||||
|
|
@ -25909,6 +25897,7 @@ softandbouncy.co.uk, 1
|
|||
softanka.com, 1
|
||||
softballrampage.com, 1
|
||||
softclean.pt, 1
|
||||
softcreatr.de, 1
|
||||
softplay4hire.co.uk, 1
|
||||
softplaynation.co.uk, 1
|
||||
softprayog.in, 1
|
||||
|
|
@ -26602,6 +26591,7 @@ stonemanbrasil.com.br, 1
|
|||
stony.com, 1
|
||||
stonystratford.org, 1
|
||||
stopakwardhandshakes.org, 1
|
||||
stopbreakupnow.org, 1
|
||||
stopbullying.gov, 1
|
||||
stopfraud.gov, 1
|
||||
stopthethyroidmadness.com, 1
|
||||
|
|
@ -26799,6 +26789,7 @@ sundayfundayjapan.com, 1
|
|||
suneilpatel.com, 1
|
||||
sunfeathers.net, 1
|
||||
sunfireshop.com.br, 1
|
||||
sunflyer.cn, 0
|
||||
sunfox.cz, 1
|
||||
sunfulong.me, 1
|
||||
sungo.wtf, 1
|
||||
|
|
@ -27095,6 +27086,7 @@ taborsky.cz, 1
|
|||
tac-volley.com, 1
|
||||
tacklog.com, 1
|
||||
tacoma-games.com, 1
|
||||
tacomafia.net, 1
|
||||
tacotown.tk, 1
|
||||
tacticalsquare.com, 1
|
||||
tadata.me, 1
|
||||
|
|
@ -27181,6 +27173,7 @@ tapestries.tk, 1
|
|||
taqsim.jp, 1
|
||||
taquilla.com, 1
|
||||
taqun.club, 1
|
||||
taranis.re, 1
|
||||
tarantul.org.ua, 1
|
||||
tarasecurity.co.uk, 1
|
||||
tarasecurity.com, 1
|
||||
|
|
@ -27672,6 +27665,7 @@ thedreamtravelgroup.co.uk, 1
|
|||
thedrinks.co, 1
|
||||
thedronechart.com, 1
|
||||
thedrunkencabbage.com, 1
|
||||
thedutchmarketers.com, 1
|
||||
theeducationchannel.info, 1
|
||||
theeducationdirectory.org, 1
|
||||
theevergreen.me, 1
|
||||
|
|
@ -28102,6 +28096,7 @@ tjl.rocks, 1
|
|||
tjp.ch, 1
|
||||
tjs.me, 1
|
||||
tjsbouncycastles.co.uk, 1
|
||||
tjullrich.de, 1
|
||||
tkacz.pro, 1
|
||||
tkat.ch, 1
|
||||
tkgpm.com, 1
|
||||
|
|
@ -28111,7 +28106,6 @@ tkn.tokyo, 1
|
|||
tkts.cl, 1
|
||||
tkusano.jp, 1
|
||||
tkw01536.de, 1
|
||||
tlach.cz, 1
|
||||
tlca.org, 1
|
||||
tlcnet.info, 1
|
||||
tlehseasyads.com, 1
|
||||
|
|
@ -28232,7 +28226,6 @@ tollsjekk.no, 1
|
|||
tom-geiger.de, 1
|
||||
tom-kunze.de, 1
|
||||
tom-maxwell.com, 1
|
||||
tom.run, 1
|
||||
tomabrafix.de, 1
|
||||
tomandshirley.com, 1
|
||||
tomasjacik.cz, 1
|
||||
|
|
@ -28429,6 +28422,7 @@ touslesdrivers.com, 1
|
|||
tousproducteurs.fr, 1
|
||||
tout-art.ch, 1
|
||||
toutart.ch, 1
|
||||
toutenmusic.fr, 1
|
||||
toutmonexam.fr, 1
|
||||
tovare.com, 1
|
||||
toverland-tickets.nl, 1
|
||||
|
|
@ -29579,7 +29573,6 @@ vgerak.com, 1
|
|||
vgolos.zt.ua, 1
|
||||
vgropp.de, 1
|
||||
vhummel.nl, 1
|
||||
viabemestar.com.br, 1
|
||||
viacdn.org, 1
|
||||
viafinance.cz, 1
|
||||
viaggio-in-cina.it, 1
|
||||
|
|
@ -29702,6 +29695,7 @@ vinzite.com, 1
|
|||
violetraven.co.uk, 1
|
||||
violin4fun.nl, 1
|
||||
vionicbeach.com, 1
|
||||
viosey.com, 1
|
||||
vipi.es, 1
|
||||
viplentes.com.br, 1
|
||||
viptamin.eu, 1
|
||||
|
|
@ -30695,7 +30689,6 @@ wmaccess.com, 1
|
|||
wmawri.com, 1
|
||||
wmfusercontent.org, 1
|
||||
wmkowa.de, 1
|
||||
wmoda.com.br, 1
|
||||
wmustore.com, 1
|
||||
wnu.com, 1
|
||||
wo-ist-elvira.net, 1
|
||||
|
|
@ -31521,6 +31514,7 @@ youran.me, 1
|
|||
yourciso.com, 1
|
||||
yourcopywriter.it, 1
|
||||
yourdaddy.dk, 1
|
||||
yourforex.org, 1
|
||||
yourgame.co.il, 1
|
||||
yourgames.tv, 1
|
||||
yourhair.net, 1
|
||||
|
|
@ -31682,6 +31676,7 @@ zapier.com, 1
|
|||
zappbuildapps.com, 1
|
||||
zaratan.fr, 1
|
||||
zarpo.com.br, 1
|
||||
zary.me, 1
|
||||
zaufanatrzeciastrona.pl, 1
|
||||
zavec.com.ec, 1
|
||||
zavetaji.lv, 1
|
||||
|
|
@ -31849,7 +31844,6 @@ zojadravai.com, 1
|
|||
zoki.art, 1
|
||||
zokster.net, 1
|
||||
zolokar.xyz, 1
|
||||
zolotoy-standart.com.ua, 1
|
||||
zombiesecured.com, 1
|
||||
zomerschoen.nl, 1
|
||||
zone-produkte.de, 1
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
|
||||
#include <immintrin.h>
|
||||
|
||||
#include "aom_ports/msvc.h"
|
||||
#include "./aom_dsp_rtcd.h"
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -43,5 +43,25 @@ static INLINE long lroundf(float x) {
|
|||
}
|
||||
#endif // _MSC_VER < 1800
|
||||
|
||||
#if HAVE_AVX
|
||||
#include <immintrin.h>
|
||||
// Note:
|
||||
// _mm256_insert_epi16 intrinsics is available from vs2017.
|
||||
// We define this macro for vs2015 and earlier. The
|
||||
// intrinsics used here are in vs2015 document:
|
||||
// https://msdn.microsoft.com/en-us/library/hh977022.aspx
|
||||
// Input parameters:
|
||||
// a: __m256i,
|
||||
// d: int16_t,
|
||||
// indx: imm8 (0 - 15)
|
||||
#if _MSC_VER <= 1900
|
||||
#define _mm256_insert_epi16(a, d, indx) \
|
||||
_mm256_insertf128_si256( \
|
||||
a, \
|
||||
_mm_insert_epi16(_mm256_extractf128_si256(a, indx >> 3), d, indx % 8), \
|
||||
indx >> 3)
|
||||
#endif // _MSC_VER <= 1900
|
||||
#endif // HAVE_AVX
|
||||
|
||||
#endif // _MSC_VER
|
||||
#endif // AOM_PORTS_MSVC_H_
|
||||
|
|
|
|||
|
|
@ -1728,9 +1728,9 @@ void av1_build_inter_predictors_sb(const AV1_COMMON *cm, MACROBLOCKD *xd,
|
|||
av1_build_inter_predictors_sbuv(cm, xd, mi_row, mi_col, ctx, bsize);
|
||||
}
|
||||
|
||||
void av1_setup_dst_planes(struct macroblockd_plane planes[MAX_MB_PLANE],
|
||||
BLOCK_SIZE bsize, const YV12_BUFFER_CONFIG *src,
|
||||
int mi_row, int mi_col) {
|
||||
void av1_setup_dst_planes(struct macroblockd_plane *planes, BLOCK_SIZE bsize,
|
||||
const YV12_BUFFER_CONFIG *src, int mi_row,
|
||||
int mi_col) {
|
||||
const int widths[MAX_MB_PLANE] = { src->y_crop_width, src->uv_crop_width,
|
||||
src->uv_crop_width };
|
||||
const int heights[MAX_MB_PLANE] = { src->y_crop_height, src->uv_crop_height,
|
||||
|
|
|
|||
|
|
@ -446,9 +446,9 @@ static INLINE void setup_pred_plane(struct buf_2d *dst, BLOCK_SIZE bsize,
|
|||
dst->stride = stride;
|
||||
}
|
||||
|
||||
void av1_setup_dst_planes(struct macroblockd_plane planes[MAX_MB_PLANE],
|
||||
BLOCK_SIZE bsize, const YV12_BUFFER_CONFIG *src,
|
||||
int mi_row, int mi_col);
|
||||
void av1_setup_dst_planes(struct macroblockd_plane *planes, BLOCK_SIZE bsize,
|
||||
const YV12_BUFFER_CONFIG *src, int mi_row,
|
||||
int mi_col);
|
||||
|
||||
void av1_setup_pre_planes(MACROBLOCKD *xd, int idx,
|
||||
const YV12_BUFFER_CONFIG *src, int mi_row, int mi_col,
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ static INLINE void sync_write(AV1LfSync *const lf_sync, int r, int c,
|
|||
|
||||
#if !CONFIG_EXT_PARTITION_TYPES
|
||||
static INLINE enum lf_path get_loop_filter_path(
|
||||
int y_only, struct macroblockd_plane planes[MAX_MB_PLANE]) {
|
||||
int y_only, struct macroblockd_plane *planes) {
|
||||
if (y_only)
|
||||
return LF_PATH_444;
|
||||
else if (planes[1].subsampling_y == 1 && planes[1].subsampling_x == 1)
|
||||
|
|
@ -98,7 +98,7 @@ static INLINE enum lf_path get_loop_filter_path(
|
|||
}
|
||||
|
||||
static INLINE void loop_filter_block_plane_ver(
|
||||
AV1_COMMON *cm, struct macroblockd_plane planes[MAX_MB_PLANE], int plane,
|
||||
AV1_COMMON *cm, struct macroblockd_plane *planes, int plane,
|
||||
MODE_INFO **mi, int mi_row, int mi_col, enum lf_path path,
|
||||
LOOP_FILTER_MASK *lfm) {
|
||||
if (plane == 0) {
|
||||
|
|
@ -120,7 +120,7 @@ static INLINE void loop_filter_block_plane_ver(
|
|||
}
|
||||
|
||||
static INLINE void loop_filter_block_plane_hor(
|
||||
AV1_COMMON *cm, struct macroblockd_plane planes[MAX_MB_PLANE], int plane,
|
||||
AV1_COMMON *cm, struct macroblockd_plane *planes, int plane,
|
||||
MODE_INFO **mi, int mi_row, int mi_col, enum lf_path path,
|
||||
LOOP_FILTER_MASK *lfm) {
|
||||
if (plane == 0) {
|
||||
|
|
@ -286,10 +286,9 @@ static int loop_filter_row_worker(AV1LfSync *const lf_sync,
|
|||
#endif // CONFIG_PARALLEL_DEBLOCKING
|
||||
|
||||
static void loop_filter_rows_mt(YV12_BUFFER_CONFIG *frame, AV1_COMMON *cm,
|
||||
struct macroblockd_plane planes[MAX_MB_PLANE],
|
||||
int start, int stop, int y_only,
|
||||
AVxWorker *workers, int nworkers,
|
||||
AV1LfSync *lf_sync) {
|
||||
struct macroblockd_plane *planes, int start,
|
||||
int stop, int y_only, AVxWorker *workers,
|
||||
int nworkers, AV1LfSync *lf_sync) {
|
||||
#if CONFIG_EXT_PARTITION
|
||||
printf(
|
||||
"STOPPING: This code has not been modified to work with the "
|
||||
|
|
@ -415,7 +414,7 @@ static void loop_filter_rows_mt(YV12_BUFFER_CONFIG *frame, AV1_COMMON *cm,
|
|||
}
|
||||
|
||||
void av1_loop_filter_frame_mt(YV12_BUFFER_CONFIG *frame, AV1_COMMON *cm,
|
||||
struct macroblockd_plane planes[MAX_MB_PLANE],
|
||||
struct macroblockd_plane *planes,
|
||||
int frame_filter_level,
|
||||
#if CONFIG_LOOPFILTER_LEVEL
|
||||
int frame_filter_level_r,
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ void av1_loop_filter_dealloc(AV1LfSync *lf_sync);
|
|||
|
||||
// Multi-threaded loopfilter that uses the tile threads.
|
||||
void av1_loop_filter_frame_mt(YV12_BUFFER_CONFIG *frame, struct AV1Common *cm,
|
||||
struct macroblockd_plane planes[MAX_MB_PLANE],
|
||||
struct macroblockd_plane *planes,
|
||||
int frame_filter_level,
|
||||
#if CONFIG_LOOPFILTER_LEVEL
|
||||
int frame_filter_level_r,
|
||||
|
|
|
|||
|
|
@ -10,9 +10,11 @@
|
|||
av1_selfguided_restoration)
|
||||
*/
|
||||
static void calc_block(__m128i sum, __m128i sum_sq, __m128i n,
|
||||
__m128i one_over_n, __m128i s, int bit_depth, int idx,
|
||||
int32_t *A, int32_t *B) {
|
||||
__m128i *one_over_n_, __m128i *s_, int bit_depth,
|
||||
int idx, int32_t *A, int32_t *B) {
|
||||
__m128i a, b, p;
|
||||
__m128i one_over_n = *one_over_n_;
|
||||
__m128i s = *s_;
|
||||
#if CONFIG_HIGHBITDEPTH
|
||||
if (bit_depth > 8) {
|
||||
__m128i rounding_a = _mm_set1_epi32((1 << (2 * (bit_depth - 8))) >> 1);
|
||||
|
|
@ -147,7 +149,7 @@ static void selfguided_restoration_1_h(int32_t *A, int32_t *B, int width,
|
|||
__m128i s = _mm_set_epi32(
|
||||
sgrproj_mtable[eps - 1][3 * h - 1], sgrproj_mtable[eps - 1][3 * h - 1],
|
||||
sgrproj_mtable[eps - 1][3 * h - 1], sgrproj_mtable[eps - 1][2 * h - 1]);
|
||||
calc_block(sum_, sum_sq_, n, one_over_n, s, bit_depth, i * buf_stride, A,
|
||||
calc_block(sum_, sum_sq_, n, &one_over_n, &s, bit_depth, i * buf_stride, A,
|
||||
B);
|
||||
|
||||
n = _mm_set1_epi32(3 * h);
|
||||
|
|
@ -178,8 +180,8 @@ static void selfguided_restoration_1_h(int32_t *A, int32_t *B, int width,
|
|||
_mm_alignr_epi8(b2, b1, 8)));
|
||||
sum_sq_ = _mm_add_epi32(a1, _mm_add_epi32(_mm_alignr_epi8(a2, a1, 4),
|
||||
_mm_alignr_epi8(a2, a1, 8)));
|
||||
calc_block(sum_, sum_sq_, n, one_over_n, s, bit_depth, i * buf_stride + j,
|
||||
A, B);
|
||||
calc_block(sum_, sum_sq_, n, &one_over_n, &s, bit_depth,
|
||||
i * buf_stride + j, A, B);
|
||||
}
|
||||
__m128i a3 = _mm_loadu_si128((__m128i *)&A[i * buf_stride + j + 3]);
|
||||
__m128i b3 = _mm_loadu_si128((__m128i *)&B[i * buf_stride + j + 3]);
|
||||
|
|
@ -227,7 +229,7 @@ static void selfguided_restoration_1_h(int32_t *A, int32_t *B, int width,
|
|||
s = _mm_set_epi32(
|
||||
sgrproj_mtable[eps - 1][2 * h - 1], sgrproj_mtable[eps - 1][3 * h - 1],
|
||||
sgrproj_mtable[eps - 1][3 * h - 1], sgrproj_mtable[eps - 1][3 * h - 1]);
|
||||
calc_block(sum_, sum_sq_, n, one_over_n, s, bit_depth, i * buf_stride + j,
|
||||
calc_block(sum_, sum_sq_, n, &one_over_n, &s, bit_depth, i * buf_stride + j,
|
||||
A, B);
|
||||
}
|
||||
}
|
||||
|
|
@ -342,7 +344,7 @@ static void selfguided_restoration_2_h(int32_t *A, int32_t *B, int width,
|
|||
__m128i s = _mm_set_epi32(
|
||||
sgrproj_mtable[eps - 1][5 * h - 1], sgrproj_mtable[eps - 1][5 * h - 1],
|
||||
sgrproj_mtable[eps - 1][4 * h - 1], sgrproj_mtable[eps - 1][3 * h - 1]);
|
||||
calc_block(sum_, sum_sq_, n, one_over_n, s, bit_depth, i * buf_stride, A,
|
||||
calc_block(sum_, sum_sq_, n, &one_over_n, &s, bit_depth, i * buf_stride, A,
|
||||
B);
|
||||
|
||||
// Re-align a1 and b1 so that they start at index i * buf_stride + 2
|
||||
|
|
@ -372,8 +374,8 @@ static void selfguided_restoration_2_h(int32_t *A, int32_t *B, int width,
|
|||
_mm_alignr_epi8(a2, a1, 8))),
|
||||
_mm_add_epi32(_mm_alignr_epi8(a2, a1, 12), a2));
|
||||
|
||||
calc_block(sum_, sum_sq_, n, one_over_n, s, bit_depth, i * buf_stride + j,
|
||||
A, B);
|
||||
calc_block(sum_, sum_sq_, n, &one_over_n, &s, bit_depth,
|
||||
i * buf_stride + j, A, B);
|
||||
}
|
||||
// If the width is not a multiple of 4, we need to reset j to width - 4
|
||||
// and adjust a1, a2, b1, b2 so that the loop invariant above is maintained
|
||||
|
|
@ -428,7 +430,7 @@ static void selfguided_restoration_2_h(int32_t *A, int32_t *B, int width,
|
|||
s = _mm_set_epi32(
|
||||
sgrproj_mtable[eps - 1][3 * h - 1], sgrproj_mtable[eps - 1][4 * h - 1],
|
||||
sgrproj_mtable[eps - 1][5 * h - 1], sgrproj_mtable[eps - 1][5 * h - 1]);
|
||||
calc_block(sum_, sum_sq_, n, one_over_n, s, bit_depth, i * buf_stride + j,
|
||||
calc_block(sum_, sum_sq_, n, &one_over_n, &s, bit_depth, i * buf_stride + j,
|
||||
A, B);
|
||||
}
|
||||
}
|
||||
|
|
@ -562,7 +564,7 @@ static void selfguided_restoration_3_h(int32_t *A, int32_t *B, int width,
|
|||
__m128i s = _mm_set_epi32(
|
||||
sgrproj_mtable[eps - 1][7 * h - 1], sgrproj_mtable[eps - 1][6 * h - 1],
|
||||
sgrproj_mtable[eps - 1][5 * h - 1], sgrproj_mtable[eps - 1][4 * h - 1]);
|
||||
calc_block(sum_, sum_sq_, n, one_over_n, s, bit_depth, i * buf_stride, A,
|
||||
calc_block(sum_, sum_sq_, n, &one_over_n, &s, bit_depth, i * buf_stride, A,
|
||||
B);
|
||||
|
||||
// Re-align a1 and b1 so that they start at index i * buf_stride + 1
|
||||
|
|
@ -599,8 +601,8 @@ static void selfguided_restoration_3_h(int32_t *A, int32_t *B, int width,
|
|||
_mm_add_epi32(_mm_add_epi32(a2, _mm_alignr_epi8(a3, a2, 4)),
|
||||
_mm_alignr_epi8(a3, a2, 8)));
|
||||
|
||||
calc_block(sum_, sum_sq_, n, one_over_n, s, bit_depth, i * buf_stride + j,
|
||||
A, B);
|
||||
calc_block(sum_, sum_sq_, n, &one_over_n, &s, bit_depth,
|
||||
i * buf_stride + j, A, B);
|
||||
}
|
||||
__m128i a3 = _mm_loadu_si128((__m128i *)&A[i * buf_stride + j + 1]);
|
||||
__m128i b3 = _mm_loadu_si128((__m128i *)&B[i * buf_stride + j + 1]);
|
||||
|
|
@ -657,7 +659,7 @@ static void selfguided_restoration_3_h(int32_t *A, int32_t *B, int width,
|
|||
s = _mm_set_epi32(
|
||||
sgrproj_mtable[eps - 1][4 * h - 1], sgrproj_mtable[eps - 1][5 * h - 1],
|
||||
sgrproj_mtable[eps - 1][6 * h - 1], sgrproj_mtable[eps - 1][7 * h - 1]);
|
||||
calc_block(sum_, sum_sq_, n, one_over_n, s, bit_depth, i * buf_stride + j,
|
||||
calc_block(sum_, sum_sq_, n, &one_over_n, &s, bit_depth, i * buf_stride + j,
|
||||
A, B);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче