Commit Graph

477 Commits

Author SHA1 Message Date
Fred Gylys-Colwell
03d43a5d2d Merge "Separate OEMCrypto DASH from Legacy OEMCrypto" 2012-12-04 14:32:35 -08:00
Fred Gylys-Colwell
4529037bd8 Separate OEMCrypto DASH from Legacy OEMCrypto
The file OEMCrypto.h was renamed to OEMCryptoDASH.h and all
functions that are only needed for legacy support were removed.

Change-Id: I3a7a6f8cbb3ee415b4a313416a25ed78785ecdd7
2012-12-04 13:48:52 -08:00
Edwin Wong
eebba73ce1 Merge "Add ContentDecryptionModule API" 2012-12-04 12:31:39 -08:00
Fred Gylys-Colwell
d74290cc9f Update OEMCrypto.h
This change incorporates updates to the Eureka version of
OEMCrypto.h as documented here:
     https://widevine-internal-review.googlesource.com/2334

Change-Id: I52abde82cbea9b30b74e9c2292e401d5318df99d
2012-12-03 14:17:53 -08:00
Rahul Frias
9a7e424596 Add ContentDecryptionModule API
This header file documents the interface of the ContentDecryptionModule
and the CDM client.

b7615806

Change-Id: I9a036ec5539f7e5b66adb8a6a4326120624d1b30
2012-12-02 22:49:02 -08:00
Fred Gylys-Colwell
8199f94e35 Merge "Add Mock OEMCrypto Stub" 2012-11-30 14:18:02 -08:00
Fred Gylys-Colwell
684eb227d4 Add Mock OEMCrypto Stub
I added a Mock OEMCrypto implementation with stubs only.

I corrected the "extern C" location in OEMCrypto.h. (Thanks, Jerry!)

I added some Android.mk files that allows us to compile and
run a few simple unit tests.

Unit Test 1: The library compiles. (passes)
Unit Test 2: The test program links and runs. (passes)

Change-Id: Ib4c9554553de49645b5841b0bae889728cbfc8b1
2012-11-30 12:41:10 -08:00
Fred Gylys-Colwell
35585d4f8f am 4810c96e: am ec683063: am 7bd6a810: Merge "Update Widevine Libraries Version 4.5.0.10088" into jb-mr1.1-dev
* commit '4810c96e6f6ec7ce9fac4659a421ae958797c1c3':
  Update Widevine Libraries Version 4.5.0.10088
2012-11-27 18:44:10 -08:00
Fred Gylys-Colwell
4810c96e6f am ec683063: am 7bd6a810: Merge "Update Widevine Libraries Version 4.5.0.10088" into jb-mr1.1-dev
* commit 'ec68306390fa7434644130e9f9565b7cd5ca038c':
  Update Widevine Libraries Version 4.5.0.10088
2012-11-27 17:15:02 -08:00
Fred Gylys-Colwell
ec68306390 am 7bd6a810: Merge "Update Widevine Libraries Version 4.5.0.10088" into jb-mr1.1-dev
* commit '7bd6a81067afe45ff26c630c440a138da0fb73f5':
  Update Widevine Libraries Version 4.5.0.10088
2012-11-27 17:13:18 -08:00
Fred Gylys-Colwell
7bd6a81067 Merge "Update Widevine Libraries Version 4.5.0.10088" into jb-mr1.1-dev 2012-11-27 17:10:55 -08:00
Fred Gylys-Colwell
27bb877763 Add OEMCrypto.h Header
I put the OEMCrypto.h file in its final resting place.

Change-Id: Ie8ccf5501c518dda0a7ee4ea494e588ea9497afd
2012-11-27 16:40:42 -08:00
Fred Gylys-Colwell
225c70eeed Create Skeleton Directory Tree for DASH
This is the skeleton directory tree for work in the DASH
implementation.

Change-Id: I38b52d133d48df6b78f3d142b1969686c60fc76b
2012-11-27 13:04:27 -08:00
Edwin Wong
213df62b66 am fa43e4fb: (-s ours) am 7142b3d6: am d0c2e46e: am 63f5ec89: (-s ours) am 583b50d5: Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
* commit 'fa43e4fbbb8ed81ee9863f19e97c346219925407':
  Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
