Commit Graph

91 Commits

Author SHA1 Message Date
Jeff Tinker
e314afcb95 am 95d4dc77: Fix ANRs due to Widevine DRM plugin sniff taking too long.
* commit '95d4dc7776b0202f22bd743e1e2b86a444a247a3':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.
2011-12-09 14:25:42 -08:00
Jeff Tinker
95d4dc7776 Fix ANRs due to Widevine DRM plugin sniff taking too long.
Add a Widevine-specific format sniffer to avoid having to
refetch data from the remote server.

related-to-bug: 5725548

Change-Id: I622e39930f8d243111e4731557b0df17c4e2651d
2011-12-07 21:09:04 -08:00
Edwin Wong
b2ecb1899e am e8951bc6: Fixed 5207482, 5414035, 5489515 and 5489833; increase delay before converting 2014 warning to error Include Widevine library version 4.5.0.5244
* commit 'e8951bc6843f66da6a8eae106c54e7a4d22904e9':
  Fixed 5207482, 5414035, 5489515 and 5489833; increase delay before converting 2014 warning to error Include Widevine library version 4.5.0.5244
2011-11-13 16:27:59 -08:00
Edwin Wong
e8951bc684 Fixed 5207482, 5414035, 5489515 and 5489833; increase delay before converting 2014 warning to error
Include Widevine library version 4.5.0.5244

5489833 - live stream aborts early
  ignore continuity counter error warning (status=2014)

5414035 Telstra content cannot play, duplicate of 5489515
5489515 cannot play Disney content
  Telstra content has 4 bytes of AudioSpecificConfig instead of 2
  Disney content has 5 byte AudioSpecificConfig whereas 2 bytes appears to be correct for AAC-LC

5207482 SIGSEGV happens on pressing "Show Rights" during playback of expired movies

Change-Id: Iacc0d02d328c228d28b8cc8be93e63fe9f8b4600
related-to-bug: 5207482
related-to-bug: 5414035
related-to-bug: 5489515
related-to-bug: 5489833
2011-11-10 17:36:05 -08:00
Edwin Wong
2f6a27e20f am d8e21430: Merge "Adjusts seeks too close to the end in WV_Play, which allows processing of end-of-program markers. Uploaded WV libs 4.5.0.5066 for Thomas Inskip. Fixed movies not restting to beginning after fastforward to end." into ics-mr1
* commit 'd8e2143022157c44465bae4d124642db540332fa':
  Adjusts seeks too close to the end in WV_Play, which allows processing of end-of-program markers. Uploaded WV libs 4.5.0.5066 for Thomas Inskip. Fixed movies not restting to beginning after fastforward to end.
2011-11-10 19:39:25 +00:00
Edwin Wong
d8e2143022 Merge "Adjusts seeks too close to the end in WV_Play, which allows processing of end-of-program markers. Uploaded WV libs 4.5.0.5066 for Thomas Inskip. Fixed movies not restting to beginning after fastforward to end." into ics-mr1 2011-11-10 07:09:58 -08:00
Jeff Tinker
b860f7ab7e am 5fe2e2fd: Upload Ed Schacker\'s fix for ANR on expired assets
* commit '5fe2e2fdb759b4102a1614e761a0db8eecc3aa27':
  Upload Ed Schacker's fix for ANR on expired assets
2011-11-09 14:34:20 +00:00
Jeff Tinker
5fe2e2fdb7 Upload Ed Schacker's fix for ANR on expired assets
Bug: 5207528
Change-Id: I59b531d744da2046bb0698c4e45f031c3c476114
2011-11-01 10:16:50 -07:00
Edwin Wong
111050c07d Adjusts seeks too close to the end in WV_Play, which allows processing of end-of-program markers.
Uploaded WV libs 4.5.0.5066 for Thomas Inskip. Fixed movies not restting to beginning after fastforward to end.

BUG: 5489972
Change-Id: Iad4b2933b47b6614db8e9d75c9d6a5f3f4bc3201
2011-10-28 13:45:14 -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
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
Jeff Tinker
c2f26b79d4 Merge "Include a dummy jar in widevine distribution." 2011-10-20 09:57:00 -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
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
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
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
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
Doug Zongker
78a88a014f strip the widevine prebuilt .so's
Change-Id: I57c7622b321d04a89a1e7df291169f2c5c3ec15d
2011-09-06 09:53: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
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
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
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
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
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
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
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
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
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
4d7e693c00 am b0543e30: 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
* commit 'b0543e305cc4caaa5e46093877d340ed7b1b4a92':
  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
2011-05-06 23:32:18 -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
f360cbb914 am d3679fa5: Edwin\'s fix for b/4282251: AACDecoder log spam after device key failure - required reboot
* commit 'd3679fa54b155fbc6299385bd4f77445a3bf3e77':
  Edwin's fix for b/4282251: AACDecoder log spam after device key failure - required reboot
2011-04-28 12:59:02 -07:00
Jeffrey Tinker
bc31657ffe am e48b4f17: Fix for b/4163352: STOPSHIP: DRM enforcement of secure device conditional on settings Fix for b/4303904: HMJ19 ate my licenses after OTA
* commit 'e48b4f1797b4eeab657c461c4e0e995d0b4e1bc2':
  Fix for b/4163352: STOPSHIP: DRM enforcement of secure device conditional on settings Fix for b/4303904: HMJ19 ate my licenses after OTA
2011-04-28 11:46:00 -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