OSDN Git Service
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
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
Adam Hampson [Wed, 13 Nov 2013 17:21:33 +0000 (09:21 -0800)]
am
00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev
* commit '
00cb884fc870aba4052c8d187a45e4aec50a6b43':
StageFright: Removes hacks for Nvidia MPEG2 decoder
Adam Hampson [Wed, 13 Nov 2013 17:14:31 +0000 (17:14 +0000)]
Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev
Jeff Tinker [Mon, 19 Aug 2013 21:45:56 +0000 (14:45 -0700)]
am
6e3ee310: am
31d49615: am
27b876d4: am
9bc40a2c: am
98603acb: am
36337f8f: am
7d72965f: am
60476336: Remove obsolete drm manager code
* commit '
6e3ee310d90e30c928c9e29a4a07de4bcbf2855e':
Remove obsolete drm manager code
Jeff Tinker [Mon, 19 Aug 2013 21:39:15 +0000 (14:39 -0700)]
am
31d49615: am
27b876d4: am
9bc40a2c: am
98603acb: am
36337f8f: am
7d72965f: am
60476336: Remove obsolete drm manager code
* commit '
31d49615007372621ac3fba55e9e3aab48c873f9':
Remove obsolete drm manager code
Jeff Tinker [Mon, 19 Aug 2013 21:36:05 +0000 (14:36 -0700)]
am
27b876d4: am
9bc40a2c: am
98603acb: am
36337f8f: am
7d72965f: am
60476336: Remove obsolete drm manager code
* commit '
27b876d4cf78b262854b9f2aec26467f9323d3ad':
Remove obsolete drm manager code
Jeff Tinker [Mon, 19 Aug 2013 21:32:42 +0000 (14:32 -0700)]
am
9bc40a2c: am
98603acb: am
36337f8f: am
7d72965f: am
60476336: Remove obsolete drm manager code
* commit '
9bc40a2cfdd307074ef5c23ad444fc8a782bab84':
Remove obsolete drm manager code
Jeff Tinker [Mon, 19 Aug 2013 21:31:11 +0000 (14:31 -0700)]
am
98603acb: am
36337f8f: am
7d72965f: am
60476336: Remove obsolete drm manager code
* commit '
98603acbce87c3a451c8e4c26625048363c3f7f7':
Remove obsolete drm manager code
Jeff Tinker [Mon, 19 Aug 2013 21:27:45 +0000 (14:27 -0700)]
am
36337f8f: am
7d72965f: am
60476336: Remove obsolete drm manager code
* commit '
36337f8f1c4d7384cb1528205582148c85c69f4d':
Remove obsolete drm manager code
Jeff Tinker [Mon, 19 Aug 2013 21:24:50 +0000 (14:24 -0700)]
am
7d72965f: am
60476336: Remove obsolete drm manager code
* commit '
7d72965ff6a4bf9f91213fbdafcd12cfad8334e5':
Remove obsolete drm manager code
Jeff Tinker [Mon, 19 Aug 2013 21:21:48 +0000 (14:21 -0700)]
am
60476336: Remove obsolete drm manager code
* commit '
6047633622328711cc6b23667c8d6381bae179bf':
Remove obsolete drm manager code
Jeff Tinker [Mon, 22 Jul 2013 22:54:42 +0000 (15:54 -0700)]
Remove obsolete drm manager code
bug:
9545965
Change-Id: Ia6e09efa826b1349d027045e782980daeb7d7596
(cherry picked from commit
f355f18aa2cc1706761e373fe19298a9ccc9c75a)
Suresh Choudhary [Tue, 30 Jul 2013 13:30:10 +0000 (19:00 +0530)]
StageFright: Removes hacks for Nvidia MPEG2 decoder
Removes the NVIDIA MPEG2 decoder specific hacks in legacy code as
Nvidia HW MPEG2 decoder is enabled and tested now.
Change-Id: Ifc67e1119d9741551336753f85f9cfdfd3fc8600
Andreas Huber [Thu, 8 Aug 2013 15:56:37 +0000 (08:56 -0700)]
am
d0f5664a: Merge "Handle undefined NAL type for h264 streaming"
* commit '
d0f5664abb5a8d94ae13f63a5f3491b47383ee2f':
Handle undefined NAL type for h264 streaming
Andreas Huber [Thu, 8 Aug 2013 15:52:47 +0000 (15:52 +0000)]
Merge "Handle undefined NAL type for h264 streaming"
Glenn Kasten [Thu, 1 Aug 2013 19:43:55 +0000 (12:43 -0700)]
am
b687ff9f: Merge "Fix mismatched delete/new couple"
* commit '
b687ff9f2e02790e8a8e3964cb73e87546cd72dd':
Fix mismatched delete/new couple
Glenn Kasten [Thu, 1 Aug 2013 19:37:52 +0000 (19:37 +0000)]
Merge "Fix mismatched delete/new couple"
Andreas Huber [Wed, 31 Jul 2013 15:52:41 +0000 (08:52 -0700)]
am
d0ef1ccd: Merge "rtsp handle response line ended with \'\n\'"
* commit '
d0ef1ccd987e650e025b840e72f91770d03a5110':
rtsp handle response line ended with '\n'
Andreas Huber [Wed, 31 Jul 2013 15:43:56 +0000 (15:43 +0000)]
Merge "rtsp handle response line ended with '\n'"
Yajun Zeng [Tue, 14 May 2013 02:00:10 +0000 (10:00 +0800)]
rtsp handle response line ended with '\n'
Change-Id: I5bfafd3fa2c95083e833da2846556282eada2b02
Signed-off-by: Yajun Zeng <beanz@marvell.com>
Andrei V. FOMITCHEV [Tue, 9 Oct 2012 09:33:25 +0000 (11:33 +0200)]
Fix mismatched delete/new couple
In RecordThread::readInputParameters(), mRsmpInBuffer is allocated
with new[] and should be freed with delete[] instead of delete.
This error has been found by valgrind.
Change-Id: I2f947abb658a21a7d1e61eebb99270cb37d2d147
Signed-off-by: Andrei V. FOMITCHEV <andreix.fomitchev@intel.com>
Signed-off-by: David Wagner <david.wagner@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Patrik2 Carlsson [Fri, 16 Nov 2012 15:18:03 +0000 (16:18 +0100)]
Handle undefined NAL type for h264 streaming
Packages of undefined NAL type (0) was observed but lead to deleting
the subsequent package due to the current assembler implementation.
Identifying and ignoring this package without returning an error
handles undefined packages without side-effects.
Change-Id: I02e15b8682bee3154b3c4acf82639a28417f0c85
The Android Open Source Project [Fri, 19 Jul 2013 21:20:40 +0000 (14:20 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I48e936434971feedd176c2d5eafd0fdf43b75f74
Eino-Ville Talvala [Fri, 19 Jul 2013 20:43:00 +0000 (13:43 -0700)]
am
46910bdc: Camera2/3: Fix deadlock when starting recording before preview.
* commit '
46910bdc57c35ac36bd4adcbb76f4f3a590e3f21':
Camera2/3: Fix deadlock when starting recording before preview.
Eino-Ville Talvala [Fri, 19 Jul 2013 02:15:17 +0000 (19:15 -0700)]
Camera2/3: Fix deadlock when starting recording before preview.
Move 3A notification synthesis for HAL3 devices from
Camera3Device::processCaptureResult to Camera2Client's
FrameProcessor. This will ensure that calls to processCaptureResult
from HAL can never block on Camera2Client internal mutexes.
Bug:
9923891
Change-Id: I5184649bf45c0807babe6b8c0e1239e959cd3480
Eino-Ville Talvala [Fri, 19 Jul 2013 02:15:17 +0000 (19:15 -0700)]
Camera2/3: Fix deadlock when starting recording before preview.
Move 3A notification synthesis for HAL3 devices from
Camera3Device::processCaptureResult to Camera2Client's
FrameProcessor. This will ensure that calls to processCaptureResult
from HAL can never block on Camera2Client internal mutexes.
Bug:
9923891
Change-Id: I5184649bf45c0807babe6b8c0e1239e959cd3480
The Android Open Source Project [Wed, 10 Jul 2013 15:34:46 +0000 (08:34 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ie4a7e41d8d28b46966f6aadfd38af5516c082f04
The Android Automerger [Wed, 10 Jul 2013 12:55:16 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Tue, 9 Jul 2013 16:37:21 +0000 (09:37 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I9a9eea4a01ba78b06cb79a26db9b0bcb52f5fd7b
Zhijun He [Tue, 9 Jul 2013 15:00:35 +0000 (08:00 -0700)]
am
a2520db0: camera2/3: set preview callback oneshot flag during still capture
* commit '
a2520db02bead68d4980783c41500ae96511bdf8':
camera2/3: set preview callback oneshot flag during still capture
The Android Automerger [Tue, 9 Jul 2013 12:55:21 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Zhijun He [Mon, 8 Jul 2013 23:12:32 +0000 (16:12 -0700)]
camera2/3: set preview callback oneshot flag during still capture
Preview callback oneshot flag need set when a still picture is being captured
and preview callback oneshot is enabled, otherwise, the callback enabling status
could be lost when preview is restarted after still catpure.
Bug
9742091
Change-Id: If9562369013e53727edfdd16f3d00d6a9392e70d
Eino-Ville Talvala [Mon, 8 Jul 2013 23:47:27 +0000 (16:47 -0700)]
am
4a5c009b: Camera2/3: As a fallback, unilaterally free old recording buffers
* commit '
4a5c009bc2389304cf078c270bceb656479367d2':
Camera2/3: As a fallback, unilaterally free old recording buffers
The Android Open Source Project [Mon, 8 Jul 2013 22:33:11 +0000 (15:33 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I13e45e13c3abf52cef3fb58de3f4707fb8fedaac
Jean-Baptiste Queru [Mon, 8 Jul 2013 20:42:25 +0000 (13:42 -0700)]
am
c582fde9: resolved conflicts for merge of
c158971f to stage-aosp-master
* commit '
c582fde93ded7219107157333a9e46d780adcf9c':
Store rtsp accessunit until PLAY response parsed
Jean-Baptiste Queru [Mon, 8 Jul 2013 20:36:08 +0000 (13:36 -0700)]
resolved conflicts for merge of
c158971f to stage-aosp-master
Change-Id: I3d77b86f7e616af62a826fc37126706ad8ff6158
Eino-Ville Talvala [Wed, 3 Jul 2013 23:56:11 +0000 (16:56 -0700)]
Camera2/3: As a fallback, unilaterally free old recording buffers
When starting a recording session, check for and clear out recording
buffers still owned by stagefright from a previous recording session,
if any. There should never be any, but in case they are due to a bug
elsewhere in the system, clearing out the buffers makes recovery
possible.
Bug:
9591080
Change-Id: I3a2a1256860bd174381cd525948419f985c9b415
Jean-Baptiste Queru [Mon, 8 Jul 2013 19:35:13 +0000 (19:35 +0000)]
Merge "Store rtsp accessunit until PLAY response parsed"
Jean-Baptiste Queru [Mon, 8 Jul 2013 19:20:16 +0000 (12:20 -0700)]
am
5de9ef20: am
365ed394: Merge "Typo in CameraParameters::set"
* commit '
5de9ef20d596bc20f53cba664f1ac7e358910ea2':
Typo in CameraParameters::set
Jean-Baptiste Queru [Mon, 8 Jul 2013 19:15:36 +0000 (12:15 -0700)]
am
365ed394: Merge "Typo in CameraParameters::set"
* commit '
365ed394c4135d9d42082c85638c076aed4bd156':
Typo in CameraParameters::set
Jean-Baptiste Queru [Mon, 8 Jul 2013 19:00:51 +0000 (19:00 +0000)]
Merge "Typo in CameraParameters::set"
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:29:15 +0000 (11:29 -0700)]
am
5d2ab2a6: am
8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack"
* commit '
5d2ab2a6d5e90c045d0989ef1be6c66a2295ee2d':
libstagefright: Use LOG_BASIC when use chromium http stack
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:25:40 +0000 (11:25 -0700)]
am
06197925: am
267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero."
* commit '
061979253985e59c4fcb82ede232717736e633b1':
Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:25:39 +0000 (11:25 -0700)]
am
8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack"
* commit '
8eef093c213094c7efb655ef4d9e31439646bd7f':
libstagefright: Use LOG_BASIC when use chromium http stack
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:25:34 +0000 (11:25 -0700)]
am
7266bc80: am
ca7f1609: Merge "Prevent double disconnects in RTSPSource"
* commit '
7266bc80850dc327e9f18c27b81613f959399630':
Prevent double disconnects in RTSPSource
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:23:45 +0000 (18:23 +0000)]
Merge "libstagefright: Use LOG_BASIC when use chromium http stack"
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:21:48 +0000 (11:21 -0700)]
am
267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero."
* commit '
267363ee2836ff9bc18d7fdd93aaedf19de546ad':
Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:21:45 +0000 (11:21 -0700)]
am
ca7f1609: Merge "Prevent double disconnects in RTSPSource"
* commit '
ca7f160921a4a1a5da32ebe8fab1067bd8998a1f':
Prevent double disconnects in RTSPSource
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:17:43 +0000 (18:17 +0000)]
Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero."
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:17:02 +0000 (18:17 +0000)]
Merge "Prevent double disconnects in RTSPSource"
The Android Automerger [Mon, 8 Jul 2013 12:55:23 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Jeff Tinker [Sun, 7 Jul 2013 19:26:16 +0000 (12:26 -0700)]
am
eced745a: Merge "Part of fix for TEE resource leaks when app crashes" into jb-mr2-dev
* commit '
eced745af7d2d27a8c45e04eb071d4fb30cd3e48':
Part of fix for TEE resource leaks when app crashes
Jeff Tinker [Sun, 7 Jul 2013 19:21:55 +0000 (19:21 +0000)]
Merge "Part of fix for TEE resource leaks when app crashes" into jb-mr2-dev
Jeff Tinker [Wed, 3 Jul 2013 22:38:58 +0000 (15:38 -0700)]
Part of fix for TEE resource leaks when app crashes
bug:
9672606
Change-Id: I98cf65260d5e43d34e3897452f6f26ed2c89294e
Eric Laurent [Wed, 3 Jul 2013 15:16:46 +0000 (08:16 -0700)]
am
f59a4b39: fix scheduling policy service death detection
* commit '
f59a4b393f4844c5bbc8d6212364bdddea33d232':
fix scheduling policy service death detection
hovanchen [Tue, 2 Jul 2013 07:07:44 +0000 (15:07 +0800)]
Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.
[Cause]
- getBitrate(int64_t *bitrate) will return true if mBitrate = 0.
- Then, in getCachedDuration_l(int64_t *durationUs, bool *eos),
we might execute the following function when
getBitrate(&bitrate) = true and bitrate = 0.
*durationUs = cachedDataRemaining * 8000000ll / bitrate;
- Mediaserver will be crashed when divided by zero.
- The mediaserver crash often occur when DLNA IOP tests on Golden DMS
with AAC_ADTS_320 audio.
[Solution]
- Prevent the divide function executing when bitrate is zero.
Change-Id: I4439d92cee5faec95df2109e9186c33b3fff6c66
Eric Laurent [Tue, 2 Jul 2013 18:15:41 +0000 (11:15 -0700)]
fix scheduling policy service death detection
Check status of transactions to scheduling policy service
and re-acquire a binder interface in case of DEAD_OBJECT.
Bug:
8875559.
Change-Id: I1e00bd44e2d4723b3ec95d5c31d9652ba08e238a
The Android Open Source Project [Mon, 1 Jul 2013 14:42:56 +0000 (07:42 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Idf0f0cdf02e6e94603ff003b6baf869b4414e1cf
Fredrik Rosin [Wed, 6 Mar 2013 12:42:53 +0000 (13:42 +0100)]
Prevent double disconnects in RTSPSource
Prevent a null pointer from occuring by checking that we are not
already disconnected before performing a disconnect, in case
multiple disconnects have been issued.
Change-Id: Ib88800cd246086fd57f77d10748d41b1aefe2084
The Android Automerger [Sun, 30 Jun 2013 12:55:22 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Andreas Huber [Fri, 28 Jun 2013 22:31:37 +0000 (15:31 -0700)]
am
47a1fe04: am
a9aa6baa: Merge "Set u.ext_data to null after it has been freed"
* commit '
47a1fe04637793f48d808261b1fac47acc3de1e1':
Set u.ext_data to null after it has been freed
Andreas Huber [Fri, 28 Jun 2013 22:29:01 +0000 (15:29 -0700)]
am
a9aa6baa: Merge "Set u.ext_data to null after it has been freed"
* commit '
a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507':
Set u.ext_data to null after it has been freed
Andreas Huber [Fri, 28 Jun 2013 22:26:42 +0000 (22:26 +0000)]
Merge "Set u.ext_data to null after it has been freed"
Andreas Huber [Wed, 29 May 2013 21:20:52 +0000 (14:20 -0700)]
Update HTTP proxy configuration for all media playback inside stagefright.
Change-Id: Ie0dd00045aba668d8b49da73224e7a7c9c04f69b
related-to-bug:
8873723
(cherry picked from commit
2704965b8a1ff3b7450ff58ccecf86d8ec688c40)
Glenn Kasten [Fri, 28 Jun 2013 16:33:15 +0000 (09:33 -0700)]
am
83790fcc: am
bdf33c98: Merge "Fix compilation warning: incorrect format specifier for type \'ssize_t\'."
* commit '
83790fcce4f5cda1e7c89f1cbed452426502f227':
Fix compilation warning: incorrect format specifier for type 'ssize_t'.
Glenn Kasten [Fri, 28 Jun 2013 16:30:58 +0000 (09:30 -0700)]
am
bdf33c98: Merge "Fix compilation warning: incorrect format specifier for type \'ssize_t\'."
* commit '
bdf33c98912090176183d3e9b9a9217dbbdca6da':
Fix compilation warning: incorrect format specifier for type 'ssize_t'.
Glenn Kasten [Fri, 28 Jun 2013 16:28:48 +0000 (16:28 +0000)]
Merge "Fix compilation warning: incorrect format specifier for type 'ssize_t'."
Eino-Ville Talvala [Fri, 28 Jun 2013 14:07:29 +0000 (07:07 -0700)]
am
a691ff3c: Camera2/3: Don\'t allow recording and callbacks to coexist.
* commit '
a691ff3c03e38e148bbefed35ebb15e552a12613':
Camera2/3: Don't allow recording and callbacks to coexist.
Christer Fletcher [Tue, 18 Jun 2013 06:55:09 +0000 (08:55 +0200)]
Set u.ext_data to null after it has been freed
SEGV_MAPPER crash could happen in MetaData::typed_data::freeStorage.
The faulty address could be both random pointers and
deadbaad. It
seems like free could be called more than once on u.ext_data. Set
u.ext_data to null after it has been freed as there already is a
null check before trying to free it.
Change-Id: I710c49f9c231bd8852159914c0b2add58a685f0e
Eino-Ville Talvala [Thu, 27 Jun 2013 01:23:23 +0000 (18:23 -0700)]
Camera2/3: Don't allow recording and callbacks to coexist.
- Tear down conflicting streams when necessary.
- Shut down callbacks if recording starts
- Do not allow callbacks to start if recording is active
Per the current camera API, recording and preview callbacks cannot be
active simultaneously. However, the framework did not explicitly
disallow this, and in fact left the streams configured once they were
created, even if switching between the two operational modes.
In addition, no guards existed for trying to enable both recording and
callbacks at the same time.
Bug:
9423825
Change-Id: I7d6e6114c2e14fcfb5299b4c72ad557895cbf4b8
Scott Fan [Sun, 28 Apr 2013 02:13:54 +0000 (10:13 +0800)]
Fix compilation warning: incorrect format specifier for type 'ssize_t'.
warning: format '%ld' expects argument of type 'long int',
but argument 7 has type 'ssize_t {aka int}' [-Wformat]
Change-Id: I823835a26320a3abb82f8dff9fbe82e5132e7556
Signed-off-by: Scott Fan <fancp2007@gmail.com>
The Android Open Source Project [Tue, 25 Jun 2013 23:12:03 +0000 (16:12 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I4de46f3bfcfb80867bbeb52a76d383f5870e74f4
Jean-Baptiste Queru [Tue, 25 Jun 2013 17:40:38 +0000 (10:40 -0700)]
am
3a4ff0b8: am
d74a9ee8: Merge "libstagefright: fix the duration "00:00" for some httplive link"
* commit '
3a4ff0b8bf464c9c286d63326bea42609527051e':
libstagefright: fix the duration "00:00" for some httplive link
Jean-Baptiste Queru [Tue, 25 Jun 2013 17:38:44 +0000 (10:38 -0700)]
am
d74a9ee8: Merge "libstagefright: fix the duration "00:00" for some httplive link"
* commit '
d74a9ee83fd6e033fd2260ca3777390d7e5f817a':
libstagefright: fix the duration "00:00" for some httplive link
Jean-Baptiste Queru [Tue, 25 Jun 2013 17:37:28 +0000 (17:37 +0000)]
Merge "libstagefright: fix the duration "00:00" for some httplive link"
The Android Automerger [Mon, 24 Jun 2013 21:55:06 +0000 (14:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 24 Jun 2013 21:41:40 +0000 (14:41 -0700)]
Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD
The Android Open Source Project [Fri, 21 Jun 2013 18:56:55 +0000 (11:56 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id1c9edbb5b7b398fb863cbbd79e673ab2c10df9a
The Android Automerger [Fri, 21 Jun 2013 18:35:26 +0000 (11:35 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Jean-Michel Trivi [Fri, 21 Jun 2013 05:23:58 +0000 (22:23 -0700)]
am
209bbbcf: Apply EQ and bass boost first in effect chain
* commit '
209bbbcf4190231f9dede758cbe77d109919f9f1':
Apply EQ and bass boost first in effect chain
Jean-Michel Trivi [Thu, 20 Jun 2013 23:49:25 +0000 (16:49 -0700)]
Apply EQ and bass boost first in effect chain
EQ and bass boost can improperly interact with other effects
(e.g. virtualizer) outside of the bundle. Apply them first
in an effect chain, which is equivalent to using them to affect
the content of a track, rather than how a track is presented,
when additional effects are cascaded behind EQ and BB.
Bug
8589316
Change-Id: Ifb34e46bc1969f613cdc90ee2a79af677e2fad92
Glenn Kasten [Thu, 20 Jun 2013 22:16:00 +0000 (15:16 -0700)]
am
f3e21c30: am
60f3f102: Merge "Prevent AudioCommands being freed before read"
* commit '
f3e21c301b8fef49eecf9c716373fcbfbaa47670':
Prevent AudioCommands being freed before read
Glenn Kasten [Thu, 20 Jun 2013 22:13:19 +0000 (15:13 -0700)]
am
60f3f102: Merge "Prevent AudioCommands being freed before read"
* commit '
60f3f102ba2973cc31e5c7ea00d95bbf19968e8b':
Prevent AudioCommands being freed before read
Glenn Kasten [Thu, 20 Jun 2013 22:11:25 +0000 (22:11 +0000)]
Merge "Prevent AudioCommands being freed before read"
Christer Fletcher [Fri, 18 Jan 2013 14:27:03 +0000 (15:27 +0100)]
Prevent AudioCommands being freed before read
When AudioCommandThread::threadLoop process AudioCommands it was
possible for it to delete a command where the posting thread still
hadn't read that status from it.
If a second command signaled the thread loop to continue after it
had inserted a new command while the thread loop was actually waiting
for the first command to report that it had read the status the
thread loop would continue and delete the first command.
Changed the wait condition when waiting for the calling thread to
read status to use command->mCond instead of mWaitWorkCV. This way
it's guaranteed that the signal to continue comes from the correct
thread.
Change-Id: Ia69b48cb4fdfaf8b4c83b56a197fb9f2058a92d1
Eino-Ville Talvala [Wed, 19 Jun 2013 21:23:22 +0000 (14:23 -0700)]
am
e6478de7: Camera2/3: Avoid shutdown race in callback processor.
* commit '
e6478de72a8ae1d3abb3e8c20898977c45354a4f':
Camera2/3: Avoid shutdown race in callback processor.
Eino-Ville Talvala [Wed, 19 Jun 2013 15:42:17 +0000 (08:42 -0700)]
Camera2/3: Avoid shutdown race in callback processor.
It's possible, during shutdown, for callback processor's heap to be
destroyed when it's about to send the callback back to the user.
Properly copy the heap reference to a local variable before unlocking
the mutex.
Bug:
9485959
Change-Id: I301347b77145f19c7ac721b9127dc74f122acce2
Eino-Ville Talvala [Mon, 17 Jun 2013 23:23:56 +0000 (16:23 -0700)]
am
241b5279: Camera3: Power: Properly shut down unused thread.
* commit '
241b52798809d8db3d369af05ace1f73f723f29b':
Camera3: Power: Properly shut down unused thread.
Eino-Ville Talvala [Mon, 17 Jun 2013 20:29:16 +0000 (13:29 -0700)]
Camera3: Power: Properly shut down unused thread.
Bug:
9466221
Change-Id: I9ed0740561b2e04954eebc1b8aec89cfab40a3a0
The Android Open Source Project [Sun, 16 Jun 2013 14:44:00 +0000 (07:44 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I2ab98a5fccea49e0f4e6d22fddca485ad50b63b8
The Android Automerger [Sun, 16 Jun 2013 12:55:26 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Eino-Ville Talvala [Fri, 14 Jun 2013 15:35:48 +0000 (08:35 -0700)]
am
26bc908b: Camera2/3: Make sure to wait for idle after still capture.
* commit '
26bc908b3dafb5d80f092a22c5c71116526eae06':
Camera2/3: Make sure to wait for idle after still capture.