Commit Graph

138 Commits

Author SHA1 Message Date
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
Jeffrey Tinker
f5fa8f2017 Changes for calling the level 1 decrypt callout
Change-Id: Iccf76b59a64491952ee11ee2ed1a0e707a529f88
2011-10-07 19:25:20 -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
Jeff Tinker
61cf3d5049 am 77856588: Merge "Fixed 4515636: Playback stops short of end of video." into honeycomb-mr2
* commit '77856588ceebe02b72968c2e157b1c387ac7b6fa':
  Fixed 4515636: Playback stops short of end of video.
2011-06-09 13:42:28 -07:00
Jeffrey Tinker
56cbd54c1f am a2841093: Merging fix for b/4520353 Move make/model usage in field provisioning to server whitelist from mr1 to mr2
* commit 'a2841093fd490041c03002722905d39d049d8229':
  Merging fix for b/4520353 Move make/model usage in field provisioning to server whitelist from mr1 to mr2
2011-06-09 13:42:03 -07:00
Jeff Tinker
77856588ce Merge "Fixed 4515636: Playback stops short of end of video." into honeycomb-mr2 2011-06-08 18:12:12 -07:00
Edwin Wong
bc9604da1f Fixed 4515636: Playback stops short of end of video.
Change-Id: I798fe266fa2fb09ed37e6cb559d87111c9e33639
2011-06-08 18:10:29 -07:00
Jeffrey Tinker
a2841093fd Merging fix for b/4520353 Move make/model usage in field provisioning to server whitelist from mr1 to mr2
Change-Id: I5227b166867855bafd0516175709ffb4cd1e5e94
2011-06-08 17:50:28 -07:00
Edwin Wong
1ededb8e61 am c3c29486: Uploaded for Robin Connell. Fixed 4466580 Need widevine sample demo player support for adaptive streaming. Thumbnails now show and content plays for adaptive and oem content pages.
* commit 'c3c294866b007439ef058db8b8079160bf04d713':
  Uploaded for Robin Connell. Fixed 4466580 Need widevine sample demo player support for adaptive streaming. Thumbnails now show and content plays for adaptive and oem content pages.
2011-06-03 15:55:37 -07:00
Jeffrey Tinker
40d160cc3f am 66d9ff5f: Fix for 4198445 HC - Support for Widevine Live Streaming (adaptive)
* commit '66d9ff5fb5f99ba77e02a4719e4c65aec2aa8c4a':
  Fix for 4198445 HC - Support for Widevine Live Streaming (adaptive)
2011-06-02 13:58:08 -07:00
Edwin Wong
c3c294866b Uploaded for Robin Connell. Fixed 4466580 Need widevine sample demo player support for adaptive streaming. Thumbnails now show and content plays for adaptive and oem content pages.
Change-Id: Id03c7cc01be78d7c5d3d7ca66d2a2773273af6fe
2011-06-01 16:33:10 -07:00
Jeffrey Tinker
66d9ff5fb5 Fix for 4198445 HC - Support for Widevine Live Streaming (adaptive)
Change-Id: Id3a8a997fb1186c6af6e94f2fc2d4788238a0452
2011-05-26 11:25:05 -07:00
Edwin Wong
b07ba401b3 am a7d2e068: Fixed 4438229 Widevine extractor tries playing back non-WV .TS file over HTTP on HC MR1
* commit 'a7d2e068b6df0ae45213224d668fb905d1f9a3ae':
  Fixed 4438229 Widevine extractor tries playing back non-WV .TS file over HTTP on HC MR1
2011-05-25 21:29:21 -07:00
Edwin Wong
a7d2e068b6 Fixed 4438229 Widevine extractor tries playing back non-WV .TS file over HTTP on HC MR1
Change-Id: If9b3e0469040b8c85b32a3196e995a38861a585b
2011-05-25 10:16:55 -07:00
Jeffrey Tinker
fda2f64112 am 8c5545ef: Merge "Fix for b/4198446 HC - Support for Widevine Adaptive VOD Fix for b/4075745 libWVStreamControlAPI crashes when dlopened() and dlclosed() Added error logging to diagnose problems such as b/4430078 Playback of newly rented movie fails with "licens
* commit '8c5545ef76f39094b016986c7deec02df682356d':
  Fix for b/4198446 HC - Support for Widevine Adaptive VOD Fix for b/4075745 libWVStreamControlAPI crashes when dlopened() and dlclosed() Added error logging to diagnose problems such as b/4430078 Playback of newly rented     movie fails with "license expired"
2011-05-24 12:57:28 -07:00
Jeffrey Tinker
36a686c0a4 am 575dc0ad: Merge "Fix for b/4463415 test-wvplayer unit test always returns status 2001" into honeycomb-mr2
* commit '575dc0ad5640219620bc236bc527d75019dfbe49':
  Fix for b/4463415 test-wvplayer unit test always returns status 2001
2011-05-24 02:56:23 -07:00
Jeffrey Tinker
8c5545ef76 Merge "Fix for b/4198446 HC - Support for Widevine Adaptive VOD Fix for b/4075745 libWVStreamControlAPI crashes when dlopened() and dlclosed() Added error logging to diagnose problems such as b/4430078 Playback of newly rented movie fails with "license expired"" into honeycomb-mr2 2011-05-23 18:12:05 -07:00
Jeffrey Tinker
07b60098b3 Fix for b/4198446 HC - Support for Widevine Adaptive VOD
Fix for b/4075745 libWVStreamControlAPI crashes when dlopened() and dlclosed()
Added error logging to diagnose problems such as b/4430078 Playback of newly rented
    movie fails with "license expired"

Includes Widevine library build Version 4.5.0.3682

Change-Id: I5708bb3fb92f05a3dd1768620157a795ccebd57a
2011-05-23 18:05:39 -07:00
Jeffrey Tinker
575dc0ad56 Merge "Fix for b/4463415 test-wvplayer unit test always returns status 2001" into honeycomb-mr2 2011-05-21 18:24:48 -07:00
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
1ab51c68fc Fix for b/4463415 test-wvplayer unit test always returns status 2001
Fixed test-wvplayer unit test.  Some restructuring of the drm plugin broke this test, now it is working again.
This is an important unit test for OEMs developing support for Widevine.

Change-Id: I528608bf594f7211d839a0c3cacc5a69a7301fdf
2011-05-19 16:24:56 -07:00
Gloria Wang
54006dbf12 am 907dd75e: (-s ours) Merge "Change the DRM error code name DO NOT MERGE" into honeycomb-mr2
* commit '907dd75e3182666b0c2e89ba241941db7a13b5eb':
  Change the DRM error code name DO NOT MERGE
2011-05-19 03:44:41 -07:00
Jeffrey Tinker
8ad1f14939 am f977e154: Fix for b/4429363: Unable to play rented movie getting error "KEYBOX IS INVALID"
* commit 'f977e154c548742b0d7b36f26aed386f3f354dfc':
  Fix for b/4429363: Unable to play rented movie getting error "KEYBOX IS INVALID"
2011-05-18 17:48:32 -07:00
Gloria Wang
907dd75e31 Merge "Change the DRM error code name DO NOT MERGE" into honeycomb-mr2 2011-05-18 09:17:56 -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
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