Commit Graph

365 Commits

Author SHA1 Message Date
Edwin Wong
e9f5431e78 Revert Widevine 6.0.0 -> 4.5.0 libraries
Includes Widevine libraries Version 4.5.0.7809

Also fixed samplePlayer's MediaCodec mode not running and
WVDrmInfoRequestStatusKey returning incorrect value.

Change-Id: Ibcc6d313790670a908ada93be80d6bf55a67b4ed
related-to-bug: 6929628
related-to-bug: 6833718
related-to-bug: 6889322
2012-08-03 13:33:58 -07:00
Nick Kralevich
735ec731f2 fix build.
Change-Id: I2450066baee49ef621f9607803de3e4dd11561c2
2012-07-13 18:52:18 -07:00
Edwin Wong
49f78fccf7 am f2f4bf93: (-s ours) Merge "Fixed sample video corrupted in MediaCodec mode." into jb-dev
* commit 'f2f4bf93da236095410d96e2dca0a3e56c1a25ee':
  Fixed sample video corrupted in MediaCodec mode.
2012-07-13 17:54:28 -07:00
Edwin Wong
f2f4bf93da Merge "Fixed sample video corrupted in MediaCodec mode." into jb-dev 2012-07-13 15:11:04 -07:00
Jeff Tinker
158eda6469 am 935dba41: (-s ours) Merge "Widevine library update 4.5.0-7852 DO NOT MERGE" into ics-aah
* commit '935dba410cf402166c56c3b6902ae8863664168a':
  Widevine library update 4.5.0-7852 DO NOT MERGE
2012-07-13 13:40:43 -07:00
Jeff Tinker
2c8bb4721b am d734bc25: Increase Widevine stream buffer size from 10MB to 16MB for Q
* commit 'd734bc25b01b5df40b026e658a0053cc63b8bcbd':
  Increase Widevine stream buffer size from 10MB to 16MB for Q
2012-07-13 13:40:42 -07:00
Jeff Tinker
935dba410c Merge "Widevine library update 4.5.0-7852 DO NOT MERGE" into ics-aah 2012-07-13 13:38:19 -07:00
Edwin Wong
5cbc0ba299 Fixed sample video corrupted in MediaCodec mode.
Change-Id: I1cdfae5fda3f4002f0c17105aa25f5d25683d58f
related-to-bug: 6732061
2012-07-13 12:44:51 -07:00
Jeff Tinker
d734bc25b0 Increase Widevine stream buffer size from 10MB to 16MB for Q
Provide better support for 1080p video streaming.

Change-Id: I3d17f7bdc631ee82b9062445dca8ebd42eaf8d8a
related-to-bug: 6818319
2012-07-13 10:20:24 -07:00
Jeff Tinker
aae99f3809 Widevine library update 4.5.0-7852 DO NOT MERGE
Selected Widevine fixes for Nexus Q.

Increase data timeout from 4 to 8 seconds.
Fix HTTP download cancels on ABR switches.

Change-Id: Ifed06a72a9857a5f2eae05d4a95c74f35591dd6b
related-to-bug: 6512768
2012-07-13 10:18:45 -07:00
Jeff Tinker
736f7bb2da am 20336d81: (-s ours) [DRM] Widevine library update 4.5.0-7809 DO NOT MERGE
* commit '20336d81054e8cf8607bc94bf4144a73c9cc00b9':
  [DRM] Widevine library update 4.5.0-7809 DO NOT MERGE
2012-07-11 16:40:07 -07:00
The Android Automerger
3af0de9374 am c152d6fd: merge in jb-release history after reset to jb-dev
* commit 'c152d6fd0fb0454b17e1a3990d59aaaafcda94a4':
  Added a MediaCoded based video view to the widevine sample player app.
  Add support for crypto HAL on L3 devices DO NOT MERGE
  Widevine library update 4.5.0.7394 DO NOT MERGE
  Added some debugging log messages for tracking down ANR related issue.
  Revert Widevine 6.0.0 -> 4.5.0 libraries
  Revert "Install proprietary userspace modules under system/vendor. BUG: 5284436"
