Commit Graph

1249 Commits

Author SHA1 Message Date
Jeff Tinker
9e83c8b749 Merge "Report WOULD_BLOCK if buffer is non-empty instead of ERROR_IO" into lmp-dev
automerge: 30e4ba6

* commit '30e4ba61bd8be252ce1f1ab72b5875cbbaa75305':
  Report WOULD_BLOCK if buffer is non-empty instead of ERROR_IO
2014-10-05 03:15:06 +00:00
Lajos Molnar
570417ded5 Dequeue new input buffer once old on is queued
automerge: 63aa037

* commit '63aa037b036b4234b99f34506ae9b246c3651c0a':
  Dequeue new input buffer once old on is queued
2014-10-05 03:12:35 +00:00
Fred Gylys-Colwell
95658e73b2 Flush instruction cache for arm in haystack code
This is a merge of the widevine CL:
https://widevine-internal-review.googlesource.com/11254

On arm64, some devices are having random issues that probaby relate to
a stale instruction cache.  This code change flushes the cache for
pages that are going to be made executable.

b/17400000

Current Library Version:
  arm64:  Level3 Library Sep 25 2014 17:10:03

Change-Id: I3904e96e922654c055a478079aa52c29cbde8b9f
2014-09-30 14:43:22 -07:00
Jeff Tinker
16abc110bb Eliminate delay in MediaDrm.closeSession for widevine CDM
merge of https://widevine-internal-review.googlesource.com/11255
from the widevine cdm repo.

bug: 17657356
Change-Id: Ia228395c412c8d00ef0230f86f4b56469a1e6c69
2014-09-25 18:35:24 -07:00
Jeff Tinker
30e4ba61bd Merge "Report WOULD_BLOCK if buffer is non-empty instead of ERROR_IO" into lmp-dev 2014-09-25 01:51:02 +00:00
Jeff Tinker
e82044e05d Report WOULD_BLOCK if buffer is non-empty instead of ERROR_IO
Bug: 17423087
Change-Id: I4b1c5ead919649be3b820f63a030acac729fb06e
2014-09-25 01:39:29 +00:00
Lajos Molnar
63aa037b03 Dequeue new input buffer once old on is queued
Bug: 17630446
Change-Id: I9ce19849f85eba4c419e0dab8ea03a0675526366
2014-09-24 14:07:11 -07:00
Edwin Wong
31a53185da am 138160dd: Update license request url to new signed Widevine UAT proxy.
* commit '138160ddea41b6123aa4beea27d7de41a320c6b9':
  Update license request url to new signed Widevine UAT proxy.
2014-09-18 22:37:40 +00:00
Edwin Wong
42f368d033 am 7bf1daa4: Update Widevine classic integration guide.
* commit '7bf1daa432acd062cd40a4c2232e6bc456c676b1':
  Update Widevine classic integration guide.
2014-09-18 22:37:37 +00:00
Edwin Wong
138160ddea Update license request url to new signed Widevine UAT proxy.
Bug: 16631113
Change-Id: I442f9c9decd03213912c8c2befcbeccc2a332c53
2014-09-13 01:32:29 +00:00
Edwin Wong
7bf1daa432 Update Widevine classic integration guide.
Update "Deliverables" section.

Bug: 17405306
Change-Id: I0532aeee7b634c0a13b930efe2dbe8c7e264e561
2014-09-11 18:29:53 -07:00
Jeff Tinker
49450b8f52 am 887dcfef: Revert workaround for WVv9 netflix license issue on fugu and molly
* commit '887dcfef6be049aba661a1ffdccbda84bf02a47c':
  Revert workaround for WVv9 netflix license issue on fugu and molly
2014-09-08 21:16:01 +00:00
Jeff Tinker
887dcfef6b Revert workaround for WVv9 netflix license issue on fugu and molly
related-to-bug: 17212907

Change-Id: I9a6eed207f8fbdbd621b9ecde2cb99112f02e9fa
2014-09-08 19:32:04 +00:00
Fred Gylys-Colwell
ef8f1f21c6 am 457998d6: Correctly handle missing entry in DeactivateUsageEntry
* commit '457998d677f23cd46c0549abfde89abcd51d8d1b':
  Correctly handle missing entry in DeactivateUsageEntry
