Commit Graph

7812 Commits

Author SHA1 Message Date
Jeffrey Tinker
96a0122828 am 6482fc32: am 80daed61: am 82d675f1: [DRM] Terminate HTTPClient thread after content type sniff
* commit '6482fc3269f884c1c3dd922e8eff9d84de3c97c9':
  [DRM] Terminate HTTPClient thread after content type sniff
2011-10-26 08:28:45 -07:00
Jeffrey Tinker
6482fc3269 am 80daed61: am 82d675f1: [DRM] Terminate HTTPClient thread after content type sniff
* commit '80daed61a501498eb237a492d55441062132a518':
  [DRM] Terminate HTTPClient thread after content type sniff
2011-10-26 15:27:19 +00:00
Jeffrey Tinker
80daed61a5 am 82d675f1: [DRM] Terminate HTTPClient thread after content type sniff
* commit '82d675f15d683a492db159b15c9a5197226a86cb':
  [DRM] Terminate HTTPClient thread after content type sniff
2011-10-26 12:22:45 +00:00
Steve Block
6f620256c7 am 1f580277: (-s ours) Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
* commit '1f5802779b796ddd679a80e88549a64d9a2b6e36':
  Rename LOGV(_IF) to ALOGV(_IF)  DO NOT MERGE
2011-10-26 04:48:05 -07:00
Jeffrey Tinker
82d675f15d [DRM] Terminate HTTPClient thread after content type sniff
Eliminates a measureable power increase after playing YouTube content

Includes Widevine library version 4.5.0.5033

Bug: 5502951
Change-Id: I6ce1582d71d8e7598f1ea0b9d64b22eb6fde3caa
2011-10-25 18:33:47 -07:00
Steve Block
1f5802779b Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: Ief4bbf031cabfd10f23082d57a7608f01b8229c1
2011-10-25 18:17:14 +01:00
The Android Automerger
a422cede1d merge in ics-release history after reset to master 2011-10-23 07:05:16 -07:00
Jeff Tinker
c2f26b79d4 Merge "Include a dummy jar in widevine distribution." 2011-10-20 09:57:00 -07:00
The Android Automerger
15ed6a98f2 merge in ics-release history after reset to master 2011-10-20 07:04:35 -07:00
James Dong
f27dd7f355 am ddf12aa7: Merge "Fix segfault during Widevine playback on switch between .wvm and live" into ics-mr0
* commit 'ddf12aa7a6c4680a926a6adf53044c63d79c83bd':
  Fix segfault during Widevine playback on switch between .wvm and live
2011-10-20 01:52:55 -07:00
Bryan Mawhinney
6a6b8ece97 am e8ab892b: (-s ours) Include a dummy jar in widevine distribution.
* commit 'e8ab892b7e86f17c39661268d054dc096f82c721':
  Include a dummy jar in widevine distribution.
2011-10-20 01:52:55 -07:00
James Dong
ddf12aa7a6 Merge "Fix segfault during Widevine playback on switch between .wvm and live" into ics-mr0 2011-10-20 01:49:10 -07:00
Jeffrey Tinker
073b6b2008 Fix segfault during Widevine playback on switch between .wvm and live
This build includes Widevine release libs version 4.5.0.4972

Bug 5487873

Change-Id: Id1e38de5716fc08758e0369d1f1378860972ed73
2011-10-20 01:05:54 -07:00
Bryan Mawhinney
163d39278f Include a dummy jar in widevine distribution.
This suppresses the errors currently caused by
uses-library pointing to a .so

Bug: 4553918
Change-Id: I646456facae908c7937d4768010aef88d7389eee
2011-10-20 00:53:28 -07:00
Bryan Mawhinney
e8ab892b7e Include a dummy jar in widevine distribution.
This suppresses the errors currently caused by
uses-library pointing to a .so

Already submitted to master

DO NOT MERGE

Bug: 4553918
Change-Id: I646456facae908c7937d4768010aef88d7389eee
2011-10-20 00:49:08 -07:00
Jeffrey Tinker
782380915e Fix playback failure on sample HD 1080p Widevine DRM content
This change includes Widevine library release version 4.5.0.4968

Bug 5455559