2012-07-11 16:39:59 -07:00
Jeff Tinker
20336d8105 [DRM] Widevine library update 4.5.0-7809 DO NOT MERGE
Upload for Rahul Frias

This library version resolves an intermittent error in acquiring
a license to view a movie that is reported as CA CGI 16.

Change-Id: If5a297f140f8f8a812b1d472bfe1d2d64ff65159
related-to-bug: 6647548
2012-07-11 15:21:10 -07:00
The Android Automerger
c152d6fd0f merge in jb-release history after reset to jb-dev 2012-06-20 07:09:13 -07:00
Jean-Baptiste Queru
c0fe913cec am 8af7a13b: Clarify ownership of widevine files.
* commit '8af7a13b611ecf0b19550ac6fef6e1c026daf63b':
  Clarify ownership of widevine files.
2012-06-19 07:25:37 -07:00
Jean-Baptiste Queru
8af7a13b61 Clarify ownership of widevine files.
Bug: 6611375
Change-Id: I1e9436716411db775c33d55cbd7dcb185bdc856d
2012-06-19 07:07:20 -07:00
Andreas Huber
8d5224460e Added a MediaCoded based video view to the widevine sample player app.
Change-Id: I514fee7312c485aa5f7a8c6c0a42ce62e71d2578
2012-06-14 13:29:21 -07:00
Jeff Tinker
6bd2b05221 Add support for crypto HAL on L3 devices DO NOT MERGE
Includes widevine library release version 4.5.0.7571

Change-Id: I9e574d5606576aab376d0524a4bf1a81e5a61678
related-to-bug: 6427322
related-to-bug: 6427274
2012-06-14 13:29:20 -07:00
Jeff Tinker
13fd014615 am 2e0fb6cf: Merge "Added a MediaCoded based video view to the widevine sample player app." into jb-dev
* commit '2e0fb6cfe50b40f9b1d065ed4a1a5976d4cfd276':
  Added a MediaCoded based video view to the widevine sample player app.
2012-06-14 10:34:23 -07:00
Jeff Tinker
15397ae45a am b07508ef: (-s ours) Add support for crypto HAL on L3 devices DO NOT MERGE
* commit 'b07508ef01f3f60adf1bd16791eb4b4d377464a3':
  Add support for crypto HAL on L3 devices DO NOT MERGE
2012-06-14 10:34:23 -07:00
Edwin Wong
b53e7056fa am e6513d5c: (-s ours) Widevine library update 4.5.0.7570 DO NOT MERGE
* commit 'e6513d5c7cb66a3ad08f03101698cdfaec655a5d':
  Widevine library update 4.5.0.7570 DO NOT MERGE
2012-06-14 10:33:36 -07:00
Jeff Tinker
2e0fb6cfe5 Merge "Added a MediaCoded based video view to the widevine sample player app." into jb-dev 2012-06-14 07:33:32 -07:00
The Android Automerger
8bffd069bd merge in jb-release history after reset to jb-dev 2012-06-14 07:09:53 -07:00
Jeff Tinker
b07508ef01 Add support for crypto HAL on L3 devices DO NOT MERGE
Includes widevine library release version 4.5.0.7571

Change-Id: I9e574d5606576aab376d0524a4bf1a81e5a61678
related-to-bug: 6427322
related-to-bug: 6427274
2012-06-13 20:30:47 -07:00
Edwin Wong
e6513d5c7c Widevine library update 4.5.0.7570 DO NOT MERGE
This library release added more logging to print curl and tcp information
when the connection has stalled and download is restarted.

Change-Id: I02f3e96aa7adfdc577cbe25c32f7392f799fc954
related-to-bug: 6512768
2012-06-13 17:36:11 -07:00
The Android Automerger
0405ef709e merge in jb-release history after reset to jb-dev 2012-06-13 09:03:12 -07:00
Fred Gylys-Colwell
9bfa7d238a am 0d4ba36d: (-s ours) Widevine library update 4.5.0.7514 DO NOT MERGE
* commit '0d4ba36d4b46ef2a2830f6effc41cf23a2630583':
  Widevine library update 4.5.0.7514 DO NOT MERGE
