OSDN Git Service
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: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: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: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: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: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:01:24 +0000 (18:01 +0000)]
Merge "media: memset sizeof argument issues"
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 [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: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:00:25 +0000 (17:00 +0000)]
Merge "64-bit: Correction to OMX_U32 and OMX_S32"
Glenn Kasten [Thu, 3 Apr 2014 15:01:21 +0000 (15:01 +0000)]
Merge "Fix aac decoder flush"
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
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: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
Glenn Kasten [Wed, 19 Mar 2014 20:58:48 +0000 (20:58 +0000)]
Merge "libstagefright is no longer 32 bit only."
Glenn Kasten [Wed, 19 Mar 2014 20:29:11 +0000 (20:29 +0000)]
Merge "Use libaudioresampler instead of libaudioflinger"
Glenn Kasten [Wed, 19 Mar 2014 19:45:28 +0000 (19:45 +0000)]
Merge "Add libaudioresampler"
Narayan Kamath [Wed, 19 Mar 2014 16:07:30 +0000 (09:07 -0700)]
libstagefright is no longer 32 bit only.
Change-Id: I88d5fcfc005a2c2acd0246cdd9c08b6c00b6c39b
Signed-off-by: Glenn Kasten <gkasten@android.com>
Glenn Kasten [Wed, 19 Mar 2014 16:05:59 +0000 (09:05 -0700)]
Use libaudioresampler instead of libaudioflinger
in order to be able to build libvideoeditor as 64-bit also.
libaudioresampler is available in both 32-bit and 64-bit,
unlike libaudioflinger which is currently 32-bit only.
Change-Id: Id63857da877b1e45b7c1f8e35f18dca6600be3f7
Glenn Kasten [Wed, 19 Mar 2014 16:05:08 +0000 (09:05 -0700)]
Add libaudioresampler
libaudioresampler is available in both 32-bit and 64-bit,
unlike libaudioflinger which is currently 32-bit only.
Bug:
8141282
Change-Id: I839f7b4e6aaed6984012ca6d514323f927669df6
Colin Cross [Tue, 18 Mar 2014 23:20:52 +0000 (23:20 +0000)]
Merge "libstagefright_foundation: fix printf format for 64-bit"
Colin Cross [Tue, 18 Mar 2014 23:18:27 +0000 (16:18 -0700)]
libstagefright_foundation: fix printf format for 64-bit
Fixes build error:
frameworks/av/media/libstagefright/foundation/ANetworkSession.cpp:582:131: error: format '%d' expects argument of type 'int', but argument 4 has type 'size_t {aka long unsigned int}' [-Werror=format=]
ALOGI("%d datagrams remain queued.", mOutFragments.size());
^
cc1plus: all warnings being treated as errors
Change-Id: I69d1f086b8f1e450f107671c8f8f3ed696d170b4
Glenn Kasten [Tue, 18 Mar 2014 17:31:25 +0000 (17:31 +0000)]
Merge "AudioPolicyService: malloc/delete pair"
Glenn Kasten [Tue, 18 Mar 2014 17:13:23 +0000 (17:13 +0000)]
Merge "More precise 32-bit only for libstagefright/ subdirectories"
Glenn Kasten [Mon, 17 Mar 2014 18:49:35 +0000 (11:49 -0700)]
More precise 32-bit only for libstagefright/ subdirectories
Change-Id: Ie4e8f9ccd834b902287d3452cc9fa739809ddb68
Glenn Kasten [Mon, 17 Mar 2014 18:36:00 +0000 (18:36 +0000)]
Merge "More 32-bit only"
Glenn Kasten [Fri, 14 Mar 2014 22:36:20 +0000 (15:36 -0700)]
More 32-bit only
Change-Id: Ic333215e39757f91b12d66b8a9ad7f43c8ba8b36
Glenn Kasten [Fri, 14 Mar 2014 20:45:50 +0000 (20:45 +0000)]
Merge "mediaserver and associated services are 32-bit only"
Andreas Huber [Fri, 14 Mar 2014 15:40:22 +0000 (15:40 +0000)]
Merge "Implemented support for RTSP 301 Redirect"
Glenn Kasten [Mon, 3 Mar 2014 03:48:19 +0000 (19:48 -0800)]
mediaserver and associated services are 32-bit only
also 32-bit only command-line apps
Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
Marco Nelissen [Wed, 12 Mar 2014 15:41:55 +0000 (15:41 +0000)]
Merge "Remove streaming URI from default logs"
David Williams [Thu, 6 Sep 2012 14:33:38 +0000 (16:33 +0200)]
Remove streaming URI from default logs
Streaming URI should not be visible in default logcat logs
Change-Id: I104cc56b5335f8c5621013e4c5be8028f0379833
Narayan Kamath [Fri, 7 Mar 2014 16:04:47 +0000 (16:04 +0000)]
Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"
Narayan Kamath [Fri, 7 Mar 2014 16:04:44 +0000 (16:04 +0000)]
Merge "LP64 fixes for media/libeffects"
Glenn Kasten [Thu, 6 Mar 2014 19:08:44 +0000 (19:08 +0000)]
Merge "audioflinger: Fix for a deadlock in track creation"
Haynes Mathew George [Fri, 13 Dec 2013 23:40:13 +0000 (15:40 -0800)]
audioflinger: Fix for a deadlock in track creation
AudioFlinger enters a deadlock (with itself) on trying to free a
RecordTrack or Track object that failed initialization. Clear this
bad object from the caller instead.
Bug:
12423233
Change-Id: I926f2beb922a70f6924e593e2bbf1a5b5df85b16
Ashok Bhat [Fri, 28 Feb 2014 20:12:05 +0000 (20:12 +0000)]
Check for ARCH_ARM_HAVE_NEON flag only for ARM arch
This patch prevents ARM neon code from being included
for Arm64, where ARM is the 2nd architecture.
Change-Id: I5a283991034f2650a0e7d4227aef967be276fc9c
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Narayan Kamath [Mon, 3 Mar 2014 11:08:27 +0000 (11:08 +0000)]
Merge "Fix ALOGVs for 64bit"
Glenn Kasten [Fri, 28 Feb 2014 17:12:12 +0000 (17:12 +0000)]
Merge "Fix preventing from heap overwrite in capture command"
Kévin PETIT [Fri, 28 Feb 2014 10:48:38 +0000 (10:48 +0000)]
Fix ALOGVs for 64bit
Change-Id: I556f90f9e6ace1a897d24326e5c14e7bf1e9fe29
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Narayan Kamath [Thu, 27 Feb 2014 13:18:33 +0000 (13:18 +0000)]
Merge "AArch64: Correction for LP64"
Ying Wang [Wed, 26 Feb 2014 19:18:45 +0000 (19:18 +0000)]
Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"
Ying Wang [Wed, 26 Feb 2014 19:07:24 +0000 (11:07 -0800)]
Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH
Change-Id: Ifef0dd59ab317b1799fc899bb2e898bb09d2e5f6
Marcus Oakland [Mon, 17 Feb 2014 08:28:25 +0000 (08:28 +0000)]
AArch64: Correction for LP64
In the Intra16x16PlanePrediction function, a u32 (unsigned 32-bit
integer) was being used for the "i" variable, and being used with a
value of 7 in the loop "for (i = 0, b = 0; i < 8; i++)" to access the
"above[6-i]" location where "above" is defined as "u8 *". Because "i"
was unsigned there was no sign extension on use with the __LP64__
64-bit pointer, so rather than 0xFFFFFFFF being treated as -1, it was
treated as 4,292,967,295 and that resulted in a SIGSEGV at an invalid
address. By changing the type of "i" to an i32 (signed 32-bit integer)
the expected sign extension occurs and the value is treated as -1.
This change fixes android.media.cts.DecoderTest#testCodeBasicH264 on
64-bit platforms
Change-Id: I85df58b0dc1d39f89ab421d04ab5481356520f0c
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Glenn Kasten [Tue, 25 Feb 2014 19:36:22 +0000 (19:36 +0000)]
Merge "Avoid a building error"
Marco Nelissen [Thu, 20 Feb 2014 17:21:06 +0000 (17:21 +0000)]
Merge "LiveSession: Use the actual, possibly redirected url as base in the M3U"
Ashok Bhat [Tue, 18 Feb 2014 11:40:00 +0000 (11:40 +0000)]
LP64 fixes for media/libeffects
Changes include:
[x] In get parameter series of functions, replaced size_t*
formal parameter type with uint32_t* where actual parameter
passed was uint32_t*.
[x] In set parameter series of functions, changed size_t
formal parameter to uint32_t where actual parameter was
uint32_t.
[x] Changed the definition of LVM_UINT32 from unsigned
long to uint32_t as unsigned long is 64-bit in LP64.
[x] Used other stdint.h types for other LVM_types for
consistency.
[x] Use of uintptr_t for the pNextMember of the INST_ALLOC
structure, rather than LVM_UINT32, for portablility.
[x] Use of uintptr_t where pointers are used in arithmetic.
[x] Replaced the use of 0xFFFFFFFC with ~3 in places where
it was used to clear last two bits.
[x] Removed int casts where cmdSize and *replySize, both
uint32_t, were being compared with sizeof().
Change-Id: Ibec0b4d8e9b855f44b1cd853be6df84d13cf4186
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Ryszard Grzesica [Fri, 17 Jan 2014 10:40:16 +0000 (11:40 +0100)]
Fix preventing from heap overwrite in capture command
There was heap usage error in case of stop of audio framework while
capturePoint was negative. Pointer to reply data was moved but
final silence write was done using original buffer size.
Now silence set is done at the beginning under the condition
that framework has stopped.
Change-Id: I7dab1e922f1813e5fbfd4a64c8b0d15d9465520c
Colin Cross [Fri, 14 Feb 2014 01:04:44 +0000 (01:04 +0000)]
Merge "libeffects: don't set module path"
Colin Cross [Fri, 14 Feb 2014 00:39:11 +0000 (16:39 -0800)]
libeffects: don't set module path
Setting the module path breaks multilib builds where there may
be two different module paths for 32-bit and 64-bit, and there
is no need to set it to the default.
Change-Id: I95d62b5573a0bb0ab6c97649041dfc4309cbc8b9
Glenn Kasten [Thu, 13 Feb 2014 15:59:58 +0000 (15:59 +0000)]
Merge "Replace size_t in shared memory by uint32_t"
Glenn Kasten [Tue, 28 Jan 2014 19:03:28 +0000 (11:03 -0800)]
Replace size_t in shared memory by uint32_t
Eventually we may want to use uint64_t, but will need to confirm atomicity.
Bug:
12381724
Change-Id: Ia2c591d262d22b47b6f7dab4b9d9faa14b86d865
Lajos Molnar [Tue, 11 Feb 2014 21:31:40 +0000 (21:31 +0000)]
Merge "avcenc: Only do startcode escaping if the next byte requires it"
Martin Storsjo [Wed, 7 Aug 2013 11:57:20 +0000 (14:57 +0300)]
avcenc: Only do startcode escaping if the next byte requires it
Section 7.4.1 in the H.264 standard says that the only valid bytes
to follow a sequence that starts with 0x000003 are 0x00, 0x01,
0x02 or 0x03.
This makes EncodeDecodeTest pass properly when decoding using
OMX.google.h264.decoder, which is strict about the forbidden
escape sequences.
Change-Id: Ice113d9b934015003ea9cb10d0b21cee4d18d774
Narayan Kamath [Tue, 11 Feb 2014 13:35:01 +0000 (13:35 +0000)]
Merge "Make frameworks/av 64-bit compatible"
Kévin PETIT [Mon, 3 Feb 2014 12:35:36 +0000 (12:35 +0000)]
Make frameworks/av 64-bit compatible
Contains the necessary changes to make frameworks/av build and work
on a 64-bit machine.
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
Colin Cross [Mon, 10 Feb 2014 22:34:16 +0000 (22:34 +0000)]
Merge "frameworks/av: fix errors inside ALOGV"
Colin Cross [Fri, 7 Feb 2014 04:29:44 +0000 (20:29 -0800)]
frameworks/av: fix errors inside ALOGV
Fix errors exposed by adding compile-time checking to disabled ALOGVs.
Change-Id: Ie06db81d422bb4eee7dfc10abb8d03001627af4c
Glenn Kasten [Mon, 10 Feb 2014 18:05:01 +0000 (18:05 +0000)]
Merge "AudioFlinger: Remove code for supporting resampling in fast tracks"
Glenn Kasten [Mon, 10 Feb 2014 18:04:54 +0000 (18:04 +0000)]
Merge "AudioTrack: Never try to use the fast path if resampling is required"
Lajos Molnar [Mon, 10 Feb 2014 17:45:10 +0000 (17:45 +0000)]
Merge "avcenc: Update video port parameters in the base class"
Lajos Molnar [Mon, 10 Feb 2014 17:41:54 +0000 (17:41 +0000)]
Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"
Lajos Molnar [Mon, 10 Feb 2014 17:34:23 +0000 (17:34 +0000)]
Merge "SoftVPXEncoder: Set the frame size on the output port as well"
Marco Nelissen [Mon, 10 Feb 2014 17:12:50 +0000 (17:12 +0000)]
Merge "M3UParser: Fix typo in
8883a38a308"
Martin Storsjo [Mon, 10 Feb 2014 17:09:59 +0000 (19:09 +0200)]
M3UParser: Fix typo in
8883a38a308
Change-Id: I09f8deb40b8b34efd4bfcfab6866b7780f8bae96
Marco Nelissen [Mon, 10 Feb 2014 16:42:46 +0000 (16:42 +0000)]
Merge "M3UParser: Skip query strings when looking for the last slash in a URL"
Colin Cross [Fri, 7 Feb 2014 21:23:06 +0000 (21:23 +0000)]
Merge "frameworks/av: fix errors inside ALOGV"
Colin Cross [Fri, 7 Feb 2014 04:29:44 +0000 (20:29 -0800)]
frameworks/av: fix errors inside ALOGV
Fix errors exposed by adding compile-time checking to disabled ALOGVs.
Change-Id: I9602a4a485dffa3caad732c2a19ec0e41a0ac65b
Martin Storsjo [Wed, 5 Feb 2014 17:49:05 +0000 (19:49 +0200)]
AudioFlinger: Remove code for supporting resampling in fast tracks
This isn't used at the moment.
Change-Id: I4e0fb2af5f7d959dbafd5ddb7defa1c6b8e8636a
Martin Storsjo [Fri, 22 Nov 2013 15:05:05 +0000 (17:05 +0200)]
M3UParser: Skip query strings when looking for the last slash in a URL
Change-Id: I72d3a5e11fef9bbd75b291bc490c9cab1dce58da
Glenn Kasten [Wed, 5 Feb 2014 16:37:48 +0000 (16:37 +0000)]
Merge "audioflinger: conform inline ASM to UAL"
synergy dev [Tue, 4 Feb 2014 11:38:33 +0000 (06:38 -0500)]
audioflinger: conform inline ASM to UAL
Clang requires some inline ASM to conform to the UAL standards (Unified Assembler Language).
This fixes a small issue in this inline asm to allow building.
Change-Id: Ifd9b1814343ab5ade636b9401a21d575559dac16