2012-11-16 11:37:25 -08:00
Edwin Wong
fa43e4fbbb am 7142b3d6: am d0c2e46e: am 63f5ec89: (-s ours) am 583b50d5: Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
* commit '7142b3d60c20b671ba4fef2df3184d09c886ed19':
  Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
2012-11-16 10:06:36 -08:00
Edwin Wong
7142b3d60c am d0c2e46e: am 63f5ec89: (-s ours) am 583b50d5: Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
* commit 'd0c2e46e423b2586049f39dd295b9b725277a0fb':
  Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
2012-11-16 10:04:05 -08:00
Edwin Wong
d0c2e46e42 am 63f5ec89: (-s ours) am 583b50d5: Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
* commit '63f5ec89537598b885a88b9e74d8ef2029159005':
  Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
2012-11-16 10:00:20 -08:00
Edwin Wong
63f5ec8953 am 583b50d5: Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
* commit '583b50d5d3a87c48d42b3d604ea7cadc1b0102be':
  Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
2012-11-16 09:57:46 -08:00
Edwin Wong
583b50d5d3 Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
Initial library release for Intel Medfield x86 SOC

Change-Id: I4a8e5f98fb46e19a664602dd3d406df774103956
related-to-bug: 6842444
2012-11-15 14:51:13 -08:00
Fred Gylys-Colwell
9477a252d3 Update Widevine Libraries Version 4.5.0.10088
This change updates the Widevine binary libraries.
It includes the change:
Turn on IPv6 Compatibility.
https://widevine-internal-review.googlesource.com/2242
bug: 7471810

Change-Id: I09beacb7853435f21c263e226a3dcaff74afbd2b
2012-11-09 12:50:44 -08:00
Jeff Tinker
5971f35ca3 am da9633d4: am 7fc32e3d: am aac68688: Update Widevine Libraries Version 4.5.0.10087
* commit 'da9633d448fae2577f8eade14ed83b8895fc9a42':
  Update Widevine Libraries Version 4.5.0.10087
2012-10-23 21:46:40 -07:00
Jeff Tinker
da9633d448 am 7fc32e3d: am aac68688: Update Widevine Libraries Version 4.5.0.10087
* commit '7fc32e3dabccc96f19e007805262a5bf6e5d85aa':
  Update Widevine Libraries Version 4.5.0.10087
2012-10-23 21:44:17 -07:00
Jeff Tinker
7fc32e3dab am aac68688: Update Widevine Libraries Version 4.5.0.10087
* commit 'aac68688307d476cc7c607766a8afa644bd95905':
  Update Widevine Libraries Version 4.5.0.10087
2012-10-23 21:41:03 -07:00
Jeff Tinker
aac6868830 Update Widevine Libraries Version 4.5.0.10087
This change updates the Widevine binary libraries.

It includes the change:
Correct error returned by ProcessDrmInfo
https://widevine-internal-review.googlesource.com/#/c/1870/

bug:7320744
Change-Id: Ic73a5dfa70140093224e9ce651947b224bdeccb9
2012-10-23 12:33:51 -07:00
John "Juce" Bruce
e8cad9485c Cannot Rewind WVM in MediaCodec Mode
The solution previously checked in as 2e0e3 is re-introduced here. However,
the MediaCodec-compatible heuristic is not used unless WVM is in Crypto Plugin
(i.e. Media Codec) mode.

To repeat from last time: The problem here is that WVM cannot independently
seek the audio and video read heads, but the API assumes it can. WVM does the
right thing for AwesomePlayer-based playback (essentially ignoring audio
seeks) but the wrong thing for MediaCodec-based playback. For MediaCodec
mode, we should respect the first seek we get for a given destination and
ignore the second.

In this part, the new heuristic is reintroduced, but the old heuristic is
maintained for use in non-Crypto Plugin mode.

Bug: 6793514
Change-Id: I7ced2bf20af117a57eec27490b0920d906a8a684
2012-10-15 14:22:37 -07:00
Fred Gylys-Colwell
2316ae8825 am 991ad721: (-s ours) am 8584706e: am 607d9110: am f4ca146c: (-s ours) am 87fa1829: Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
* commit '991ad721205b70ed4eef6cd081152f151189700a':
  Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
2012-10-05 14:00:36 -07:00
Fred Gylys-Colwell
991ad72120 am 8584706e: am 607d9110: am f4ca146c: (-s ours) am 87fa1829: Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
* commit '8584706e032233a228ab7740ccc1eb70a8082a72':
  Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