2012-06-12 20:00:07 -07:00
Fred Gylys-Colwell
0d4ba36d4b Widevine library update 4.5.0.7514 DO NOT MERGE
This widevine library release allows the stream control library to
transition to the Done state from any other state.  Previously, it
would only transtion to Done from Playing.  This caused problem if
playback seeks to almost the end of the movie, and the end of stream
marker is read into a buffer before playback starts.

Change-Id: I9132094993fb35b0e93216845a29db46a9d07975
related-to-bug: 6635366
2012-06-12 17:11:12 -07:00
Jeff Tinker
159017208d am a81f397c: (-s ours) Widevine library update 4.5.0.7489 DO NOT MERGE
* commit 'a81f397c3e4175f0ae2c5479412f8eddebd1c15f':
  Widevine library update 4.5.0.7489 DO NOT MERGE
2012-06-12 16:48:38 -07:00
Jeff Tinker
a81f397c3e Widevine library update 4.5.0.7489 DO NOT MERGE
This widevine library release resolves an
intermittent problem with continuity counter
errors during HLS streaming.

Change-Id: Ie1009ed161daaf9c89bbdd56ac53105c51a35de0
related-to-bug: 6562375
2012-06-12 13:28:35 -07:00
Andreas Huber
d5547b3aaa Added a MediaCoded based video view to the widevine sample player app.
Change-Id: I514fee7312c485aa5f7a8c6c0a42ce62e71d2578
2012-06-09 12:52:43 -07:00
The Android Automerger
a03a72f443 merge in jb-release history after reset to jb-dev 2012-06-08 08:27:08 -07:00
Edwin Wong
35ca03bceb am 7309379b: (-s ours) Widevine library update 4.5.0.7443 DO NOT MERGE
* commit '7309379b9b4275ebd268ece815ca0ca653f51671':
  Widevine library update 4.5.0.7443 DO NOT MERGE
2012-06-07 18:29:36 -07:00
Edwin Wong
7309379b9b Widevine library update 4.5.0.7443 DO NOT MERGE
Add logging to client for CACgi error 16; logging only occurs when error is encountered, b/6614495.
This version also includes the fix for spurious "data stopped arriving" messages, b/6512768.

Change-Id: I49e56dc1ab59abfb3037834a04748b0d5247aa50
related-to-bug: 6614495
related-to-bug: 6512768
2012-06-07 17:25:34 -07:00
Jeff Tinker
aa53b75b12 Widevine library update 4.5.0.7394 DO NOT MERGE
Fixes dns resolution failures when multiple
name servers are defined.

Fixes the occasional CA CGI 16 error.

Change-Id: I3e68a7c9a01ae3caeb9473c90f021f56f7e1210b
related-to-bug: 6493657
related-to-bug: 6567835
2012-06-06 16:50:19 -07:00
Jeff Tinker
a23f9a71a8 am aae76100: (-s ours) Widevine library update 4.5.0.7394 DO NOT MERGE
* commit 'aae76100b9a96eac67362a0602e59314f20d1afd':
  Widevine library update 4.5.0.7394 DO NOT MERGE
2012-06-06 16:41:38 -07:00
Jeff Tinker
aae76100b9 Widevine library update 4.5.0.7394 DO NOT MERGE
Fixes dns resolution failures when multiple
name servers are defined.

Fixes the occasional CA CGI 16 error.

Change-Id: I3e68a7c9a01ae3caeb9473c90f021f56f7e1210b
related-to-bug: 6493657
related-to-bug: 6567835
2012-06-05 21:48:34 -07:00
Ying Wang
e36b59b8d3 Use board config variable BOARD_WIDEVINE_OEMCRYPTO_LEVEL
Instead of grepping out the oemcrypto level from PRODUCT_PACKAGES, which
is very fragile.

