OSDN Git Service
Chong Zhang [Thu, 14 May 2015 23:17:08 +0000 (23:17 +0000)]
am
dbe6c320: HDCP: buffer over flow check -- DO NOT MERGE
* commit '
dbe6c320b414d8139c46aaf880d5f154ef4f9af8':
HDCP: buffer over flow check -- DO NOT MERGE
Chong Zhang [Tue, 28 Apr 2015 01:38:17 +0000 (18:38 -0700)]
HDCP: buffer over flow check -- DO NOT MERGE
bug:
20222489
Change-Id: I3a64a5999d68ea243d187f12ec7717b7f26d93a3
(cherry picked from commit
532cd7b86a5fdc7b9a30a45d8ae2d16ef7660a72)
Robert Shih [Mon, 11 May 2015 11:10:36 +0000 (11:10 +0000)]
am
7acac10a: Merge "DO NOT MERGE: Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes" into klp-dev
* commit '
7acac10aae34da5ae4d628c5a270e7e3e94f7598':
DO NOT MERGE: Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes
Robert Shih [Mon, 11 May 2015 03:00:49 +0000 (03:00 +0000)]
Merge "DO NOT MERGE: Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes" into klp-dev
Marco Nelissen [Thu, 7 May 2015 15:02:30 +0000 (15:02 +0000)]
am
30d77e2c: Fix potential buffer overrun
* commit '
30d77e2c75c1973f9fb363717af92cf640685da3':
Fix potential buffer overrun
Marco Nelissen [Fri, 1 May 2015 23:18:26 +0000 (16:18 -0700)]
Fix potential buffer overrun
The "samples" parameter indicates the max number of sample tuples, not
the max number of samples.
Bug:
16183063
Change-Id: I5347497bbbe65910b8489d354e985ebc90d65516
Lajos Molnar [Thu, 2 Apr 2015 02:32:25 +0000 (19:32 -0700)]
DO NOT MERGE: Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes
Bug:
19641538
Change-Id: I5aae3f100846c125decc61eec7cd6563e3f33777
Nick Kralevich [Fri, 10 Apr 2015 23:34:59 +0000 (23:34 +0000)]
am
64290793: Merge "Fix integer underflow in ESDS processing" into klp-dev
* commit '
6429079345404932c5be5956efc7154390d2ed0e':
Fix integer underflow in ESDS processing
Nick Kralevich [Fri, 10 Apr 2015 23:34:57 +0000 (23:34 +0000)]
am
17b625b7: Merge "Fix integer overflow during MP4 atom processing" into klp-dev
* commit '
17b625b7f51b75fde6640c737474b8b2c51412bf':
Fix integer overflow during MP4 atom processing
Joshua J. Drake [Fri, 10 Apr 2015 23:34:56 +0000 (23:34 +0000)]
am
030d8d0a: Fix several ineffective integer overflow checks
* commit '
030d8d0a557097b88d6ecbf6d04823213512b620':
Fix several ineffective integer overflow checks
Nick Kralevich [Fri, 10 Apr 2015 23:16:02 +0000 (23:16 +0000)]
Merge "Fix integer underflow in ESDS processing" into klp-dev
Nick Kralevich [Fri, 10 Apr 2015 23:15:52 +0000 (23:15 +0000)]
Merge "Fix integer overflow during MP4 atom processing" into klp-dev
Joshua J. Drake [Thu, 9 Apr 2015 04:53:10 +0000 (23:53 -0500)]
Fix integer underflow in ESDS processing
Several arithmetic operations within parseESDescriptor could underflow, leading
to an out-of-bounds read operation. Ensure that subtractions from 'size' do not
cause it to wrap around.
Bug:
20139950
(cherry picked from commit
07c0f59d6c48874982d2b5c713487612e5af465a)
Change-Id: I377d21051e07ca654ea1f7037120429d3f71924a
Joshua J. Drake [Thu, 9 Apr 2015 04:44:57 +0000 (23:44 -0500)]
Fix integer overflow during MP4 atom processing
A few sample table related FourCC values are handled by the
setSampleToChunkParams function. An integer overflow exists within this
function. Validate that mNumSampleToChunkOffets will not cause an integer
overflow.
Bug:
20139950
(cherry picked from commit
c24607c29c96f939aed9e33bfa702b1dd79da4b7)
Change-Id: I49086952451b09a234d8b82669251ab9f1ef58d9
Joshua J. Drake [Thu, 9 Apr 2015 04:23:55 +0000 (23:23 -0500)]
Fix several ineffective integer overflow checks
Commit
edd4a76 (which addressed bugs
15328708,
15342615,
15342751) added
several integer overflow checks. Unfortunately, those checks fail to take into
account integer promotion rules and are thus themselves subject to an integer
overflow. Cast the sizeof() operator to a uint64_t to force promotion while
multiplying.
Bug:
20139950
(cherry picked from commit
e2e812e58e8d2716b00d7d82db99b08d3afb4b32)
Change-Id: I080eb3fa147601f18cedab86e0360406c3963d7b
Eric Laurent [Mon, 10 Nov 2014 23:28:27 +0000 (23:28 +0000)]
am
ae6965ae: am
3aef3560: am
e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessing
* commit '
ae6965ae7664aaea489a8d58358035610075c9af':
IAudioPolicyService: bound array size in queryDefaultPreProcessing
Eric Laurent [Mon, 10 Nov 2014 23:20:25 +0000 (23:20 +0000)]
am
3aef3560: am
e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessing
* commit '
3aef35600523eb6b4ccc8086a8913e80701a031a':
IAudioPolicyService: bound array size in queryDefaultPreProcessing
Eric Laurent [Mon, 10 Nov 2014 23:16:22 +0000 (23:16 +0000)]
am
e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessing
* commit '
e360f0f6cad290f69e07fd3a20dcf11a1dbc4160':
IAudioPolicyService: bound array size in queryDefaultPreProcessing
Eric Laurent [Wed, 5 Nov 2014 20:15:36 +0000 (12:15 -0800)]
IAudioPolicyService: bound array size in queryDefaultPreProcessing
Bug:
18226810.
Change-Id: Ib8e2bfe835a8681aac50bf23161db14e50c9a124
(cherry picked from commit
74adca9ad30b7f8a70d40c5237bade0d16c4ea58)
Eric Laurent [Fri, 31 Oct 2014 00:26:23 +0000 (00:26 +0000)]
am
42f785c5: am
4fbe49a8: am
96016c2d: am
9944ff09: am
70c3507d: am
450b10c9: am
d0f9dc71: am
e0a65f30: am
f5af3a72: am
6d80b687: audio policy: validate stream type received from binder calls.
* commit '
42f785c5d5ae596d781171327c98c541f0517feb':
audio policy: validate stream type received from binder calls.
Eric Laurent [Fri, 31 Oct 2014 00:17:14 +0000 (00:17 +0000)]
am
4fbe49a8: am
96016c2d: am
9944ff09: am
70c3507d: am
450b10c9: am
d0f9dc71: am
e0a65f30: am
f5af3a72: am
6d80b687: audio policy: validate stream type received from binder calls.
* commit '
4fbe49a83d41a64d44e363ccd691e7bfc41bb6af':
audio policy: validate stream type received from binder calls.
Eric Laurent [Fri, 31 Oct 2014 00:11:15 +0000 (00:11 +0000)]
am
96016c2d: am
9944ff09: am
70c3507d: am
450b10c9: am
d0f9dc71: am
e0a65f30: am
f5af3a72: am
6d80b687: audio policy: validate stream type received from binder calls.
* commit '
96016c2d583ccca9fffd6974cb9473f7effd6cf5':
audio policy: validate stream type received from binder calls.
Eric Laurent [Thu, 30 Oct 2014 23:55:43 +0000 (23:55 +0000)]
am
9944ff09: am
70c3507d: am
450b10c9: am
d0f9dc71: am
e0a65f30: am
f5af3a72: am
6d80b687: audio policy: validate stream type received from binder calls.
* commit '
9944ff09ac4eb076cab994ef245b0103f60836ba':
audio policy: validate stream type received from binder calls.
Eric Laurent [Thu, 30 Oct 2014 23:48:47 +0000 (23:48 +0000)]
am
70c3507d: am
450b10c9: am
d0f9dc71: am
e0a65f30: am
f5af3a72: am
6d80b687: audio policy: validate stream type received from binder calls.
* commit '
70c3507d915baaa5a0ab163eeb0a445030f4f492':
audio policy: validate stream type received from binder calls.
Eric Laurent [Thu, 30 Oct 2014 23:41:08 +0000 (23:41 +0000)]
am
450b10c9: am
d0f9dc71: am
e0a65f30: am
f5af3a72: am
6d80b687: audio policy: validate stream type received from binder calls.
* commit '
450b10c97514411ef1d0d887d4e18851fd286f0b':
audio policy: validate stream type received from binder calls.
Eric Laurent [Thu, 30 Oct 2014 23:25:15 +0000 (23:25 +0000)]
am
d0f9dc71: am
e0a65f30: am
f5af3a72: am
6d80b687: audio policy: validate stream type received from binder calls.
* commit '
d0f9dc7156e531d5cd0615f6e682d2449e08e9a7':
audio policy: validate stream type received from binder calls.
Eric Laurent [Thu, 30 Oct 2014 23:01:01 +0000 (23:01 +0000)]
am
e0a65f30: am
f5af3a72: am
6d80b687: audio policy: validate stream type received from binder calls.
* commit '
e0a65f3008ac5874106b21d03e19296c8015da41':
audio policy: validate stream type received from binder calls.
Eric Laurent [Thu, 30 Oct 2014 22:52:48 +0000 (22:52 +0000)]
am
f5af3a72: am
6d80b687: audio policy: validate stream type received from binder calls.
* commit '
f5af3a72f308cd4dff7859e62922ee5a13bd4c15':
audio policy: validate stream type received from binder calls.
Eric Laurent [Thu, 30 Oct 2014 22:44:00 +0000 (22:44 +0000)]
am
6d80b687: audio policy: validate stream type received from binder calls.
* commit '
6d80b687c3b8d9c8da7cdad7d9813aa51c1cf15e':
audio policy: validate stream type received from binder calls.
Eric Laurent [Thu, 30 Oct 2014 21:46:18 +0000 (14:46 -0700)]
audio policy: validate stream type received from binder calls.
Bug:
18001784.
Bug:
18002005.
Change-Id: If08866a3c21bcbfd8cdbbf8336bcf1faad66f321
Chris Elliott [Thu, 16 Oct 2014 02:17:27 +0000 (02:17 +0000)]
Revert "audio: prevent larger than required sleeps - DO NOT MERGE"
Revert change if we require a build beyond P
This reverts commit
620208dc0bbd7a0792702df3ab08800fdad60cec.
Change-Id: I07f65e35dbd9f814725f50f7bb346f7b285f41aa
Chris Elliott [Wed, 15 Oct 2014 20:46:15 +0000 (20:46 +0000)]
audio: prevent larger than required sleeps - DO NOT MERGE
This will be cherry picked into P build after O completes for other devices.
This reverts the revert from commit
2feb18ddfdbd20941ebcc3314780a582da5608e4.
b/
17962037
From: Haynes Mathew George <hgeorge@codeaurora.org>
Date: Wed, 26 Mar 2014 16:18:42 -0700
Subject: [PATCH] AudioTrack: prevent larger than required sleeps
AudioTrackThread can end up waiting for larger than necessary
time for free space to be available in the cblk. Fix this by
waiting on the cblk futex instead of the (internal) condition variable.
Change-Id: Iba5b266f9b4082b3833f4abd52ebc6601c8e3034
Chris Elliott [Wed, 15 Oct 2014 00:49:17 +0000 (00:49 +0000)]
Revert "audio: prevent larger than required sleeps - DO NOT MERGE"
This reverts commit
8c0417c173d1fd618ae54e2d721b0ec360ea70cc.
Reverting as we only wanted to include this CL the KNX01M build
Change-Id: Ib53292de658078285a38710915168e1746486fea
Haynes Mathew George [Thu, 9 Oct 2014 12:06:00 +0000 (20:06 +0800)]
audio: prevent larger than required sleeps - DO NOT MERGE
b/
17962037
From: Haynes Mathew George <hgeorge@codeaurora.org>
Date: Wed, 26 Mar 2014 16:18:42 -0700
Subject: [PATCH] AudioTrack: prevent larger than required sleeps
AudioTrackThread can end up waiting for larger than necessary
time for free space to be available in the cblk. Fix this by
waiting on the cblk futex instead of the (internal) condition variable.
Change-Id: I75bd14cd46f3b75afe0ea8bd9b48d7a2f95f654a
Robert Shih [Thu, 11 Sep 2014 00:50:33 +0000 (00:50 +0000)]
am
6fd1cf0c: am
86543654: am
0d83cf22: am
97d917bc: am
ab0b3212: am
9b51a37f: am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
6fd1cf0c00ee76802cfff0035011691aac8a1724':
SampleTable: check integer overflow during table alloc
Robert Shih [Thu, 11 Sep 2014 00:34:29 +0000 (00:34 +0000)]
am
86543654: am
0d83cf22: am
97d917bc: am
ab0b3212: am
9b51a37f: am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
8654365499f8e9956c490e98184abe33978d4e67':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 20:48:04 +0000 (20:48 +0000)]
am
0d83cf22: am
97d917bc: am
ab0b3212: am
9b51a37f: am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
0d83cf22991c48f4bb5f2afe3d16ae076861f394':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 20:26:40 +0000 (20:26 +0000)]
am
97d917bc: am
ab0b3212: am
9b51a37f: am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
97d917bc1ccc958d8f1051de6a888de9a25dc6bd':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 20:19:54 +0000 (20:19 +0000)]
am
ab0b3212: am
9b51a37f: am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
ab0b3212e0c15132f2dab2beeb39c47d31bb1dab':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 20:09:14 +0000 (20:09 +0000)]
am
9b51a37f: am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
9b51a37fa8ad9d28be791213ceba4fcbec52b14d':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 19:58:37 +0000 (19:58 +0000)]
am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
cb5dc219b78e6eeacb7ee2f5c93e6763db677122':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 19:47:42 +0000 (19:47 +0000)]
am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
74abb1ae32fbd3fa4112cc8b8d53882777feb191':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 19:41:45 +0000 (19:41 +0000)]
am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
482b18bbfd6c9214157bfab47feae86df48a7178':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 19:31:46 +0000 (19:31 +0000)]
am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
f106b1993143df44282777253244ce67974c9d4a':
SampleTable: check integer overflow during table alloc
Robert Shih [Mon, 28 Jul 2014 16:54:57 +0000 (09:54 -0700)]
SampleTable: check integer overflow during table alloc
Bug:
15328708
Bug:
15342615
Bug:
15342751
Change-Id: I6bb110a1eba46506799c73be8ff9a4f71c7e7053
(cherry picked from commit
edd4a76eb4747bd19ed122df46fa46b452c12a0d)
Eino-Ville Talvala [Thu, 19 Jun 2014 23:33:15 +0000 (23:33 +0000)]
am
f0d8468d: DO NOT MERGE: CameraService: Fix permissions check issues
* commit '
f0d8468dcec08e1ac4edf62ec7da5782a0b84d93':
DO NOT MERGE: CameraService: Fix permissions check issues
Eino-Ville Talvala [Tue, 17 Jun 2014 02:21:12 +0000 (19:21 -0700)]
DO NOT MERGE: CameraService: Fix permissions check issues
Bug:
15677063
Change-Id: I012c111fff90fefd9eb0fef7c9d6034f00c9c6df
Adam Lesinski [Fri, 6 Jun 2014 21:13:00 +0000 (21:13 +0000)]
Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev
Adam Lesinski [Wed, 4 Jun 2014 22:14:03 +0000 (15:14 -0700)]
Implement a NoOp DrmManagerClientImpl when no DRM service exists
Change-Id: Ib06f429102a51c540c8132f3397130328279e03a
Lajos Molnar [Thu, 29 May 2014 14:34:59 +0000 (07:34 -0700)]
DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor
Bug:
15320804
Change-Id: I1c2f0f75aeaabc20cb94e79e47b70f7faefe0a9e
Benoit Goby [Mon, 12 May 2014 22:59:50 +0000 (15:59 -0700)]
screenrecord: Add raw frames output format
This works like the frames output format but without a header so that
the output can be piped directly to mplayer:
adb shell screenrecord --output-format=raw-frames - | mplayer -demuxer
rawvideo -rawvideo w=320:h=240:format=rgb24 -
Change-Id: Ib5ed508fdca3a5d63e973c5189b3677c2d92b43f
Andy McFadden [Wed, 26 Feb 2014 02:29:06 +0000 (18:29 -0800)]
Add frame dump output
This adds the ability to dump frames as RGB data with a minimal
frame header. Only recommended for devices with small displays.
Enable with "--output-format=frames".
The "--raw" option is now selected with "--output-format=h264".
Change-Id: I18d3d4a87cd056d7acf0658985a90dc5895dbfb6
Andy McFadden [Fri, 20 Dec 2013 21:40:34 +0000 (13:40 -0800)]
Provide raw H.264 output from screenrecord
This adds an experimental (undocumented) "--raw" flag. If set, we
output an H.264 byte stream rather than a .mp4 file.
If the filename is "-", we send the output to stdout. If stdout is a
tty, we reconfigure it to avoid CRLF line termination over adb.
Change-Id: I5193f6193c9c1a59f92eefad0ed399f24afbf6de
Jeff Tinker [Wed, 2 Apr 2014 23:41:38 +0000 (16:41 -0700)]
Add signature|system permission to MediaDrm signer APIs
Change-Id: If970e5ff8dcab2e67af2f3376dcd14dca82f2394
related-to-bug:
12702350
Jeff Tinker [Tue, 4 Mar 2014 21:21:31 +0000 (13:21 -0800)]
Support CAST V2 Authentication in MediaDrm
Java API version
Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.
Change-Id: I9066ada0edf8e0d777c503897d8c7fc7f76f2861
related-to-bug:
12702350
Lajos Molnar [Fri, 28 Mar 2014 01:45:11 +0000 (01:45 +0000)]
am
f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev
* commit '
f780d28de2e3cf7f6b26b9626321dba75719736e':
DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
Lajos Molnar [Fri, 28 Mar 2014 01:45:10 +0000 (01:45 +0000)]
am
3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"" into klp-dev
* commit '
3d4e4fcbcfc5c16dd794591727f5c713831ab6dc':
DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"
Lajos Molnar [Fri, 28 Mar 2014 00:11:23 +0000 (00:11 +0000)]
Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev
Lajos Molnar [Fri, 28 Mar 2014 00:11:04 +0000 (00:11 +0000)]
Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"" into klp-dev
Lajos Molnar [Thu, 27 Mar 2014 23:44:23 +0000 (16:44 -0700)]
DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
This reverts commit
b635b0e66b257ab442e230bca96afd5105cf6829.
Bug:
13655631
Lajos Molnar [Thu, 27 Mar 2014 23:41:37 +0000 (16:41 -0700)]
DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"
This reverts commit
a0470879e25394cb85437366fa53ce8055cd556f.
Bug:
13655631
Igor Murashkin [Tue, 25 Mar 2014 20:11:09 +0000 (20:11 +0000)]
am
0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
* commit '
0370be96e33ea0c8fb4069e704deccce43b7403c':
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
Igor Murashkin [Wed, 19 Mar 2014 01:15:23 +0000 (18:15 -0700)]
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
As a workaround, duplicate CameraParameters into CameraParameters2 to
prevent ABI break for some camera HALs that directly link into
CameraParameters.
CameraParameters2 implements the real fixes needed in the framework,
while CameraParameters is left in to satisfy older camera HALs.
Bug:
12609188
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
Lajos Molnar [Fri, 21 Mar 2014 19:20:27 +0000 (19:20 +0000)]
am
333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev
* commit '
333ceb4f66ccf790081026f645474e07d832fbdb':
DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
Lajos Molnar [Fri, 21 Mar 2014 19:09:48 +0000 (19:09 +0000)]
Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev
Robert Shih [Fri, 7 Feb 2014 20:26:58 +0000 (12:26 -0800)]
DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
First check for embedded ID3 tag, then bail out if invalid.
Bug:
12934795
Change-Id: I74acebed4bfb2c6ca44dfe936166fdba8510233f
Rachad [Fri, 21 Mar 2014 17:08:11 +0000 (17:08 +0000)]
am
f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)
* commit '
f622e2c78407b50806a53a06a89b2b6546420f55':
Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)
Rachad [Tue, 11 Feb 2014 00:54:46 +0000 (16:54 -0800)]
Increased recorded MP4 max file size to 4GB
(more precisely 2^32-1 bytes -- FAT32 max file size)
bug:
11039801
Change-Id: I6169f798c59d123d02d5fd7afa3b9e645ebdb598
(cherry picked from commit
1f1f2b1678fd0d038dfc501252dd2b65ecf10cae)
Marco Nelissen [Thu, 20 Mar 2014 20:57:12 +0000 (20:57 +0000)]
Marco Nelissen [Thu, 20 Mar 2014 20:48:52 +0000 (20:48 +0000)]
Marco Nelissen [Thu, 20 Mar 2014 20:29:33 +0000 (13:29 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 20:18:07 +0000 (13:18 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 20:13:35 +0000 (13:13 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 20:08:17 +0000 (13:08 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 20:04:11 +0000 (13:04 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 20:00:07 +0000 (13:00 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 19:32:48 +0000 (12:32 -0700)]
Fix build
As of jb-mr1, need to explicitly include library dependencies. The original
change in jb, which the automerger dutyfully merged, did not need this.
Change-Id: I429637e2d01b8084376bb97a02bb091a0ea9eaf7
Marco Nelissen [Thu, 20 Mar 2014 18:58:42 +0000 (18:58 +0000)]
Marco Nelissen [Thu, 20 Mar 2014 18:17:24 +0000 (18:17 +0000)]
Marco Nelissen [Thu, 20 Mar 2014 18:08:43 +0000 (11:08 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 17:49:15 +0000 (10:49 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 17:31:32 +0000 (10:31 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 17:27:04 +0000 (10:27 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 17:21:14 +0000 (10:21 -0700)]
am
dfd90c80: am
d434944b: am
3bc4f7ea: am
0c271b75: Verify certificates
* commit '
dfd90c8052a913ed2bbbea1873ee51838d40bfe1':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:16:53 +0000 (10:16 -0700)]
am
d434944b: am
3bc4f7ea: am
0c271b75: Verify certificates
* commit '
d434944b00cf83a38019047e0d7db155a15d77f4':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:11:20 +0000 (10:11 -0700)]
am
3bc4f7ea: am
0c271b75: Verify certificates
* commit '
3bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:04:18 +0000 (10:04 -0700)]
am
0c271b75: Verify certificates
* commit '
0c271b750f7314e187f8479f478ad9382d9a9045':
Verify certificates
Lajos Molnar [Wed, 19 Mar 2014 19:56:15 +0000 (19:56 +0000)]
am
1faa4170: stagefright: allow for minUndequeuedBufs to be one less
* commit '
1faa41704e0b976e546321effcb09a85767d51ba':
stagefright: allow for minUndequeuedBufs to be one less
Lajos Molnar [Wed, 19 Mar 2014 19:22:01 +0000 (12:22 -0700)]
stagefright: allow for minUndequeuedBufs to be one less
Bug:
13533477
Change-Id: I909324e3e24f65d8051e0d5474267620efcfc729
Marco Nelissen [Thu, 13 Mar 2014 21:18:25 +0000 (14:18 -0700)]
Verify certificates
b/
13418320
Cherrypicked from
8a57d24c733b08da846b54d1adf029e606b5a5f3
https://googleplex-android-review.git.corp.google.com/#/c/433309/
Change-Id: I3052dd5f9ec057e700784cd713f6a7dab9ecfe7b
Lajos Molnar [Wed, 19 Mar 2014 03:10:58 +0000 (03:10 +0000)]
am
b635b0e6: mediaplayer: keep more buffers with the BufferQueue
* commit '
b635b0e66b257ab442e230bca96afd5105cf6829':
mediaplayer: keep more buffers with the BufferQueue
Robert Shih [Wed, 19 Mar 2014 02:19:55 +0000 (02:19 +0000)]
am
43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.
* commit '
43ca783effd99bba0e6e2dd6fe177a8888578ef8':
httplive: block-by-block fetch, decrypt, and parse ts files.
Lajos Molnar [Thu, 13 Feb 2014 23:29:49 +0000 (15:29 -0800)]
mediaplayer: keep more buffers with the BufferQueue
Change OMX buffer allocation policy to allocate
nBufferCountMin + what is required for the BQ.
For the BQ, try to allocate 2 additional buffers than
the minimum undequeued count.
Also account for the fact that BQ may return one less
than the actual minimum undequeued count.
In most cases the resulting number of buffers ends up
being the same as with the previous policy, but we
keep more buffers with the BQ.
Change-Id: I826db8bf7dd333b620299dba60bf1b81b228275d
Bug:
13170236
Robert Shih [Thu, 27 Feb 2014 20:33:24 +0000 (12:33 -0800)]
httplive: block-by-block fetch, decrypt, and parse ts files.
Bug:
12060952
Change-Id: I695345081fe23961b9d0ef6db264885f914703ec
Igor Murashkin [Mon, 17 Mar 2014 22:56:00 +0000 (22:56 +0000)]
am
bd3e2e03: camera2: Fix segfault when using null availability listener
* commit '
bd3e2e03f3ab686c52982a9e50cae853128172cf':
camera2: Fix segfault when using null availability listener
Igor Murashkin [Mon, 17 Mar 2014 20:01:41 +0000 (13:01 -0700)]
camera2: Fix segfault when using null availability listener
ICameraService::addListener / removeListener will now return BAD_VALUE
if a null listener is used.
Bug:
12891434
Change-Id: I9764110094d8fd42e22fcc8df3ef0e73c1b070e7
Marco Nelissen [Fri, 14 Mar 2014 22:55:52 +0000 (22:55 +0000)]
am
75dcf510: Merge "Verify certificates" into klp-dev
* commit '
75dcf5101c90e31bbac95694d835b0e8f57ba720':
Verify certificates
Marco Nelissen [Fri, 14 Mar 2014 22:27:17 +0000 (22:27 +0000)]
Merge "Verify certificates" into klp-dev
Lajos Molnar [Fri, 14 Mar 2014 04:10:37 +0000 (04:10 +0000)]
am
70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev
* commit '
70cc5bdc0fca3f67f3602f04152c29323cad99df':
LiveSession: fix incorrect stream key (subtitle"s")
M3UParser: trim spaces when parsing comma separated codecs.
Lajos Molnar [Fri, 14 Mar 2014 04:10:37 +0000 (04:10 +0000)]
am
67a10c52: Merge "httplive: clear access units before returning from seekTo." into klp-dev
* commit '
67a10c522898d8223f5a2d389a846b7e2327148a':
httplive: clear access units before returning from seekTo.