Commit Graph

580 Commits

Author SHA1 Message Date
Fred Gylys-Colwell
b89b498f8a Update Widevine Libraries to Version 4.5.0.8008 and 8010.
Widevine Library for Level 1: Version 4.5.0.8008 AES 601_AndroidOS_J
Widevine Library for Level 3: Version 4.5.0.8010 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.

This library includes the following changes:

https://widevine-internal-review.googlesource.com/1260
Remove Variable sAfterSeek for Release Builds

https://widevine-internal-review.googlesource.com/1228
Pause WVMK Session while seeking in order to remove race condition where data gets pulled

https://widevine-internal-review.googlesource.com/1143
Use closed-range HTTP GETs in ABR client.

https://widevine-internal-review.googlesource.com/1110
Ported ABR improvements from 6.0.0 as part of b/6500173. Changes as per Edwin's review.

Change-Id: I1e1fbda84a016356b3a1dbafd98c5d2e4935d505
related-to-bug: 6189953
related-to-bug: 6948238
related-to-bug: 6500173
2012-08-23 10:09:31 -07:00
The Android Automerger
422a52acd3 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-23 06:35:16 -07:00
Jeffrey Tinker
326dde3b28 Send current bandwidth info event when buffering occurs
There is a dependent change in frameworks/av

Change-Id: Ic189654486936a501a1b45c5acb442753303d362
related-to-bug: 5883234
2012-08-23 02:01:21 -07:00
Fred Gylys-Colwell
ac570e0ccc Merge "Update Widevine Libraries to Version 4.5.0.8005 and 8007." into jb-mr1-dev 2012-08-22 15:00:55 -07:00
James Dong
20e8e2b01c Merge "Let getOriginalMimeType() take a fd passed from Java applications" into jb-mr1-dev 2012-08-22 14:50:22 -07:00
Jeffrey Tinker
14f0deafac Configure the Widevine cache buffer size via a property
The property ro.com.widevine.cachesize may be set on a device to override the
default stream buffer cache size.

related-to-bug: 6819880

Change-Id: I27da154e38289c5d1f5f2f5f424202253d0721cc
2012-08-22 09:37:36 -07:00
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
The Android Automerger
7722cd0088 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-13 08:11:26 -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
The Android Automerger
1a333ced19 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-06 06:30:31 -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
The Android Automerger
2384195936 merge in jb-mr1-release history after reset to master 2012-07-24 08:54:41 -07:00
The Android Automerger
97b7c2d45b merge in jb-mr0-release history after reset to jb-dev 2012-07-17 12:34:10 -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
8292b9a685 [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 23:17:53 -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