2014-09-05 23:04:28 +00:00
Fred Gylys-Colwell
1995a8bce9 am 72b47e57: Clarify Documentation
* commit '72b47e5789db7a54e375dfb3bd4ba16f347f1624':
  Clarify Documentation
2014-09-05 22:15:08 +00:00
Fred Gylys-Colwell
457998d677 Correctly handle missing entry in DeactivateUsageEntry
This is a copy of
https://widevine-internal-review.googlesource.com/#/c/11110/

The level 3 oemcrypto library version of DeactivateUsageEntry now
returns OEMCrypto_ERROR_INVALID_CONTEXT if there is no entry in the
usage table.

Current Library Version:
arm:  Level3 Library Sep  3 2014 18:13:47

b/17373630

Change-Id: Iaeb65b4ad4b2b9f3c6733a2c9c8d96e2be263d09
2014-09-05 14:21:07 -07:00
Fred Gylys-Colwell
72b47e5789 Clarify Documentation
This is a copy of
https://widevine-internal-review.googlesource.com/#/c/11115/

This CL just updates the integration guide.  In particular, the
following clarifiaction is made about usage tables:

The sentence:
  When the session using this key is closed, the entry in the table will
    be marked as inactive.
is replaced by
      After the session using this key is closed, the application will
      request that the entry in the table will be marked as inactive.

This should make it clear that OEMCrypto should not automaically
deactivate usage entries.  This behaviour is already verified by unit
tests.

bug: 17405160

Change-Id: If836c7c76205e6759c1c194a6f31232c52c4f179
2014-09-05 17:44:42 +00:00
Rahul Frias
04d36ea71f am 29b228a1: Merge "Corrections for license release on fallback to L3" into lmp-dev
* commit '29b228a10bf50a8546004154716cd81d513e7f82':
  Corrections for license release on fallback to L3
2014-09-04 18:58:09 +00:00
Rahul Frias
29b228a10b Merge "Corrections for license release on fallback to L3" into lmp-dev 2014-09-04 18:35:03 +00:00
Rahul Frias
9bc13a07a0 Corrections for license release on fallback to L3
When falling back to L3, release requests were failing. Information
requesting falling back to L3 is passed along when the session is opened.
Licenses however are released using the key set ID and information
requesting fallback to L3(CdmClientPropertySet) at that point is
unavailable. The release was actually attempting to release a license
at the default security level which is incorrect.

In addition, the mac keys were not being setup correctly and the release
message was signed with keys derived from the license request and not the
response.  Both these issues have been addressed and unit tests added
to track release of offline licenses and usage reporting scenarios.

[ Merge of https://widevine-internal-review.googlesource.com/#/c/11062
  from wv cdm repo ]

b/17073910

Change-Id: I5cd95a7dfe58ebae7ae27ece6c92e67755c1d665
2014-09-04 10:29:10 -07:00
Edwin Wong
9bf29faddd am c6723c56: Remove Widevine Classic MediaCodec mode from application.
* commit 'c6723c564a16f6e948fd06d23e86cfdbfdb2d319':
  Remove Widevine Classic MediaCodec mode from application.
2014-09-04 03:38:33 +00:00
Edwin Wong
c6723c564a Remove Widevine Classic MediaCodec mode from application.
bug: 17303948
Change-Id: Ia0db7be1d99f8fab968641cbf57438ee1dd364ab
2014-09-03 18:06:00 -07:00
Fred Gylys-Colwell
da75841efa am eb4b7cdc: Merge "Catch null pst in OEMCrypto" into lmp-dev
* commit 'eb4b7cdc473ef8fe00f246c4e56f5ab8af0f2f1b':
  Catch null pst in OEMCrypto
2014-09-04 00:15:59 +00:00
Edwin Wong
6d573f40bc am 96721d71: Update Widevine Classic Library to 4.5.0.10127.
* commit '96721d7145a4b38beee9fa6028534b452829f04f':
  Update Widevine Classic Library to 4.5.0.10127.