Change-Id: I862669ab3a2f7bc33f69b9ea38fa6d1dbb838d35
2011-10-19 20:26:44 -07:00
Edwin Wong
7cc8cb25d2 Fixed always getting -1004 error and "Connection to server lost" on long seek bugs.
Includes Widevine release libs version 4.5.0.4957.

BUG: 5382956,5463212
Change-Id: Ieb28ed4d710f000e881b4a7160d3260d72323587
2011-10-19 12:41:50 -07:00
The Android Automerger
ed2083b96a merge in ics-release history after reset to master 2011-10-19 07:45:47 -07:00
Jeffrey Tinker
23327bdb66 Merge "Fix incorrect error returns from DRM plugin" into ics-mr0 2011-10-18 19:14:58 -07:00
Jeffrey Tinker
7bad756b1a Widevine demo app update
Fix the minSdkVersion and stop playback when switching apps from onPause

Change-Id: I7d465d34f6a60a2c620cf50b9c1e42bc1456aa82
2011-10-18 16:49:43 -07:00
Jeffrey Tinker
8cecb914c3 Fix incorrect error returns from DRM plugin
Includes Widevine library release 4.5.0.4946

Bug 5223230

Change-Id: Ie68d3a821c22b3b0b9b720560fee6768838f1a08
2011-10-18 15:25:20 -07:00
The Android Automerger
b8e24ebb0b merge in ics-release history after reset to master 2011-10-18 07:03:38 -07:00
Jeff Tinker
bcfe38dcb0 Fix failure to play through the end of wv videos
Properly compute the buffered and remaining time, also properly account
for the different old and new rates at adaptive switch and other
performance tuning related to b/5153227.

Includes Widevine release libs version 4.5.0.4936

Bug 5336777

Change-Id: I997ea353b7c320dca5e3f5c065395dca206d35a6
2011-10-17 15:11:06 -07:00
Edwin Wong
1fee8fd75a Install proprietary userspace modules under /vendor.
BUG: 5284436

Change-Id: I9921b8446626b7041a3fc66bff918d3adac5bbe1
2011-10-14 14:09:12 -07:00
The Android Automerger
11f6c16945 merge in ics-release history after reset to master 2011-10-09 07:03:14 -07:00
Jeffrey Tinker
f5fa8f2017 Changes for calling the level 1 decrypt callout
Change-Id: Iccf76b59a64491952ee11ee2ed1a0e707a529f88
2011-10-07 19:25:20 -07:00
Edwin Wong
f271975161 Revert "Install proprietary userspace modules under system/vendor. BUG: 5284436"
This reverts commit 784469b355
2011-09-22 18:25:49 -07:00
Edwin Wong
ceac204c61 Revert "Install proprietary userspace modules under system/vendor. BUG: 5284436"
This reverts commit 784469b355
2011-09-22 17:08:37 -07:00
Edwin Wong
784469b355 Install proprietary userspace modules under system/vendor.
BUG: 5284436

Change-Id: Ib338b4665a086abde83028a78f51372275ca83b7
2011-09-15 18:01:55 -07:00
Edwin Wong
6aaee145d8 Additional changes for b/5081725 as per code review by Jeff Tinker. Missed allocating buffer for HLS case.
BUG: 5081725

Change-Id: I21439a5dcce38102a943ade966b5fa79f3d1a686
2011-09-12 14:07:45 -07:00
Edwin Wong
ba14720f8e Widevine HLS live stream support for L1 secure playback.
Check in for Jeff Tinker.
BUG 5081725

Change-Id: If1d828e97319788ab52c6f15a7782a1da63d8f20
2011-09-08 15:11:37 -07:00
Edwin Wong
758456e6c7 Merge "Restructured libwvm.so build. It is now built under vendor/device/.../liboemcrypto/ because of dependencies on liboemcrypto.a, which cannot be linked by platform-independant code." 2011-09-06 10:43:45 -07:00
Doug Zongker
78a88a014f strip the widevine prebuilt .so's
Change-Id: I57c7622b321d04a89a1e7df291169f2c5c3ec15d
2011-09-06 09:53:12 -07:00
Edwin Wong
df9a3d4cc3 Restructured libwvm.so build.
It is now built under vendor/device/.../liboemcrypto/ because of dependencies on liboemcrypto.a,
which cannot be linked by platform-independant code.

