Commit Graph

55 Commits

Author SHA1 Message Date
Jeffrey Tinker
f977e154c5 Fix for b/4429363: Unable to play rented movie getting error "KEYBOX IS INVALID"
Fixed race condition on initialization of WV drm plugin.

Change-Id: Ic4bfd40fe3c241a50da9c182e9f25c98b9a007f2
2011-05-14 04:37:02 -07:00
Jeffrey Tinker
b0543e305c Fix for b/4375037 Rental expired error message for the newly rented movie
Fix for b/4378589 Native crash on playback of same movie rented immediately after expiry
Fix for b/4394061 Intermittent license failure with client signature verification error

Change-Id: Ifafc768c1113ffeca5b0654cbb13db88273eda11
2011-05-06 21:32:06 -07:00
Jeffrey Tinker
e262a49b8d Merge "Fix for b/4279535 Seeking in a video causes it to start form beginning" into honeycomb-mr1 2011-04-28 12:59:06 -07:00
Jeffrey Tinker
d3679fa54b Edwin's fix for b/4282251: AACDecoder log spam after device key failure - required reboot
Change-Id: Id28dd6ecf10175dd21a13a3d455ffcf3b4ad8116
2011-04-27 23:06:31 -07:00
Jeffrey Tinker
e7768d52b0 Fix for b/4279535 Seeking in a video causes it to start form beginning
Use a longer timeout than normal when seeking

Change-Id: I8c1306818e5fffefc15c33bd4f412f9346e8dc7e
2011-04-27 19:31:18 -07:00
Jeffrey Tinker
e48b4f1797 Fix for b/4163352: STOPSHIP: DRM enforcement of secure device conditional on settings
Fix for b/4303904: HMJ19 ate my licenses after OTA

Change-Id: Ife18b525cb8166c618fca1c5932950a29437bbb4
2011-04-27 16:32:44 -07:00
Jeffrey Tinker
88aa52ffdf Merge "Implement new heartbeat error codes" into honeycomb-mr1 2011-04-27 11:51:28 -07:00
Jeffrey Tinker
a6758ad20e Implement new heartbeat error codes
Related to defect b/4322415

Change-Id: I2bd41e70dcb64a03a94b3770732149a6f2489a8e
2011-04-27 11:14:13 -07:00
Jeffrey Tinker
7f53ca1647 Fix for b/4330146: license corruption after OTA update
Fix for b/4217102: ANR after the movie expired
Fix for b/4202971 ANR upon expiry during playback, followed by license fetch failure

Change-Id: Ieb6e6392ca74333517889f7b14ec508234a8d805
2011-04-25 14:21:35 -07:00
Jeffrey Tinker
a342c0828c Fix for b/4331109, b/4332630, b/4274620 HTTPClient thread leak
Also added logging to heartbeats so we can detect failures better
    during testing.

    Resolved merge conflict from https://android-git.corp.google.com/g/#change,107298

Change-Id: I0d731f4d21555eff7c80e34fed4b8c335023edc1
2011-04-23 04:03:38 -07:00
Jeffrey Tinker
83ce352744 Fix for b/4291356 video stopped playing with dialog "video being played on another device"
Change-Id: Ia70eedde075d740598c6a1ab5d26bcde8be43668
2011-04-21 11:22:32 -07:00
Gloria Wang
fc6f6134e9 Widevine sample player
For bug 4245169

Change-Id: Ie110d5603f19cd54878d2c4506e8ffad11207f10
2011-04-07 09:35:25 -07:00
Jeffrey Tinker
1445a4288d Fix for b/4198399. This reverts the change for 4194032.
Change-Id: I20401f58de0874f48b5ed0fac416c18d13b1856b
2011-03-31 18:57:13 -07:00
Jeffrey Tinker
c0a82d66b2 Merge "Fixes for b/4194032, b/4192318 and b/4190560" into honeycomb-mr1 2011-03-30 16:14:46 -07:00
Jeffrey Tinker
7c606db261 Fixes for b/4194032, b/4192318 and b/4190560
Found in online/offline testing with heartbeat server:

b/4194032 - when streaming playback is stopped the streaming license is not removed
b/4192318 - streaming licenses are allowing offline playback
b/4190560 - offline heartbeats stopping video playback

Change-Id: Iacf31f559d6b374752ca1b7f2b93d4ec8a4d7440
2011-03-30 10:31:09 -07:00
Jeffrey Tinker
c78c1461df Merge "Partial fix for 4181654 hang in seeking after seeking to the end" into honeycomb-mr1 2011-03-29 20:15:42 -07:00
Jeffrey Tinker
3d69ec0ee0 Merge "Fix for b/4173948 - video & audio hang after multiple seeks" into honeycomb-mr1 2011-03-29 12:34:04 -07:00
Jeffrey Tinker
e406097da6 Merge "Fix for b/4173711 - license acquire fails on slow wifi" into honeycomb-mr1 2011-03-29 12:33:35 -07:00
Jeffrey Tinker
f9eea89828 Partial fix for 4181654 hang in seeking after seeking to the end
Also prevents player from becoming unresponsive as described in 3510047.

Change-Id: I3350990c46641e48c34e9a64598157c8af77dcc5
2011-03-29 08:32:29 -07:00
Jeffrey Tinker
93d87df37a Fix for b/4173948 - video & audio hang after multiple seeks
Resolves the problem of the file offset being set to a large
value if readAt returns an error instead of number of bytes
read.  I haven't been able to repro the failure yet since
putting in this fix, so we still need to confirm that the player
recovers correctly when the server error occurs.

Change-Id: I963191144835a89310ad1b0ea0863dd536dff564
2011-03-29 07:49:25 -07:00
Jeffrey Tinker
0b09443e11 Fix for b/4173711 - license acquire fails on slow wifi
Change-Id: Ibc846a4cb55ab30008ac8739860593cbb94207b5
2011-03-28 15:57:35 -07:00
Guru Nagarajan
00ef41ab73 Removed the trailing line at the end of the file.
Change-Id: I11331adc15a534135e2a2eee27b2be53dc30cdc9
2011-03-27 21:24:01 -07:00
Guru Nagarajan
2ea5ad1f00 Added widevine feature file to enable clients to lookup wv drm feature
Change-Id: Iabd2db92c325d1969eca2169f518238f3cb7ac3d
2011-03-25 19:19:37 -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
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
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
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
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
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
Glenn Kasten
f2c4035d15 Fix broken build on full_x86-eng
Change-Id: Ie5d6c94d6b993cf83e48971009562c6718c488e0
2011-03-15 13:42:03 -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
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
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
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