Commit Graph

78 Commits

Author SHA1 Message Date
Jeffrey Tinker
18b17056c9 am 3d18aaa2: Merge "Fix for b/4380963 Log spam from widevine drm on I/O error WVMFileSource: mDataSource-readAt returned error -1004" into honeycomb-mr2
* commit '3d18aaa20712642aecb21c2df818b194ab43abe1':
  Fix for b/4380963 Log spam from widevine drm on I/O error WVMFileSource: mDataSource-readAt returned error -1004
2011-05-19 17:21:24 -07:00
Jeffrey Tinker
3d18aaa207 Merge "Fix for b/4380963 Log spam from widevine drm on I/O error WVMFileSource: mDataSource-readAt returned error -1004" into honeycomb-mr2 2011-05-19 16:30:18 -07:00
Jeffrey Tinker
c89fe73868 Fix for b/4380963 Log spam from widevine drm on I/O error WVMFileSource: mDataSource-readAt returned error -1004
Change-Id: I001d496bc59aa6465c20f85dfade364f4cca33de
2011-05-17 21:27:45 -07:00
Gloria Wang
50c2a6b0d8 Change the DRM error code name
DO NOT MERGE

Change-Id: I9851b24b5327476e1c20c13ab166bc3fc0f98eb9
2011-05-13 15:11:40 -07:00
Jeffrey Tinker
bf52c8873a am e262a49b: Merge "Fix for b/4279535 Seeking in a video causes it to start form beginning" into honeycomb-mr1
* commit 'e262a49b8dd85317efad07cfe17abc2b71d3caad':
  Fix for b/4279535 Seeking in a video causes it to start form beginning
2011-04-28 13:04:56 -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
cc09fa33d4 am 88aa52ff: Merge "Implement new heartbeat error codes" into honeycomb-mr1
* commit '88aa52ffdfbb40fcd29059011259a3ba76e51e1d':
  Implement new heartbeat error codes
2011-04-27 12:28:57 -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
68d1266b52 am c78c1461: Merge "Partial fix for 4181654 hang in seeking after seeking to the end" into honeycomb-mr1
* commit 'c78c1461df1e5b36374bb6f5a1da2090a5baba88':
  Partial fix for 4181654 hang in seeking after seeking to the end
2011-03-30 16:33:34 -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
42af33c213 am 3d69ec0e: Merge "Fix for b/4173948 - video & audio hang after multiple seeks" into honeycomb-mr1
* commit '3d69ec0ee03a9e6e32392ebe8a46ad1d2832cfea':
  Fix for b/4173948 - video & audio hang after multiple seeks
2011-03-29 12:38:25 -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
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
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
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
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
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
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
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
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