Commit Graph

7885 Commits

Author SHA1 Message Date
Edwin Wong
cfe6d80c2d 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:01:17 -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
The Android Automerger
9d8aa491fb merge in ics-release history after reset to master 2011-11-14 07:01:30 -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
3236ad55c5 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:26:10 -08:00
The Android Automerger
2af6071dff merge in ics-release history after reset to master 2011-11-13 07:04:45 -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
b71151ce43 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 15:13:45 +00:00
Edwin Wong
53067679d2 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 15:12:07 +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
The Android Automerger
9756123106 merge in ics-release history after reset to master 2011-11-10 07:03:23 -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
67ec23c8b9 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-08 18:17:21 +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
Ed Heyl
3c5851ed9f keep previous history after reset to mr1 plus aah changes (ics-aah-wip) 2011-10-28 19:06:08 +00:00
Ed Heyl
9905bc8f11 undo reset to ics-mr1 until we have a better method 2011-10-26 21:53:31 +00:00
Ed Heyl
790c1ec177 reset to ics-mr1, but keep history 2011-10-26 18:50:37 +00:00
The Android Automerger
ca5f1e9a9c merge in ics-release history after reset to master 2011-10-26 09:56:56 -07:00
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