OSDN Git Service
Ying Wang [Thu, 8 May 2014 08:55:36 +0000 (08:55 +0000)]
am
02483465: am
1d2909b3: Merge "Remove unused LOCAL_LDLIBS."
* commit '
02483465e294571a6a92fce4f38c933e77bf5e67':
Remove unused LOCAL_LDLIBS.
Ying Wang [Thu, 8 May 2014 07:27:53 +0000 (07:27 +0000)]
am
1d2909b3: Merge "Remove unused LOCAL_LDLIBS."
* commit '
1d2909b38f76d9d866e61cf505b88518d3a52acf':
Remove unused LOCAL_LDLIBS.
Ying Wang [Thu, 8 May 2014 07:25:00 +0000 (07:25 +0000)]
Merge "Remove unused LOCAL_LDLIBS."
Ying Wang [Thu, 8 May 2014 07:23:11 +0000 (00:23 -0700)]
Remove unused LOCAL_LDLIBS.
Change-Id: I14865bee99fbcc5188b64fbd22bb49a1947ec6ff
Eric Laurent [Tue, 6 May 2014 15:30:49 +0000 (15:30 +0000)]
am
f655acf1: am
8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_l()"
* commit '
f655acf15e587dbf5d7120e9f2bf4b5bcb89941c':
Fix memory leak when filtering commands in insertCommand_l()
Eric Laurent [Tue, 6 May 2014 15:28:39 +0000 (15:28 +0000)]
am
8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_l()"
* commit '
8fb04d474ed9e0d1302ae223ee76fafbe5fb41a3':
Fix memory leak when filtering commands in insertCommand_l()
Eric Laurent [Tue, 6 May 2014 15:25:45 +0000 (15:25 +0000)]
Merge "Fix memory leak when filtering commands in insertCommand_l()"
Lajos Molnar [Fri, 2 May 2014 18:04:22 +0000 (18:04 +0000)]
am
bc4bf532: am
b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"
* commit '
bc4bf532b7581ecb1c8734a63742183c3ecb02c5':
AwesomePlayer: use PTS for queueBuffer
Lajos Molnar [Fri, 2 May 2014 18:01:21 +0000 (18:01 +0000)]
am
b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"
* commit '
b231408849158baea8dddc0edf7e97fcfc2e3240':
AwesomePlayer: use PTS for queueBuffer
Lajos Molnar [Fri, 2 May 2014 18:00:44 +0000 (18:00 +0000)]
am
5fa3f7af: am
b52675e9: Merge "Smooth out AwesomePlayer"
* commit '
5fa3f7afc0d8d4978d0192cd2cf67ed3899d4dd5':
Smooth out AwesomePlayer
Lajos Molnar [Fri, 2 May 2014 17:57:56 +0000 (17:57 +0000)]
am
b52675e9: Merge "Smooth out AwesomePlayer"
* commit '
b52675e9e3b2cfd7ca3ec4eda80dde77dee9dafb':
Smooth out AwesomePlayer
Lajos Molnar [Fri, 2 May 2014 17:56:37 +0000 (17:56 +0000)]
Merge "AwesomePlayer: use PTS for queueBuffer"
Lajos Molnar [Fri, 2 May 2014 17:53:58 +0000 (17:53 +0000)]
Merge "Smooth out AwesomePlayer"
Lajos Molnar [Fri, 2 May 2014 17:18:02 +0000 (17:18 +0000)]
am
6e76fda3: am
f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"
* commit '
6e76fda36a87e154397de816fa091b721a4c11bd':
AwesomePlayer: improve scheduling of video event to hit PTS
Lajos Molnar [Fri, 2 May 2014 17:18:01 +0000 (17:18 +0000)]
am
075c8f6e: am
a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"
* commit '
075c8f6e174e824b6bc95809cc25f1430e9d4e62':
stagefright: add ClockEstimator API and WindowedLinearFitEstimator
Lajos Molnar [Fri, 2 May 2014 17:14:18 +0000 (17:14 +0000)]
am
f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"
* commit '
f9782266802b02fc06a9c532f40128496aefb3e0':
AwesomePlayer: improve scheduling of video event to hit PTS
Lajos Molnar [Fri, 2 May 2014 17:14:17 +0000 (17:14 +0000)]
am
a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"
* commit '
a69d6f529239950a8bdf5e4253ea13bb029375cb':
stagefright: add ClockEstimator API and WindowedLinearFitEstimator
Lajos Molnar [Fri, 2 May 2014 17:11:14 +0000 (17:11 +0000)]
Merge "AwesomePlayer: improve scheduling of video event to hit PTS"
Lajos Molnar [Fri, 2 May 2014 17:10:57 +0000 (17:10 +0000)]
Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"
Glenn Kasten [Fri, 2 May 2014 14:51:37 +0000 (14:51 +0000)]
am
e580aa4a: am
86438382: Merge "When passing a size_t via binder, use 64-bits unconditionally"
* commit '
e580aa4a756d1825c440a4b4309022b1babb6de1':
When passing a size_t via binder, use 64-bits unconditionally
Glenn Kasten [Fri, 2 May 2014 14:48:27 +0000 (14:48 +0000)]
am
86438382: Merge "When passing a size_t via binder, use 64-bits unconditionally"
* commit '
86438382a381eb39ed8da53fbd16cf6730fded6c':
When passing a size_t via binder, use 64-bits unconditionally
Glenn Kasten [Fri, 2 May 2014 14:45:29 +0000 (14:45 +0000)]
Merge "When passing a size_t via binder, use 64-bits unconditionally"
Lajos Molnar [Wed, 30 Apr 2014 17:19:40 +0000 (10:19 -0700)]
AwesomePlayer: use PTS for queueBuffer
Change-Id: I1c14ad4784c799c46cf06a14b0f00c5e4d01f718
Lajos Molnar [Wed, 30 Apr 2014 18:10:44 +0000 (11:10 -0700)]
Smooth out AwesomePlayer
Use clock estimator to smooth out audio time stamps.
Change-Id: Iec1ff30c011069d06ff8051fc4839d00895463d6
Lajos Molnar [Wed, 30 Apr 2014 18:10:00 +0000 (11:10 -0700)]
AwesomePlayer: improve scheduling of video event to hit PTS
Change-Id: I7b19911acbde9b592b757b952d4ad63cd8efebed
Lajos Molnar [Tue, 22 Apr 2014 23:31:54 +0000 (16:31 -0700)]
stagefright: add ClockEstimator API and WindowedLinearFitEstimator
Change-Id: I74474c385848a8eab2ac0da7c069510378e2b217
Glenn Kasten [Thu, 1 May 2014 22:22:33 +0000 (22:22 +0000)]
am
3d9164da: am
236f8ddd: Merge "Add missing include"
* commit '
3d9164da1b3d58701e41c78e06839d61ed1b4ff9':
Add missing include
Glenn Kasten [Thu, 1 May 2014 22:20:06 +0000 (22:20 +0000)]
am
236f8ddd: Merge "Add missing include"
* commit '
236f8ddd23af92f98f2deae86bf6e6b5c9278857':
Add missing include
Glenn Kasten [Thu, 1 May 2014 22:18:34 +0000 (22:18 +0000)]
Merge "Add missing include"
Lajos Molnar [Thu, 1 May 2014 20:10:08 +0000 (20:10 +0000)]
am
2b0b701f: am
0c388650: Merge "ACodec: add frame render/drop systrace"
* commit '
2b0b701f57c5efebe868d0eedce8cfc399007e8a':
ACodec: add frame render/drop systrace
Lajos Molnar [Thu, 1 May 2014 20:07:50 +0000 (20:07 +0000)]
am
0c388650: Merge "ACodec: add frame render/drop systrace"
* commit '
0c388650722ac53571be21ee04ce342c1c9510c2':
ACodec: add frame render/drop systrace
Lajos Molnar [Thu, 1 May 2014 20:04:45 +0000 (20:04 +0000)]
Merge "ACodec: add frame render/drop systrace"
Glenn Kasten [Thu, 1 May 2014 19:31:31 +0000 (19:31 +0000)]
am
1afedc4d: am
6eafba6b: Merge "Temporary workaround for log spam"
* commit '
1afedc4d99acd52f99221d71b3a372a0a5497a84':
Temporary workaround for log spam
Glenn Kasten [Thu, 1 May 2014 19:29:25 +0000 (19:29 +0000)]
am
6eafba6b: Merge "Temporary workaround for log spam"
* commit '
6eafba6bba3a4949cf3807ea39d5c1e969bebc52':
Temporary workaround for log spam
Glenn Kasten [Thu, 1 May 2014 19:27:02 +0000 (19:27 +0000)]
Merge "Temporary workaround for log spam"
Glenn Kasten [Thu, 1 May 2014 17:41:11 +0000 (10:41 -0700)]
Temporary workaround for log spam
Bug:
13790505
Change-Id: Icfc403bceaefdede1af65dfd70ba3e8b26abab02
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"
Lajos Molnar [Wed, 30 Apr 2014 17:13:57 +0000 (10:13 -0700)]
ACodec: add frame render/drop systrace
Change-Id: I7a33d4a937d039fd454b889ddb12b7ca1c0ff3c2
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
Jesper Tragardh [Mon, 24 Mar 2014 13:12:43 +0000 (14:12 +0100)]
Fix memory leak when filtering commands in insertCommand_l()
When AudioPolicyService::AudioCommandThread::insertCommand_l filters
a command from the queue, the AudioCommand* is removed from the
vector mAudioCommands by calling mAudioCommands.removeAt(). This will
destroy the pointer and compact the vector, but not delete the
AudioCommand object.
This patch adds code to delete a filtered out AudioCommand and its
data object mParam. However, mParam was void* and deleting a void
pointer is undefined behavior according to the C++
standard. Therefore, the data classes are modified to inherit
from an abstract base class with a virtual destructor.
The deletion of non-filtered commands in
AudioPolicyService::AudioCommandThread::threadLoop() was already
correct, as each case casts mParam to the proper type before
deleting.
This also fixes AOSP issue 36370.
Change-Id: I2b63838aff3608132aa496f964a929f78c4b6267
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