2014-09-04 00:15:58 +00:00
Fred Gylys-Colwell
eb4b7cdc47 Merge "Catch null pst in OEMCrypto" into lmp-dev 2014-09-03 23:03:03 +00:00
Edwin Wong
96721d7145 Update Widevine Classic Library to 4.5.0.10127.
Add openssl-0.9.8za.
https://widevine-internal-review.googlesource.com/#/c/10828/

Update openssl lib to 0.9.8za.
https://widevine-internal-review.googlesource.com/#/c/10862/

Update Version string to 601_AndroidOS_L.
https://widevine-internal-review.googlesource.com/#/c/10950/

Fix Build On lmp-dev.
https://widevine-internal-review.googlesource.com/#/c/10837/

Translate widevine:// Protocol In getConstrains() and checkRightsStatus().
https://widevine-internal-review.googlesource.com/#/c/10838/

Convert "widevine:" prefix for lm->Register() as well.
https://widevine-internal-review.googlesource.com/#/c/11080/

bug: 9835684
bug: 15932110

Change-Id: I1f996355cf13ffca8d0b6ed464aa7b59b5fe4458
2014-09-03 20:55:34 +00:00
Rahul Frias
cf9d589fad am 7c7f1f5d: Merge "Address CDM request license unit test failures" into lmp-dev
* commit '7c7f1f5d55caf4c1772876227fb716edc85a96b1':
  Address CDM request license unit test failures
2014-09-03 19:25:30 +00:00
Fred Gylys-Colwell
e51f8ba7a1 Catch null pst in OEMCrypto
This is a copy of
https://widevine-internal-review.googlesource.com/#/c/11030

It is an error for the key control block to have a nonzero replay
control flag and a null pst.  This CL adds unit tests to
oemcrypto_test to verify that oemcrypto checkes this.  A unit test is
also added for verifying that an offline license has a valid nonce the
first time it is loaded.

It also updates the reference implementation (mock) to check that the
pst is not empty when the replay control flag is nonzero.

It also updates the level 3 implementation to check that the pst is
not empty when the replay control flag is nonzero.

This change is compiled into the arm library, but because of
compilation errors, is not included in x86 or mips.

    Current Library Version:
    arm:  Level3 Library Aug 27 2014 18:42:40

bug: 16525204 OEMCrypto unit test for reloading offline license
bug: 16844305 Mock OEMCrypto does not catch null pst
Change-Id: Icdb090e80fc92522c187b26f30e5ba082f26363b
2014-09-03 11:46:10 -07:00
Rahul Frias
7c7f1f5d55 Merge "Address CDM request license unit test failures" into lmp-dev 2014-09-03 18:15:13 +00:00
Edwin Wong
b11446f859 am 5800ecc1: Revert "Remove Widevine Classic MediaCodec mode from application."
* commit '5800ecc15e8d26b080bc50d7a79a3b739038115c':
  Revert "Remove Widevine Classic MediaCodec mode from application."
2014-09-02 07:09:38 +00:00
Rahul Frias
d2ad6d7f13 Address CDM request license unit test failures
UAT issues fixed PSTs for each piece of content. This requires the usage
table to be cleared (or usage records released) between tests. If not
PST collisions occur and OEMCrypto fails with
OEMCrypto_ERROR_INVALID_CONTEXT (0x29).

b/17318063

[ Merge of https://widevine-internal-review.googlesource.com/#/c/11061/
  from wv cdm repo ]

Change-Id: I7758e5444637583a171edafcd4fb18315bfa8395
2014-08-29 11:14:29 -07:00
Edwin Wong
5800ecc15e Revert "Remove Widevine Classic MediaCodec mode from application."
This reverts commit a9071cd4bd.

Change-Id: Ibbfc30579bb665a18fa98cc453df956ea7c4e558
2014-08-29 13:29:40 +00:00
Jeff Tinker
8d4124e199 am fa3098ad: Merge "Workaround WVv9 netflix license issue on fugu" into lmp-dev
* commit 'fa3098ad0781747fb9c1c60f71aa372c1a26018e':
  Workaround WVv9 netflix license issue on fugu
