OSDN Git Service
Dongwon Kang [Thu, 13 Feb 2014 03:00:06 +0000 (03:00 +0000)]
am
0105027f: Fix wrong channel table in ESQueue according to the A/52 table 5.8
* commit '
0105027f2a385ecb29a64b055f3046fb01ca2803':
Fix wrong channel table in ESQueue according to the A/52 table 5.8
Lajos Molnar [Tue, 11 Feb 2014 21:45:21 +0000 (21:45 +0000)]
am
7eacea11: Merge "avcenc: Only do startcode escaping if the next byte requires it"
* commit '
7eacea1156a3896ee7813cd9a06c535e63c95f6a':
avcenc: Only do startcode escaping if the next byte requires it
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:41:54 +0000 (13:41 +0000)]
am
3c9130a8: Merge "Make frameworks/av 64-bit compatible"
* commit '
3c9130a8a12ce962dc8d22e04243b135b9e98b01':
Make frameworks/av 64-bit compatible
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
Dongwon Kang [Tue, 11 Feb 2014 09:26:40 +0000 (18:26 +0900)]
Fix wrong channel table in ESQueue according to the A/52 table 5.8
Reference: http://www.atsc.org/cms/standards/A52-2012(12-17).pdf
Bug:
12950777
Change-Id: Ic60033170b21e67408a3b3444507f6528946bdd0
Colin Cross [Mon, 10 Feb 2014 22:40:05 +0000 (22:40 +0000)]
am
cdda7bf4: Merge "frameworks/av: fix errors inside ALOGV"
* commit '
cdda7bf4d3ca9cad6979374a18dd5be79ea83d80':
frameworks/av: fix errors inside ALOGV
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:10:54 +0000 (18:10 +0000)]
am
5930e8eb: Merge "AudioFlinger: Remove code for supporting resampling in fast tracks"
* commit '
5930e8ebdacf3a59c13eef11fd03658ba58b443e':
AudioFlinger: Remove code for supporting resampling in fast tracks
Glenn Kasten [Mon, 10 Feb 2014 18:10:53 +0000 (18:10 +0000)]
am
4361749d: Merge "AudioTrack: Never try to use the fast path if resampling is required"
* commit '
4361749d74113069aafb0620a1189404205c58d0':
AudioTrack: Never try to use the fast path if resampling is required
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:50:33 +0000 (17:50 +0000)]
am
7142d10a: Merge "avcenc: Update video port parameters in the base class"
* commit '
7142d10a7a3941b2deb18869a7f7b79462e0aa52':
avcenc: Update video port parameters in the base class
Lajos Molnar [Mon, 10 Feb 2014 17:47:07 +0000 (17:47 +0000)]
am
61bdaaa1: Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"
* commit '
61bdaaa18a1d52666827e31bb7980a5784443835':
ChromiumHTTPDataSource: Keep track of the redirected URL
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:39:01 +0000 (17:39 +0000)]
am
88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the output port as well"
* commit '
88e99f9a5e098ee50019ce85f2b1273b48883f37':
SoftVPXEncoder: Set the frame size on the output port as well
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:20:15 +0000 (17:20 +0000)]
am
44f2b8c2: Merge "M3UParser: Fix typo in
8883a38a308"
* commit '
44f2b8c2ff4baf64baa0510cd37ac178ef91b7bc':
M3UParser: Fix typo in
8883a38a308
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:48:42 +0000 (16:48 +0000)]
am
8519b8a1: Merge "M3UParser: Skip query strings when looking for the last slash in a URL"
* commit '
8519b8a1298d80949edadce9c8f0963ef62cc3ff':
M3UParser: Skip query strings when looking for the last slash in a URL
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:28:28 +0000 (21:28 +0000)]
am
e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"
* commit '
e2307ccbab9c32a7806f15c2572cfe6ec428f2f5':
frameworks/av: fix errors inside ALOGV
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:42:48 +0000 (16:42 +0000)]
am
d66cd743: Merge "audioflinger: conform inline ASM to UAL"
* commit '
d66cd743525cc049033caa3e81cbdf74c72a4556':
audioflinger: conform inline ASM to UAL
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
Changwan Ryu [Tue, 4 Feb 2014 07:31:45 +0000 (07:31 +0000)]
am
dd432ce0: [DO NOT MERGE] Support TS + AC3 for ATSC standard
* commit '
dd432ce03eccf280d83672f95076b6fbd561047f':
[DO NOT MERGE] Support TS + AC3 for ATSC standard
Changwan Ryu [Tue, 4 Feb 2014 07:31:44 +0000 (07:31 +0000)]
am
90903383: [DO NOT MERGE] Support AC3 in stagefright
* commit '
9090338367bd9f3fc5678032332a44d457a4a2fe':
[DO NOT MERGE] Support AC3 in stagefright
Lajos Molnar [Mon, 3 Feb 2014 17:57:35 +0000 (17:57 +0000)]
am
5db1e3a6: Merge "correct one logic error in decide whether should render or not"
* commit '
5db1e3a6f30c252ed61461dd8c58786e905e5f5a':
correct one logic error in decide whether should render or not
Eric Laurent [Mon, 3 Feb 2014 17:57:33 +0000 (17:57 +0000)]
am
c4eef29a: 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"
* commit '
c4eef29af4e306319d8741e0c3ade1ede9a0a2b5':
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
Eric Laurent [Mon, 3 Feb 2014 17:57:33 +0000 (17:57 +0000)]
am
b447379e: Merge "audioflinger: fix static track end detection"
* commit '
b447379e2ea1c9ca4cd543ac183df70567d40485':
audioflinger: fix static track end detection
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>
Changwan Ryu [Mon, 28 Oct 2013 02:08:44 +0000 (11:08 +0900)]
[DO NOT MERGE] Support TS + AC3 for ATSC standard
Change-Id: I141667f3f54b242bafdf0ab9db86852c56f49ffa
Changwan Ryu [Mon, 28 Oct 2013 01:53:48 +0000 (10:53 +0900)]
[DO NOT MERGE] Support AC3 in stagefright
Change-Id: I12016b424bd069413bd6e380ff11484e175e05f3
Brian Carlstrom [Fri, 31 Jan 2014 12:34:19 +0000 (12:34 +0000)]
am
60181e36: Merge "frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
60181e360e1c6240d70a3b365b78f8ff28b31493':
frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default
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:57:49 +0000 (17:57 +0000)]
am
d2dc66a2: am
1bf0eecd: Merge "AudioMixer: Remove tracks from enabledTracks after reseting outTemp"
* commit '
d2dc66a223b611142da8a019ebde79e3f8dc18f5':
AudioMixer: Remove tracks from enabledTracks after reseting outTemp
Glenn Kasten [Wed, 29 Jan 2014 17:53:44 +0000 (17:53 +0000)]
am
1bf0eecd: Merge "AudioMixer: Remove tracks from enabledTracks after reseting outTemp"
* commit '
1bf0eecd2ec6a3b3e29ad2c91bcefda76abef2fe':
AudioMixer: Remove tracks from enabledTracks after reseting outTemp
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>
Dongwon Kang [Wed, 29 Jan 2014 00:59:34 +0000 (00:59 +0000)]
Merge "Support for MPEG2 video" into klp-modular-dev
Colin Cross [Tue, 28 Jan 2014 01:03:02 +0000 (01:03 +0000)]
am
06f7d151: am
06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '
06f7d1513ee325b5792ef26b77aeaae373f83ddc':
frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Colin Cross [Tue, 28 Jan 2014 00:51:41 +0000 (00:51 +0000)]
am
06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '
06da69d57d90e180e1165905e6c703227a06f041':
frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
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 19:49:29 +0000 (19:49 +0000)]
am
fe6db33a: am
4ef1dc2d: Merge "Only increase the counter when we do take a wakelock"
* commit '
fe6db33a4b6454f441c6f0f5ff622d7527c5680c':
Only increase the counter when we do take a wakelock
Eric Laurent [Mon, 27 Jan 2014 19:49:28 +0000 (19:49 +0000)]
am
8ba3192f: am
d0e7e801: Merge "Do partial reads in MemoryLeakTrackUtil"
* commit '
8ba3192fc5f3fd72217f5946e8bd1831f0854749':
Do partial reads in MemoryLeakTrackUtil
Eric Laurent [Mon, 27 Jan 2014 19:20:16 +0000 (11:20 -0800)]
am
4ef1dc2d: Merge "Only increase the counter when we do take a wakelock"
* commit '
4ef1dc2d5b5f5df93b173b0b4c4719d4484e031d':
Only increase the counter when we do take a wakelock
Eric Laurent [Mon, 27 Jan 2014 19:20:15 +0000 (11:20 -0800)]
am
d0e7e801: Merge "Do partial reads in MemoryLeakTrackUtil"
* commit '
d0e7e8012e19ac750e7858756247be1036da32c4':
Do partial reads in MemoryLeakTrackUtil
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
Changwan Ryu [Tue, 29 Oct 2013 05:31:00 +0000 (14:31 +0900)]
Support for MPEG2 video
Change-Id: If1f4e20939c96c87c65c84d56e529501facb8597
(cherry picked from commit
774eb18c40c3a7da0bc1636a9779f02315ddbad8)
Marco Nelissen [Fri, 17 Jan 2014 21:32:22 +0000 (21:32 +0000)]
am
1526c2e1: am
96a7b5a9: Merge "Long mp3 metadata displays as corrupted file after transfer"
* commit '
1526c2e1d7be6b942859c68c509493d3636bca43':
Long mp3 metadata displays as corrupted file after transfer
Marco Nelissen [Fri, 17 Jan 2014 21:27:19 +0000 (13:27 -0800)]
am
96a7b5a9: Merge "Long mp3 metadata displays as corrupted file after transfer"
* commit '
96a7b5a9c87ec3f8cadad5bffc06a82f9f4d86d8':
Long mp3 metadata displays as corrupted file after transfer
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 19:30:24 +0000 (19:30 +0000)]
am
319c5640: am
07a017d3: Merge "Added support for ID3v2 meta data in 3gp files"
* commit '
319c5640ca2e5838e35faaddc47df00174dac1b5':
Added support for ID3v2 meta data in 3gp files
Marco Nelissen [Fri, 17 Jan 2014 19:30:23 +0000 (19:30 +0000)]
am
fd0daeb3: am
4cc47940: Merge "Fix compile error in NuPlayerRenderer debug print"
* commit '
fd0daeb3fd20ba1c0a0fae530ea263e382a811e5':
Fix compile error in NuPlayerRenderer debug print
Marco Nelissen [Fri, 17 Jan 2014 19:19:50 +0000 (11:19 -0800)]
am
07a017d3: Merge "Added support for ID3v2 meta data in 3gp files"
* commit '
07a017d3ff9cb36e47649a9de28e469415eb8103':
Added support for ID3v2 meta data in 3gp files
Marco Nelissen [Fri, 17 Jan 2014 19:19:49 +0000 (11:19 -0800)]
am
4cc47940: Merge "Fix compile error in NuPlayerRenderer debug print"
* commit '
4cc4794029998b21a1689794cd5bcbd5e4480ef6':
Fix compile error in NuPlayerRenderer debug print
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:24:02 +0000 (22:24 +0000)]
am
cbf9e91a: am
1e8a57c2: Merge "Avoid jumps to faulty position after seeks"
* commit '
cbf9e91a5ab186904d3dad21eae416c23ee13668':
Avoid jumps to faulty position after seeks
Marco Nelissen [Wed, 15 Jan 2014 22:18:14 +0000 (14:18 -0800)]
am
1e8a57c2: Merge "Avoid jumps to faulty position after seeks"
* commit '
1e8a57c212d26c41325e950ed629244071acc326':
Avoid jumps to faulty position after seeks
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:35:37 +0000 (20:35 +0000)]
am
3eccdde9: am
c7614eb7: Merge "libcameraservice: Fix build in ISO C++11 mode"
* commit '
3eccdde99f7063eba4e2788aa7c8c290f7a24120':
libcameraservice: Fix build in ISO C++11 mode
Eino-Ville Talvala [Wed, 15 Jan 2014 20:30:41 +0000 (12:30 -0800)]
am
c7614eb7: Merge "libcameraservice: Fix build in ISO C++11 mode"
* commit '
c7614eb7cf2e3e121baa3de26e3622974a163786':
libcameraservice: Fix build in ISO C++11 mode
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 05:48:40 +0000 (05:48 +0000)]
am
514ac2ba: am
e311b15c: Merge "Fix c++11 narrowing"
* commit '
514ac2bae9fc32327cac3ba22c4862e8b5ef259e':
Fix c++11 narrowing
Nick Kralevich [Sat, 11 Jan 2014 04:25:46 +0000 (20:25 -0800)]
am
e311b15c: Merge "Fix c++11 narrowing"
* commit '
e311b15cf821f65f68af2cdfe01e864cbc9a86ce':
Fix c++11 narrowing
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:32:40 +0000 (17:32 +0000)]
am
d8d45edf: am
61540b5f: Merge "Frameworks: AudioFlinger: Fix effects memory leak"
* commit '
d8d45edf6a2714fff051d67aa1ac83d74bb0c6e0':
Frameworks: AudioFlinger: Fix effects memory leak
Glenn Kasten [Fri, 10 Jan 2014 17:26:02 +0000 (09:26 -0800)]
am
61540b5f: Merge "Frameworks: AudioFlinger: Fix effects memory leak"
* commit '
61540b5fe82cad1c6baa018f02bd2554e62e4364':
Frameworks: AudioFlinger: Fix effects memory leak
Glenn Kasten [Fri, 10 Jan 2014 17:22:39 +0000 (17:22 +0000)]
Merge "Frameworks: AudioFlinger: Fix effects memory leak"
Marco Nelissen [Thu, 9 Jan 2014 17:54:13 +0000 (17:54 +0000)]
am
586dda1d: am
5ca94d2f: Merge "HLS: Fixed rounding error with decimal segment duration"
* commit '
586dda1d0845612af88e3f4ffc46ed38e304ef85':
HLS: Fixed rounding error with decimal segment duration
Marco Nelissen [Thu, 9 Jan 2014 17:50:14 +0000 (09:50 -0800)]
am
5ca94d2f: Merge "HLS: Fixed rounding error with decimal segment duration"
* commit '
5ca94d2f3c4662aed7b66a97b77eb2d1948464ad':
HLS: Fixed rounding error with decimal segment duration
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 09:45:25 +0000 (09:45 +0000)]
am
f60cfa7f: am
99044adc: Merge "Change M4OSA_ERR_CREATE to return unsigned integer."
* commit '
f60cfa7faa0bdde0a4f302f1272d6aa869588cc4':
Change M4OSA_ERR_CREATE to return unsigned integer.
Narayan Kamath [Wed, 8 Jan 2014 09:01:54 +0000 (01:01 -0800)]
am
99044adc: Merge "Change M4OSA_ERR_CREATE to return unsigned integer."
* commit '
99044adc6e209d31e9c5308d960e2bd5f6999f85':
Change M4OSA_ERR_CREATE to return unsigned integer.
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:32:26 +0000 (01:32 +0000)]
am
b904d53f: am
8115f4b2: Merge "stagefright: do not offload LD-AAC decoding"
* commit '
b904d53ffaaafddb2f9b6f469b73d2a3bec3dd0d':
stagefright: do not offload LD-AAC decoding