OSDN Git Service
Narayan Kamath [Wed, 9 Jul 2014 08:32:36 +0000 (08:32 +0000)]
Merge "m4v_h263_enc: Use uint32_t for ULong"
Ashok Bhat [Mon, 16 Jun 2014 16:42:02 +0000 (17:42 +0100)]
m4v_h263_enc: Use uint32_t for ULong
ULong is used in the encoder code as 32-bit unsigned integer type.
But it has been defined as an unsigned long, which will be 64-bit
on 64-bit platforms. This causes many problems including output
mismatch between 32-bit and 64-bit code and crash in certain cases.
This patch defines ULong as uint32_t. In addition, it uses uintptr_t
at places where an address is cast to an integer to check for alignment.
Change-Id: I2b0086824a5985b9fc4628ce6fbe81db156e37d2
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Lajos Molnar [Tue, 24 Jun 2014 17:56:00 +0000 (17:56 +0000)]
Merge "DO NOT MERGE: Fix for SW video decoder OMX profile/level query"
Xiaosong Wei [Tue, 17 Dec 2013 15:05:29 +0000 (23:05 +0800)]
DO NOT MERGE: Fix for SW video decoder OMX profile/level query
get the correct profile index from the input param and pass it to
profileLevel array to get the corresponding profile/level
Change-Id: I582961c0afb53c1781af7fb94226a23e5fdb96cf
Signed-off-by: Xiaosong Wei <xiaosong.wei@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Mark Salyzyn [Tue, 24 Jun 2014 17:12:19 +0000 (17:12 +0000)]
Merge "libmediaplayerservice: unused argument warning messages"
Mark Salyzyn [Mon, 23 Jun 2014 21:14:40 +0000 (14:14 -0700)]
libmediaplayerservice: unused argument warning messages
Change-Id: I7dbf62858114ac9b8de6d7b66cc00e002769a5cf
Marco Nelissen [Mon, 23 Jun 2014 18:23:22 +0000 (18:23 +0000)]
Merge "Fix buffer allocation"
Marco Nelissen [Mon, 23 Jun 2014 15:15:13 +0000 (08:15 -0700)]
Fix buffer allocation
b/
15293123
Change-Id: Icb3ceabf02a55bc931baaf388ce125db6332de0e
Elliott Hughes [Fri, 13 Jun 2014 15:27:25 +0000 (15:27 +0000)]
Merge "Use char x[] rather than char x[0]."
Elliott Hughes [Fri, 13 Jun 2014 01:17:11 +0000 (18:17 -0700)]
Use char x[] rather than char x[0].
Bug:
15514223
Change-Id: I895ea8ef7e391fd14cdf8976e048385e01c90f8f
Elliott Hughes [Wed, 11 Jun 2014 23:59:18 +0000 (23:59 +0000)]
Merge "Offer a type-safe album art interface."
Elliott Hughes [Tue, 10 Jun 2014 23:55:38 +0000 (16:55 -0700)]
Offer a type-safe album art interface.
Bug:
15514223
Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
Christopher Ferris [Tue, 10 Jun 2014 23:42:20 +0000 (23:42 +0000)]
Merge "Add libcrypto for users of libstagefright."
Christopher Ferris [Tue, 10 Jun 2014 22:15:04 +0000 (15:15 -0700)]
Add libcrypto for users of libstagefright.
libstagefright_rtsp uses some MD5 functions that used to be in bionic,
but it was removed recently. As an initial fix, I statically linked in
libcrypto_static to the libstagefright_rtsp library. However, I think
it's better to modify the single user of this library to link against
the shared libcrypto library.
Change-Id: Iaf2e1aeea32fd8af038f6e77bf58ea7df50d807a
Narayan Kamath [Fri, 13 Jun 2014 09:26:30 +0000 (09:26 +0000)]
Merge "Remove dependency on Parcel::{read,write}IntPtr"
Jeff Tinker [Mon, 9 Jun 2014 22:51:38 +0000 (15:51 -0700)]
Remove dependency on Parcel::{read,write}IntPtr
bug:
15424960
bug:
15107693
(cherry picked from commit
bcca9e072c1f288a53ce6862936f57dc36488f96)
Change-Id: I3ba59fccb184e99a07f6f82ccdbd00e5204901f6
Narayan Kamath [Fri, 13 Jun 2014 08:55:13 +0000 (08:55 +0000)]
Merge "Update OMX messages for 64 bit"
Andy Hung [Fri, 2 May 2014 18:05:04 +0000 (11:05 -0700)]
Update OMX messages for 64 bit
Change node_id and buffer_id to uint32_t.
Ensure IOMX messages are fixed size.
Remove 64 bit compile warnings in associated files.
Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203
Signed-off-by: Andy Hung <hunga@google.com>
Christopher Ferris [Tue, 10 Jun 2014 03:03:50 +0000 (03:03 +0000)]
Merge "Link libcrypto for MD5_* functions."
Christopher Ferris [Tue, 10 Jun 2014 02:35:17 +0000 (19:35 -0700)]
Link libcrypto for MD5_* functions.
Change-Id: I5dce8f041b9faf035161b82d5e46bd46166bd05c
Mark Salyzyn [Mon, 9 Jun 2014 23:36:17 +0000 (23:36 +0000)]
Merge "libcamera_client: 64-bit compile issue"
Mark Salyzyn [Mon, 9 Jun 2014 23:28:21 +0000 (16:28 -0700)]
libcamera_client: 64-bit compile issue
- size_t print format
- some unused parameter warning messages
Change-Id: I2c0f50dda7e810f3f60603fd9d8c62c5b8767528
Narayan Kamath [Tue, 3 Jun 2014 08:35:10 +0000 (08:35 +0000)]
Merge "Mp3decoder: Remove unused arm assembly files"
Mark Salyzyn [Fri, 30 May 2014 21:47:19 +0000 (21:47 +0000)]
am
2d0e8d8f: Merge "libcpustats: Turn on -Werror"
* commit '
2d0e8d8f75369b491362f2ea3a6efd5159df404c':
libcpustats: Turn on -Werror
Mark Salyzyn [Fri, 30 May 2014 21:42:54 +0000 (21:42 +0000)]
Merge "libcpustats: Turn on -Werror"
Mark Salyzyn [Fri, 30 May 2014 20:30:18 +0000 (13:30 -0700)]
libcpustats: Turn on -Werror
- Switch to static_assert from deprecated utils/Debug.h
- Turn on C++11 standard
- Turn on -Werror
Change-Id: I4f1c08bbcaf1ad3a97502cde756a2f42bcece789
Brian Carlstrom [Wed, 28 May 2014 22:31:41 +0000 (22:31 +0000)]
am
df9b1ff3: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
df9b1ff3726e263c8533add096435520ca4b7d61':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:28:37 +0000 (22:28 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 21:31:47 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
(cherry picked from commit
483f59ab9fb4b2d8ab212f77a50eed0528beca58)
Change-Id: I387af6e4721840f98063f26854c02e6da26b9974
Ashok Bhat [Fri, 23 May 2014 09:54:24 +0000 (10:54 +0100)]
Mp3decoder: Remove unused arm assembly files
The unused ARM assembly files were written for
legacy proprietary ARM compilers. They are not
needed when gcc or clang compiler is used.
Change-Id: I8dfe9ad458efbb34922094e943ad334cc34f59a3
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Elliott Hughes [Thu, 22 May 2014 22:42:46 +0000 (22:42 +0000)]
am
8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."
* commit '
8b187f4acea8d7e517ff9ced32fc7368bdbaa6e0':
Move frameworks/av off <sys/atomics.h>.
Elliott Hughes [Thu, 22 May 2014 21:30:25 +0000 (21:30 +0000)]
Merge "Move frameworks/av off <sys/atomics.h>."
Elliott Hughes [Thu, 22 May 2014 21:20:39 +0000 (14:20 -0700)]
Move frameworks/av off <sys/atomics.h>.
Bug:
14903517
Change-Id: I92cdfc618d83fd914cfb558a07b1deae0255fccb
Calin Juravle [Thu, 22 May 2014 13:40:35 +0000 (13:40 +0000)]
am
d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."
* commit '
d551633916d3677da4dda10aba6837bdc6803ee0':
Move frameworks/av from fdprintf to POSIX dprintf.
Calin Juravle [Thu, 22 May 2014 13:36:22 +0000 (13:36 +0000)]
Merge "Move frameworks/av from fdprintf to POSIX dprintf."
Elliott Hughes [Thu, 22 May 2014 08:22:06 +0000 (01:22 -0700)]
Move frameworks/av from fdprintf to POSIX dprintf.
Bug:
11156955
Change-Id: Ia98cd16b4c1f7be87cf060b7456de4f40896bacb
Elliott Hughes [Thu, 22 May 2014 01:49:44 +0000 (01:49 +0000)]
am
85e6e87c: Merge "Restore accidentally-removed NULL timeout."
* commit '
85e6e87c41bba51729cee8958a5c30157c8dc674':
Restore accidentally-removed NULL timeout.
Elliott Hughes [Thu, 22 May 2014 01:45:47 +0000 (01:45 +0000)]
Merge "Restore accidentally-removed NULL timeout."
Elliott Hughes [Thu, 22 May 2014 01:44:27 +0000 (18:44 -0700)]
Restore accidentally-removed NULL timeout.
Change-Id: I933c80fea50950243f109acf8d6350013aaa811f
Elliott Hughes [Thu, 22 May 2014 01:28:18 +0000 (01:28 +0000)]
am
3b6da6bf: Merge "Move frameworks/av off private API."
* commit '
3b6da6bfb50a1c0324fb4c87326d3a477944d5fe':
Move frameworks/av off private API.
Elliott Hughes [Thu, 22 May 2014 01:23:41 +0000 (01:23 +0000)]
Merge "Move frameworks/av off private API."
Elliott Hughes [Thu, 22 May 2014 00:55:51 +0000 (17:55 -0700)]
Move frameworks/av off private API.
Bug:
11156955
Change-Id: Ib3bb9d66a2bf92977c2445b62aa074a2d7a45aea
Elliott Hughes [Thu, 22 May 2014 00:39:10 +0000 (00:39 +0000)]
am
d084206d: Merge "Move frameworks/av off __futex_syscall3."
* commit '
d084206d5a4a5364211af46e4201311933e83bfc':
Move frameworks/av off __futex_syscall3.
Elliott Hughes [Thu, 22 May 2014 00:35:48 +0000 (00:35 +0000)]
Merge "Move frameworks/av off __futex_syscall3."
Elliott Hughes [Thu, 22 May 2014 00:31:18 +0000 (17:31 -0700)]
Move frameworks/av off __futex_syscall3.
Bug:
11156955
Change-Id: I943080bc51b6efa781059b48b5b5ecc4fa287512
Eric Laurent [Mon, 19 May 2014 15:28:51 +0000 (15:28 +0000)]
am
ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode"
* commit '
ce473c32705e2d1c5fcc817198101e1220b3c8f7':
Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode
Eric Laurent [Mon, 19 May 2014 15:26:37 +0000 (15:26 +0000)]
Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode"
Andreas Huber [Fri, 16 May 2014 15:14:38 +0000 (15:14 +0000)]
am
3059e27d: Merge "libstagefright foundation: fix uninitialized varibale warning"
* commit '
3059e27d0e18a427f3c19889aac86ea31ec0d5d1':
libstagefright foundation: fix uninitialized varibale warning
Andreas Huber [Fri, 16 May 2014 15:11:28 +0000 (15:11 +0000)]
Merge "libstagefright foundation: fix uninitialized varibale warning"
Amit Pundir [Thu, 15 May 2014 07:12:04 +0000 (12:42 +0530)]
libstagefright foundation: fix uninitialized varibale warning
gcc-4.9 reports warning for this uninitialized variable
and -Werror make this warning fatal.
Change-Id: I6901362246d53deeded78fa38ad656b167705346
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Uday Gupta [Tue, 13 May 2014 18:19:17 +0000 (11:19 -0700)]
Codec Offload: Add NULL check as mCallbackThread is NULL
when offloaded HAL is running BLOCKING mode
b/
14897952
Change-Id: I159a33e1181c1a62d80ab4bd3337a35dafaad884
Signed-off-by: Uday Gupta <guptau@broadcom.com>
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
Eino-Ville Talvala [Mon, 12 May 2014 17:31:29 +0000 (17:31 +0000)]
am
f02f06c4: Merge "camera: check Intent entry count before reading it"
* commit '
f02f06c422a58ddaca49d14f21a196eaa435d07b':
camera: check Intent entry count before reading it
Eino-Ville Talvala [Mon, 12 May 2014 17:27:54 +0000 (17:27 +0000)]
Merge "camera: check Intent entry count before reading it"
Yuvraj Pasi [Tue, 15 Apr 2014 13:33:26 +0000 (19:03 +0530)]
camera: check Intent entry count before reading it
In case when find() returns empty entry, blindly
reading the entry will cause segfault
Change-Id: Ib5be7fd855c409ba3b45f0d43e15237367172817
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: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: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 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: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: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: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: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: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: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 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 [Tue, 29 Apr 2014 18:34:16 +0000 (11:34 -0700)]
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 [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"