Bug 5254175
Change-Id: I2fd5c55c4c0c94cebbca2a51ecd94940096930a1
2011-09-02 14:17:12 -07:00
Edwin Wong
766d206a31 Address 5069044: non rooted device getting error 49.
This error is hard to reproduce, it can be caused by file system error at boot; with this change, the drm will reprovision the device when the file system error occurs.

Change-Id: Ibec7077913b7efe3be41542600b169bcdf5d0ba4
2011-09-01 19:35:26 -07:00
Jeff Tinker
4105c3c146 Fix for build break - trygon image size too large.
Change-Id: I118b4059feb1049f0017b5cad62acb3d2ab2cb6f
2011-08-13 07:38:26 -07:00
Jeff Tinker
9e8923789e Some restructuring of the build was required to support the different
OEM security levels used on tuna vs stingray & crespo. This is part of
the work for b/4598045 Implementing secure video path on TI OMAP4 chip
for ICS.

The Widevine libraries included here, 4.5.0.4321 also contain a fix
for b/4400696 Pinning and unpinning multiple movie for download behavior
is not uniform for multiple tries.

Change-Id: I67f34c06a0353ac7f401f55c1ed4fc2493bc8ab7
2011-08-12 11:38:16 -07:00
Edwin Wong
fa7e3b620a Fixed 4271507: updated asset url, portal name and EMM url.
Change-Id: Iaef5a4644d2f64e4e8169ddbe64262a451402a65
2011-08-10 11:48:10 -07:00
Yohann Connell
ebeacef015 Merge "UI changes for smaller devices and GTV. Fix for defect 4616102." 2011-08-04 12:52:53 -07:00
Edwin Wong
7c45fff99a Fixed 3510047: MediaPlayer ANR if play or seek past end of file.
Change-Id: I733dbf20dc67a5f2c49fbb994291f98e2dce650a
2011-08-03 15:43:08 -07:00
Yohann Connell
baebdacb0a UI changes for smaller devices and GTV. Fix for defect 4616102.
Change-Id: Ida32671121d35de49894f91f6145a568ba9cfb77
2011-08-02 16:21:36 -07:00
Yohann Connell
851009ab73 Merge "UI changes for smaller devices and GTV. Fix for defect 4616102." 2011-07-27 08:59:30 -07:00
Yohann Connell
b87bd55555 UI changes for smaller devices and GTV. Fix for defect 4616102.
Change-Id: I2fc37199eedfd779494cf9e5c87f53fb1081c1eb
2011-07-26 11:45:39 -07:00
Gloria Wang
025ab6a4dc Part of fix for bug 4371230.
Differentiate native and Java listeners based on the 0x100 bit of unique ID.

Change-Id: I68531947e5fd3ccc702aa6a7590311fdfd89b0f3
2011-07-21 15:14:59 -07:00
Jeff Brown
ba2fd8b297 Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I49b53eff72af04737cbc22107869ae0169520cd9
2011-07-11 22:12:46 -07:00
Jeff Tinker
ba335957e9 Widevine extractor changes to support secure media buffer playback.
Supports either secure or insecure buffer configurations, depending
on the build-time flag REQUIRE_SECURE_BUFFERS.

Change-Id: I5b8150315eced4ed9be656b73d91485a6216819d
2011-06-30 15:47:43 -07:00
Ying Wang
fee0126ed8 Use LOCAL_WHOLE_STATIC_LIBRARIES
to include the static libraries in the final shared libraries.

Change-Id: Iecb6b377e2dead41478d88bf576c06bc3ff2d886
2011-06-29 11:09:59 -07:00
Jeff Tinker
0f044e36b9 Merge "Fix for b/4104838 DRM doesn't work on master TOT" 2011-06-28 17:20:35 -07:00
Jeff Tinker
76665fc951 Fix for b/4104838 DRM doesn't work on master TOT
Moved final build of widevine DRM plugin into vendor directory for platform
to avoid needing to reference device-specific libs in the Widevine DRM plugin
link.

Also removed some old .sh scripts that are not needed.

Change-Id: Ie6d397c97bc8afd8154f1dddadbab8c7ee524d7a
2011-06-28 15:53:33 -07:00
Gloria Wang
0ca8f17a2e Change the DRM error code name
Merge to master

Change-Id: I9851b24b5327476e1c20c13ab166bc3fc0f98eb9
2011-06-27 10:26:20 -07:00