Commit Graph

7849 Commits

Author SHA1 Message Date
Jeffrey Tinker
767717376d am 18617b93: fix for b/4126624 Widevine DRM client not sending heartbeats
* commit '18617b93c67b87bd4b8a6eb5e5d0c6e23fe82d32':
  fix for b/4126624 Widevine DRM client not sending heartbeats
2011-03-25 14:54:18 -07:00
Jeffrey Tinker
18617b93c6 fix for b/4126624 Widevine DRM client not sending heartbeats
Added some missing parameters to the heartbeat message, found in end-to-end
testing with youtube.  Also enabled heartbeats on client builds.

Change-Id: I445fb0cb168e63a041f0ecf828eaad493143a648
2011-03-25 14:02:08 -07:00
Jeffrey Tinker
a39b73cec3 am ba5fa0ef: Fixes for b/4149416:expired license refresh, b/4126624:heartbeats, b/4171055: inconsistent license modes Also includes b/3500025: A/V resync issues
* commit 'ba5fa0ef570f6ca3524f8158a23371528930f0fc':
  Fixes for b/4149416:expired license refresh, b/4126624:heartbeats, b/4171055: inconsistent license modes Also includes b/3500025: A/V resync issues
2011-03-25 10:13:54 -07:00
Jeffrey Tinker
ba5fa0ef57 Fixes for b/4149416:expired license refresh, b/4126624:heartbeats, b/4171055: inconsistent license modes
Also includes b/3500025: A/V resync issues

Change-Id: Ib885d7219d211b188f38e9427bdaecd10fbd7329
2011-03-25 07:20:49 -07:00
Jeffrey Tinker
c585611949 am 7458d581: Merge "Provide a default liboemcrypto called liboemstub for devices that do not have widevine OEM integration but still build the wv libs." into honeycomb-mr1
* commit '7458d581cd7b7fdcb620ae12bfe453084186a484':
  Provide a default liboemcrypto called liboemstub for devices that do not have widevine OEM integration but still build the wv libs.
2011-03-18 16:56:53 -07:00
Jeffrey Tinker
81474cec4c am 6bed7bfe: Fix for b/4132041 Widevine DRM plugin getConstraints not returning error
* commit '6bed7bfe90dfac8d24a25842dadb5e35088f2cbe':
  Fix for b/4132041 Widevine DRM plugin getConstraints not returning error
2011-03-18 16:56:51 -07:00
Jeffrey Tinker
7458d581cd Merge "Provide a default liboemcrypto called liboemstub for devices that do not have widevine OEM integration but still build the wv libs." into honeycomb-mr1 2011-03-18 16:08:59 -07:00
Jeffrey Tinker
6bed7bfe90 Fix for b/4132041 Widevine DRM plugin getConstraints not returning error
Change-Id: I07f02aabb4b68287eb7978abb5d106c86f2790b6
2011-03-18 13:29:28 -07:00
Jeffrey Tinker
55b05dab92 Provide a default liboemcrypto called liboemstub for devices that do not have widevine OEM integration but still build the wv libs.
Change-Id: Iaa577416f3996677af234738ac0cd3344bbee9bc
2011-03-18 12:14:31 -07:00
Jeffrey Tinker
cc4b949d8d am dac95750: Merge "Fix for b/4126103: Segfault in widevine DRM plugin when sending DRM event" into honeycomb-mr1
* commit 'dac957507c88a85af84633f6ce6ad2a69e33b016':
  Fix for b/4126103: Segfault in widevine DRM plugin when sending DRM event
2011-03-17 18:06:40 -07:00
Jeffrey Tinker
f06975ea45 am cd11ce46: Fix unresolved reference to libtpa in tervigon (wingray) builds
* commit 'cd11ce46355872241a4d0c6168fe0a9631de7d2d':
  Fix unresolved reference to libtpa in tervigon (wingray) builds
2011-03-17 18:06:38 -07:00
Jeffrey Tinker
dac957507c Merge "Fix for b/4126103: Segfault in widevine DRM plugin when sending DRM event" into honeycomb-mr1 2011-03-17 17:26:12 -07:00
Jeffrey Tinker
48305130a4 Fix for b/4126103: Segfault in widevine DRM plugin when sending DRM event
Change-Id: Ib892b3ca259b364e4ef04ee34d5a8b9d4458812f
2011-03-17 13:00:36 -07:00
Jeffrey Tinker
cd11ce4635 Fix unresolved reference to libtpa in tervigon (wingray) builds
Change-Id: I9ef5f52e319513b4186b8cbc61b8a7d047c6bf26
2011-03-16 23:17:06 -07:00
Jeffrey Tinker
d0eca66cc7 am 1dd66696: Merge "Fix for b/3504638 wv - when the Widevine client receives a stop play response from the heartbeat need an error event to pass to app" into honeycomb-mr1
* commit '1dd666966d64c42f9e8d78424506eaf44071ed03':
  Fix for b/3504638 wv - when the Widevine client receives a stop play response from the heartbeat need an error event to pass to app
