Commit Graph

7892 Commits

Author SHA1 Message Date
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
Jeff Tinker
530f291889 am 8b22e139: (-s ours) Fix Widevine error reporting
* commit '8b22e13988fad4c35a8f7fffbbd7230a231dae34':
  Fix Widevine error reporting
2012-05-24 14:30:58 -07:00
Jeff Tinker
8b22e13988 Fix Widevine error reporting
Includes Widevine library version 4.5.0.7220

Change-Id: Iff9d98e0f168bee69226d5087dbeb20ec39872d8
related-to-bug: 6554257
2012-05-24 13:29:47 -07:00
The Android Automerger
4a2ce0a43e merge in jb-release history after reset to jb-dev 2012-05-23 07:10:12 -07:00
Jeff Tinker
4de22cf3f7 am df066c06: (-s ours) Widevine library update for Jellybean DO NOT MERGE
* commit 'df066c06345eb544238061afd444db1cddb5b651':
  Widevine library update for Jellybean DO NOT MERGE
2012-05-22 21:13:13 -07:00
Jeff Tinker
df066c0634 Widevine library update for Jellybean DO NOT MERGE
This release contains widevine library version 4.5.0-7201

Fix NPE in videos app due to missing license status
Resolve SIGPIPE fault in mediaserver

Change-Id: Ib51f4ca5560d3e50363ed4933e07e29e8ab74c7c
related-to-bug: 6512128
related-to-bug: 6528820
2012-05-22 17:36:25 -07:00
The Android Automerger
232401b862 merge in jb-release history after reset to jb-dev 2012-05-22 07:11:08 -07:00
Jean-Baptiste Queru
f6f4507186 am 34b997be: liboemcrypto only exists in vendor/ builds
* commit '34b997be967ed0d44703fd4b567750f0597de6b2':
  liboemcrypto only exists in vendor/ builds
2012-05-21 14:31:13 -07:00
James Dong
fdbb5fa10d am f7ce4a9b: Merge "Add bandwidth to adaptive log" into jb-dev
* commit 'f7ce4a9b9aacd01b0a47439a1c33f4e9ace24c5c':
  Add bandwidth to adaptive log
2012-05-21 12:39:33 -07:00
Jeff Tinker
318d335e63 Merge commit 'cf425f5b' into manualmerge
Conflicts:
	proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L1.so
	proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L3.so

Change-Id: I786fa1f8da270acb8d48c515f8fb2f6eb83f9783
2012-05-21 12:32:53 -07:00
Fred Gylys-Colwell
9cb8f2b91b am 382a5286: Merge "Fix HLS Live Playback with Widevine DRM." into jb-dev
* commit '382a5286b5c8ccfd6fe501ed5bd53cc8630b9de4':
  Fix HLS Live Playback with Widevine DRM.
2012-05-21 11:51:38 -07:00
Jean-Baptiste Queru
34b997be96 liboemcrypto only exists in vendor/ builds
Bug: 6521860
Change-Id: I62f7106cbc31015ee382f6901460dd3c46832813
2012-05-18 16:37:50 -07:00
Jeff Tinker
5658b8dc13 resolved conflicts for merge of 98c35aa4 to master
Change-Id: I32de004b575729f9b1852517ad5df71395e0ae69
2012-05-18 05:17:44 -07:00
Fred Gylys-Colwell
b8dbc29f7a am 87718450: Fix Show Rights for HLS content
* commit '87718450ac16621b17ec1cda9e3695b6d1f05b5c':
  Fix Show Rights for HLS content
2012-05-17 20:56:54 -07:00
The Android Automerger
7d68462f56 merge in jb-release history after reset to jb-dev 2012-05-17 09:27:58 -07:00
James Dong
f7ce4a9b9a Merge "Add bandwidth to adaptive log" into jb-dev 2012-05-17 08:34:24 -07:00
The Android Automerger
262f81e319 merge in jb-release history after reset to jb-dev 2012-05-17 07:11:04 -07:00
Jeff Tinker
cf425f5bbc Fix file descriptor leak in WV library
In ICS we overloaded the curl fd close callout to enable
attributing bandwidth usage to the proper app instead of
the OS.  When you use the curl close callout, you are
expected to explicitly close the file, curl does not do
it for you.  This change adds an explicit fd close on the
curl callout.

Includes widevine library 4.5.0.7147

Change-Id: Ie22e6186f88b55a96e06f63e07f2746349aeae4e
related-to-bug: 6500752
2012-05-17 06:59:58 -07:00
Jeff Tinker
1c084694fe Add bandwidth to adaptive log
Change-Id: I79bf860db76bbdc6020d617f918cafb1f73d54de
related-to-bug: 6500173
2012-05-17 06:41:27 -07:00
Fred Gylys-Colwell
382a5286b5 Merge "Fix HLS Live Playback with Widevine DRM." into jb-dev 2012-05-16 20:29:08 -07:00
Fred Gylys-Colwell
ff793bcaf0 Fix HLS Live Playback with Widevine DRM.
In WVMExtractorImpl.cpp, a structure of type WVCallbacks was not initialized.
In version 4.5.0 of the Widevine library, this is just a struct (not a class)
so it does not have a constructor method.  This record was being set with
garbage default values and was causing problems setting up playback.  This may
have caused other stability issues after we reverted to 4.5.0.  In the future,
when we push forward to version 6.0 of the Widevine library, this change should
be removed.

In WVMediaSource.cpp, a flag was set to strip off the ATDS headers.  This was
redundent, and causing seg faults, for live stream.

related-to-bug: 6454710

Change-Id: I3edeb40c731021b2f31f639416188d4a1c002cc5
2012-05-16 20:12:28 -07:00
Jeff Tinker
98c35aa4ec Merge "Fix native fault in WVMMediaSource::DecryptCallback" into jb-dev 2012-05-16 19:49:58 -07:00
Jeff Tinker
e9c40a625c Fix native fault in WVMMediaSource::DecryptCallback
This change resolves a lifetime issue between the media extractor
and media sources.  The extractor was being passed as a context
object to a callout in the WV libs.  In some cases, a pointer to
the extractor would be delivered to the callout after the extractor
had been released.  This change assigns the responsibility of the
lifetime of the context object to the media source, to ensure that
a ref is always held on the context object during the lifetime of
the media source.

Change-Id: Ic7a57a1c8496a4798fe590ec356b8a19a4f69967
related-to-bug: 6502322
2012-05-16 19:08:25 -07:00
Fred Gylys-Colwell
87718450ac Fix Show Rights for HLS content
In WVMDrmPlugin.cpp, the supported suffixes was only .wvm.  I changed this to
include .m3u8, .vob, .smil, and the empty extension.  This allows the
WVMDrmPlugin to register itself as handling these files.  If the plugin is not
registered, the "show rights" feature will not query the plugin.

related-to-bug: 6507440

Change-Id: Ib655760e46cfa4125d21beb9ff77e38b444ddc5a
2012-05-16 17:38:21 -07:00