Jeff Tinker
c3949b1967
Changed license headers from AOSP to Google copyright
...
Change-Id: I3587e290cf49755e06354118fbf877d189508ce8
related-to-bug: 5833045
2012-01-24 15:27:50 -08:00
Jeff Tinker
c634a709f9
am 65d4c7ab: Fix security hole and hang on movie playback
...
* commit '65d4c7ab2031833cf82331aa375da0bdec282303':
Fix security hole and hang on movie playback
2012-01-23 09:18:02 -08:00
Jeff Tinker
65d4c7ab20
Fix security hole and hang on movie playback
...
Security hole is in /data/drm world writable directories
Hang on movie playback was found on ASUS TF201
Sorry, can't make these independent since binary libs aren't
mergeable.
Contains Widevine library Version 4.5.0.5753
Change-Id: I01ddfc5b2390f15d5d187dd6581b0a01743f4a68
related-to-bug: 5834297
related-to-bug: 5874137
2012-01-20 10:31:40 -08:00
James Dong
ec3d3d9f47
Remove excessive warning log message from IsWidevineMedia() method
...
Change-Id: I0358541c10c9807332579c80a1111074b38a721e
2012-01-17 10:52:11 -08:00
James Dong
9fd21a7798
Implement WV side of the separation of sniffing and decrypt session initialization.
...
Further optimization may be done to further speed up a drm content playback session
related-to-bug: 5725548
Change-Id: Ife69deaf5d2d70bba812fe1a48d9268d8e9530f7
2012-01-12 16:12:39 -08:00
Steve Block
7284b7e7f3
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
...
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: I9b2273ef758c78d927591c1a0a9f988de739742c
2012-01-08 10:17:01 +00:00
Steve Block
b443024341
Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"
2012-01-05 14:08:24 -08:00
Jeff Tinker
ddf87803c7
am f66301bd: Report correct decrypted video length to OMX codec
...
* commit 'f66301bddb27f6dc5abb0fa0b4d368d7ff6c6840':
Report correct decrypted video length to OMX codec
2012-01-04 21:51:51 -08:00
Steve Block
8d8df85113
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
...
See https://android-git.corp.google.com/g/156801
Bug: 5449033
Change-Id: Ib8dfa140669788229a5a59d5849907c92393225c
2012-01-04 20:06:42 +00:00
Steve Block
efe632956d
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
...
See https://android-git.corp.google.com/g/156016
Bug: 5449033
Change-Id: I2d28198c2fc4622a090f4d830cbb311fe522749c
2012-01-03 22:33:09 +00:00
Jeff Tinker
f66301bddb
Report correct decrypted video length to OMX codec
...
Change-Id: I8f869cfbb0ee74d03d1b0cb14c422c4b78b3692d
related-to-bug: 5772593
2011-12-16 16:10:32 -08:00
James Dong
4b10b77fa1
am 444dc2a8: Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long." We need to do this because with this patch, SHA/MD5 module may get stuck and cause power consumption regression.
...
* commit '444dc2a84539f100689642f5756e5e6d6e5cd705':
Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long." We need to do this because with this patch, SHA/MD5 module may get stuck and cause power consumption regression.
2011-12-14 13:53:32 -08:00
James Dong
444dc2a845
Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long."
...
We need to do this because with this patch, SHA/MD5 module may get stuck and cause power consumption regression.
This reverts commit 95d4dc7776 .
related-to-bug: 5739618
2011-12-14 11:05:53 -08:00
Jeff Tinker
e6aa26e7cf
am c00a26a0: Fix OMX codec error playing Widevine content on Nexus S
...
* commit 'c00a26a05f59c352dc457a211284dc2c697ae2fd':
Fix OMX codec error playing Widevine content on Nexus S
2011-12-12 15:39:25 -08:00
Jeff Tinker
c00a26a05f
Fix OMX codec error playing Widevine content on Nexus S
...
Includes Widevine library version 4.5.0.5561
Change-Id: I9c69466bd7d055c64a3e8be0804793fe38977161
related-to-bug: 5699816
2011-12-12 10:22:05 -08:00
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
01663c7e99
am 94edc18b: Fixed session not terminated when bandwidth goes below the supported encoded bitrate (preload error).
...
* commit '94edc18bdeb3a4a1e044ee81bb1f64ccb31c4a8e':
Fixed session not terminated when bandwidth goes below the supported encoded bitrate (preload error).
2011-11-15 18:25:27 -08:00
Edwin Wong
94edc18bde
Fixed session not terminated when bandwidth goes below the supported encoded bitrate (preload error).
...
Change-Id: Ib7bddaaaac7d48df7f18fab0c5d486624abe3119
related-to-bug: 5564453
2011-11-15 09:45:56 -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
2987f9b71f
am 523caa4c: Merge "Moved onPause from WidevineSamplePlayer class to VideoPlayerView class. BUG: 5561197" into ics-mr1
...
* commit '523caa4c940cb13b05d2c4ce2fd1f12cfbe7be24':
Moved onPause from WidevineSamplePlayer class to VideoPlayerView class. BUG: 5561197
2011-11-10 19:39:26 +00: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
523caa4c94
Merge "Moved onPause from WidevineSamplePlayer class to VideoPlayerView class. BUG: 5561197" into ics-mr1
2011-11-10 07:11:49 -08: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
Edwin Wong
662dced941
Moved onPause from WidevineSamplePlayer class to VideoPlayerView class.
...
BUG: 5561197
Change-Id: I0486c04094e3535106726ef9902814315dd07522
2011-11-03 09:27:53 -07: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
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
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
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
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
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