Commit Graph

580 Commits

Author SHA1 Message Date
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
The Android Automerger
536517cfa7 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-23 23:36:27 -07: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
John "Juce" Bruce
f1da185ed4 [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-04 18:06:44 -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
The Android Automerger
5563d9be8a merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-03 07:01:13 -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
The Android Automerger
056fa76db3 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-02 07:01:17 -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
Fred Gylys-Colwell
9b65c0b74a am f0349e52: am 59e30852: Update Widevine Libraries Version 4.5.0.10085
* commit 'f0349e5225cc980ca608f5d6ebfe6d313398c2cb':
  Update Widevine Libraries Version 4.5.0.10085
2012-10-01 10:27:06 -07:00
Fred Gylys-Colwell
f0349e5225 am 59e30852: Update Widevine Libraries Version 4.5.0.10085
* commit '59e30852ddaa2d1922b1189f8664368705ed1167':
  Update Widevine Libraries Version 4.5.0.10085
2012-10-01 10:24:40 -07:00
Fred Gylys-Colwell
59e30852dd Update Widevine Libraries Version 4.5.0.10085
This change updates the Widevine binary libraries.
It includes the change:
https://widevine-internal-review.googlesource.com/1400
Cleaned Up Locks and Removed Pause/Resume

bug: 6799914
Change-Id: I5e266e4d8bdc92e88e488d90aa5312ac740303b0
2012-09-28 18:11:34 -07:00
Edwin Wong
ca21c93f66 Revert "When Running in MediaCodec Mode, Widevine Freezes If You Rewind"
This reverts commit 2e0e32f9f7

Change-Id: I1362839633bca4260d83f470a780d93b8de431ca

related-to-bug: 7216099
related-to-bug: 7223566
2012-09-28 17:47:37 -07:00
Jean-Baptiste Queru
0ce4a3155d am 9ff76e70: Merge from jb-mr1-aah-dev
* commit '9ff76e701579206850692de7634aab6b52ae12b2':
2012-09-28 15:52:46 -07:00
Jean-Baptiste Queru
9ff76e7015 Merge from jb-mr1-aah-dev
Change-Id: I63020e77683503de6c8a95c0e7f03ba18c31610d
2012-09-28 14:48:21 -07:00
The Android Automerger
18f9dccb46 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-27 07:01:46 -07:00
Edwin Wong
6df02b1e98 am 4fffa0ff: Fixed mediacodec mode\'s fatal error when eos is encountered.
* commit '4fffa0ff6ab7777db634b3f0cb9b38525a801169':
  Fixed mediacodec mode's fatal error when eos is encountered.
2012-09-26 22:50:05 -07:00
Edwin Wong
d264a2ad55 am 4fffa0ff: Fixed mediacodec mode\'s fatal error when eos is encountered.
* commit '4fffa0ff6ab7777db634b3f0cb9b38525a801169':
  Fixed mediacodec mode's fatal error when eos is encountered.
2012-09-26 22:48:33 -07:00
Edwin Wong
4fffa0ff6a Fixed mediacodec mode's fatal error when eos is encountered.
The FATAL EXCEPTION is caused by the decrypt function returning -EINVAL
when OEMCrypto decrypt returns an error. The fix is not to call
OEMCrypto decrypt when eos is reached.

related-to-bug: 7216928
related-to-bug: 7217609
Change-Id: I8f006905386e2cdfb907d4ab15c766ae69f20f00
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-09-26 22:46:35 -07:00
The Android Automerger
e396075c34 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-25 07:02:04 -07:00
Gene Morgan
dadcf0c492 am 4e3efb41: Keep local file open for DrmManagerService::acquireDrmInfo().
* commit '4e3efb415b17573e1e08f57ead6a436690d74fa7':
  Keep local file open for DrmManagerService::acquireDrmInfo().
2012-09-24 10:10:36 -07:00
Gene Morgan
28dac9d034 am 4e3efb41: Keep local file open for DrmManagerService::acquireDrmInfo().
* commit '4e3efb415b17573e1e08f57ead6a436690d74fa7':
  Keep local file open for DrmManagerService::acquireDrmInfo().
2012-09-24 10:08:35 -07:00