OSDN Git Service
Lajos Molnar [Sat, 5 Apr 2014 01:09:35 +0000 (18:09 -0700)]
stagefright: add AString constructor from String8
Change-Id: I85b37b6dee4ea9d5f7f1c1a40ff405a01a0c67f1
Dan Stoza [Fri, 4 Apr 2014 17:36:04 +0000 (17:36 +0000)]
Merge "Remove deprecated BufferQueue constructor"
Glenn Kasten [Thu, 3 Apr 2014 17:20:09 +0000 (10:20 -0700)]
Merge commit '
52a23bd3' into manualmerge
Change-Id: I7a6105f467a2fa3631c62be3d306845e9cf9b365
Glenn Kasten [Thu, 3 Apr 2014 17:11:25 +0000 (17:11 +0000)]
am
51b3ea2b: Merge "64-bit: Correction to OMX_U32 and OMX_S32"
* commit '
51b3ea2b8f7298bffbd246c65a606cd053357b66':
64-bit: Correction to OMX_U32 and OMX_S32
Glenn Kasten [Thu, 3 Apr 2014 17:09:07 +0000 (17:09 +0000)]
am
8260bf63: am
93bbc834: Merge "Fix aac decoder flush"
* commit '
8260bf63e2fa974b524029f170d9ad17b69b884f':
Fix aac decoder flush
Glenn Kasten [Thu, 3 Apr 2014 17:00:25 +0000 (17:00 +0000)]
Merge "64-bit: Correction to OMX_U32 and OMX_S32"
Glenn Kasten [Thu, 3 Apr 2014 15:09:26 +0000 (15:09 +0000)]
am
93bbc834: Merge "Fix aac decoder flush"
* commit '
93bbc8343133b910aeae536617efce978040bbae':
Fix aac decoder flush
Glenn Kasten [Thu, 3 Apr 2014 15:01:21 +0000 (15:01 +0000)]
Merge "Fix aac decoder flush"
Jeff Tinker [Thu, 3 Apr 2014 08:31:22 +0000 (08:31 +0000)]
am
d009aa2b: am
81e0bd44: Add signature|system permission to MediaDrm signer APIs
* commit '
d009aa2bac4a4c8ca2e0c1203148194e237cc5d0':
Add signature|system permission to MediaDrm signer APIs
Jeff Tinker [Thu, 3 Apr 2014 01:35:29 +0000 (01:35 +0000)]
am
81e0bd44: Add signature|system permission to MediaDrm signer APIs
* commit '
81e0bd44a10e90778ab5b0a3babd4fc52cadedd8':
Add signature|system permission to MediaDrm signer APIs
Andy Hung [Thu, 3 Apr 2014 01:15:09 +0000 (01:15 +0000)]
Merge "Change references of Q19.12 to Q4.27 for clarity"
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
Glenn Kasten [Wed, 2 Apr 2014 22:09:37 +0000 (15:09 -0700)]
Merge commit '
54654025' into manualmerge
Change-Id: I2df92dbae606cc9805ff5dd7abc2f53b60108112
Glenn Kasten [Wed, 2 Apr 2014 21:48:01 +0000 (21:48 +0000)]
am
2b2fbe29: Merge "Fix decoder EOS handling"
* commit '
2b2fbe299163b544668b41f594943a19b78dafd3':
Fix decoder EOS handling
Glenn Kasten [Wed, 2 Apr 2014 21:38:17 +0000 (21:38 +0000)]
Merge "Fix decoder EOS handling"
Lajos Molnar [Wed, 2 Apr 2014 21:36:57 +0000 (21:36 +0000)]
Merge "ACodec: do not signal kWhatShutdownCompleted on codec error"
Andy Hung [Wed, 2 Apr 2014 18:24:53 +0000 (11:24 -0700)]
Change references of Q19.12 to Q4.27 for clarity
Change-Id: I5beb7daf6ff9bc123ff3582f7c294edcaf8652f6
Signed-off-by: Andy Hung <hunga@google.com>
Glenn Kasten [Wed, 2 Apr 2014 17:25:35 +0000 (10:25 -0700)]
64-bit: Correction to OMX_U32 and OMX_S32
Change-Id: I9c41bb34c35595ac19a7ab8faaacde8cb4fa9a15
Marco Nelissen [Fri, 20 Sep 2013 14:18:21 +0000 (07:18 -0700)]
Fix aac decoder flush
b/
8543366
Change-Id: I746ffed6289486b802a2292bfc492ea6c780ed0b
Marco Nelissen [Thu, 29 Aug 2013 16:31:26 +0000 (09:31 -0700)]
Fix decoder EOS handling
Conceptually it should be the same whether EOS is signalled on the last
buffer holding data, or an empty buffer that follows. Make it so that
this actually behaves the same for mp3, AAC and Vorbis.
b/
8747869
Change-Id: Idece8ef45689a3ffaf70fb45d19862d7b93b2f92
Jeff Tinker [Tue, 1 Apr 2014 22:23:23 +0000 (22:23 +0000)]
am
f356a123: am
68d9d71a: Support CAST V2 Authentication in MediaDrm
* commit '
f356a123bf966150965a1af1cb9bd6ff2ca020de':
Support CAST V2 Authentication in MediaDrm
Jeff Tinker [Tue, 1 Apr 2014 22:00:45 +0000 (22:00 +0000)]
am
68d9d71a: Support CAST V2 Authentication in MediaDrm
* commit '
68d9d71a792deed75d32fe13febc07c9c12c8449':
Support CAST V2 Authentication in MediaDrm
Lajos Molnar [Mon, 31 Mar 2014 19:30:01 +0000 (12:30 -0700)]
ACodec: do not signal kWhatShutdownCompleted on codec error
Do not signal kWhatShutdownCompleted when moving to Uninitialized
state due to receiving a codec error.
Do not abort if error happens just before handling a stop request.
Bug:
13675112
Change-Id: I4b14b2e64cff0f71215d2bbc24cd850617dfb67b
Lajos Molnar [Tue, 1 Apr 2014 18:41:59 +0000 (18:41 +0000)]
Merge "MediaCodec: move to UNINITIALIZED state on codec error"
Glenn Kasten [Tue, 1 Apr 2014 17:47:00 +0000 (17:47 +0000)]
Merge "FastMixer use FastThread and FastMixerState use FastThreadState"
Glenn Kasten [Tue, 1 Apr 2014 17:32:17 +0000 (17:32 +0000)]
Merge changes I5748f47d,I3f074933
* changes:
Add FastThread.h
Add FastThreadState
Lajos Molnar [Mon, 31 Mar 2014 19:30:01 +0000 (12:30 -0700)]
MediaCodec: move to UNINITIALIZED state on codec error
ACodec moves to Uninitialized state after receiving codec error.
Make MediaCodec also move to the same state, so stop() and
release() will work correctly.
Bug:
13675112
Change-Id: I1c7e8b274f68345fc0e6a55c70dff6c7a4fb2e72
Glenn Kasten [Wed, 19 Mar 2014 00:01:15 +0000 (17:01 -0700)]
FastMixer use FastThread and FastMixerState use FastThreadState
Change-Id: I594c973e9f575113bdefee6f4cf8c29d8beac1f3
Glenn Kasten [Tue, 18 Mar 2014 23:25:04 +0000 (16:25 -0700)]
Add FastThread.h
Change-Id: I5748f47dbfa42c14cc93973742e05ac963bf3ba8
Glenn Kasten [Wed, 19 Mar 2014 00:17:04 +0000 (17:17 -0700)]
Add FastThreadState
Change-Id: I3f07493375ace6e5cfdcd02ad90c4b6fad543b0c
Glenn Kasten [Thu, 13 Mar 2014 22:07:51 +0000 (15:07 -0700)]
Add FIXMEs to createRecord for fast capture
Change-Id: I759be200fae32969212c52a409f46f2e704081e3
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 21:37:51 +0000 (14:37 -0700)]
ACodec: ignore OMX messages to already freed component
Bug:
12916984
Change-Id: I92848797b8d556cff468b9b0f0a618946083208f
Lajos Molnar [Fri, 28 Mar 2014 16:53:46 +0000 (09:53 -0700)]
mediaplayer: add temporary developer settings to use NuPlayer as default
Bug:
11784824
Change-Id: Ic98f5fd15ee283d7f581bdc3331d000198ecc9e8
Glenn Kasten [Fri, 28 Mar 2014 16:43:59 +0000 (16:43 +0000)]
Merge "Mark the logging heap read-only to media.log service"
Lajos Molnar [Fri, 28 Mar 2014 05:24:07 +0000 (05:24 +0000)]
am
4f1ef2cd: (-s ours) am
1000d426: am
f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev
* commit '
4f1ef2cd65d734edae17f8586cf717598b40f2c3':
DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
Lajos Molnar [Fri, 28 Mar 2014 05:24:02 +0000 (05:24 +0000)]
am
ff382d0c: (-s ours) am
8bf96c01: am
3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"" into klp-dev
* commit '
ff382d0c40493303ceb81a6c22d1a48c0fecfe9c':
DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"
Lajos Molnar [Fri, 28 Mar 2014 01:50:50 +0000 (01:50 +0000)]
am
1000d426: am
f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev
* commit '
1000d426bedb1ec38bdfff98fc8f004b64af13cb':
DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
Lajos Molnar [Fri, 28 Mar 2014 01:50:50 +0000 (01:50 +0000)]
am
8bf96c01: am
3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"" into klp-dev
* commit '
8bf96c011ff4128f9bf06b892a38d869192d6a25':
DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"
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"
Zhijun He [Thu, 27 Mar 2014 23:46:15 +0000 (16:46 -0700)]
CameraMetadata: Fix String tag update null character issue
String8.size() doesn't count the null character in whatever case. But camera
metadata tag android.jpeg.gpsProcessingMethod need a null-terminited string.
Bug:
13679912
Change-Id: I91e742702b16b9ab9b42f9822de189a9a96e8e53
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
Zhijun He [Thu, 27 Mar 2014 20:24:18 +0000 (20:24 +0000)]
Merge "Camera3: fix HAL3.x version check issue"
Eric Laurent [Thu, 27 Mar 2014 02:05:55 +0000 (19:05 -0700)]
Fix the build
Change-Id: I2169a3d26f4e35e5cfa35a1264175aab6ac4db41
Zhijun He [Thu, 27 Mar 2014 01:18:00 +0000 (18:18 -0700)]
Camera3: fix HAL3.x version check issue
Camera service should support HAL3.x instead of only HAL3.0.
Bug:
13609405
Change-Id: If7e86f9abe019547fc0be2e11337551cd7c57870
Eric Laurent [Thu, 27 Mar 2014 01:22:34 +0000 (01:22 +0000)]
Merge "audio policy: remove obsolete AudioPolicyManager class members"
Eric Laurent [Thu, 27 Mar 2014 01:22:16 +0000 (01:22 +0000)]
Merge "audio policy: use new audio device representation"
Glenn Kasten [Wed, 26 Mar 2014 23:23:09 +0000 (23:23 +0000)]
Merge "Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>"
Eric Laurent [Mon, 17 Mar 2014 19:42:06 +0000 (12:42 -0700)]
audio policy: remove obsolete AudioPolicyManager class members
Remove mHasA2dp, mHasUsb and mHasRemoteSubmix members from
AudoPolicyManager. They are not needed any more since
we use device descriptors with additional attributes.
Also remove obsolete limitation on device address
length (MAX_DEVICE_ADDRESS_LEN).
Change-Id: Iffe760a521692a4b50be3f6b935af84afb61bb86
Eric Laurent [Mon, 17 Mar 2014 19:00:47 +0000 (12:00 -0700)]
audio policy: use new audio device representation
Represent audio devices with more attributes than just the
type (audio_device_t).
This is in preparation for new routing APIs allowing
device selection based on more criteria than just the type
(address, channel mask...)
A new class DeviceDescriptor is created and used by functions
needing more information than just the device type.
Bit fields for available and supported input or output devices are
replaced by vectors of device descriptors.
Each available device is allocated a unique ID for future use.
Removed obsolete mA2dpDeviceAddress, mScoDeviceAddress and mUsbCardAndDevice
fields replaced by address stored in DeviceDescriptor.
Policy decisions like getDeviceForStrategy() are still based
only on the device type.
Change-Id: I5de3b3ffb12ff8dcfb746782ab1e6b15bf040d0c
Glenn Kasten [Wed, 26 Mar 2014 22:22:23 +0000 (22:22 +0000)]
Merge "Use LOG_ALWAYS_FATAL instead of LOG_FATAL"
Glenn Kasten [Wed, 26 Mar 2014 00:44:59 +0000 (17:44 -0700)]
Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>
Change-Id: Id6b1aa17558eb73e17f22b8eab6cd02e00a96dff
Glenn Kasten [Fri, 17 Jan 2014 18:21:00 +0000 (10:21 -0800)]
Update comments
Change-Id: I5776313b9b49072cd666d28880f0d07cc73f827b
Glenn Kasten [Fri, 21 Feb 2014 22:51:43 +0000 (14:51 -0800)]
Use LOG_ALWAYS_FATAL instead of LOG_FATAL
LOG_FATAL is compiled out in most builds, so the
assertion checks were not being performed.
Change-Id: I774f0985ab9c5ccecd8989a0f1c940386b73fc35
Glenn Kasten [Wed, 26 Mar 2014 21:29:28 +0000 (21:29 +0000)]
Merge "Use symbolic constants from <system/audio.h>"
Glenn Kasten [Wed, 26 Mar 2014 21:14:17 +0000 (21:14 +0000)]
Merge "Use symbol AUDIO_DEVICE_NONE from <system/audio.h>"
Glenn Kasten [Wed, 26 Mar 2014 21:13:18 +0000 (21:13 +0000)]
Merge "Remove stream type from AudioSystem::getRenderPosition()"
Glenn Kasten [Wed, 26 Mar 2014 21:08:12 +0000 (21:08 +0000)]
Merge "Use symbol AUDIO_SESSION_OUTPUT_MIX from <system/audio.h>"
Glenn Kasten [Wed, 26 Mar 2014 20:56:04 +0000 (20:56 +0000)]
Merge "Fix uses of KeyedVector"
Glenn Kasten [Wed, 26 Mar 2014 20:44:48 +0000 (20:44 +0000)]
Merge "Remove streamType parameter from AudioSystem::getLatency()"
Glenn Kasten [Wed, 26 Mar 2014 14:50:05 +0000 (07:50 -0700)]
Remove stream type from AudioSystem::getRenderPosition()
The I/O handle is never equal to AUDIO_IO_HANDLE_NONE,
so the stream type is not needed.
Change-Id: I1ab134a2fa379d6dd0b6167345a856a192d478f9
Glenn Kasten [Wed, 26 Mar 2014 18:59:01 +0000 (18:59 +0000)]
Merge "Remove dead code"
Glenn Kasten [Wed, 26 Mar 2014 18:44:40 +0000 (18:44 +0000)]
Merge "Fix log spam when MonoPipe is unable to get local frequency"
Eino-Ville Talvala [Wed, 26 Mar 2014 18:36:18 +0000 (18:36 +0000)]
Merge "Revert "camera: Fix setParameters for Preview FPS single/range values""
Eino-Ville Talvala [Wed, 26 Mar 2014 18:10:09 +0000 (18:10 +0000)]
Revert "camera: Fix setParameters for Preview FPS single/range values"
Causes a regression on some devices, so reverting until we're in a position to fix those devices.
This reverts commit
9078a1b3b9f9c0c48046ade0e8e18b0d79a659db.
Bug:
13563098
Change-Id: I7aedd01fde8b8fdee77e972ec395f0ecadbf8ccb
Glenn Kasten [Wed, 26 Mar 2014 18:27:43 +0000 (18:27 +0000)]
Merge "Document AudioSystem::newAudioSessionId() failures"
Glenn Kasten [Wed, 26 Mar 2014 17:38:35 +0000 (17:38 +0000)]
Merge "Document AudioFlinger::nextUniqueId()"
Glenn Kasten [Wed, 26 Mar 2014 15:21:17 +0000 (08:21 -0700)]
Remove dead code
Change-Id: I0878d11451c7bbbf96b59f5fe0cd97ba1f033aa9
Glenn Kasten [Wed, 26 Mar 2014 00:41:42 +0000 (17:41 -0700)]
Use symbol AUDIO_SESSION_OUTPUT_MIX from <system/audio.h>
Change-Id: I4e48bb7edcc9f9407ee63bb33d029aca02211d74
Glenn Kasten [Wed, 26 Mar 2014 00:48:57 +0000 (17:48 -0700)]
Remove streamType parameter from AudioSystem::getLatency()
Change-Id: Ie7346e93436ddc215cad7d16be555dcb6c277d54
Glenn Kasten [Fri, 17 Jan 2014 18:23:01 +0000 (10:23 -0800)]
Use symbol AUDIO_DEVICE_NONE from <system/audio.h>
Change-Id: I61f882c5e7c949bf00d3bfc745ebf3b5e1c42a58
Glenn Kasten [Fri, 17 Jan 2014 01:44:23 +0000 (17:44 -0800)]
Use symbolic constants from <system/audio.h>
AUDIO_INTERLEAVE_*
AUDIO_STREAM_MIN
AUDIO_SESSION_ALLOCATE
Change-Id: I31dd6f327204685e50716079ce21c4ba206dff11
Glenn Kasten [Fri, 17 Jan 2014 18:21:24 +0000 (10:21 -0800)]
Fix uses of KeyedVector
Constructor for AudioFlinger::mAudioHwDevs was missing, and so
AudioFlinger::findSuitableHwDev_l() could return an undefined pointer
if a non-0 module wasn't found.
A KeyedVector of Plain Old Data (POD) element type must specify the
default value in the constructor, or else the default will be undefined.
Minor:
- Parameter had wrong type in constructor for AudioSystem::gOutputs.
- Remove obsolete AudioSystem::gStreamOutputMap.
Change-Id: I9841493e018440e559d8b8b0e4e748ba2b2d365b
Glenn Kasten [Fri, 17 Jan 2014 20:09:05 +0000 (12:09 -0800)]
Document AudioFlinger::nextUniqueId()
Change-Id: Iafe96f1c10bd85cb23a2553945ca68aa601dc2eb
Glenn Kasten [Fri, 17 Jan 2014 18:25:08 +0000 (10:25 -0800)]
Document AudioSystem::newAudioSessionId() failures
Change-Id: Iaa168722f362c36bdfa87fe20dc0a59b43cf1ca3
Glenn Kasten [Thu, 21 Nov 2013 21:54:25 +0000 (13:54 -0800)]
Fix log spam when MonoPipe is unable to get local frequency
Local frequency does not change, so only ask for it the first time a
MonoPipe is constructed in a given client process. Thereafter use a
previously cached value. Likewise, if the local frequency is unavailable,
only log this the first time.
Change-Id: Ib1fc7251c3832e02fe03811db39a87e500f1df50
Igor Murashkin [Tue, 25 Mar 2014 21:23:26 +0000 (21:23 +0000)]
am
c3dcf100: (-s ours) am
65550a0e: am
0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
* commit '
c3dcf1007aa964f825b2ea2ef86acb7f332e748f':
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
Eino-Ville Talvala [Tue, 25 Mar 2014 21:22:52 +0000 (21:22 +0000)]
am
a1aaaf86: am
4f53fe74: Merge "CameraService: deadlock fix"
* commit '
a1aaaf86cd04eabaf961a30d7b0a9fa857089862':
CameraService: deadlock fix
Igor Murashkin [Tue, 25 Mar 2014 20:15:40 +0000 (20:15 +0000)]
am
65550a0e: am
0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
* commit '
65550a0e17852fe657795508e3bf05bdbfb2520b':
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
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
Eino-Ville Talvala [Tue, 25 Mar 2014 19:09:34 +0000 (19:09 +0000)]
am
4f53fe74: Merge "CameraService: deadlock fix"
* commit '
4f53fe74051026e6635ba5bdbed4f1898cb66028':
CameraService: deadlock fix
Glenn Kasten [Tue, 25 Mar 2014 18:49:08 +0000 (11:49 -0700)]
Fix operator precedence
Change-Id: I164708a5b76a341a185467b008ecbec98d58a6df
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
Eino-Ville Talvala [Tue, 25 Mar 2014 18:14:01 +0000 (18:14 +0000)]
Merge "CameraService: deadlock fix"
Lajos Molnar [Tue, 25 Mar 2014 14:49:27 +0000 (14:49 +0000)]
Merge "mtp: avoid silent allocation overflow in MtpProperty"
Kalle Lampila [Tue, 30 Apr 2013 12:27:19 +0000 (15:27 +0300)]
CameraService: deadlock fix
Release lock before return from CameraService::dump()
Change-Id: Ia20b0921fc675a284f3b7f8d26e0e3596b5a8774
Signed-off-by: Kalle Lampila <kallex.lampila@intel.com>
Lajos Molnar [Mon, 24 Mar 2014 23:18:36 +0000 (16:18 -0700)]
mtp: avoid silent allocation overflow in MtpProperty
Bug:
13006907
Change-Id: Ice0352394840132c9c2ce6c28366632c792a32c0
Zhijun He [Tue, 25 Mar 2014 01:08:25 +0000 (01:08 +0000)]
Merge "Camera3: Fix flush call deadlock"
Colin Cross [Mon, 24 Mar 2014 19:36:36 +0000 (19:36 +0000)]
am
5c679d41: resolved conflicts for merge of
3d7c5002 to klp-modular-dev-plus-aosp
* commit '
5c679d41714e42f153f6aeb492df54510a195bc1':
libcameraservice: build 64-bit
libcameraservice: fix 64-bit print format warnings
Lajos Molnar [Mon, 24 Mar 2014 17:34:26 +0000 (17:34 +0000)]
am
ba139033: (-s ours) am
30890210: am
333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev
* commit '
ba1390335794a38472bf0349568bc4f199dc5c90':
DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
Zhijun He [Mon, 24 Mar 2014 01:44:49 +0000 (18:44 -0700)]
Camera3: Fix flush call deadlock
Flush shouldn't call waitUntilDrained directly, as they are all API calls
with mLock and mInterfaceLock held. Move the waitUntilDrained implementation
into waitUntilDrainedLocked to solve this issue.
Change-Id: Id7d931091d5c11e12204790841097433515446db
Colin Cross [Sat, 22 Mar 2014 00:43:32 +0000 (17:43 -0700)]
resolved conflicts for merge of
3d7c5002 to klp-modular-dev-plus-aosp
Change-Id: Ia6d87d56174d1388c1148fb55b6e4bc57d8666db
Rachad [Sat, 22 Mar 2014 00:29:17 +0000 (00:29 +0000)]
am
d1afbf13: am
1bfb8f76: am
f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)
* commit '
d1afbf1372488bd927afdbb2ca49a3000511125f':
Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)
Colin Cross [Sat, 22 Mar 2014 00:23:15 +0000 (00:23 +0000)]
Merge changes I9f28bc42,I135620e0
* changes:
libcameraservice: build 64-bit
libcameraservice: fix 64-bit print format warnings
Jianing Wei [Sat, 22 Mar 2014 00:04:19 +0000 (00:04 +0000)]
Merge "CameraService: Add support for burst capture and repeating burst."
Jianing Wei [Thu, 13 Mar 2014 01:29:36 +0000 (18:29 -0700)]
CameraService: Add support for burst capture and repeating burst.
Bug:
10749500
Change-Id: I292a485b222e5cf97388d76bf0d956a6ac54bb2f