2011-03-16 14:40:00 -07:00
Jeffrey Tinker
f7bdedda41 am 778b5ce2: Fix for b/3501089 Require an API in the DRM client to specify the license type (offline/streaming) and b/4084670 Define events in DRM API to support license expiration, revocation, license failure. Implements events and license changes as documented in t
* commit '778b5ce26f691119f6c275538dc56a63179d93f2':
  Fix for b/3501089 Require an API in the DRM client to specify the license type (offline/streaming) and b/4084670 Define events in DRM API to support license expiration, revocation, license failure.  Implements events and license changes as documented in the Widevine_Java_API_for_Android_DRM_Framework spec
2011-03-16 14:37:48 -07:00
Jeffrey Tinker
1dd666966d Merge "Fix for b/3504638 wv - when the Widevine client receives a stop play response from the heartbeat need an error event to pass to app" into honeycomb-mr1 2011-03-16 14:33:06 -07:00
Jeffrey Tinker
778b5ce26f Fix for b/3501089 Require an API in the DRM client to specify the license type (offline/streaming) and b/4084670 Define events in DRM API to support license expiration, revocation, license failure. Implements events and license changes as documented in the Widevine_Java_API_for_Android_DRM_Framework spec
Change-Id: I3d0440e4f64d2279ab3b272a5287db5144e41eb1
2011-03-16 11:49:24 -07:00
Glenn Kasten
6efe8cccef am f2c4035d: Fix broken build on full_x86-eng
* commit 'f2c4035d15bf2d909d4864d9483aa8d1e3cdc4a3':
  Fix broken build on full_x86-eng
2011-03-15 23:55:33 -07:00
Jeffrey Tinker
656ec45728 Fix for b/3504638 wv - when the Widevine client receives a stop play response from the heartbeat need an error event to pass to app
Change-Id: I6d0635e791c0b8537318c47113d533841a1e5555
2011-03-15 23:49:31 -07:00
Joe Onorato
54c134d1a3 Fix the build. These don't build on soju. Stingry boots, but there is almost certainly something
that doesn't work.

Change-Id: I5f356bec02b6c9f3d25d4bae8d79f547ff97f2c2
2011-03-15 14:52:31 -07:00
Glenn Kasten
f2c4035d15 Fix broken build on full_x86-eng
Change-Id: Ie5d6c94d6b993cf83e48971009562c6718c488e0
2011-03-15 13:42:03 -07:00
Jeffrey Tinker
2d1694854c am 3a1e0f37: Integration with moto secure keybox storage and add obfuscation of security-related symbols (3513413, 4083757). Also 3481645 - log spam and 3302187 - error handling
* commit '3a1e0f3768f8c586700c00ac3b6a2a5f00cb32b5':
  Integration with moto secure keybox storage and add obfuscation of security-related symbols (3513413, 4083757).  Also 3481645 -  log spam and 3302187 - error handling
2011-03-14 17:45:50 -07:00
Iliyan Malchev
ccf266ca90 vendor/widevine: remove LOCAL_PRELINK_MODULE
Change-Id: Ib4dfa1fa827628736969644778a002559d2f0d30
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-03-14 14:24:29 -07:00
Jeffrey Tinker
3a1e0f3768 Integration with moto secure keybox storage and add obfuscation of security-related symbols (3513413, 4083757). Also 3481645 - log spam and 3302187 - error handling
Change-Id: Ic11ed7ad57717e88b6f0f2991d8bbb9e1251d546
2011-03-11 14:10:43 -08:00
Kenny Root
a5a6d84805 Make Widevine build ARM-only
Change-Id: I0c749e491eed765ed89d5bbd0ac69a448a428b0d
2011-03-11 12:51:41 -08:00
Gloria Wang
14761c80a9 Fix for bug 3477330
This patch fixs a crash bug caused by using a NULL DecryptHandle pointer in the DRM Framework.
Fix by using sp<DecryptHandle> instead.

Change-Id: I1355d4719857ab64ad6cd12803fcf19e45bb50a0
2011-03-10 14:32:11 -08:00
Gloria Wang
cf1d556195 am 007788f0: Add CTS support for Widevine DRM plugin Fix for bug 3329779
* commit '007788f06079a4521a843ed098d689fceb147f22':
  Add CTS support for Widevine DRM plugin Fix for bug 3329779
2011-03-07 13:36:23 -08:00
Gloria Wang
007788f060 Add CTS support for Widevine DRM plugin
Fix for bug 3329779

Change-Id: I2e44bea50c31e7c70162c8cb0496fde30e62c2dd
2011-03-07 12:52:01 -08:00
Gloria Wang
b14eccc3bc am 7e8c3b61: (-s ours) - Support streaming of content without .wvm extension. If the .wvm extension is not present, the file header is parsed to determine if it is Widevine content. - Fixed a missing call to OpenSession. - Fixed unit test build. - Fixed x86-eng build. - Thi
* commit '7e8c3b616ee53b9038a275452407c6cdce2185ab':
  - Support streaming of content without .wvm extension.   If the .wvm extension is not present, the file header   is parsed to determine if it is Widevine content. - Fixed a missing call to OpenSession. - Fixed unit test build. - Fixed x86-eng build. - This is cherry-picked from master to hc-mr1 branch   "DO NOT MERGE" Change-Id: Ied0579325d3c11a91f6f182fe59cd978eca68368
