OSDN Git Service
Glenn Kasten [Wed, 30 Apr 2014 23:56:24 +0000 (23:56 +0000)]
am
b1d2b51c: am
761636f3: Merge "Do not force all command-line apps to be 32-bit only"
* commit '
b1d2b51c4652ecdea907a5a6865d55a9bc52c6a2':
Do not force all command-line apps to be 32-bit only
Glenn Kasten [Wed, 30 Apr 2014 23:52:49 +0000 (23:52 +0000)]
am
761636f3: Merge "Do not force all command-line apps to be 32-bit only"
* commit '
761636f3c2904a9e1fb03991b6896ed7113f8596':
Do not force all command-line apps to be 32-bit only
Glenn Kasten [Wed, 30 Apr 2014 23:50:37 +0000 (23:50 +0000)]
Merge "Do not force all command-line apps to be 32-bit only"
Glenn Kasten [Wed, 30 Apr 2014 18:09:31 +0000 (11:09 -0700)]
Do not force all command-line apps to be 32-bit only
This is a partial revert of
>Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
Change-Id: I214e1bd117dd40150ac5f7447f12c72c61f09a2f
Glenn Kasten [Wed, 30 Apr 2014 19:00:21 +0000 (19:00 +0000)]
am
b27ce2fb: am
416685d0: Merge "Fix format warnings"
* commit '
b27ce2fba0049897558f1f3df9039f443ee4bc88':
Fix format warnings
Glenn Kasten [Wed, 30 Apr 2014 18:56:54 +0000 (18:56 +0000)]
am
416685d0: Merge "Fix format warnings"
* commit '
416685d0cbab40bfc48b0e787206b5d5c2e2ec25':
Fix format warnings
Glenn Kasten [Wed, 30 Apr 2014 18:54:03 +0000 (18:54 +0000)]
Merge "Fix format warnings"
Bill Yi [Wed, 30 Apr 2014 00:59:03 +0000 (00:59 +0000)]
Bill Yi [Tue, 29 Apr 2014 18:34:16 +0000 (11:34 -0700)]
Glenn Kasten [Mon, 28 Apr 2014 22:49:34 +0000 (22:49 +0000)]
am
f131f873: Merge "Add private method NBLog::Reader::dumpLine()"
* commit '
f131f87369ec06fc27fc1f14ea72f0ca1a066509':
Add private method NBLog::Reader::dumpLine()
Glenn Kasten [Mon, 28 Apr 2014 22:43:21 +0000 (22:43 +0000)]
Merge "Add private method NBLog::Reader::dumpLine()"
Glenn Kasten [Mon, 28 Apr 2014 21:11:45 +0000 (14:11 -0700)]
Fix format warnings
Change-Id: Id7aded4287cc8d5387a20389d3ef6220d67d1d88
Glenn Kasten [Thu, 11 Jul 2013 21:29:59 +0000 (14:29 -0700)]
Add private method NBLog::Reader::dumpLine()
This allows us to abstract out fdprintf vs ALOGI
so that callers don't need an 'if' at every location.
Change-Id: I4c68185fc19f32caeaed93347e6b7d09b8d4c4d8
Glenn Kasten [Thu, 24 Apr 2014 09:02:28 +0000 (09:02 +0000)]
am
4513aa2c: Merge "AArch64: rewrite audioflinger\'s sinc resample by intrinsics."
* commit '
4513aa2cda9e636e4ac675dab9a1353b22e951ae':
AArch64: rewrite audioflinger's sinc resample by intrinsics.
Glenn Kasten [Wed, 23 Apr 2014 23:45:27 +0000 (23:45 +0000)]
Merge "AArch64: rewrite audioflinger's sinc resample by intrinsics."
Eino-Ville Talvala [Mon, 21 Apr 2014 20:28:59 +0000 (20:28 +0000)]
am
95006625: Merge "camera: set mNeedConfig after creating ZSL stream"
* commit '
95006625bd1c562c952833bf08c52e7e6c524363':
camera: set mNeedConfig after creating ZSL stream
Nick Kralevich [Mon, 21 Apr 2014 20:28:58 +0000 (20:28 +0000)]
am
27158eb5: Merge "AArch64: AString::append for longs and pointers"
* commit '
27158eb55de8150258faba6574fc51c7aa641516':
AArch64: AString::append for longs and pointers
Eino-Ville Talvala [Mon, 21 Apr 2014 20:22:53 +0000 (20:22 +0000)]
Merge "camera: set mNeedConfig after creating ZSL stream"
Nick Kralevich [Mon, 21 Apr 2014 20:21:42 +0000 (20:21 +0000)]
Merge "AArch64: AString::append for longs and pointers"
Mark Salyzyn [Fri, 18 Apr 2014 22:09:04 +0000 (22:09 +0000)]
am
e0f20cea: Merge "libeffects: 64 bit compile issues"
* commit '
e0f20cea4a40deaabd2b409ab301f6fd7b2e8e7f':
libeffects: 64 bit compile issues
Mark Salyzyn [Fri, 18 Apr 2014 22:03:45 +0000 (22:03 +0000)]
Merge "libeffects: 64 bit compile issues"
Mark Salyzyn [Fri, 18 Apr 2014 20:48:25 +0000 (13:48 -0700)]
libeffects: 64 bit compile issues
Change-Id: I32dd13d307572fee91150f8e113df78924ca0067
Mark Salyzyn [Tue, 15 Apr 2014 22:38:32 +0000 (22:38 +0000)]
am
cd4eb72e: Merge "media: -Werror re-enabled"
* commit '
cd4eb72edb0575ce1e84fbd3f27bb85bab6110ed':
media: -Werror re-enabled
Mark Salyzyn [Tue, 15 Apr 2014 22:35:00 +0000 (22:35 +0000)]
am
839d11d1: Merge changes I0a744dc7,Id993a70d
* commit '
839d11d1f7be9dff2f06c7d30a9eb39cb6782078':
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
Mark Salyzyn [Tue, 15 Apr 2014 22:31:39 +0000 (22:31 +0000)]
Merge "media: -Werror re-enabled"
Mark Salyzyn [Tue, 15 Apr 2014 22:28:34 +0000 (22:28 +0000)]
Merge changes I0a744dc7,Id993a70d
* changes:
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
Mark Salyzyn [Tue, 15 Apr 2014 21:55:53 +0000 (14:55 -0700)]
media: use size_t for integer iterator to Vector::size()
Change-Id: I0a744dc7815a86a993df9b0623440be620ec8903
Mark Salyzyn [Fri, 4 Apr 2014 21:47:28 +0000 (14:47 -0700)]
media: 64 bit compile issues
- change internal sized types to use stdint.h
- printf & scanf formats
- size_t or unsigned int for iterators
Change-Id: Id993a70d8bf54c667c5d652b34179a2c727ed446
Dmitriy Ivanov [Tue, 15 Apr 2014 19:40:57 +0000 (19:40 +0000)]
am
1df2557a: Merge "Remove code markers"
* commit '
1df2557ac95a6d8a087fb15f6f842dc049f2759b':
Remove code markers
Dmitriy Ivanov [Tue, 15 Apr 2014 19:37:19 +0000 (19:37 +0000)]
Merge "Remove code markers"
Dmitriy Ivanov [Tue, 15 Apr 2014 19:10:43 +0000 (12:10 -0700)]
Remove code markers
Change-Id: Iaebfaef2e58e9659d86699d9b7fc68f24cf09bf3
Mark Salyzyn [Mon, 14 Apr 2014 19:51:07 +0000 (12:51 -0700)]
media: -Werror re-enabled
Change-Id: I62fdb78e8acefafd468ce2e5aa9e78eba0dd0f48
Mark Salyzyn [Tue, 15 Apr 2014 14:33:48 +0000 (14:33 +0000)]
am
432ed3d6: Merge "libstagefright: fix 64-bit warnings"
* commit '
432ed3d66d09464778df31c73374ee897f7b8840':
libstagefright: fix 64-bit warnings
Mark Salyzyn [Tue, 15 Apr 2014 14:30:03 +0000 (14:30 +0000)]
Merge "libstagefright: fix 64-bit warnings"
Yuvraj Pasi [Tue, 15 Apr 2014 13:07:45 +0000 (18:37 +0530)]
camera: set mNeedConfig after creating ZSL stream
Set mNeedConfig after creating ZSL stream, camera device
will reconfigure for the case when only ZSL stream
is changed.
Change-Id: Ib592817f81125969824a1280349f77973116f375
Marcus Oakland [Tue, 25 Mar 2014 17:32:00 +0000 (17:32 +0000)]
AArch64: AString::append for longs and pointers
The AString::append methods for long, unsigned long and void *
pointers were using char arrays of 16 elements, which were not long
enough for 64-bit longs and pointers in __LP64__ systems. This
resulted in "FORTIFY_SOURCE: vsprintf: prevented write past end of
buffer. Calling abort()." when the
android.media.cts.DecoderTest#testFlush CTS test was run.
The AString::append methods that were using sprintf have been modifed
to use snprintf instead, taking the sizeof the "s" array (which has
been made 32 char without conditional compilation for __LP64__ where
appropriate), and checking the return value to ensure that the string
has not been truncated.
After this change and changes to the types of OMX_U32 and OMX_S32 in the
frameworks/native/include/media/openmax/OMX_Types.h header file, the
android.media.cts.DecoderTest#testFlush CTS test passes.
Change-Id: I76d897373473c82f52986f43a15b050b844a370a
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Colin Cross [Tue, 15 Apr 2014 00:12:27 +0000 (17:12 -0700)]
libstagefright: fix 64-bit warnings
%lld -> %" PRId64 " for int64_t
%d -> %zu for size_t
Also fixes some casts from void* to integer types, and some comparisons
between signed and unsigned.
(cherry picked from commit
b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)
Change-Id: I76ba94d0b67776fd7abdc83b43d47c61d6c32f4c
Mark Salyzyn [Mon, 14 Apr 2014 18:07:35 +0000 (18:07 +0000)]
am
9829344d: Merge "media: memset sizeof argument issues"
* commit '
9829344d526f87ca745208f04216ec795b239581':
media: memset sizeof argument issues
Mark Salyzyn [Mon, 14 Apr 2014 18:01:24 +0000 (18:01 +0000)]
Merge "media: memset sizeof argument issues"
Mark Salyzyn [Fri, 11 Apr 2014 22:03:28 +0000 (22:03 +0000)]
am
e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build
1119326"
* commit '
e523889332b88348e673137d272854278acbef8f':
Fix aosp_arm64 mirror-aosp-master build
1119326
Mark Salyzyn [Fri, 11 Apr 2014 21:57:21 +0000 (21:57 +0000)]
Merge "Fix aosp_arm64 mirror-aosp-master build
1119326"
Mark Salyzyn [Fri, 11 Apr 2014 21:29:37 +0000 (14:29 -0700)]
Fix aosp_arm64 mirror-aosp-master build
1119326
Remove -Werror that was set in 'warnings be gone'
Change-Id: I2379dc56f04a6d0ac50f90e6d1cdf05fce3a5c30
Mark Salyzyn [Fri, 11 Apr 2014 18:30:00 +0000 (18:30 +0000)]
am
a133bc87: Merge "build fix for aosp-idea133 @
1119318"
* commit '
a133bc87eb8269a6fa61772cb708f10c9c3b7a87':
build fix for aosp-idea133 @
1119318
Mark Salyzyn [Fri, 11 Apr 2014 18:26:28 +0000 (18:26 +0000)]
am
0938c6f7: Merge "warnings be gone (4/4)"
* commit '
0938c6f7a1e713030b04e32548012f0c29c94f4d':
warnings be gone (4/4)
Mark Salyzyn [Fri, 11 Apr 2014 18:26:27 +0000 (18:26 +0000)]
am
2a27a640: Merge "warnings be gone (3/4)"
* commit '
2a27a640d0d9747659cc609b4384ffead090866e':
warnings be gone (3/4)
Mark Salyzyn [Fri, 11 Apr 2014 18:26:26 +0000 (18:26 +0000)]
am
79724856: Merge "warnings be gone (2/4)"
* commit '
797248568b5ba32606ac0d8de024190e3cc95973':
warnings be gone (2/4)
Mark Salyzyn [Thu, 10 Apr 2014 16:37:52 +0000 (09:37 -0700)]
media: memset sizeof argument issues
Change-Id: I37ef154eea0f77fb7f22faf6891f3025f6ff346e
Mark Salyzyn [Fri, 11 Apr 2014 18:24:17 +0000 (18:24 +0000)]
Merge "build fix for aosp-idea133 @
1119318"
Mark Salyzyn [Fri, 11 Apr 2014 18:21:02 +0000 (18:21 +0000)]
Merge "warnings be gone (4/4)"
Mark Salyzyn [Fri, 11 Apr 2014 16:50:45 +0000 (09:50 -0700)]
warnings be gone (4/4)
(cherry picked from commit
84333e0475bc911adc16417f4ca327c975cf6c36)
(squashed with commit
b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)
Change-Id: I55df09714a0e1cb98a44c8fcddac2c646ae5e139
Mark Salyzyn [Fri, 11 Apr 2014 18:20:39 +0000 (18:20 +0000)]
Merge "warnings be gone (3/4)"
Mark Salyzyn [Fri, 11 Apr 2014 16:49:23 +0000 (09:49 -0700)]
warnings be gone (3/4)
(cherry picked from commit
84333e0475bc911adc16417f4ca327c975cf6c36)
(squashed with commit
b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)
Change-Id: I0c5a0c3ea32bb5091d90c7391c67edd02e50397f
Mark Salyzyn [Fri, 11 Apr 2014 18:20:12 +0000 (18:20 +0000)]
Merge "warnings be gone (2/4)"
Mark Salyzyn [Fri, 11 Apr 2014 16:47:30 +0000 (09:47 -0700)]
warnings be gone (2/4)
(cherry picked from commit
84333e0475bc911adc16417f4ca327c975cf6c36)
(squashed with commit
b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)
Change-Id: I048a2c6868515716c7cd7319a3d0abe6311dac4e
Mark Salyzyn [Fri, 11 Apr 2014 18:01:18 +0000 (11:01 -0700)]
build fix for aosp-idea133 @
1119318
Change-Id: I34084ebb48318628d46c2ff7ca567bd7638619e4
Mark Salyzyn [Fri, 11 Apr 2014 17:26:28 +0000 (17:26 +0000)]
am
52a861d2: Merge "warnings be gone."
* commit '
52a861d2825544fe2eb90f8e5f6351d02ff95536':
warnings be gone.
Mark Salyzyn [Fri, 11 Apr 2014 17:20:54 +0000 (17:20 +0000)]
Merge "warnings be gone."
Andreas Huber [Fri, 11 Apr 2014 14:54:53 +0000 (07:54 -0700)]
warnings be gone.
(cherry picked from commit
84333e0475bc911adc16417f4ca327c975cf6c36)
Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts
or errors downstream to a minimum.
Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
Zhongwei Yao [Thu, 10 Apr 2014 16:23:42 +0000 (17:23 +0100)]
AArch64: rewrite audioflinger's sinc resample by intrinsics.
Pass conformance test on armv7 and aarch64, performance test is done on armv7.
Compared with original armv7 assembly version, this version has similar
result. Here is performance data on pandaboard android4.4 (input: random wave
file, unit: Mspl/s, toolchain:gcc 4.8):
| | origin(assembly) | current(intrinsics) | C version |
|----------------+------------------+---------------------+-----------|
| single channel | 6.17 | 7.14 | 3.43 |
| double channel | 5.24 | 5.63 | 3.50 |
Change-Id: If5670218e1586e9dfd2b8d9c66a6880f3e4808ca
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: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 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
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 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"
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:00:45 +0000 (22:00 +0000)]
am
68d9d71a: Support CAST V2 Authentication in MediaDrm
* commit '
68d9d71a792deed75d32fe13febc07c9c12c8449':
Support CAST V2 Authentication in MediaDrm
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: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"
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: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
Igor Murashkin [Tue, 25 Mar 2014 19:08:01 +0000 (19:08 +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 18:25:13 +0000 (18:25 +0000)]
am
4f53fe74: Merge "CameraService: deadlock fix"
* commit '
4f53fe74051026e6635ba5bdbed4f1898cb66028':
CameraService: deadlock fix
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"
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>
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
Colin Cross [Sat, 22 Mar 2014 00:36:41 +0000 (17:36 -0700)]
resolved conflicts for merge of
3d7c5002 to klp-dev-plus-aosp
Change-Id: I19e1a26bd0226119c4fe2920bf6a09aaeff315d9
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
Colin Cross [Fri, 21 Mar 2014 22:09:19 +0000 (15:09 -0700)]
libcameraservice: build 64-bit
libcameraservice builds fine for 64-bit, remove LOCAL_32_BIT_ONLY
Change-Id: I9f28bc42dc424dee9b92e6ab092f86d3aa1419b7
Colin Cross [Fri, 21 Mar 2014 22:04:25 +0000 (15:04 -0700)]
libcameraservice: fix 64-bit print format warnings
Use PRId64 from inttypes.h to print nsecs_t (int64_t)
Use %zu to print size_t
Change-Id: I135620e0388db33587a8a7da393b48a45cb7275a
Lajos Molnar [Fri, 21 Mar 2014 19:26:31 +0000 (19:26 +0000)]
am
30890210: am
333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev
* commit '
3089021031d6ad0f2b330567f108aec03fa13994':
DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
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:20:07 +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:11:22 +0000 (17:11 +0000)]
am
1bfb8f76: am
f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)
* commit '
1bfb8f762dd21b39756fd8fd9990172cae1cef79':
Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)
Rachad [Fri, 21 Mar 2014 17:08:50 +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)