OSDN Git Service
Glenn Kasten [Wed, 2 Apr 2014 21:38:17 +0000 (21:38 +0000)]
Merge "Fix decoder EOS handling"
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
Lajos Molnar [Mon, 3 Feb 2014 17:53:00 +0000 (17:53 +0000)]
Merge "correct one logic error in decide whether should render or not"
Jianzheng Zhou [Tue, 14 Jan 2014 09:55:16 +0000 (17:55 +0800)]
correct one logic error in decide whether should render or not
Change-Id: Ie41663f6fd5a7d983279f14a2228cb57231771bf
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
Martin Storsjo [Fri, 31 Jan 2014 11:30:15 +0000 (13:30 +0200)]
AudioTrack: Never try to use the fast path if resampling is required
Unless AudioFlinger was built with FAST_TRACKS_AT_NON_NATIVE_SAMPLE_RATE
enabled, AudioFlinger would deny using the fast path (and internally
fall back to the normal codepath) when it realized that resampling
was required. Since the buffer size calculations within AudioFlinger
don't take resampling into account properly (see the calculation
below "AUDIO_OUTPUT_FLAG_FAST denied" in audioflinger/Threads.cpp,
just below the hunk that this patch changes), make sure AudioTrack
doesn't try to use the fast path if resampling is required.
This removes the possibility to enable
FAST_TRACKS_AT_NON_NATIVE_SAMPLE_RATE in AudioFlinger since it
AudioTrack now won't even try to use the fast path for content
that requires resampling, regardless of the AudioFlinger configuration.
Change-Id: Icf0f8ad50bf0fdb84657f518c0120aa0535f23f9
Eric Laurent [Fri, 31 Jan 2014 00:59:47 +0000 (00:59 +0000)]
Merge "fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds"
jpadmana [Thu, 14 Nov 2013 11:50:52 +0000 (17:20 +0530)]
fix deadlock issues that arise when there are simultaneous
effect control interface calls to proxy and to
non sub-effect wrappers(eg., bundlewrapper) from audioflinger
Also, return NO_ERROR when CMD_OFFLOAD succeeds
Whenever there are parallel calls to proxy and non sub-effects wrappers,
some of the calls are not completed. This is due to deadlock arsing out
of Proxy waiting for the subeffect call to return and subeffect waiting
for proxy to release lock.
The call flow is changed to a cleaner and simple one - Proxy gets the
aeli(effect library info) of subeffects during the EffectGetSubEffects()
call. Therby, proxy will manage the sub effects by itself rather than
going through effects factory.
Signed-off-by: jpadmana <jayashree.r.padmanaban@intel.com>
Bug:
12424044
Change-Id: I16852222f1d0e94e433a19177729323a4bb1c090
Eric Laurent [Fri, 31 Jan 2014 00:58:30 +0000 (00:58 +0000)]
Merge "audioflinger: fix static track end detection"
Brian Carlstrom [Thu, 30 Jan 2014 21:51:01 +0000 (21:51 +0000)]
Merge "frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default"
Brian Carlstrom [Thu, 30 Jan 2014 21:14:01 +0000 (13:14 -0800)]
frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default
Bug:
12798969
Change-Id: I2db14a7ee28db2449ec6e2384ade21944284528d
Eric Laurent [Sat, 21 Dec 2013 01:36:01 +0000 (17:36 -0800)]
audioflinger: fix static track end detection
If a static track is not a fast track,
prepareTracks_l() must rely on framesReady() to
detect end of buffer and remove the track from the active
track list.
Failing to do so results in the track staying active but
not processed by the mixer because in underrun. This leaves the
mix buffer content uninitialized and causes the effect process
function to accumulate its output onto undefined data.
Bug:
12013676.
Change-Id: Iad72c921fa18d34811abf7d1073890c093a27725
Glenn Kasten [Wed, 29 Jan 2014 17:48:44 +0000 (17:48 +0000)]
Merge "AudioMixer: Remove tracks from enabledTracks after reseting outTemp"
Gaurav Kumar [Mon, 6 Jan 2014 05:27:18 +0000 (10:57 +0530)]
AudioMixer: Remove tracks from enabledTracks after reseting outTemp
If any track goes through AudioMixer::process__genericNoResampling, and
its getnextbuffer returns NULL, Then that track is removed by AudioMixer
from enabledTracks.
Thus if all tracks getnextbuffer return NULL, Then this function doesn't
reset outTemp and last buffer in AudioFlinger's mMixBuffer will be
repeated and noise is observed.
Remove tracks from enabledTracks after reseting outTemp to zero, so that
process__genericNoResampling will reset outTemp and noise won't appear.
Bug:
12450065
Change-Id: I1ccac7ee4a3bf7fd930254356c072099e11e7c19
Signed-off-by: Gaurav Kumar <gaurav.kumar@broadcom.com>
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
Colin Cross [Tue, 28 Jan 2014 00:43:21 +0000 (00:43 +0000)]
Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
Colin Cross [Sat, 25 Jan 2014 05:00:32 +0000 (21:00 -0800)]
frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.
Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
Eric Laurent [Mon, 27 Jan 2014 17:19:48 +0000 (17:19 +0000)]
Merge "Only increase the counter when we do take a wakelock"
Eric Laurent [Mon, 27 Jan 2014 17:10:34 +0000 (17:10 +0000)]
Merge "Do partial reads in MemoryLeakTrackUtil"
Oscar Rydhé [Tue, 22 Jan 2013 10:09:54 +0000 (11:09 +0100)]
Do partial reads in MemoryLeakTrackUtil
Do partial read in MemoryLeakTrackUtil dumpMemoryAddresses
to avoid using more memory than what is allocated.
Change-Id: I94feb4e00647407f938571167b981c7371f39e3d
Jimmy Dalqvist [Tue, 14 Jan 2014 13:13:52 +0000 (14:13 +0100)]
Only increase the counter when we do take a wakelock
We keep track on how many wakelocks we have taken. We always
just take one real wakelock but increase / decrease the
counter every time we try to acquire / release a wakelock.
The counter is always increased even if the power manager is
not ready, leading to an incorrect counter that could cause a
crash when we try to release it.
Make sure we only increase the counter when a wakelock, real
or counted, is taken.
Change-Id: Iad940e052694932f1dad8a1a71fa63601d289d6a
Marco Nelissen [Fri, 17 Jan 2014 21:23:17 +0000 (21:23 +0000)]
Merge "Long mp3 metadata displays as corrupted file after transfer"
Marco Nelissen [Fri, 17 Jan 2014 17:08:51 +0000 (17:08 +0000)]
Merge "Added support for ID3v2 meta data in 3gp files"
Marco Nelissen [Fri, 17 Jan 2014 16:04:36 +0000 (16:04 +0000)]
Merge "Fix compile error in NuPlayerRenderer debug print"
Oscar Rydhé [Thu, 27 Jan 2011 13:01:24 +0000 (14:01 +0100)]
Added support for ID3v2 meta data in 3gp files
Added support for parsing ID3v2 meta data from
the ID32 chunk in 3gp files. The priority will be
3gpp -> ID3v2 -> iTunes per field.
Change-Id: I0282ecab58e3e5fa6bd738078d562c8bb8ce00ed
Marco Nelissen [Wed, 15 Jan 2014 22:12:04 +0000 (22:12 +0000)]
Merge "Avoid jumps to faulty position after seeks"
Eino-Ville Talvala [Wed, 15 Jan 2014 20:26:02 +0000 (20:26 +0000)]
Merge "libcameraservice: Fix build in ISO C++11 mode"
Nick Kralevich [Sat, 11 Jan 2014 04:20:10 +0000 (04:20 +0000)]
Merge "Fix c++11 narrowing"
Glenn Kasten [Fri, 10 Jan 2014 17:22:39 +0000 (17:22 +0000)]
Merge "Frameworks: AudioFlinger: Fix effects memory leak"
Martin Storsjo [Fri, 22 Nov 2013 15:57:31 +0000 (17:57 +0200)]
LiveSession: Use the actual, possibly redirected url as base in the M3U
This fixes playback of HLS streams where the M3U playlists use
relative paths and the main playlist is opened via a redirect.
Change-Id: I787e1c050daddc566be4c8e3f84803d3f91eec46
Marco Nelissen [Thu, 9 Jan 2014 17:43:40 +0000 (17:43 +0000)]
Merge "HLS: Fixed rounding error with decimal segment duration"
Narayan Kamath [Wed, 8 Jan 2014 08:56:10 +0000 (08:56 +0000)]
Merge "Change M4OSA_ERR_CREATE to return unsigned integer."
Oscar Rydhé [Tue, 15 Oct 2013 07:54:08 +0000 (09:54 +0200)]
Fix compile error in NuPlayerRenderer debug print
When activating verbose log prints in NuPlayerRenderer the build
fails because a variable have changed but the log print hasn't been
updated.
Change-Id: I3089b087d296c37dfe6379d7e75d5892912fef96
Ashok Bhat [Thu, 2 Jan 2014 14:54:57 +0000 (14:54 +0000)]
Change M4OSA_ERR_CREATE to return unsigned integer.
While M4OSA_ERR is defined as M4OSA_UInt32, MOSA_ERR_CREATE
is defined to return M4OSA_Int32. This leads to signed/unsigned
comparison warnings. M4OSA_ERR_CREATE has been changed to return
M4OSA_UInt32 to fix this issue.
Change-Id: I71a5c50a95c7f296469604b486a1d3969d302a3f
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Eric Laurent [Sat, 21 Dec 2013 01:19:56 +0000 (01:19 +0000)]
Merge "stagefright: do not offload LD-AAC decoding"
Eric Laurent [Fri, 6 Dec 2013 19:51:42 +0000 (11:51 -0800)]
stagefright: do not offload LD-AAC decoding
For now, do not offload LD and ELD AAC decoding because there
is no way to know if it is supported by the audio DSP implementation.
The longer term fix will be to have mapMimeToAudioFormat() use the
audio object type in track metadata to refine the AAC format and the
audio HAL list supported AAC profiles.
Change-Id: Iaa88ecf3f4ae42ad48c1b42a9b007dd80eb88147
Eric Laurent [Sat, 21 Dec 2013 01:18:46 +0000 (01:18 +0000)]
Merge "stagefright: fix offloading HE-AAC sampling rate."
Yin Liu [Tue, 4 Dec 2012 08:19:53 +0000 (09:19 +0100)]
Long mp3 metadata displays as corrupted file after transfer
Cut the metadata to 1 Byte and return in function
getObjectPropertyList in order to show it properly on a PC.
Change-Id: Iefacf9fa86c20ece2572e6d95d35877a94066fe7
Eric Laurent [Fri, 6 Dec 2013 19:16:54 +0000 (11:16 -0800)]
stagefright: fix offloading HE-AAC sampling rate.
Fix HE AAC SBR sampling rate reading for explicit
signaling.
Bug:
11697128.
Change-Id: Ifec0ab9d48d9293f6774ec1efd9da9445994cb7c