OSDN Git Service
Eric Laurent [Fri, 7 Mar 2014 18:30:41 +0000 (18:30 +0000)]
am
880413f7: Merge "stagefright: fix offloading HE-AAC sampling rate." into klp-dev
* commit '
880413f7923ec77467243e15dc34d4af4f8064f9':
stagefright: fix offloading HE-AAC sampling rate.
Glenn Kasten [Fri, 7 Mar 2014 02:30:11 +0000 (02:30 +0000)]
am
af191eb4: Merge "Replace size_t in shared memory by uint32_t"
* commit '
af191eb4feac513d17dc0362e0cea5bc9e0ffe9d':
Replace size_t in shared memory by uint32_t
Lajos Molnar [Fri, 7 Mar 2014 02:27:07 +0000 (02:27 +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
Narayan Kamath [Fri, 7 Mar 2014 02:26:36 +0000 (02:26 +0000)]
am
3c9130a8: Merge "Make frameworks/av 64-bit compatible"
* commit '
3c9130a8a12ce962dc8d22e04243b135b9e98b01':
Make frameworks/av 64-bit compatible
Colin Cross [Fri, 7 Mar 2014 02:26:14 +0000 (02:26 +0000)]
am
cdda7bf4: Merge "frameworks/av: fix errors inside ALOGV"
* commit '
cdda7bf4d3ca9cad6979374a18dd5be79ea83d80':
frameworks/av: fix errors inside ALOGV
Glenn Kasten [Fri, 7 Mar 2014 02:26:05 +0000 (02:26 +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 [Fri, 7 Mar 2014 02:26:05 +0000 (02:26 +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
Lajos Molnar [Fri, 7 Mar 2014 02:26:02 +0000 (02:26 +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 [Fri, 7 Mar 2014 02:26:02 +0000 (02:26 +0000)]
am
61bdaaa1: Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"
* commit '
61bdaaa18a1d52666827e31bb7980a5784443835':
ChromiumHTTPDataSource: Keep track of the redirected URL
Lajos Molnar [Fri, 7 Mar 2014 02:26:01 +0000 (02:26 +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
Marco Nelissen [Fri, 7 Mar 2014 02:26:00 +0000 (02:26 +0000)]
am
44f2b8c2: Merge "M3UParser: Fix typo in
8883a38a308"
* commit '
44f2b8c2ff4baf64baa0510cd37ac178ef91b7bc':
M3UParser: Fix typo in
8883a38a308
Marco Nelissen [Fri, 7 Mar 2014 02:25:59 +0000 (02:25 +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
Colin Cross [Fri, 7 Mar 2014 02:25:14 +0000 (02:25 +0000)]
am
e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"
* commit '
e2307ccbab9c32a7806f15c2572cfe6ec428f2f5':
frameworks/av: fix errors inside ALOGV
Glenn Kasten [Fri, 7 Mar 2014 02:23:19 +0000 (02:23 +0000)]
am
d66cd743: Merge "audioflinger: conform inline ASM to UAL"
* commit '
d66cd743525cc049033caa3e81cbdf74c72a4556':
audioflinger: conform inline ASM to UAL
Lajos Molnar [Fri, 7 Mar 2014 01:34:19 +0000 (01:34 +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 [Fri, 7 Mar 2014 01:34:18 +0000 (01:34 +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 [Fri, 7 Mar 2014 01:34:18 +0000 (01:34 +0000)]
am
b447379e: Merge "audioflinger: fix static track end detection"
* commit '
b447379e2ea1c9ca4cd543ac183df70567d40485':
audioflinger: fix static track end detection
Brian Carlstrom [Fri, 7 Mar 2014 00:37:18 +0000 (00:37 +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
Eric Laurent [Thu, 6 Mar 2014 19:21:49 +0000 (19:21 +0000)]
Merge "stagefright: fix offloading HE-AAC sampling rate." into klp-dev
Chong Zhang [Thu, 6 Mar 2014 18:01:07 +0000 (18:01 +0000)]
am
3b7ddf83: set AAC MPEG version to MPEG-2
* commit '
3b7ddf83db2d11c08116a6476c0f11e71bd72ba4':
set AAC MPEG version to MPEG-2
Chong Zhang [Fri, 7 Feb 2014 20:05:34 +0000 (12:05 -0800)]
set AAC MPEG version to MPEG-2
wifi display play spec only allows MPEG-2 AAC.
Bug:
12747927
Change-Id: Ic96d27ce57f5c8e7da55e43b38f629b5c7333817
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
Glenn Kasten [Wed, 5 Mar 2014 23:47:20 +0000 (23:47 +0000)]
am
d812fc01: Increase kFastTrackMultiplier from 1 to 2
* commit '
d812fc012298470a1b8120e6d60a24b0b1d48047':
Increase kFastTrackMultiplier from 1 to 2
Eric Laurent [Wed, 5 Mar 2014 23:47:20 +0000 (23:47 +0000)]
am
88876fb4: AudioTrack: fix obtainBuffer timeout calculation
* commit '
88876fb4eb8365343f2a9ca0e8f53148ca38b845':
AudioTrack: fix obtainBuffer timeout calculation
Haynes Mathew George [Wed, 5 Mar 2014 23:47:18 +0000 (23:47 +0000)]
am
145b727b: libstagefright: Delay release of wakelock in TimedEventQueue
* commit '
145b727b4cce8b1b8d161612f30d12bbdfc8d134':
libstagefright: Delay release of wakelock in TimedEventQueue
Eric Laurent [Wed, 5 Mar 2014 23:47:17 +0000 (23:47 +0000)]
am
281dd4e1: audioflinger: fix static track end detection
* commit '
281dd4e13309973dbb85bce531f884237e0d8fb0':
audioflinger: fix static track end detection
Gaurav Kumar [Wed, 5 Mar 2014 23:47:17 +0000 (23:47 +0000)]
am
abab1c33: AudioMixer: Remove tracks from enabledTracks after reseting outTemp
* commit '
abab1c33caf0982c11713e6d64d60105dcbc8ab7':
AudioMixer: Remove tracks from enabledTracks after reseting outTemp
Eric Laurent [Wed, 5 Mar 2014 23:47:16 +0000 (23:47 +0000)]
am
d0115d8c: update offloaded audio track sampling rate
* commit '
d0115d8c4db2f337030dea706bc0a434c4a03ed6':
update offloaded audio track sampling rate
Eric Laurent [Wed, 5 Mar 2014 22:41:53 +0000 (22:41 +0000)]
am
7e92abea: audioflinger: fix offload write buffer offset
* commit '
7e92abeafb184e8a34213d7149592e95a72601b0':
audioflinger: fix offload write buffer offset
Glenn Kasten [Tue, 3 Dec 2013 17:06:43 +0000 (09:06 -0800)]
Increase kFastTrackMultiplier from 1 to 2
Bug:
11967381
Change-Id: Iedec06280aa745d9df5d661f4916940cede9c191
Eric Laurent [Tue, 28 Jan 2014 02:13:39 +0000 (18:13 -0800)]
AudioTrack: fix obtainBuffer timeout calculation
AudioTrack::obtainBuffer() passes a pointer to a timeout
variable that has gone out of scope when calling
ClientProxy::obtainBuffer().
Same fix for AudioRecord.
Bug:
11968591.
Change-Id: I5b3d0d86ed2bd8c0412eb2432b1ab519d70efce9
Haynes Mathew George [Fri, 6 Dec 2013 19:31:57 +0000 (11:31 -0800)]
libstagefright: Delay release of wakelock in TimedEventQueue
Delay release of wakelock in the TimedEventQueue to
after an event has been processed.
This ensures AP shutdown does not happen while an event
is ready but hasn't been processed yet.
Bug:
11976087.
Change-Id: I9bce83b9ff0f2b4d174a53c95e5b0f135b5ccc70
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: I4b0819a9d93141ac3307b8786fc6a451dd585220
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: I28996d425838728955f01eb1a00acf6e6dc2dea1
Signed-off-by: Gaurav Kumar <gaurav.kumar@broadcom.com>
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
Eric Laurent [Sat, 27 Jul 2013 00:16:50 +0000 (17:16 -0700)]
update offloaded audio track sampling rate
AudioPlayer must read the sampling rate from offloaded audio sinks
whenever a new time position is computed as the decoder can update
the sampling rate on the fly.
Bug:
12823955.
Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
Eric Laurent [Fri, 22 Nov 2013 17:29:56 +0000 (09:29 -0800)]
audioflinger: fix offload write buffer offset
Fix current audio HAL write buffer offset calculation
which assumes that the frame size is a multiple of 2.
'
Bug:
12823725.
Change-Id: I0195ed5cfef225a6f114e7dd405a02680bb7254e
jpadmana [Wed, 5 Mar 2014 01:24:11 +0000 (01:24 +0000)]
am
85b3013e: 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 '
85b3013e06e8fe7802fe6259ecac80261e834332':
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
Haynes Mathew George [Wed, 5 Mar 2014 01:24:10 +0000 (01:24 +0000)]
am
50c3157c: audioflinger: check for condition before waiting
* commit '
50c3157c5a3e0617be77716beff1ae8801d8a72f':
audioflinger: check for condition before waiting
Haynes Mathew George [Wed, 5 Mar 2014 01:24:09 +0000 (01:24 +0000)]
am
e0cd1051: audioflinger: update track ready condition
* commit '
e0cd1051ed9fea0629745c29020516ae62298461':
audioflinger: update track ready condition
Haynes Mathew George [Wed, 5 Mar 2014 01:24:09 +0000 (01:24 +0000)]
am
e010f65e: audioflinger: Fix for a deadlock in track creation
* commit '
e010f65e6337267cb15f8894c950a3f64370dd36':
audioflinger: Fix for a deadlock in track creation
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.
Change-Id: If4b259da5776f151c1e81a78a0239d342046d923
Signed-off-by: jpadmana <jayashree.r.padmanaban@intel.com>
Bug:
12424044
Haynes Mathew George [Wed, 4 Dec 2013 05:26:02 +0000 (21:26 -0800)]
audioflinger: check for condition before waiting
AsyncCallbackThread must check for any condition that
was already been satisfied before waiting.
Bug:
11824817
Change-Id: I04683a1f355de4f440106cab47fd916aa39d5e35
Haynes Mathew George [Sat, 28 Dec 2013 00:09:28 +0000 (16:09 -0800)]
audioflinger: update track ready condition
Signal track ready if the track isStopping().
Bug:
12423190
Change-Id: I95e14905df10ebf301e398263478c8ca25d7e2ce
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
Eric Laurent [Tue, 4 Mar 2014 23:17:47 +0000 (23:17 +0000)]
am
a4f24ff9: AudioTrack: fix position callback after restore
* commit '
a4f24ff9b239300b4bb2098c1413c0a60edc2d7e':
AudioTrack: fix position callback after restore
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: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>
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: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
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: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: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: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 04:25:46 +0000 (20:25 -0800)]
am
e311b15c: Merge "Fix c++11 narrowing"
* commit '
e311b15cf821f65f68af2cdfe01e864cbc9a86ce':
Fix c++11 narrowing