Change-Id: I1ac5b8ace25dd4798d3383304f01496f12193526
2012-06-05 14:29:27 -07:00
The Android Automerger
f63708cb5c merge in jb-release history after reset to jb-dev 2012-06-03 06:12:07 -07:00
Jeff Tinker
e01879128b am 1024b041: Part of fix for double spins & faster startup
* commit '1024b041e824bb6eb232971fc4a2984d63f7e079':
  Part of fix for double spins & faster startup
2012-06-01 11:25:55 -07:00
Jeff Tinker
1024b041e8 Part of fix for double spins & faster startup
This change alters the way that the media player
interacts with the Widevine adaptive streaming buffer
logic.  It eliminates the reliance on cached buffer
duration to determine pause/play states and instead
only generates buffering events when the widevine
library is not producing data (i.e. when it is
buffering).  This eliminates unnecessary pause and
rebuffer cycles, reducing startup time and the
frequency and duration of spinners.

Multi-repo commit, depends on related changes in frameworks/av

Change-Id: I5b71f954268fbd390eed7f27db98a1bb470d5cfb
related-to-bug:6503294
related-to-bug:6463780
2012-05-31 23:26:14 -07:00
Fred Gylys-Colwell
5b88678ad7 am b83e7ca1: Merge "Fix pause at end of movie." into jb-dev
* commit 'b83e7ca14ab7241c1bbfb50dd6d97edf160f2b74':
  Fix pause at end of movie.
2012-05-31 16:38:21 -07:00
Fred Gylys-Colwell
b83e7ca14a Merge "Fix pause at end of movie." into jb-dev 2012-05-31 16:34:29 -07:00
Fred Gylys-Colwell
0b7d0f3fe3 Fix pause at end of movie.
The function WVMExtractorImpl::getCachedDurationUs returns the cached buffer
size in microseconds, and sets a status to ERROR_END_OF_STREAM at the end of
the movie.  The AwesomePlayer will pause if the cache is too small and the
status is not EOS.  In bug 6277231, the player would pause just before the EOS
marker would have been seen by the Widevine library.

This change checks the current play time against the total movie duration.  If
there is less than 10 seconds left in the movie, the EOS flag is set.

related-to-bug: 6277231

Change-Id: I8dbf60c82c41df485185f85e72452aab0a6a9686
2012-05-31 16:01:42 -07:00
James Dong
7ef852fe2c Added some debugging log messages for tracking down ANR related issue.
Change-Id: I2d338b5e4efbc13acdb3ed8f592d405052ecad9d
related-to-bug: 6565826
2012-05-29 19:48:47 -07:00
James Dong
7a5da70046 am 0fb73729: Added some debugging log messages for tracking down ANR related issue.
* commit '0fb73729164f2d8fc294aa49888153b88944c312':
  Added some debugging log messages for tracking down ANR related issue.
2012-05-29 16:33:40 -07:00
James Dong
0fb7372916 Added some debugging log messages for tracking down ANR related issue.
Change-Id: I2d338b5e4efbc13acdb3ed8f592d405052ecad9d
related-to-bug: 6565826
2012-05-29 14:08:36 -07:00
The Android Automerger
3177918a14 merge in jb-release history after reset to jb-dev 2012-05-29 09:05:39 -07:00
Jeff Tinker
4d696a09a2 am 43b8f708: (-s ours) Widevine library update 4.5.0.7251 DO NOT MERGE
* commit '43b8f708368ea4a6bd6921ca2c78cd42a55bf907':
  Widevine library update 4.5.0.7251 DO NOT MERGE
2012-05-25 19:01:11 -07:00
Jeff Tinker
43b8f70836 Widevine library update 4.5.0.7251 DO NOT MERGE
Resolves timeout issues on CDN redirect delays.
Includes the client side changes to support SD-only
playback on unlocked/rooted L2/L3 devices.

Change-Id: Id962e08b67e4d29bd22d254a4967c71891b504c9
related-to-bug: 6512768
related-to-bug: 6234558
2012-05-25 18:05:15 -07:00