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
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
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
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
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
Gene Morgan
4e3efb415b
Keep local file open for DrmManagerService::acquireDrmInfo().
...
Bug: 7208979
Change-Id: I1b7798929f55b956e43bb9ed1a0f41dec9342be4
2012-09-21 17:50:10 -07:00
Fred Gylys-Colwell
77da47c4cd
am 845e53e6: Update Widevine Libraries Version 4.5.0.10082
...
* commit '845e53e68420439c1c5bbb66e80f4febaecb8915':
Update Widevine Libraries Version 4.5.0.10082
2012-09-21 13:34:02 -07:00
Gene Morgan
ab8c97b194
am 8cd5d091: Allow DRM client to pass the FD of an open file to the DRM server.
...
* commit '8cd5d09119cd789846f9ddedfdc31439109d5c1c':
Allow DRM client to pass the FD of an open file to the DRM server.
2012-09-21 13:34:02 -07:00
Fred Gylys-Colwell
f329eaff4d
am 845e53e6: Update Widevine Libraries Version 4.5.0.10082
...
* commit '845e53e68420439c1c5bbb66e80f4febaecb8915':
Update Widevine Libraries Version 4.5.0.10082
2012-09-20 20:31:08 -07:00
Gene Morgan
08c9cc199e
am 8cd5d091: Allow DRM client to pass the FD of an open file to the DRM server.
...
* commit '8cd5d09119cd789846f9ddedfdc31439109d5c1c':
Allow DRM client to pass the FD of an open file to the DRM server.
2012-09-20 20:31:07 -07:00
Fred Gylys-Colwell
845e53e684
Update Widevine Libraries Version 4.5.0.10082
...
This change updates the Widevine binary libraries.
It includes
https://widevine-internal-review.googlesource.com/1330
Add an argument to AcquireDrmInfo() for passing in the FD of an open file.
IMPORTANT: This change should be merge at the same time as these two:
https://googleplex-android-review.googlesource.com/226382
https://googleplex-android-review.googlesource.com/222797
bug: 7092908
bug: 6769768
Change-Id: I6931f9e4783234348ab384275fdc2ba374f6b591
2012-09-20 11:54:02 -07:00
Gene Morgan
8cd5d09119
Allow DRM client to pass the FD of an open file to the DRM server.
...
This allows a DRM client to open a locally-cached file on behalf of the
DRM server so the DRM server no longer requires the sdcard_r permission
to access the file's metadata. Specifically, this adds an optional
attribute FileDescriptorKey to the DrmInfoRequest.
This change is dependent on this Widevine CL:
https://widevine-internal-review.googlesource.com/#/c/1330/
Relevant bug reports:
bug: 6426185
Change-Id: Ia7bcb2455c7a55fa4c7c7061de4d672957c7ac0a
2012-09-20 11:42:09 -07:00
John "Juce" Bruce
69d2a7c651
am b092b158: Merge "When Running in MediaCodec Mode, Widevine Freezes If You Rewind" into jb-mr1-dev
...
* commit 'b092b158d2cb5be6428694e5581d19472b2ec244':
When Running in MediaCodec Mode, Widevine Freezes If You Rewind
2012-09-18 14:49:16 -07:00
John "Juce" Bruce
92a7778b0a
am b092b158: Merge "When Running in MediaCodec Mode, Widevine Freezes If You Rewind" into jb-mr1-dev
...
* commit 'b092b158d2cb5be6428694e5581d19472b2ec244':
When Running in MediaCodec Mode, Widevine Freezes If You Rewind
2012-09-18 14:45:29 -07:00
John "Juce" Bruce
b092b158d2
Merge "When Running in MediaCodec Mode, Widevine Freezes If You Rewind" into jb-mr1-dev
2012-09-18 14:37:52 -07:00
Jeff Tinker
b2fa5c4552
am 86cddd37: Merge "[WVDRM] Allow adaptive logging of more than 10 tracks" into jb-mr1-dev
...
* commit '86cddd376b403b7b3de13af4850f7398812e5561':
[WVDRM] Allow adaptive logging of more than 10 tracks
2012-09-18 12:27:35 -07:00
Jeff Tinker
5c4feda5fa
am 86cddd37: Merge "[WVDRM] Allow adaptive logging of more than 10 tracks" into jb-mr1-dev
...
* commit '86cddd376b403b7b3de13af4850f7398812e5561':
[WVDRM] Allow adaptive logging of more than 10 tracks
2012-09-18 12:16:36 -07:00
Jeff Tinker
86cddd376b
Merge "[WVDRM] Allow adaptive logging of more than 10 tracks" into jb-mr1-dev
2012-09-18 11:23:58 -07:00
John "Juce" Bruce
2e0e32f9f7
When Running in MediaCodec Mode, Widevine Freezes If You Rewind
...
There was a subtle interaction between Widevine's libraries and MediaCodec
mode. Widevine's code assumed (erroneously) that video seeks would always
happen before audio seeks, and because we can't seek audio and video
independently from each other, we would ignore audio seeks but respect video
seeks. This led to a problem since MediaCodec mode calls seeks in arbitrary
order.
Fix is to always respect the first request we get to seek and ignore the
second.
Bug: 6793514
Change-Id: Ic9ec60e0e0f606c7a0de6283dd4c30318eebdbad
2012-09-17 15:54:42 -07:00
Jeff Tinker
33b24fba9d
[WVDRM] Allow adaptive logging of more than 10 tracks
...
Change-Id: I9d2f8efcc658532dc2a0b1d69b8551444120f664
related-to-bug: 7173307
2012-09-17 15:08:42 -07:00
Fred Gylys-Colwell
6bddcff940
am 38e5d591: Merge "Add InfoListener to Widevine Test Application" into jb-mr1-dev
...
* commit '38e5d5912cb4b654577f63970b9bfbd49f22e83e':
Add InfoListener to Widevine Test Application
2012-09-17 11:09:58 -07:00
James Dong
831ab1f6a5
am be20f248: Revert "Update Widevine Libraries to Version 4.5.0.10079"
...
* commit 'be20f24819ce816fa9176d06935e8113562910f6':
Revert "Update Widevine Libraries to Version 4.5.0.10079"
2012-09-17 10:27:57 -07:00
Fred Gylys-Colwell
e3655bb021
am 38e5d591: Merge "Add InfoListener to Widevine Test Application" into jb-mr1-dev
...
* commit '38e5d5912cb4b654577f63970b9bfbd49f22e83e':
Add InfoListener to Widevine Test Application
2012-09-14 12:57:24 -07:00
Fred Gylys-Colwell
38e5d5912c
Merge "Add InfoListener to Widevine Test Application" into jb-mr1-dev
2012-09-14 12:54:36 -07:00
James Dong
06293eb191
am be20f248: Revert "Update Widevine Libraries to Version 4.5.0.10079"
...
* commit 'be20f24819ce816fa9176d06935e8113562910f6':
Revert "Update Widevine Libraries to Version 4.5.0.10079"
2012-09-14 09:26:22 -07:00