2014-08-28 23:18:33 +00:00
Jeff Tinker
fa3098ad07 Merge "Workaround WVv9 netflix license issue on fugu" into lmp-dev 2014-08-28 22:35:28 +00:00
Jeff Tinker
14460bd66e Workaround WVv9 netflix license issue on fugu
Change-Id: Ib4335d1dd0fea88b23c1b7ce675ae3863b86bc42
related-to-bug: 16994418
2014-08-28 15:28:42 -07:00
Edwin Wong
2d7f7bebc4 am a9071cd4: Remove Widevine Classic MediaCodec mode from application.
* commit 'a9071cd4bd71341db53b67ac983f75e42cc565b3':
  Remove Widevine Classic MediaCodec mode from application.
2014-08-28 16:34:03 +00:00
Edwin Wong
a9071cd4bd Remove Widevine Classic MediaCodec mode from application.
Hide MediaCodec mode for Build.VERSION_CODES.L and forward.

bug: 17303948
Change-Id: Iae8381ee67950a3f0c1bb9e273e3e45be24a3352
2014-08-27 18:39:06 -07:00
Jeff Tinker
279e301311 am b445a1fe: Workaround for casting and playback failures
* commit 'b445a1fef24659c209e35e351ab8b7d297c35ee7':
  Workaround for casting and playback failures
2014-08-21 04:19:53 +00:00
Jeff Tinker
b445a1fef2 Workaround for casting and playback failures
Change-Id: I45add76d7941d4942368d10e5893ff8f89a8bf82
related-to-bug: 16994418
2014-08-20 16:06:41 -07:00
Jeff Tinker
81ff3f3c6a am 907ca911: Merge "Fix MediaDrmAPITest install command in test script" into lmp-dev
* commit '907ca911d6850cabcdf24dcea5c63a61860f7f70':
  Fix MediaDrmAPITest install command in test script
2014-08-20 19:08:04 +00:00
Jeff Tinker
d6ae058c36 am 0a21d9ee: Merge "Fix widevine unit test builds on 64-bit devices" into lmp-dev
* commit '0a21d9ee686c829409add54bcaa93d30e823eaf4':
  Fix widevine unit test builds on 64-bit devices
2014-08-18 19:47:02 +00:00
Jeff Tinker
907ca911d6 Merge "Fix MediaDrmAPITest install command in test script" into lmp-dev 2014-08-16 04:03:42 +00:00
Jeff Tinker
773ddd3864 Fix MediaDrmAPITest install command in test script
Change-Id: Ibf062788e26e75838875460718c665ea56a773aa
related-to-bug: 17080975
2014-08-20 11:21:56 -07:00
Jeff Tinker
fbe0994902 Fix widevine unit test builds on 64-bit devices
bug: 17080975
Change-Id: Ic54d484e18fe0416855264ca073474f3d597e1a3
2014-08-16 12:11:05 -07:00
Jeff Tinker
0a21d9ee68 Merge "Fix widevine unit test builds on 64-bit devices" into lmp-dev 2014-08-16 03:56:00 +00:00
Edwin Wong
f13d00768a am bd4bfa1f: (-s ours) am 4135a57f: (-s ours) am e024bb54: am 5b57acc1: am f22b9807: am 7fd92342: (-s ours) am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
* commit 'bd4bfa1fd4aa157da53e49bade2983f10fd9501a':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-15 13:39:17 +00:00
Edwin Wong
bd4bfa1fd4 am 4135a57f: (-s ours) am e024bb54: am 5b57acc1: am f22b9807: am 7fd92342: (-s ours) am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
* commit '4135a57feb85223cc3adc58e53f74672c8b30d99':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-14 22:24:22 +00:00
Edwin Wong
4135a57feb am e024bb54: am 5b57acc1: am f22b9807: am 7fd92342: (-s ours) am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
* commit 'e024bb545b0a0f06b6cbac6c14c16f596cae8493':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-14 22:19:42 +00:00
Edwin Wong
e024bb545b am 5b57acc1: am f22b9807: am 7fd92342: (-s ours) am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
* commit '5b57acc12a7cef04666ed19ac6e96d2921813c85':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-14 22:15:26 +00:00
Edwin Wong
5b57acc12a am f22b9807: am 7fd92342: (-s ours) am abee817f: (-s ours) am bf68c586: am 15ef647c: Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
* commit 'f22b980716b187db673c0265acd73a1f315a374d':
  Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
2014-08-14 22:10:59 +00:00