Commit Graph

302 Commits

Author SHA1 Message Date
Fred Gylys-Colwell
6a6c1522a9 Update Widevine Libraries to Version 4.5.0.8005 and 8007.
Widevine Library for Level 1: Version 4.5.0.8005 AES 601_AndroidOS_J
Widevine Library for Level 3: Version 4.5.0.8007 AES 601_AndroidOS_J

Note: The current built procedure updates the minor version number separately for
the L1 and L3 libraries.  This will change in the near future.

Log file from https://googleplex-android-review.googlesource.com follows:
----------------------------------------------------------------------
commit b26352bc14498a87178678a9cf02fb29733ec7fb
Author: Fred Gylys-Colwell <fredgc@google.com>
Date:   Mon Aug 20 14:48:46 2012 -0700

    Update Version Number

    The official build script currently modifies the minor number and the major
    number, but does not yet modify the branch.  This is planned work. As a
    stop-gap measure, I changed this value by hand.

    I also modified the header file so that the version numbers may be modified on
    the command line with a -D instead of running a script that modifies the header
    file on the build machine.

    Change-Id: I2216600bf19ea6f268e711516d45f466b0d312da

commit 2334062773bbb32a3e0cab27770bd03cd8793c45
Merge: 429cc40 02ecdff
Author: Thomas Inskip <tinskip@google.com>
Date:   Mon Aug 20 11:30:55 2012 -0700

    Merge "Remove "Truncated File" warning at end of file." into RC/4.5.0/601_AndroidOS_J

commit 429cc4089c733f04785aaa09ed0b5d8fed76a567
Author: John Bruce <juce@google.com>
Date:   Fri Aug 17 14:36:06 2012 -0700

    Revert "Android has moved the NDK in their tree, so our Jamfiles need to be updated."

    This reverts commit d8e792ee61825b9090cec5f1096ba41fde7a5d7e

    Change-Id: I31470f0962591816f9a96b74866ca97c5e47ba38

commit d8e792ee61825b9090cec5f1096ba41fde7a5d7e
Author: John "Juce" Bruce <juce@google.com>
Date:   Wed Aug 15 19:01:30 2012 -0700

    Android has moved the NDK in their tree, so our Jamfiles need to be updated.

commit 02ecdff3dfcc93cac828bd973a41f33f067f9bcb
Author: Fred Gylys-Colwell <fredgc@google.com>
Date:   Fri Aug 17 09:37:35 2012 -0700

    Remove "Truncated File" warning at end of file.

    Previously, when ExternalClient finds the end of file, it sets the
    error flag to mark the file as truncated.  This does not usually
    cause a problem, because errors at the end of file can be ignored.

    If we need to mark the file as truncated, we could either check that
    the length of the file is actually shorter than expected, or check
    that an end-of-stream marker has not already been added to the memory
    chunk queue.

    related-to-bug: 6635366 Could not terminate a DRM local playback session, probably due to -1004

commit a248147b0ca7db78dc42ba2e0c885044db97fe49
Author: John "Juce" Bruce <juce@google.com>
Date:   Wed Aug 15 12:31:58 2012 -0700

    Fixing references to renamed DIST variable in Jamfile for Android OS Plugin builds.

commit e251fff6623fab83ed2b052a0af3a1114d409f47
Author: Fred Gylys-Colwell <fredgc@google.com>
Date:   Wed Aug 8 14:57:37 2012 -0700

    Updated Jam files so that android master is set at compile time.

    I replaced references to the /usr/local/android-master with the variable
    ANDROID_DIST so that it can be set at compile time.  The default is still
    /usr/local/android-master, so the change should be transparent.

    I changed DIST and ANDROID_MASTER both to be ANDROID_DIST in the Jam files
    so that there is only one variable with that meaning.

    I also updated the path for the loader script armelf.xsc.  This location is now
    specified in the main Jamrules file as ARMELF_PATH.

    Change-Id: I2d6945546198cdf3ab828346418bd4b07ea8c176

--------------------------------------------------------------------------------------------------

Change-Id: I99f445a44f0124c61532fdccfc8f620d10e15659
related-to-bug: 6635366
2012-08-21 14:18:42 -07:00
Edwin Wong
196fe01488 Add GetVersion API to query the client plugin version.
Includes Widevine libraries 4.5.0.8097

Change-Id: I7590d5a60f300f6686887f62ae127b86f76e6f94
related-to-bug: 6000505
2012-08-10 18:23:54 -07:00
James Dong
adad411ea6 Let getOriginalMimeType() take a fd passed from Java applications
This patch completes the change needed for widevine drm plugin.

o related-to-bug: 6426185

Change-Id: Ib9897be6264506f1c96eecca8be1de016f3b0b86
2012-08-09 14:04:13 -07:00
Edwin Wong
c4d88be1fb Fixed: screen time out during streaming in mediacodec mode.
Also, print log to indicate if the device is provisioned or not.

Change-Id: I674e2fe4531cc79b4bf307939c4b08ba19207244
related-to-bug: 6821614
2012-08-05 16:31:25 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
James Dong
f7ce4a9b9a Merge "Add bandwidth to adaptive log" into jb-dev 2012-05-17 08:34:24 -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
James Dong
c477bb957f am 79e250e9: If number of audio channels returned is 0, report an error
* commit '79e250e999b7002dc39fa8ee31630fabde6132a8':
  If number of audio channels returned is 0, report an error
2012-05-15 18:14:16 -07:00
James Dong
79e250e999 If number of audio channels returned is 0, report an error
related-to-bug: 6500580

Change-Id: I55cab0bde30841c31f671d03f99c59d337fea564
2012-05-15 17:54:59 -07:00
Jeff Tinker
35064be9c6 Revert Widevine 6.0.0 -> 4.5.0 libraries
DO NOT MERGE

Source and library changes to roll back to 4.5.0, including
maintaining the DRM HAL support.

Includes Widevine libraries 4.5.0-7111

Change-Id: I420c6990748e95ad7516ecb2397ebf7707a157f4
related-to-bug: 6492434
2012-05-14 15:06:13 -07:00
Jeff Tinker
3db47ef723 am c7214ed1: [WVDRM] Fix buffering gets stuck late into movies
* commit 'c7214ed13e60abda1757cdf6ec23e42ef40662b4':
  [WVDRM] Fix buffering gets stuck late into movies
2012-05-09 01:55:09 -07:00
Jeff Tinker
c7214ed13e [WVDRM] Fix buffering gets stuck late into movies
Includes Widevine libraries version 6.0.0.7036

Change-Id: I84a6d6853b999571bb7cde812cd44b31436ae972
related-to-bug: 6449713
2012-05-07 18:35:22 -07:00
Jeff Tinker
31906d8b50 am 62e455e6: Merge "Fix WV CryptoPlugin exports invalid entrypoint" into jb-dev
* commit '62e455e6f2a04fddc09027a25837df5c72869cf5':
  Fix WV CryptoPlugin exports invalid entrypoint
2012-05-05 23:14:24 -07:00
Jeff Tinker
62e455e6f2 Merge "Fix WV CryptoPlugin exports invalid entrypoint" into jb-dev 2012-05-05 23:09:24 -07:00