From 548fe9a335c8c49e32065615f53bd38c7f321727 Mon Sep 17 00:00:00 2001 From: Widevine Buildbot Date: Fri, 2 Nov 2018 23:26:39 +0000 Subject: [PATCH] Be clear it is DVB_CSA2 we are supporting right now. There shouldn't be anyone using DVB_CSA anymore, DVB_CSA3 is in the future. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=219867168 --- example/wv_cas_ecm_example | Bin 1450392 -> 1450392 bytes example/wv_cas_ecm_example.cc | 2 +- libmedia_cas_packager_sdk.so | Bin 1968360 -> 1968360 bytes media_cas_packager_sdk/public/wv_cas_types.h | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/example/wv_cas_ecm_example b/example/wv_cas_ecm_example index 07b1ae0066651be61ca2164416fa02e6be341a7f..ec61c6453bbe850020b5526f813be9478cb5eade 100644 GIT binary patch delta 1416 zcmYk6e@q-z5XX1!_|4-toN_=xYNTl>BG5vVK(w0sq1Og#Bc)Y1IG_Ql#{nX3&{ldy zG>zhrF8!+pG18=@1dOXtZz)%y(zJ#CGL0D2P&q6jDorgkUFRL!=qBIUdo%NSvpe(l zy4*!w?xOxPnsAe*W;Cr)-Z6bF_WY^sgDW@%@q->s;hyN+H!XrE;kKd}og-m~`+@{P z&c$sd*-(l{N;X8-^6<&u)Uc6%e|OYY62I&U8;+@ z%!BTEFFOQ+AW-}=o-ECPS)3-zFwFW0EMtl_Att_wa--IAU1>!Yp&>+$$6Z!4q+^fO z0QtCJ)syuvGr@K&DAPq2b7E=kVd*%z7@Ny-GMB07*LJf-aMe(PJbAZ3Fpm2?evR&) z{A?!3O`LQ7k88r&vYahmZiI91ac)HA&T;PA7UDWNrzehHbZ8xan>e`>3(HkB{Y651 zINGnGUvRXNqo+A~>en@NPU}Ta<4Cz4M)8O8lvG|@{zS!kIQGwG!X`PEw}!bgD2IA7 ziD@=7%wV(40P}d(rYAdX%L!hk+#$Y?ONWUSy6E+95u1EVo!g`j&22rJD$LZv&I$t< zaJoWI_AYsL;&YV-cn#mL)RX{YwGdp@JP0)fFRe2y{T~!oWXO#u|@M_ih zM_s(gnV-EyjP34*q=Pxs6_*fFekv#Rq? z+KFezaObk>oK~Fzcdn|=an*VI0Xd<0t9m(8|0nOmH!yl~WBXW`GkKLlewbCA7Mtna_m;7BA<45i^WQnk!~@lO zcp8sYr_kYbRqJAMDbv$RDReX*9^PD>uQr1TvucK+0GDbK=%Wa&?GAooKMg9;M!lWH z;o1%uM$5hq=*Jnd&kWYR-UCpKI(sUV;8wDG(Qe-b4xF%eKr`;Cdlg!7s4f#e#KpQ) z8b+L>4HocIN0GmG_(DsoroK&64iqySPNDM-@P2mdt%5#pWaSvKgU zO)sz$zOYWZXlCE|Lz47CAv^2?8>R49*w#SUExugJ#-Uq`x3WAih`X(<8QR3_R@MXC z#QkM#0CtF*%2^lel*YR3k*$YQUCw| delta 1414 zcmYk6e^69a6vy9T7ZCQs@;hCiC8h>z5E4)*9GKGFgA!pP~oZf`8j~@mO6+e`094RVOmr$d~F=58nxyy6v&3w<>d(QdX^WHi4 zZO2e<$58I6a~=UNrO9Wq9Gm>L;}ceEy>e=AH`@8U;wWc#l-U3^2aLH#j$_Z5jM`Tv}Me>mU5^k z;}~blgrBg^W&#%u*bHQ+Z7I4%%I)R*I787`92OG2huG-r>f9!@G`DEXD9)r7wilaV zGfo#9$lfDQ4nALEf*p9U#6b4bk`$f07adz@vp3LHk^%LYP?`pZv8ptftfSNd$MI6> zg_V80$hlwKMa->3HBpTz)D`C-_Pjp)_5})>TW4J1zbXnpTIq_SIHy#nm+E|qJFltE zKWQhP8Oogts&iU(3f#G-YeimNF`SM8mDEupq>Ymt3gEHEv zx8r!Wq78b{va=07#~HHE_Ehca0?5O#%2;>}H}M4I|v%0(01D&-Hc>U#V~MsBZD729gI!L(-BwNnRvx(h8Cf$yf5I*8MdJ0pi_F zEE!fwYhGYSJRws0E|c|ngHd`nn;p=?lTyGdY@-is6LSjK2z(+&SXmlu7GJfpI%pQZ zx3Vs=FbwtsSUG3brQW~=}jRqp5i@TY|3nrw?``DKNH^f5?Y#S^|t_C)* zfj;rdJM09EN-g`Drv`$hLk?cKQyOSyD|DcjM%$PUKqp=PfDO$^AKCqyeI;XqU*70r zU)U}55eowUv*FjEy8c$ZUll(z`Nss_R+mfaT`NwS{Ea@|G;)6VwA?rOlk}tjQXnaa O6if<{?wdl7T=^GZ3}&|g diff --git a/example/wv_cas_ecm_example.cc b/example/wv_cas_ecm_example.cc index f9506cd..ff088e1 100644 --- a/example/wv_cas_ecm_example.cc +++ b/example/wv_cas_ecm_example.cc @@ -30,7 +30,7 @@ int main(int argc, char **argv) { widevine::cas::WvCasEcm wv_cas_ecm; widevine::cas::WvCasStatus status = wv_cas_ecm.Initialize(/* content_iv_size= */ 8, kKeyRotationEnabled, - widevine::cas::CryptoMode::kDvbCsa); + widevine::cas::CryptoMode::kDvbCsa2); if (status != widevine::cas::OK) { std::cerr << "Failed to initialize WV CAS ECM, error: " << widevine::cas::GetWvCasStatusMessage(status) diff --git a/libmedia_cas_packager_sdk.so b/libmedia_cas_packager_sdk.so index de7319f1ed41526cb2f04d19ab881aca70ee7d28..b7b8c91aedd460c14cbddcac079dd066b173888c 100755 GIT binary patch delta 4231 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 k5`&2