2011-03-04 00:59:31 -08:00
Gloria Wang
7e8c3b616e - Support streaming of content without .wvm extension.
If the .wvm extension is not present, the file header
  is parsed to determine if it is Widevine content.
- Fixed a missing call to OpenSession.
- Fixed unit test build.
- Fixed x86-eng build.
- This is cherry-picked from master to hc-mr1 branch
  "DO NOT MERGE"
Change-Id: Ied0579325d3c11a91f6f182fe59cd978eca68368
2011-03-03 22:04:09 -08:00
Gloria Wang
e68b0a3d20 - Support streaming of content without .wvm extension.
If the .wvm extension is not present, the file header
  is parsed to determine if it is Widevine content.
- Fixed a missing call to OpenSession.
- Fixed unit test build.
- Fixed x86-eng build.
Change-Id: Ie6a81ce5e323c56d10cb5306453bff27f0feefd1
2011-03-03 15:07:38 -08:00
Gloria Wang
739a2970a1 Some refactoring
Change-Id: Ia4ce205bfccfb642815a2852d0ddd3e0e590a110
2011-03-01 17:31:09 -08:00
Gloria Wang
c78f4380f9 To return correct status in WVMMediaSource::start() and WVMMediaSource::stop()
Change-Id: I09db9ba58a4e375128bb3b60bd375b887e11ac05
2011-02-22 10:59:19 -08:00
Gloria Wang
0f9922ff77 Move all Widevine code which have dependency on vendor modules from framework/base to vendor/widevine
Change-Id: I2b43e90c279391436f1bbb18ebd64961bec4f9ee
2011-02-18 22:52:12 -08:00
Gloria Wang
1c53769dc1 Update from Widevine
Change-Id: Ie508911ed2bff66c1fe5962f51f1a51b8f484f5a
2011-02-18 16:24:28 -08:00
Glenn Kasten
f00905c9b3 Bug 3229711
Change-Id: If84322e440c06e8163024c16f9fb95d5c3f8cee7
2011-01-11 17:13:01 -08:00
Gloria Wang
9d6619309c am 67c93923: (-s ours) Remove Widevine libs from the HC branch. do not merge
* commit '67c9392363d4e8535f376981c0a362e5207ff8ee':
  Remove Widevine libs from the HC branch. do not merge
2011-01-11 13:36:49 -08:00
Gloria Wang
67c9392363 Remove Widevine libs from the HC branch. do not merge
Change-Id: I616acf151931e3e3a9fd9cc3136c9e2dac78e18b
2011-01-10 17:32:05 -08:00
Glenn Kasten
64f74b6dab Merge "Bug 3250414" 2010-12-14 09:56:32 -08:00
Glenn Kasten
6501fa1d58 Bug 3250414
Change-Id: I27f0783216cd9ae7dd0ec4e5a44b494e7992edb3
2010-12-14 09:49:46 -08:00
Glenn Kasten
db244e8a41 Merge "Widevine "verbose" binaries as at 12112010" 2010-12-14 09:27:53 -08:00
Glenn Kasten
a74ffcec1a Bug 3223806
Change-Id: I7adc5b55e23a2710c17f2906faa2c22b844b7035
2010-12-14 09:20:36 -08:00
Bryan Mawhinney
caa45c8a99 Widevine "verbose" binaries as at 12112010
Change-Id: I0e98aadb11aa55cea710c2a5fe4b94a07d45eecc
2010-12-13 13:20:16 +00:00
Glenn Kasten
d4d4b6f1d1 Update from Widevine
-rw-------@ 1 gkasten  eng  1486244 Nov 29 21:35 libdrmwvmplugin.so
-rw-------@ 1 gkasten  eng  1419704 Nov 30 17:12 libwvm.so

Change-Id: Icf6f7acea52493b673adcb3a2a693b4c490078b0
2010-12-02 07:58:14 -08:00
Glenn Kasten
e9d080ddf1 Attempt to fix build
Change-Id: I222a49d6513267e55fa2f52a4e4335c8e1dd2379
2010-11-24 17:43:34 -08:00
Glenn Kasten
c26373b94a Fix module name
Change-Id: I614da8fb1a0f31146b486124721a06b1952635e0
2010-11-24 15:29:14 -08:00
Glenn Kasten
a14ee0dcf1 Closed source Widevine DRM plug-in for Youtube
Change-Id: I2d854946d7f68f50e748e2bca8e736708ab14daf
2010-11-23 17:22:37 -08:00
Anatol Pomozov
17f447cc65 2010-11-23 10:47:48 -08:00