2012-10-05 13:58:56 -07:00
Fred Gylys-Colwell
8584706e03 am 607d9110: am f4ca146c: (-s ours) am 87fa1829: Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
* commit '607d91108f38b9603a3a93200c21354d3315687b':
  Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
2012-10-05 13:57:07 -07:00
Fred Gylys-Colwell
607d91108f am f4ca146c: (-s ours) am 87fa1829: Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
* commit 'f4ca146ca9d0c388b83c083ad6dd1c8fef81231f':
  Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
2012-10-05 13:54:55 -07:00
Fred Gylys-Colwell
f4ca146ca9 am 87fa1829: Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
* commit '87fa1829685aeebd340edf0bf1b501f438e9dc30':
  Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
2012-10-05 13:52:23 -07:00
Fred Gylys-Colwell
87fa182968 Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
This reverts commit 4bdfcc990b

This change was causing some deadlock problems.
bug: 7144860
bug: 7132419

Change-Id: I6a45459b0be024c8c36ccca3b2e2d304ddd94ee9
2012-10-04 12:57:27 -07:00
John "Juce" Bruce
4daa746052 am 4fe8875d: am 3f2bf742: am c671e404: Merge "[WVDRM] Fix effectively-unlimited memory usage" into jb-mr1-dev
* commit '4fe8875d14ae454b52779fe8c8d40b243be79187':
  [WVDRM] Fix effectively-unlimited memory usage
2012-10-04 12:28:31 -07:00
John "Juce" Bruce
4fe8875d14 am 3f2bf742: am c671e404: Merge "[WVDRM] Fix effectively-unlimited memory usage" into jb-mr1-dev
* commit '3f2bf742c165a2b88dc29a9a82ce689244822b49':
  [WVDRM] Fix effectively-unlimited memory usage
2012-10-04 11:41:01 -07:00
John "Juce" Bruce
3f2bf742c1 am c671e404: Merge "[WVDRM] Fix effectively-unlimited memory usage" into jb-mr1-dev
* commit 'c671e40432d19226aff0dc486ea04a9b2f1b50dc':
  [WVDRM] Fix effectively-unlimited memory usage
2012-10-04 11:39:09 -07:00
John "Juce" Bruce
c671e40432 Merge "[WVDRM] Fix effectively-unlimited memory usage" into jb-mr1-dev 2012-10-04 11:37:33 -07:00
John "Juce" Bruce
2ce9ab8e67 [WVDRM] Fix effectively-unlimited memory usage
Change 14f0d to read the maximum buffer size from a device property did not
work correctly on Mako and Prime devices, as they did not have the property
set, and the code to fall back to a default value was not working. An empty
string would be read instead of the default value, resulting in a maximum of
zero. Because Widevine Media Kit would then subtract a few megabytes from this,
it would underflow, giving a maximum buffer size of several gigabytes. This
would lead to the download code trying to pre-buffer the entire, many-gigabyte
movie. As the media server's memory usage grew and grew, other programs would
become starved for memory, leading to most other processes on the phone being
forced to close. Eventually, the playback app, the media server, or some other
crucial piece of functionality would be starved, resulting in a crash.

The fix is to fix how we get the default, so that when the property is not
available, we get a sensible result. We check the return value of property_get.
If it is greater than zero, the property was read successfully, and we parse
the answer. If it is equal to (or less than) zero, we fall back to the default
value.

Bug: 7222769
Change-Id: Ie6186a0533036ab8fa45b1e467611d55f7c345ac
2012-10-03 19:12:35 -07:00
Fred Gylys-Colwell
7c6e14d3e4 am c0fe94c6: am 50ae157c: am b1a1aa7b: Update Widevine Libraries Version 4.5.0.10086
* commit 'c0fe94c6612c8f09e4b714423430741c7b6b19e5':
  Update Widevine Libraries Version 4.5.0.10086
2012-10-02 15:10:59 -07:00
Fred Gylys-Colwell
c0fe94c661 am 50ae157c: am b1a1aa7b: Update Widevine Libraries Version 4.5.0.10086
* commit '50ae157c852034b9e90f11127fb1dcea95241916':
  Update Widevine Libraries Version 4.5.0.10086
