OSDN Git Service
Eric Laurent [Fri, 7 Mar 2014 11:01:14 +0000 (11:01 +0000)]
am
51b7125b: am
bfc26066: am
ed4d8b28: Merge "stagefright: do not offload LD-AAC decoding" into klp-dev
* commit '
51b7125bd0e2127f1d57938e95523dcc61e657ef':
stagefright: do not offload LD-AAC decoding
Eric Laurent [Fri, 7 Mar 2014 03:02:50 +0000 (03:02 +0000)]
am
8f379f63: am
4ed0b0b6: am
880413f7: Merge "stagefright: fix offloading HE-AAC sampling rate." into klp-dev
* commit '
8f379f63a525a82965e5926490747db9f7241e8f':
stagefright: fix offloading HE-AAC sampling rate.
Glenn Kasten [Fri, 7 Mar 2014 03:02:37 +0000 (03:02 +0000)]
am
afa5263f: am
395c2fc0: Merge "audioflinger: Fix for a deadlock in track creation"
* commit '
afa5263f7f29affc77ff05d9c0a1b53e598531fa':
audioflinger: Fix for a deadlock in track creation
Chong Zhang [Fri, 7 Mar 2014 03:02:22 +0000 (03:02 +0000)]
am
eff98dde: am
2b6191fd: am
3b7ddf83: set AAC MPEG version to MPEG-2
* commit '
eff98ddea36264d028c0811c96b112a52977b51c':
set AAC MPEG version to MPEG-2
Eric Laurent [Fri, 7 Mar 2014 01:51:35 +0000 (01:51 +0000)]
am
bfc26066: am
ed4d8b28: Merge "stagefright: do not offload LD-AAC decoding" into klp-dev
* commit '
bfc260667e566d4ea29c8b1d089b95ce2c11890c':
stagefright: do not offload LD-AAC decoding
Eric Laurent [Fri, 7 Mar 2014 01:35:41 +0000 (01:35 +0000)]
am
ed4d8b28: Merge "stagefright: do not offload LD-AAC decoding" into klp-dev
* commit '
ed4d8b28b8ee5a3e4ebc8f73bf4dc86c75a74258':
stagefright: do not offload LD-AAC decoding
Glenn Kasten [Fri, 7 Mar 2014 01:28:22 +0000 (01:28 +0000)]
Merge "Simplify AudioTrack stream end and fix race"
Eric Laurent [Fri, 7 Mar 2014 01:09:33 +0000 (01:09 +0000)]
Merge "stagefright: do not offload LD-AAC decoding" into klp-dev
Glenn Kasten [Fri, 7 Mar 2014 00:54:14 +0000 (00:54 +0000)]
Merge "Remove Format_frameBitShift()"
Glenn Kasten [Fri, 7 Mar 2014 00:38:18 +0000 (00:38 +0000)]
Merge "Re-implement Format_frameSize(), to support non-power-of-2"
Glenn Kasten [Thu, 6 Mar 2014 23:51:20 +0000 (23:51 +0000)]
Merge "Split mPacked into 4 separate fields"
Eric Laurent [Thu, 6 Mar 2014 22:41:24 +0000 (22:41 +0000)]
am
4ed0b0b6: am
880413f7: Merge "stagefright: fix offloading HE-AAC sampling rate." into klp-dev
* commit '
4ed0b0b6f1fb1adab5df6342d03a695545a18be3':
stagefright: fix offloading HE-AAC sampling rate.
Glenn Kasten [Thu, 6 Mar 2014 22:18:27 +0000 (22:18 +0000)]
Merge "Add format parameter to Format_from_SR_C"
Glenn Kasten [Thu, 6 Mar 2014 21:59:23 +0000 (21:59 +0000)]
am
395c2fc0: Merge "audioflinger: Fix for a deadlock in track creation"
* commit '
395c2fc0c422c9218f39f6ed2040e90b1cc9920a':
audioflinger: Fix for a deadlock in track creation
Eric Laurent [Thu, 6 Mar 2014 21:58:27 +0000 (21:58 +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 [Thu, 6 Mar 2014 20:28:04 +0000 (20:28 +0000)]
Merge "Use mFrameSize instead of mBitShift"
Eric Laurent [Thu, 6 Mar 2014 20:12:23 +0000 (20:12 +0000)]
Merge "AudioTrack: When paused, return cached playback position"
Glenn Kasten [Thu, 6 Mar 2014 20:02:28 +0000 (20:02 +0000)]
Merge "Add mFrameSize but do not remove mFrameBitShift yet"
Chong Zhang [Thu, 6 Mar 2014 19:50:41 +0000 (19:50 +0000)]
am
2b6191fd: am
3b7ddf83: set AAC MPEG version to MPEG-2
* commit '
2b6191fddb1f4a750ad03792d09d4b8efdeeb35a':
set AAC MPEG version to MPEG-2
Haynes Mathew George [Wed, 8 Jan 2014 21:59:53 +0000 (13:59 -0800)]
AudioTrack: When paused, return cached playback position
An offload output can be re-used between two audio tracks having
the same configuration. A timestamp query for a paused track
while the other is running would return an incorrect time.
To fix this, cache the playback position on a pause() and return
this time when requested until the track is resumed.
Bug:
12826612.
Change-Id: I324112ea9827e52fff53ef44cd8513c8d85a0bc4
Eric Laurent [Thu, 6 Mar 2014 19:28:07 +0000 (19:28 +0000)]
Merge "audio policy service: clean up type casting."
Eric Laurent [Thu, 6 Mar 2014 19:21:49 +0000 (19:21 +0000)]
Merge "stagefright: fix offloading HE-AAC sampling rate." into klp-dev
Glenn Kasten [Thu, 6 Mar 2014 19:17:01 +0000 (19:17 +0000)]
Merge "Use larger capture pipe since we support resampling by 6:1"
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.
Bug:
11697128.
Change-Id: Iaa88ecf3f4ae42ad48c1b42a9b007dd80eb88147
Glenn Kasten [Thu, 6 Mar 2014 19:08:44 +0000 (19:08 +0000)]
Merge "audioflinger: Fix for a deadlock in track creation"
Chong Zhang [Thu, 6 Mar 2014 18:44:46 +0000 (18:44 +0000)]
am
3b7ddf83: set AAC MPEG version to MPEG-2
* commit '
3b7ddf83db2d11c08116a6476c0f11e71bd72ba4':
set AAC MPEG version to MPEG-2
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
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
Glenn Kasten [Thu, 6 Mar 2014 16:01:38 +0000 (08:01 -0800)]
Remove Format_frameBitShift()
Change-Id: Iae2e80a7330c5dd0f70a263051aa44c23cfe3541
Glenn Kasten [Thu, 6 Mar 2014 16:23:11 +0000 (08:23 -0800)]
Re-implement Format_frameSize(), to support non-power-of-2
Change-Id: I671bd4f03ce70de685770fd7992e2e023133c9b4
Glenn Kasten [Thu, 6 Mar 2014 16:02:51 +0000 (08:02 -0800)]
Split mPacked into 4 separate fields
Change-Id: I940324dce9b51fd8d7e2e362e12ad74b70e658dd
Glenn Kasten [Thu, 6 Mar 2014 15:59:49 +0000 (07:59 -0800)]
Add format parameter to Format_from_SR_C
Change-Id: I891138b7754342fe2a4f02de30ee616dbd078474
Glenn Kasten [Thu, 6 Mar 2014 15:53:11 +0000 (07:53 -0800)]
Use mFrameSize instead of mBitShift
Change-Id: Idac335ae70cc9300bb3325839fe8ef1e9e097245
Glenn Kasten [Thu, 6 Mar 2014 16:00:31 +0000 (08:00 -0800)]
Add mFrameSize but do not remove mFrameBitShift yet
Change-Id: Icb1edefeb6a0e659503f6b7a92c9d15784df9865
Andy McFadden [Thu, 6 Mar 2014 15:30:37 +0000 (15:30 +0000)]
Merge "FramebufferNativeWindow.h is obsolete"
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
Eric Laurent [Thu, 6 Mar 2014 02:30:08 +0000 (18:30 -0800)]
audio policy service: clean up type casting.
Change-Id: If16d6495c16e0d61a221f81bfd49e7d14bbfdc12
Glenn Kasten [Thu, 6 Mar 2014 00:59:22 +0000 (00:59 +0000)]
am
fbae2674: am
a4aa88b8: am
9e64cd42: am
d812fc01: Increase kFastTrackMultiplier from 1 to 2
* commit '
fbae2674688c6dc0a267d4da139061d7abc287fd':
Increase kFastTrackMultiplier from 1 to 2
Eric Laurent [Thu, 6 Mar 2014 00:59:22 +0000 (00:59 +0000)]
am
c1e06f69: am
09e45992: am
25a86930: am
88876fb4: AudioTrack: fix obtainBuffer timeout calculation
* commit '
c1e06f692cf16a8c9f5ae921ab4d642f7a082877':
AudioTrack: fix obtainBuffer timeout calculation
Haynes Mathew George [Thu, 6 Mar 2014 00:59:21 +0000 (00:59 +0000)]
am
5d3e310a: am
44130bf5: am
994d9bad: am
145b727b: libstagefright: Delay release of wakelock in TimedEventQueue
* commit '
5d3e310a847d090b7f79554154d25c70be8fd594':
libstagefright: Delay release of wakelock in TimedEventQueue
Eric Laurent [Thu, 6 Mar 2014 00:59:20 +0000 (00:59 +0000)]
am
40e95fe9: am
5248efb0: am
4f4c9a22: am
281dd4e1: audioflinger: fix static track end detection
* commit '
40e95fe9aafc71832ac2878275c3e4eb2a72f1c7':
audioflinger: fix static track end detection
Gaurav Kumar [Thu, 6 Mar 2014 00:59:19 +0000 (00:59 +0000)]
am
8984577e: am
854e547d: am
c7753b12: am
abab1c33: AudioMixer: Remove tracks from enabledTracks after reseting outTemp
* commit '
8984577e0f2389a8763bdbcab6c5979d21038b4b':
AudioMixer: Remove tracks from enabledTracks after reseting outTemp
Eric Laurent [Thu, 6 Mar 2014 00:59:19 +0000 (00:59 +0000)]
am
25bebdf9: am
1de5c060: am
ec94f7a6: am
d0115d8c: update offloaded audio track sampling rate
* commit '
25bebdf9a8d3b6ddb37882994b2800c3e15b60f5':
update offloaded audio track sampling rate
Eric Laurent [Thu, 6 Mar 2014 00:59:04 +0000 (00:59 +0000)]
am
0c937b49: (-s ours) am
eb16bb5d: am
7028a2c8: am
7e92abea: audioflinger: fix offload write buffer offset
* commit '
0c937b4946fae178447d9f8d29200fa2798c05f9':
audioflinger: fix offload write buffer offset
Glenn Kasten [Wed, 5 Mar 2014 23:54:01 +0000 (23:54 +0000)]
am
a4aa88b8: am
9e64cd42: am
d812fc01: Increase kFastTrackMultiplier from 1 to 2
* commit '
a4aa88b8a9eb4028120363f226f7df6dfc8871a0':
Increase kFastTrackMultiplier from 1 to 2
Eric Laurent [Wed, 5 Mar 2014 23:54:00 +0000 (23:54 +0000)]
am
09e45992: am
25a86930: am
88876fb4: AudioTrack: fix obtainBuffer timeout calculation
* commit '
09e45992067f03a05f82400a6cacf16bb8018f16':
AudioTrack: fix obtainBuffer timeout calculation
Haynes Mathew George [Wed, 5 Mar 2014 23:53:59 +0000 (23:53 +0000)]
am
44130bf5: am
994d9bad: am
145b727b: libstagefright: Delay release of wakelock in TimedEventQueue
* commit '
44130bf528842445254537604ed628ad4ac1507b':
libstagefright: Delay release of wakelock in TimedEventQueue
Eric Laurent [Wed, 5 Mar 2014 23:53:59 +0000 (23:53 +0000)]
am
5248efb0: am
4f4c9a22: am
281dd4e1: audioflinger: fix static track end detection
* commit '
5248efb0eecb20b2d5c02aa844c4dc7aeb925c16':
audioflinger: fix static track end detection
Gaurav Kumar [Wed, 5 Mar 2014 23:53:58 +0000 (23:53 +0000)]
am
854e547d: am
c7753b12: am
abab1c33: AudioMixer: Remove tracks from enabledTracks after reseting outTemp
* commit '
854e547d219ea4c7258d72442052f744dc7fc0f4':
AudioMixer: Remove tracks from enabledTracks after reseting outTemp
Eric Laurent [Wed, 5 Mar 2014 23:53:57 +0000 (23:53 +0000)]
am
1de5c060: am
ec94f7a6: am
d0115d8c: update offloaded audio track sampling rate
* commit '
1de5c060ea60f2fa982cfb340686deb158c9154a':
update offloaded audio track sampling rate
Glenn Kasten [Wed, 5 Mar 2014 23:51:03 +0000 (23:51 +0000)]
am
9e64cd42: am
d812fc01: Increase kFastTrackMultiplier from 1 to 2
* commit '
9e64cd42032665c90c52804c1042b3671621cda5':
Increase kFastTrackMultiplier from 1 to 2
Eric Laurent [Wed, 5 Mar 2014 23:51:02 +0000 (23:51 +0000)]
am
25a86930: am
88876fb4: AudioTrack: fix obtainBuffer timeout calculation
* commit '
25a86930ac0ccf4750ad2fb0c2f5a4a122d24ecf':
AudioTrack: fix obtainBuffer timeout calculation
Haynes Mathew George [Wed, 5 Mar 2014 23:51:01 +0000 (23:51 +0000)]
am
994d9bad: am
145b727b: libstagefright: Delay release of wakelock in TimedEventQueue
* commit '
994d9bad4c545cc8861e971f9dbcb4c061ee19ed':
libstagefright: Delay release of wakelock in TimedEventQueue
Eric Laurent [Wed, 5 Mar 2014 23:51:01 +0000 (23:51 +0000)]
am
4f4c9a22: am
281dd4e1: audioflinger: fix static track end detection
* commit '
4f4c9a22f4676c65bcae77f0805dcd699b3ba475':
audioflinger: fix static track end detection
Gaurav Kumar [Wed, 5 Mar 2014 23:50:55 +0000 (23:50 +0000)]
am
c7753b12: am
abab1c33: AudioMixer: Remove tracks from enabledTracks after reseting outTemp
* commit '
c7753b12a9c8c1cba69ba75bccc0083c37bc67f1':
AudioMixer: Remove tracks from enabledTracks after reseting outTemp
Eric Laurent [Wed, 5 Mar 2014 23:50:49 +0000 (23:50 +0000)]
am
ec94f7a6: am
d0115d8c: update offloaded audio track sampling rate
* commit '
ec94f7a6eba6f55175c39c3abcd64046ecd413ad':
update offloaded audio track sampling rate
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
Andy McFadden [Wed, 5 Mar 2014 23:38:26 +0000 (15:38 -0800)]
FramebufferNativeWindow.h is obsolete
Change-Id: I7d2b06bc711694deb481ae50596080b6bef23f11
Eric Laurent [Wed, 5 Mar 2014 22:48:11 +0000 (22:48 +0000)]
am
eb16bb5d: am
7028a2c8: am
7e92abea: audioflinger: fix offload write buffer offset
* commit '
eb16bb5dcecf430bfec1c2a4bd15851c83b9c3cc':
audioflinger: fix offload write buffer offset
Eric Laurent [Wed, 5 Mar 2014 22:44:59 +0000 (22:44 +0000)]
am
7028a2c8: am
7e92abea: audioflinger: fix offload write buffer offset
* commit '
7028a2c8106ee5a22db88da5dad581820ee07254':
audioflinger: fix offload write buffer offset
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>
jpadmana [Wed, 5 Mar 2014 21:54:27 +0000 (21:54 +0000)]
am
57f87026: am
97504893: am
6b260425: 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 '
57f87026a30f3e461f6a804e94b6dab7b385f3ca':
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 21:54:27 +0000 (21:54 +0000)]
am
40e01b43: am
4287b414: am
fc04776a: am
50c3157c: audioflinger: check for condition before waiting
* commit '
40e01b4395ee2d8569fc392e889decc365b78288':
audioflinger: check for condition before waiting
Haynes Mathew George [Wed, 5 Mar 2014 21:54:26 +0000 (21:54 +0000)]
am
0504a198: am
632c3790: am
7c206e5b: am
e0cd1051: audioflinger: update track ready condition
* commit '
0504a198d6595e29e58d1d66ae59fac1d662384a':
audioflinger: update track ready condition
Haynes Mathew George [Wed, 5 Mar 2014 21:54:25 +0000 (21:54 +0000)]
am
d384a2c4: (-s ours) am
4f9e38c6: am
21e81bca: am
e010f65e: audioflinger: Fix for a deadlock in track creation
* commit '
d384a2c44810ce1b51277cc4ab4c5415ff7de6ee':
audioflinger: Fix for a deadlock in track creation
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 20:01:15 +0000 (20:01 +0000)]
am
97504893: am
6b260425: 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 '
97504893a3ee96f612e0e1b47d331583a88e289b':
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 20:01:15 +0000 (20:01 +0000)]
am
4287b414: am
fc04776a: am
50c3157c: audioflinger: check for condition before waiting
* commit '
4287b41411b40415b4186babf5763c3cfa0391ef':
audioflinger: check for condition before waiting
Haynes Mathew George [Wed, 5 Mar 2014 20:01:14 +0000 (20:01 +0000)]
am
632c3790: am
7c206e5b: am
e0cd1051: audioflinger: update track ready condition
* commit '
632c3790523896260dc43fd6cd40a158765cdb15':
audioflinger: update track ready condition
Haynes Mathew George [Wed, 5 Mar 2014 20:01:11 +0000 (20:01 +0000)]
am
4f9e38c6: am
21e81bca: am
e010f65e: audioflinger: Fix for a deadlock in track creation
* commit '
4f9e38c60cc79407a8b2966b3b9780a3e395b017':
audioflinger: Fix for a deadlock in track creation
jpadmana [Wed, 5 Mar 2014 19:26:49 +0000 (19:26 +0000)]
am
6b260425: 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 '
6b2604259c12ee28b49f26ab2adac96eefe30934':
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 19:26:48 +0000 (19:26 +0000)]
am
fc04776a: am
50c3157c: audioflinger: check for condition before waiting
* commit '
fc04776adc5572fcc323b1dca66dee27a537c619':
audioflinger: check for condition before waiting
Haynes Mathew George [Wed, 5 Mar 2014 19:26:47 +0000 (19:26 +0000)]
am
7c206e5b: am
e0cd1051: audioflinger: update track ready condition
* commit '
7c206e5bd24b5ae4565d0e60b637458a1054dfcf':
audioflinger: update track ready condition
Haynes Mathew George [Wed, 5 Mar 2014 19:26:47 +0000 (19:26 +0000)]
am
21e81bca: am
e010f65e: audioflinger: Fix for a deadlock in track creation
* commit '
21e81bca4d1e6f7d1ccac61b65da7c7a4a121064':
audioflinger: Fix for a deadlock in track creation
Robert Shih [Wed, 5 Mar 2014 01:59:39 +0000 (01:59 +0000)]
Merge "PlaylistFetcher: fix infinite loop when parsing ADTS."
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
Eric Laurent [Wed, 5 Mar 2014 00:10:26 +0000 (00:10 +0000)]
am
3cd7a13a: am
d26e6522: am
57159656: am
a4f24ff9: AudioTrack: fix position callback after restore
* commit '
3cd7a13a7926e210bd8dff65d6f43a257f5235e5':
AudioTrack: fix position callback after restore
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:24:15 +0000 (23:24 +0000)]
am
d26e6522: am
57159656: am
a4f24ff9: AudioTrack: fix position callback after restore
* commit '
d26e652226b5e589d6784bd01f2c5fc381dc6e2c':
AudioTrack: fix position callback after restore
Eric Laurent [Tue, 4 Mar 2014 23:21:48 +0000 (23:21 +0000)]
am
57159656: am
a4f24ff9: AudioTrack: fix position callback after restore
* commit '
571596564f4b818b8e89c4bbe824e557e8e00075':
AudioTrack: fix position callback after restore
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
Robert Shih [Fri, 7 Feb 2014 20:26:58 +0000 (12:26 -0800)]
PlaylistFetcher: fix infinite loop when parsing ADTS.
First check for embedded ID3 tag, then bail out if invalid.
Bug:
12934795
Change-Id: I74acebed4bfb2c6ca44dfe936166fdba8510233f
Andy McFadden [Tue, 4 Mar 2014 15:26:45 +0000 (15:26 +0000)]
Merge "Fix destructors"