OSDN Git Service
Eric Laurent [Thu, 31 Oct 2013 22:39:14 +0000 (15:39 -0700)]
am
4cf799fb: am
5c7ffaed: Merge "AudioFlinger: fix duplicating thread standby." into klp-dev
* commit '
4cf799fbbb74de102d34ccb014ba7fbd9bfa5e14':
AudioFlinger: fix duplicating thread standby.
Eric Laurent [Thu, 31 Oct 2013 22:36:49 +0000 (15:36 -0700)]
am
5c7ffaed: Merge "AudioFlinger: fix duplicating thread standby." into klp-dev
* commit '
5c7ffaed6f04b844c2e4e2024bfb0203ac2233dd':
AudioFlinger: fix duplicating thread standby.
Eric Laurent [Thu, 31 Oct 2013 22:29:50 +0000 (22:29 +0000)]
Merge "AudioFlinger: fix duplicating thread standby." into klp-dev
Changwan Ryu [Tue, 29 Oct 2013 05:31:00 +0000 (14:31 +0900)]
Support for MPEG2 video
Change-Id: If1f4e20939c96c87c65c84d56e529501facb8597
Eric Laurent [Wed, 30 Oct 2013 23:57:06 +0000 (16:57 -0700)]
AudioFlinger: fix duplicating thread standby.
Commit
fd47797 fixing issue
11247103 introduced a regression
where the duplicating thread does not exit standby state as
expected. This in turn prevents the tracks sending audio to
other threads to complete their activity cycle normally.
The fix conists in clearing mStandby state also in the specialized
threadLoop_write() method of DuplicatingThread subclass.
Bug:
11451415.
Change-Id: Ie8a92c819a56a2834ea25fa70a8b7b2125721775
Igor Murashkin [Wed, 30 Oct 2013 21:18:45 +0000 (14:18 -0700)]
am
34790c86: am
3ff5792a: Merge "camera: Collect stack traces when bad things happen, print with dumpsys" into klp-dev
* commit '
34790c866cdc309e3779b811db43f63aa7eae7ef':
camera: Collect stack traces when bad things happen, print with dumpsys
Igor Murashkin [Wed, 30 Oct 2013 21:16:18 +0000 (14:16 -0700)]
am
3ff5792a: Merge "camera: Collect stack traces when bad things happen, print with dumpsys" into klp-dev
* commit '
3ff5792adfdbf67662a5f8064315a55690d53944':
camera: Collect stack traces when bad things happen, print with dumpsys
Igor Murashkin [Wed, 30 Oct 2013 21:09:49 +0000 (21:09 +0000)]
Merge "camera: Collect stack traces when bad things happen, print with dumpsys" into klp-dev
Lajos Molnar [Wed, 30 Oct 2013 20:28:36 +0000 (13:28 -0700)]
am
8578eb36: am
c76b9f52: Merge "AwesomePlayer: ensure STARTED message works after reset" into klp-dev
* commit '
8578eb364799f83c6f237d286e1447c02db6afbc':
AwesomePlayer: ensure STARTED message works after reset
Lajos Molnar [Wed, 30 Oct 2013 20:26:53 +0000 (13:26 -0700)]
am
c76b9f52: Merge "AwesomePlayer: ensure STARTED message works after reset" into klp-dev
* commit '
c76b9f52cf4e39f6943c53f5b3657dfee65857ac':
AwesomePlayer: ensure STARTED message works after reset
Lajos Molnar [Wed, 30 Oct 2013 20:23:17 +0000 (20:23 +0000)]
Merge "AwesomePlayer: ensure STARTED message works after reset" into klp-dev
Lajos Molnar [Wed, 30 Oct 2013 01:36:16 +0000 (18:36 -0700)]
am
b6b97f60: am
eb76f318: am
96aed4fb: Merge "avcenc: Prepend startcodes to output buffers"
* commit '
b6b97f6071a3948494b5e9cb1a9c175157bdaf07':
avcenc: Prepend startcodes to output buffers
Lajos Molnar [Wed, 30 Oct 2013 01:31:05 +0000 (18:31 -0700)]
am
eb76f318: am
96aed4fb: Merge "avcenc: Prepend startcodes to output buffers"
* commit '
eb76f318e9daf91dbf195bcb74852b3bd736a32a':
avcenc: Prepend startcodes to output buffers
Eric Laurent [Wed, 30 Oct 2013 01:20:38 +0000 (18:20 -0700)]
am
ce275b7d: am
1c594b63: Merge "audioflinger: enable effects after registration if needed" into klp-dev
* commit '
ce275b7dd20e3d4781a46126c753e6eb998e6c0f':
audioflinger: enable effects after registration if needed
Eric Laurent [Wed, 30 Oct 2013 01:17:46 +0000 (18:17 -0700)]
am
1c594b63: Merge "audioflinger: enable effects after registration if needed" into klp-dev
* commit '
1c594b637df26499ce1dae2db34f2b3290efd838':
audioflinger: enable effects after registration if needed
Eric Laurent [Wed, 30 Oct 2013 01:13:52 +0000 (01:13 +0000)]
Merge "audioflinger: enable effects after registration if needed" into klp-dev
Lajos Molnar [Tue, 29 Oct 2013 22:41:50 +0000 (15:41 -0700)]
am
96aed4fb: Merge "avcenc: Prepend startcodes to output buffers"
* commit '
96aed4fb18e5303b039cc7e5dc252e0827491d09':
avcenc: Prepend startcodes to output buffers
Lajos Molnar [Tue, 29 Oct 2013 22:39:25 +0000 (22:39 +0000)]
Merge "avcenc: Prepend startcodes to output buffers"
Igor Murashkin [Wed, 23 Oct 2013 23:40:06 +0000 (16:40 -0700)]
camera: Collect stack traces when bad things happen, print with dumpsys
Bug:
11324229
Change-Id: Ic920e170a8f5a389fc139bbf5416c0e3186c7fb6
Eric Laurent [Tue, 29 Oct 2013 00:18:53 +0000 (17:18 -0700)]
am
7f8f7585: am
fd477974: AudioFlinger: more fixes for offload audio lost
* commit '
7f8f758506a95d6fe5c0e52aa7b5ef82fb18861a':
AudioFlinger: more fixes for offload audio lost
Eric Laurent [Tue, 29 Oct 2013 00:17:03 +0000 (17:17 -0700)]
am
fd477974: AudioFlinger: more fixes for offload audio lost
* commit '
fd4779740ec3e9e865d5514464df26d015354388':
AudioFlinger: more fixes for offload audio lost
Lajos Molnar [Mon, 28 Oct 2013 22:01:15 +0000 (15:01 -0700)]
AwesomePlayer: ensure STARTED message works after reset
Change-Id: I06217c07c0b68476cb296fd6151f6a0d8d4e02d0
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
11412881
Eric Laurent [Sat, 26 Oct 2013 01:10:40 +0000 (18:10 -0700)]
AudioFlinger: more fixes for offload audio lost
mStandby being false was not a reliable indication that
something had been written to audio HAL.
Considering the last track in mActiveTracks vector as the
latest activated track was wrong as this is a SortedVector.
Bug:
11247103.
Change-Id: I397d011c5afcdd779def3fe25aaae7669a472cfc
Marco Nelissen [Sat, 26 Oct 2013 22:21:09 +0000 (15:21 -0700)]
am
241be8d5: (-s ours) am
9cae2170: Assign blame for playback wakelocks.
* commit '
241be8d5874023761121043b8709a6062baac6f1':
Assign blame for playback wakelocks.
Marco Nelissen [Sat, 26 Oct 2013 15:32:50 +0000 (08:32 -0700)]
am
9cae2170: Assign blame for playback wakelocks.
* commit '
9cae217050aa1347d4ac5053c305754879e3f97f':
Assign blame for playback wakelocks.
Marco Nelissen [Mon, 14 Jan 2013 22:12:05 +0000 (14:12 -0800)]
Assign blame for playback wakelocks.
Set a work source for the playback wakelock, so that playback is
counted against the requesting app instead of the media server.
Cherrypicked from master.
b/
9464621
Change-Id: I7329f88a288a95a582a78005a1c3d16a5a611e31
Marco Nelissen [Mon, 14 Jan 2013 22:12:05 +0000 (14:12 -0800)]
Assign blame for playback wakelocks.
Set a work source for the playback wakelock, so that playback is
counted against the requesting app instead of the media server.
Change-Id: I7329f88a288a95a582a78005a1c3d16a5a611e31
Andy McFadden [Thu, 24 Oct 2013 17:49:11 +0000 (10:49 -0700)]
am
de5f7cd6: am
be567be3: Merge "Check for NULL buffer in repeat-latest" into klp-dev
* commit '
de5f7cd61df74027834cd1ed2f1e482238f3ed4b':
Check for NULL buffer in repeat-latest
Vineeta Srivastava [Thu, 24 Oct 2013 17:49:11 +0000 (10:49 -0700)]
am
57c1f758: am
f3a6234b: Merge "Fix kAutoRampDurationUs overflow issue" into klp-dev
* commit '
57c1f758d8811024aa1298d2ba244577c44ef7b9':
Fix kAutoRampDurationUs overflow issue
Andy McFadden [Thu, 24 Oct 2013 17:45:06 +0000 (10:45 -0700)]
am
be567be3: Merge "Check for NULL buffer in repeat-latest" into klp-dev
* commit '
be567be3f92026f5964c1c9ecce00e30bb7df412':
Check for NULL buffer in repeat-latest
Andy McFadden [Thu, 24 Oct 2013 17:35:43 +0000 (17:35 +0000)]
Merge "Check for NULL buffer in repeat-latest" into klp-dev
Andy McFadden [Wed, 23 Oct 2013 20:39:43 +0000 (13:39 -0700)]
Check for NULL buffer in repeat-latest
Repeating the most-recent buffer appears to fail when the producer
disconnects. This adds a NULL check to avoid crashing.
Bug
10607920
Change-Id: Ied036004425f046fcf9c26303823681f3fddb99e
Vineeta Srivastava [Wed, 23 Oct 2013 20:02:58 +0000 (13:02 -0700)]
am
f3a6234b: Merge "Fix kAutoRampDurationUs overflow issue" into klp-dev
* commit '
f3a6234ba21640cf2bc893dbcb98fb9b0fa47481':
Fix kAutoRampDurationUs overflow issue
Vineeta Srivastava [Wed, 23 Oct 2013 19:58:15 +0000 (19:58 +0000)]
Merge "Fix kAutoRampDurationUs overflow issue" into klp-dev
Elliott Hughes [Wed, 23 Oct 2013 17:35:30 +0000 (10:35 -0700)]
am
c20636f7: am
e7329bd5: am
d5255d1d: Merge "If dlopen("libwvm.so") fails, log the reason why."
* commit '
c20636f7a4053c6f93a8808617252afcd5dc8d50':
If dlopen("libwvm.so") fails, log the reason why.
Elliott Hughes [Wed, 23 Oct 2013 17:30:40 +0000 (10:30 -0700)]
am
e7329bd5: am
d5255d1d: Merge "If dlopen("libwvm.so") fails, log the reason why."
* commit '
e7329bd564e7c5f671b786dc7d0cc684d6d11fca':
If dlopen("libwvm.so") fails, log the reason why.
Elliott Hughes [Wed, 23 Oct 2013 17:25:57 +0000 (10:25 -0700)]
am
d5255d1d: Merge "If dlopen("libwvm.so") fails, log the reason why."
* commit '
d5255d1de125d15afae6cfc35701a5255b5e2933':
If dlopen("libwvm.so") fails, log the reason why.
Elliott Hughes [Wed, 23 Oct 2013 17:22:43 +0000 (17:22 +0000)]
Merge "If dlopen("libwvm.so") fails, log the reason why."
Elliott Hughes [Wed, 23 Oct 2013 17:03:20 +0000 (10:03 -0700)]
If dlopen("libwvm.so") fails, log the reason why.
Bug:
11342992
Change-Id: I99986b6181df6d7615fdc1520d2edaadaccd9bb4
Nick Kralevich [Sun, 20 Oct 2013 16:36:14 +0000 (09:36 -0700)]
am
173f0125: am
9857473f: am
0f4b0d23: Merge "libeffects: do not use GNU old-style field designators"
* commit '
173f0125bdd54ba325068d51baa5c31c3e685b1e':
libeffects: do not use GNU old-style field designators
Nick Kralevich [Sun, 20 Oct 2013 16:34:04 +0000 (09:34 -0700)]
am
9857473f: am
0f4b0d23: Merge "libeffects: do not use GNU old-style field designators"
* commit '
9857473f48abf1333ddd3454ab3c916b4e69daa4':
libeffects: do not use GNU old-style field designators
Nick Kralevich [Sun, 20 Oct 2013 16:31:32 +0000 (09:31 -0700)]
am
0f4b0d23: Merge "libeffects: do not use GNU old-style field designators"
* commit '
0f4b0d238613cd98fe0b8931f7e6cbcc8b9ad7b1':
libeffects: do not use GNU old-style field designators
Nick Kralevich [Sun, 20 Oct 2013 16:28:47 +0000 (16:28 +0000)]
Merge "libeffects: do not use GNU old-style field designators"
synergydev [Sun, 20 Oct 2013 05:51:33 +0000 (22:51 -0700)]
libeffects: do not use GNU old-style field designators
Not using a GNU extension improves portability
Change-Id: I4e8a0376c089828ca4fc7f1aaf3914bfd917d4c5
Nick Kralevich [Sat, 19 Oct 2013 02:35:38 +0000 (19:35 -0700)]
am
3f93c8f8: am
998c4e88: am
0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard"
* commit '
3f93c8f8dbfb8b7cfed2cd21210f875497cbb39c':
libvideoeditor: fix M4OSA_Clock header guard
Nick Kralevich [Sat, 19 Oct 2013 02:32:44 +0000 (19:32 -0700)]
am
998c4e88: am
0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard"
* commit '
998c4e88f962336472c5e1c3afbf0ed8d6d3a971':
libvideoeditor: fix M4OSA_Clock header guard
Nick Kralevich [Sat, 19 Oct 2013 02:30:45 +0000 (19:30 -0700)]
am
0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard"
* commit '
0219856e5e45c0bdd20f2199297ec92f11f0875f':
libvideoeditor: fix M4OSA_Clock header guard
Nick Kralevich [Sat, 19 Oct 2013 02:28:09 +0000 (02:28 +0000)]
Merge "libvideoeditor: fix M4OSA_Clock header guard"
synergydev [Sat, 19 Oct 2013 02:20:59 +0000 (19:20 -0700)]
libvideoeditor: fix M4OSA_Clock header guard
CLOCK was mispelled as CLOCH
Change-Id: Ie7163fc8723d7a5b9df113f55a4a550e5465d9b5
Glenn Kasten [Fri, 18 Oct 2013 22:09:03 +0000 (15:09 -0700)]
am
77177fa2: am
95c03858: Merge "Allow releaseBuffer after flush" into klp-dev
* commit '
77177fa20773d02b4f9c4147ecb98107f019fa7d':
Allow releaseBuffer after flush
Glenn Kasten [Fri, 18 Oct 2013 22:06:37 +0000 (15:06 -0700)]
am
95c03858: Merge "Allow releaseBuffer after flush" into klp-dev
* commit '
95c03858e2ab4fb693a2bfe47b3caa806e43c044':
Allow releaseBuffer after flush
Glenn Kasten [Fri, 18 Oct 2013 22:02:46 +0000 (22:02 +0000)]
Merge "Allow releaseBuffer after flush" into klp-dev
Vineeta Srivastava [Thu, 17 Oct 2013 21:23:00 +0000 (14:23 -0700)]
Fix kAutoRampDurationUs overflow issue
When kAutoRampDurationUs multiplies with mSampleRate, it overflows to int64.
Type cast it to int64 to make sure RampDurationUs properly.
BUg:
11162491
Change-Id: I4f93bc9acc8456e25623a9255ca7a5b206425009
Glenn Kasten [Fri, 18 Oct 2013 20:00:29 +0000 (13:00 -0700)]
Allow releaseBuffer after flush
After AudioTrack start checks for pending flush,
allow releaseBuffer on any previously obtained buffer.
For example, this can happen if the resampler has obtained
a buffer but not released the whole buffer yet.
Note that the resampler will be reading obsolete data.
Bug:
11285590
Change-Id: I0614fbb62e43604aac3089cce4b7797c87a306b5
Eric Laurent [Fri, 18 Oct 2013 20:03:34 +0000 (13:03 -0700)]
am
6edd8ca5: am
6a51d7ed: audioflinger: fix track terminated before playing
* commit '
6edd8ca5b7e3d169db4314d2b994bc9d48e9e082':
audioflinger: fix track terminated before playing
Eric Laurent [Fri, 18 Oct 2013 20:00:04 +0000 (13:00 -0700)]
am
6a51d7ed: audioflinger: fix track terminated before playing
* commit '
6a51d7ed7062536ccc892c8850a34ed55cbc8d5c':
audioflinger: fix track terminated before playing
Eric Laurent [Fri, 18 Oct 2013 01:59:26 +0000 (18:59 -0700)]
audioflinger: fix track terminated before playing
When a track is terminated before any audio was written,
we should not send a drain request to the HAL. The drain
will be ignored and we will wait the async callback for ever.
Also fix a potential deadlock by not deleting a track with the
thread mutex held: mPreviousTrack changed from a sp to a raw pointer.
Bug:
11247103.
Change-Id: I0a4b47b099204c7c326d45d700234ab8f72d8eae
Glenn Kasten [Thu, 17 Oct 2013 23:23:39 +0000 (16:23 -0700)]
am
e45796de: am
dedc7b0f: Merge "Fix flush() followed by start()" into klp-dev
* commit '
e45796dee9c072cdb13a00b407e68be2cd55e2f2':
Fix flush() followed by start()
Glenn Kasten [Thu, 17 Oct 2013 23:19:44 +0000 (16:19 -0700)]
am
dedc7b0f: Merge "Fix flush() followed by start()" into klp-dev
* commit '
dedc7b0fa23c21b525dc8abb572bb8161ad66a9b':
Fix flush() followed by start()
Glenn Kasten [Thu, 17 Oct 2013 23:12:05 +0000 (23:12 +0000)]
Merge "Fix flush() followed by start()" into klp-dev
Andreas Huber [Thu, 17 Oct 2013 21:40:45 +0000 (14:40 -0700)]
am
694d0295: am
6fa20187: Make sure we get to discover that the cache is sufficiently full again
* commit '
694d0295b986e4ed8f91e71cc5ac8af0341be1de':
Make sure we get to discover that the cache is sufficiently full again
Andreas Huber [Thu, 17 Oct 2013 21:16:43 +0000 (14:16 -0700)]
am
6fa20187: Make sure we get to discover that the cache is sufficiently full again
* commit '
6fa20187e4cf9ace5692979a84741484f19e3f57':
Make sure we get to discover that the cache is sufficiently full again
Andreas Huber [Thu, 17 Oct 2013 20:24:42 +0000 (13:24 -0700)]
Make sure we get to discover that the cache is sufficiently full again
by posting buffering events while in the CACHE_UNDERRUN state.
Change-Id: Ic60c8d57f0ae502aa2b6eec7160dc4224b989604
related-to-bug:
11262689
Glenn Kasten [Thu, 17 Oct 2013 18:32:39 +0000 (11:32 -0700)]
Fix flush() followed by start()
Bug:
11259166
Change-Id: I72526cdfd4e3ff4b06e6a317e577f57cc285205d
Glenn Kasten [Thu, 17 Oct 2013 01:12:55 +0000 (18:12 -0700)]
am
b2059ff3: am
f8f15b05: Merge "Fix race condition in AudioTrack::pause followed by start" into klp-dev
* commit '
b2059ff384eee8ffb70a7ec8fc5570405201c734':
Fix race condition in AudioTrack::pause followed by start
Glenn Kasten [Thu, 17 Oct 2013 01:07:33 +0000 (18:07 -0700)]
am
f8f15b05: Merge "Fix race condition in AudioTrack::pause followed by start" into klp-dev
* commit '
f8f15b05fe051009945c9042a1a9260280e0feb2':
Fix race condition in AudioTrack::pause followed by start
Ed Heyl [Thu, 17 Oct 2013 01:02:14 +0000 (18:02 -0700)]
am
fc24dc1a: am
787c0d04: merge in klp-release (no-op)
* commit '
fc24dc1a2e2ba8d74bfadfadb01d12a542828561':
Camera: Skip AE precapture when possible
Cleanup openRecord error handling
TimedEventQueue takes a wake lock
fix offload audio effect proxy implementation uuid
MediaCodecInfo: report supported color formats for non-native-window mode
Camera2 API: Hack: Always use async mode with GLConsumer
AudioTrack: fix music resume
Zhijun He [Thu, 17 Oct 2013 01:02:14 +0000 (18:02 -0700)]
am
dddafa84: am
3defdab8: Merge "Camera: don\'t do hw support check for ZSL" into klp-dev
* commit '
dddafa84dcbd85c11a732e7553d0b884e5a08c27':
Camera: don't do hw support check for ZSL
Glenn Kasten [Thu, 17 Oct 2013 00:59:33 +0000 (00:59 +0000)]
Merge "Fix race condition in AudioTrack::pause followed by start" into klp-dev
Ed Heyl [Thu, 17 Oct 2013 00:56:41 +0000 (17:56 -0700)]
am
787c0d04: merge in klp-release (no-op)
* commit '
787c0d04ac4f9c938a1311f8e30d9d7ac2b8a6da':
Camera: Skip AE precapture when possible
Cleanup openRecord error handling
TimedEventQueue takes a wake lock
fix offload audio effect proxy implementation uuid
MediaCodecInfo: report supported color formats for non-native-window mode
Camera2 API: Hack: Always use async mode with GLConsumer
AudioTrack: fix music resume
Zhijun He [Thu, 17 Oct 2013 00:56:41 +0000 (17:56 -0700)]
am
3defdab8: Merge "Camera: don\'t do hw support check for ZSL" into klp-dev
* commit '
3defdab829de7df3a343393b2b277e99d071744c':
Camera: don't do hw support check for ZSL
Ed Heyl [Thu, 17 Oct 2013 00:42:20 +0000 (17:42 -0700)]
merge in klp-release (no-op)
Glenn Kasten [Thu, 17 Oct 2013 00:02:13 +0000 (17:02 -0700)]
Fix race condition in AudioTrack::pause followed by start
Bug:
11148722
Change-Id: Iec88f00c8510363d4418e4b8d5b34feb06ecf04d
Zhijun He [Wed, 16 Oct 2013 22:47:47 +0000 (22:47 +0000)]
Merge "Camera: don't do hw support check for ZSL" into klp-dev
Eric Laurent [Wed, 16 Oct 2013 22:38:30 +0000 (15:38 -0700)]
am
7f8c3973: am
120a8847: Merge "AudioTrack: fix head position after restore" into klp-dev
* commit '
7f8c397378a7ee5abd395413be71388ad36d3ed2':
AudioTrack: fix head position after restore
Eric Laurent [Wed, 16 Oct 2013 22:35:35 +0000 (15:35 -0700)]
am
120a8847: Merge "AudioTrack: fix head position after restore" into klp-dev
* commit '
120a88471a607c85c4d60300d73c3be0a1e8f8c8':
AudioTrack: fix head position after restore
Eric Laurent [Wed, 16 Oct 2013 22:29:41 +0000 (15:29 -0700)]
am
ace8947d: am
d5766875: AwesomePlayer: fix concurrent pause and teardown
* commit '
ace8947dbcd18e86c6a089291ffe1ce32fb42508':
AwesomePlayer: fix concurrent pause and teardown
Eric Laurent [Wed, 16 Oct 2013 22:28:33 +0000 (22:28 +0000)]
Merge "AudioTrack: fix head position after restore" into klp-dev
Eric Laurent [Wed, 16 Oct 2013 22:26:52 +0000 (15:26 -0700)]
am
d5766875: AwesomePlayer: fix concurrent pause and teardown
* commit '
d576687570f19f3956d91c1d3da10d965e34c407':
AwesomePlayer: fix concurrent pause and teardown
Eric Laurent [Wed, 16 Oct 2013 22:12:32 +0000 (15:12 -0700)]
AudioTrack: fix head position after restore
The head position transfered to the new track
by restoreTrack_l() must take into account the frames that
are dropped from the old track to avoid a non recoverable
offset in the playback head position returned to applications.
Bug:
11230062.
Change-Id: I51143a08b95e8f264ed709ae2054360315f2b8b1
Zhijun He [Wed, 16 Oct 2013 22:09:17 +0000 (15:09 -0700)]
Camera: don't do hw support check for ZSL
Only use camera.disable_zsl_mode to control disable/enable ZSL.
Bug:
11258054
Change-Id: Ibf10b959d0913f7dedb59d89b571e9bf66fe978a
Eric Laurent [Tue, 15 Oct 2013 23:11:24 +0000 (16:11 -0700)]
AwesomePlayer: fix concurrent pause and teardown
There was a race condition if a pause request was received
while we were executing a teardown event. Although we hold
a mutex while processing the teardown event, there is a step
of the prepare sequence where we release the mutex if streaming.
In this case, the pause request is executed but ignored because
the player state is still preparing. At the end of the teardown
event processing we restore previous playback state and resume.
The fix consists in clearing the saved teardown playback state
when a pause request is received while processing a teardown event.
Bug:
11225491.
Change-Id: If0e61855ce5a336322f1ba8e5559bdc190beeb76
The Android Automerger [Tue, 15 Oct 2013 13:00:42 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Narayan Kamath [Tue, 15 Oct 2013 12:05:01 +0000 (05:05 -0700)]
am
8580679e: am
014e7fa2: Make Audio wakelock names less unique.
* commit '
8580679e1780617d978d28a43e932314b86608ce':
Make Audio wakelock names less unique.
Narayan Kamath [Tue, 15 Oct 2013 02:01:21 +0000 (19:01 -0700)]
am
014e7fa2: Make Audio wakelock names less unique.
* commit '
014e7fa2e90827d911c37bb0ce4d2e10e14d0bb3':
Make Audio wakelock names less unique.
Eric Laurent [Mon, 14 Oct 2013 17:51:20 +0000 (10:51 -0700)]
am
b930056e: am
b3cb72a1: SoundPool: handle new audio track event
* commit '
b930056ed4c6e1f8288d4f2cef828c3c02940482':
SoundPool: handle new audio track event
Zhijun He [Mon, 14 Oct 2013 17:49:43 +0000 (10:49 -0700)]
am
1810a287: am
15ad2470: Camera: Fix deadlock in Camera3OutputStream
* commit '
1810a287ecc81c243983051f9b1e32ff92ef1365':
Camera: Fix deadlock in Camera3OutputStream
Narayan Kamath [Mon, 14 Oct 2013 14:03:38 +0000 (15:03 +0100)]
Make Audio wakelock names less unique.
These wakelocks now show up in the client process, where they
might cause wakelock overflows if AudioFlinger threads die often.
The client process should be agnostic of audio flinger threading,
so don't make the wakelock names rely on audioflinger thread names.
Wakelock names now depend only on the audio flinger thread type, and
not the ID itself.
bug:
11200551
Change-Id: Ia1f71b569cb7502d617b77596abc245f461a6ec0
The Android Automerger [Mon, 14 Oct 2013 02:20:21 +0000 (19:20 -0700)]
merge in klp-release history after reset to klp-dev
Eric Laurent [Sun, 13 Oct 2013 18:08:06 +0000 (11:08 -0700)]
am
b3cb72a1: SoundPool: handle new audio track event
* commit '
b3cb72a17d9a472883e9e2faa18b42eac533fe99':
SoundPool: handle new audio track event
The Android Automerger [Sun, 13 Oct 2013 13:01:45 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Eric Laurent [Sun, 13 Oct 2013 00:05:19 +0000 (17:05 -0700)]
SoundPool: handle new audio track event
If the AudioTrack is torn down, SoundPool will never
receive the buffer end event and the track will stay active
for ever.
The fix consists in stopping the AudioTrack when a new audiotrack
event is received.
Bug:
11193583.
Change-Id: I9876eb2a8f75c601368f669acd67b0accf6e2736
Eric Laurent [Sat, 12 Oct 2013 23:17:46 +0000 (16:17 -0700)]
audioflinger: enable effects after registration if needed
This fixes a bug where effects were not properly reenabled after
being moved from one playback thread to another. The effect
is enabled but the audio policy manager sees it as disabled.
Bug:
11181933.
Change-Id: I19cac7acbaf61c546e667fd85ed7d4eda1c716d8
Zhijun He [Sat, 12 Oct 2013 01:27:26 +0000 (18:27 -0700)]
am
15ad2470: Camera: Fix deadlock in Camera3OutputStream
* commit '
15ad2470b2f2ac34473eb568b606ad75e8e63ac6':
Camera: Fix deadlock in Camera3OutputStream
Zhijun He [Fri, 11 Oct 2013 23:21:11 +0000 (16:21 -0700)]
Camera: Fix deadlock in Camera3OutputStream
process capture request thread, process capture result and setParameter
binder threads can run into circular locking situation when acquiring
StreamingProcessor lock, Camera3Stream lock, and bufferQueue lock.
Releasing the Camera3Stream lock briefly in process capture request
thread getbuffer call can break this deadlock.
Bug:
11016037
Change-Id: If08d4b134c26be26039b1d5363759e60f911bad6
Zhijun He [Fri, 11 Oct 2013 19:55:13 +0000 (12:55 -0700)]
am
92d27553: am
d5ed2263: Merge "Camera: Skip AE precapture when possible" into klp-dev
* commit '
92d275536ce3a7f1055627ac087b0f3a9957ad68':
Camera: Skip AE precapture when possible
Eino-Ville Talvala [Fri, 11 Oct 2013 19:55:13 +0000 (12:55 -0700)]
am
c989d2d4: am
1dd08b30: Merge "Camera2/3: Add more tracing for API1" into klp-dev
* commit '
c989d2d4f6f7e63b1572673b390a5e89fa5c5702':
Camera2/3: Add more tracing for API1
Zhijun He [Fri, 11 Oct 2013 19:50:13 +0000 (12:50 -0700)]
am
d5ed2263: Merge "Camera: Skip AE precapture when possible" into klp-dev
* commit '
d5ed2263a485d6e633fe08f033d04fad75daec6f':
Camera: Skip AE precapture when possible
Eino-Ville Talvala [Fri, 11 Oct 2013 19:50:13 +0000 (12:50 -0700)]
am
1dd08b30: Merge "Camera2/3: Add more tracing for API1" into klp-dev
* commit '
1dd08b30e2366cabc50d883885d6229dab8218f2':
Camera2/3: Add more tracing for API1
Zhijun He [Fri, 11 Oct 2013 17:26:52 +0000 (10:26 -0700)]
Camera: Skip AE precapture when possible
Skip AE precapture when AE is already converged for still capture use case. This
could save still capture latency 6-7 frame time for AE already converged case.
Bug:
10712902
Change-Id: Ie5512618b76e5d87c62c57c3d96d2004c604e29e