2012-10-02 15:09:11 -07:00
Fred Gylys-Colwell
50ae157c85 am b1a1aa7b: Update Widevine Libraries Version 4.5.0.10086
* commit 'b1a1aa7b86984d1cb202c93c9959ada06cfa8e57':
  Update Widevine Libraries Version 4.5.0.10086
2012-10-02 15:07:26 -07:00
Fred Gylys-Colwell
b1a1aa7b86 Update Widevine Libraries Version 4.5.0.10086
This change updates the Widevine binary libraries.

It includes the change:

Corrected error returned on timeout
https://widevine-internal-review.googlesource.com/1617

b/6758866

Change-Id: I81ac5d14823499b83a237406e7c5d345a15f6434
2012-10-02 13:43:35 -07:00
Jeff Tinker
2d141c3891 am bcb3bb18: am 9e5531c8: am 71422e7a: Merge "[WVDRM] Fix for stuttering on low bandwidth" into jb-mr1-dev
* commit 'bcb3bb18da192938380cfd338b17ea75f42dce9f':
  [WVDRM] Fix for stuttering on low bandwidth
2012-10-02 01:31:34 -07:00
Jeff Tinker
bcb3bb18da am 9e5531c8: am 71422e7a: Merge "[WVDRM] Fix for stuttering on low bandwidth" into jb-mr1-dev
* commit '9e5531c8c4d6e2db77d8f32b5ec931e2508e69ea':
  [WVDRM] Fix for stuttering on low bandwidth
2012-10-02 01:30:36 -07:00
Jeff Tinker
9e5531c8c4 am 71422e7a: Merge "[WVDRM] Fix for stuttering on low bandwidth" into jb-mr1-dev
* commit '71422e7a2ac763d594518eeadb85963b8b79553c':
  [WVDRM] Fix for stuttering on low bandwidth
2012-10-02 01:28:53 -07:00
Jeff Tinker
71422e7a2a Merge "[WVDRM] Fix for stuttering on low bandwidth" into jb-mr1-dev 2012-10-02 01:26:13 -07:00
Edwin Wong
1657b9f67a am 33f02f4c: am e0a62971: am 624f38bb: Merge "Revert "When Running in MediaCodec Mode, Widevine Freezes If You Rewind"" into jb-mr1-dev
* commit '33f02f4c6cd2c48937e3fe8b95df7183cb1c9b1f':
  Revert "When Running in MediaCodec Mode, Widevine Freezes If You Rewind"
2012-10-01 15:26:04 -07:00
Edwin Wong
33f02f4c6c am e0a62971: am 624f38bb: Merge "Revert "When Running in MediaCodec Mode, Widevine Freezes If You Rewind"" into jb-mr1-dev
* commit 'e0a62971635066208ad22ac323f09c03e5b60eba':
  Revert "When Running in MediaCodec Mode, Widevine Freezes If You Rewind"
2012-10-01 15:23:52 -07:00
Edwin Wong
e0a6297163 am 624f38bb: Merge "Revert "When Running in MediaCodec Mode, Widevine Freezes If You Rewind"" into jb-mr1-dev
* commit '624f38bb0c7db36e8ccb4780fffc6b3c03163ce4':
  Revert "When Running in MediaCodec Mode, Widevine Freezes If You Rewind"
2012-10-01 15:21:15 -07:00
Edwin Wong
624f38bb0c Merge "Revert "When Running in MediaCodec Mode, Widevine Freezes If You Rewind"" into jb-mr1-dev 2012-10-01 15:20:10 -07:00
Jeff Tinker
54993c50e9 [WVDRM] Fix for stuttering on low bandwidth
Reintroduces the play/pause rebuffering logic we eliminated
in JB zero day to fix double spins and slow startup - but
activates that logic only based on a comparison of the
current bandwidth measurement and the lowest bitrate track
in the movie.

Needs to be submitted with related changes in /frameworks/av

bug: 7230071
Change-Id: Ib3859a961bd3901a9c4df01eeab2b8b75f49aefe
2012-10-01 15:17:07 -07:00
Fred Gylys-Colwell
9df3962aa3 am 9b65c0b7: am f0349e52: am 59e30852: Update Widevine Libraries Version 4.5.0.10085
* commit '9b65c0b74a2d5bfd7785a84a8f4e4c8f4e6b8889':
  Update Widevine Libraries Version 4.5.0.10085
2012-10-01 13:47:02 -07:00