OSDN Git Service
Jamie Gennis [Wed, 30 Nov 2011 01:26:59 +0000 (17:26 -0800)]
am
6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
* commit '
6f1dd757cb158d17c76baeb170f7db2271802ef8':
SurfaceMediaSource: use the vid enc usage bit
Jamie Gennis [Wed, 30 Nov 2011 01:25:09 +0000 (17:25 -0800)]
Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:30:46 +0000 (14:30 -0800)]
am
564fee36: Merge "Make sure we can properly shutdown even if" into ics-mr1
* commit '
564fee36667e2699c59a29102136220dc2f65862':
Make sure we can properly shutdown even if
Andreas Huber [Tue, 29 Nov 2011 22:30:45 +0000 (14:30 -0800)]
am
d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
* commit '
d12dc28460f622ab29e83fa688ad83a8263e9417':
If an error occurs that prevents us from reallocating buffers during a format change
Andreas Huber [Tue, 29 Nov 2011 22:30:43 +0000 (14:30 -0800)]
am
351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
* commit '
351143fb0e2fcfb7dc2ef1045d693c71eb0ea329':
Updated (internal) API for IStreamSource to signal discontinuities
Andreas Huber [Tue, 29 Nov 2011 22:30:40 +0000 (14:30 -0800)]
am
405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1
* commit '
405a4e34032f8a07028138266fe9f79f6753b466':
Finer granularity discontinuity support.
Andreas Huber [Tue, 29 Nov 2011 22:09:10 +0000 (14:09 -0800)]
Merge "Make sure we can properly shutdown even if" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:09:03 +0000 (14:09 -0800)]
Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:08:45 +0000 (14:08 -0800)]
Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 19:57:35 +0000 (11:57 -0800)]
Updated (internal) API for IStreamSource to signal discontinuities
Change-Id: Idd4b9d8e7cec16b3e3c91c70e75144d42be30f96
related-to-bug:
5553055
Andreas Huber [Mon, 28 Nov 2011 20:36:11 +0000 (12:36 -0800)]
Finer granularity discontinuity support.
No clients can signal a format change on either audio or video track (or both)
and a time discontinuity (timestamps changed) independantly.
Change-Id: I3e6cf4e7c260e85759879d61a9b517f68431c22f
related-to-bug:
5553055
Andreas Huber [Tue, 29 Nov 2011 00:27:35 +0000 (16:27 -0800)]
Make sure we can properly shutdown even if
a) one of the two decoders has a pending discontinuity
b) the renderer holds on to all output buffers for that decoder
c) the renderer is paused
if all three conditions are met the decoder won't ask for more input data
and therefore never see the discontinuity.
To avoid this we briefly resume the renderer just before shutting down.
Change-Id: I9e08af2a1eb4298d1cd00497d6aa33f4ad184e9a
related-to-bug:
5655016
Andreas Huber [Mon, 28 Nov 2011 18:54:12 +0000 (10:54 -0800)]
If an error occurs that prevents us from reallocating buffers during a format change
we need to transition to executing state anyway to be able to properly flush/shutdown
in the future.
Change-Id: Ie48bc09ea31942009ae3a5a45aabc9ffad9fb91f
related-to-bug:
5655016
Eric Laurent [Wed, 23 Nov 2011 20:32:30 +0000 (12:32 -0800)]
am
20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
* commit '
20398fac99ff78cb3ec3dd122930e45d409e0524':
audioflinger: reduce sleep time to avoid underrun
Eric Laurent [Wed, 23 Nov 2011 02:50:29 +0000 (18:50 -0800)]
audioflinger: reduce sleep time to avoid underrun
Progressively reduce the sleep time applied in MixerThread::threadLoop()
in case of consecutive application underruns to avoid starving the audio HAL.
As the default sleep time is longer than the duration of an audio buffer
we ended up writing less data than needed by the audio HAL if
the condition persisted.
Issue
5553055.
Change-Id: I2b23ee79c032efa945025db228beaecd1e07a2e5
Andreas Huber [Tue, 22 Nov 2011 16:41:26 +0000 (08:41 -0800)]
am
cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
* commit '
cb6fbc89c25298643ab342b4a228e772b0e56978':
Report a runtime error instead of asserting on malformed avc configuration data.
Andreas Huber [Tue, 22 Nov 2011 16:39:11 +0000 (08:39 -0800)]
Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
James Dong [Tue, 22 Nov 2011 04:30:14 +0000 (20:30 -0800)]
am
02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1
* commit '
02740dc49df86fc94c872454aa9db98737d5e8c8':
Fix log spamming during time lapse video recording
Jamie Gennis [Tue, 22 Nov 2011 00:51:47 +0000 (16:51 -0800)]
SurfaceMediaSource: use the vid enc usage bit
This change makes SurfaceMediaSource add the VIDEO_ENC usage bit when
allocating its GraphicBuffers rather than the HW_TEXTURE bit.
Change-Id: Ie20e225c894fdbc31cad6bb82b3b64c7e98074eb
James Dong [Sun, 20 Nov 2011 17:45:44 +0000 (09:45 -0800)]
Fix log spamming during time lapse video recording
Change-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f
related-to-bug:
5626569
Marco Nelissen [Fri, 18 Nov 2011 23:10:38 +0000 (15:10 -0800)]
am
7ff7821a: am
d4b22ab4: status_t != bool
* commit '
7ff7821a601a39fffb318e29873957b4a3703c46':
status_t != bool
Marco Nelissen [Fri, 18 Nov 2011 23:07:21 +0000 (15:07 -0800)]
am
d4b22ab4: status_t != bool
* commit '
d4b22ab4889f9b1885bfc0dc45667c846a171a98':
status_t != bool
Marco Nelissen [Fri, 18 Nov 2011 21:10:56 +0000 (13:10 -0800)]
status_t != bool
b/
5567433
Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
Andreas Huber [Fri, 18 Nov 2011 20:22:59 +0000 (12:22 -0800)]
Report a runtime error instead of asserting on malformed avc configuration data.
Change-Id: Ibcd9c3fb5b6532eba843ed80ecdcdacaf50d8845
related-to-bug:
5641069
Andreas Huber [Thu, 17 Nov 2011 17:07:48 +0000 (09:07 -0800)]
am
c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1
* commit '
c1b1709b2faa985fb9c2b273ca2191b5bfba5fdd':
Make sure not to cancel pending seek/EOS notifications on a cache underrun...
Andreas Huber [Thu, 17 Nov 2011 17:05:17 +0000 (09:05 -0800)]
Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1
Andreas Huber [Wed, 16 Nov 2011 18:46:05 +0000 (10:46 -0800)]
Make sure not to cancel pending seek/EOS notifications on a cache underrun...
or they are lost for good.
Change-Id: I2f9f53efb05db4077961137c9dc8c27edac4ec62
related-to-bug:
5544907
The Android Open Source Project [Wed, 16 Nov 2011 17:34:33 +0000 (09:34 -0800)]
The Android Open Source Project [Wed, 16 Nov 2011 17:27:57 +0000 (09:27 -0800)]
No-op merge from ics-mr0
Change-Id: I6be81522ac3e6d4d8fab545abde4d81e5bb2a2c6
The Android Open Source Project [Wed, 16 Nov 2011 16:55:42 +0000 (08:55 -0800)]
Reconcile with ics-factoryrom-2-release
Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
Hong Teng [Tue, 15 Nov 2011 17:45:24 +0000 (09:45 -0800)]
am
481ffa50: Merge "Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
* commit '
481ffa505bb1d8f5089ea98e3b5960d409b6819c':
Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
Hong Teng [Tue, 15 Nov 2011 17:42:37 +0000 (09:42 -0800)]
Merge "Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
Hong Teng [Thu, 10 Nov 2011 22:54:26 +0000 (14:54 -0800)]
Fix for issue
5309336
-add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
Change-Id: I41ffbc192fcce4c7635e5b0a1f2835852e5ee509
Eric Laurent [Mon, 14 Nov 2011 16:40:13 +0000 (08:40 -0800)]
am
030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
* commit '
030bb99814157b6424c0bf290bd2ede217b5ba77':
audioflinger: fix noise when skipping to next song
Eric Laurent [Mon, 14 Nov 2011 16:38:05 +0000 (08:38 -0800)]
Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
Eric Laurent [Fri, 11 Nov 2011 23:42:52 +0000 (15:42 -0800)]
audioflinger: fix noise when skipping to next song
When audio effects are enabled, a noise can be heard at the
beginning of the new song when skipping to next song in music app.
This is because some effects (especially virtualizer) have a tail.
This tail was not played when previous song was stopped because effects were
not processed when no tracks were present on a given session. This is to
reduce CPU load when effects are enabled but no audio is playing.
The tail was then rendered when the new song was started.
Added a delay before stopping effect process after all tracks have been removed from a session.
Issue
5584880.
Change-Id: I815e0f7441f9302e8dfe413dc269a94e4cc6fd95
Andreas Huber [Fri, 11 Nov 2011 19:50:37 +0000 (11:50 -0800)]
am
23217182: Merge "Didn\'t mean to check this in..." into ics-mr1
* commit '
23217182743521063655c6fb1b1580d3558cfbe7':
Didn't mean to check this in...
Eric Laurent [Fri, 11 Nov 2011 19:50:28 +0000 (11:50 -0800)]
am
1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1
* commit '
1f8c621279ddb163ee3d63bf32d79955679db0c5':
visualizer: reset buffer if playback is idle
Andreas Huber [Fri, 11 Nov 2011 19:50:23 +0000 (11:50 -0800)]
am
cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1
* commit '
cd556b82fd12dceb49e9d6543f80212721b220ec':
Instead of asserting, signal a runtime error if the session doesn't contain
Andreas Huber [Fri, 11 Nov 2011 19:50:21 +0000 (11:50 -0800)]
am
5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
* commit '
5d42075e450a49af2bb37ca3a9610921df7607f2':
DO NOT MERGE: Instead of asserting, remove active streams if their sockets
Andreas Huber [Fri, 11 Nov 2011 19:50:20 +0000 (11:50 -0800)]
am
d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
* commit '
d9f25bc941746f268ab978e6b2af7b7c4ec2ea89':
Disconnect on socket error on the RTSP control connection.
James Dong [Fri, 11 Nov 2011 19:50:14 +0000 (11:50 -0800)]
am
08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1
* commit '
08e42967b9e459b7beb22e859f1f1eba0546741b':
Add support for retrieving location information in mp4/3gpp files
Andreas Huber [Fri, 11 Nov 2011 18:46:02 +0000 (10:46 -0800)]
Merge "Didn't mean to check this in..." into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 18:17:00 +0000 (10:17 -0800)]
Didn't mean to check this in...
Change-Id: Ie5a1902ff2613cd349ca5724f63a3fe3306640c7
Eric Laurent [Fri, 11 Nov 2011 16:17:22 +0000 (08:17 -0800)]
Merge "visualizer: reset buffer if playback is idle" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 15:39:25 +0000 (07:39 -0800)]
Merge "Instead of asserting, signal a runtime error if the session doesn't contain" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 15:39:18 +0000 (07:39 -0800)]
Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 15:39:11 +0000 (07:39 -0800)]
Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
Andreas Huber [Thu, 10 Nov 2011 22:48:20 +0000 (14:48 -0800)]
Disconnect on socket error on the RTSP control connection.
Change-Id: Ib52a69f9b0830b481c6f5c9b1991d1f4cb36ec7b
Andreas Huber [Wed, 9 Nov 2011 22:26:43 +0000 (14:26 -0800)]
DO NOT MERGE: Instead of asserting, remove active streams if their sockets
return failure
Change-Id: Icb47adfd2fbe0398c473ba66e068186311c9cc79
related-to-bug:
5593654
Andreas Huber [Thu, 10 Nov 2011 20:40:30 +0000 (12:40 -0800)]
Instead of asserting, signal a runtime error if the session doesn't contain
any playable tracks at all.
Change-Id: Ibbbe2fdcd53b7e020da80c84c8229856107a87e6
James Dong [Wed, 9 Nov 2011 08:48:56 +0000 (00:48 -0800)]
Add support for retrieving location information in mp4/3gpp files
Change-Id: Ib8427704ef9ee5a4fa8fe1818c8a62d77b4ea687
related-to-bug:
5560253
Eric Laurent [Thu, 10 Nov 2011 18:02:18 +0000 (10:02 -0800)]
visualizer: reset buffer if playback is idle
Visualizer capture buffer must be reset if audio framework has stopped
calling process for a given period of time to get read of residual
data from previous captures.
Issue
5571920.
Change-Id: I6e73f971bb812cdbb2979a3b5e763abab07634eb
Andreas Huber [Thu, 10 Nov 2011 16:52:19 +0000 (16:52 +0000)]
am
2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1
* commit '
2375d16378e6f8b7694c5a2cd9e0622e382e6049':
Send RTSP control connection keep-alive requests
Andreas Huber [Thu, 10 Nov 2011 16:52:17 +0000 (16:52 +0000)]
am
b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1
* commit '
b42aea5b4c7cc7b2766f80f5ceda94b324d776e5':
Don't believe the PV decoder's lies...
Andreas Huber [Thu, 10 Nov 2011 16:49:12 +0000 (16:49 +0000)]
am
7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1
* commit '
7c063cf9679a2ecdda5e1639cfdca3e1084019f9':
There's no point in trying to continue to decode after an error was signalled.
Andreas Huber [Thu, 10 Nov 2011 16:48:44 +0000 (08:48 -0800)]
Merge "Send RTSP control connection keep-alive requests" into ics-mr1
Andreas Huber [Thu, 10 Nov 2011 16:48:34 +0000 (08:48 -0800)]
Merge "Don't believe the PV decoder's lies..." into ics-mr1
Andreas Huber [Thu, 10 Nov 2011 16:47:25 +0000 (08:47 -0800)]
Merge "There's no point in trying to continue to decode after an error was signalled." into ics-mr1
Glenn Kasten [Wed, 9 Nov 2011 19:00:05 +0000 (19:00 +0000)]
am
f2c2b1c4: am
19998120: Merge "Bug
5478024 drop after decode if can\'t drop before" into ics-mr0
* commit '
f2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2':
Bug
5478024 drop after decode if can't drop before
Eric Laurent [Wed, 9 Nov 2011 18:59:51 +0000 (18:59 +0000)]
am
2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1
* commit '
2b7f91b932be0aa9ce6fa3acda9ff439e94643fc':
Fix regression for SoundPool playback
Andreas Huber [Wed, 9 Nov 2011 18:26:06 +0000 (10:26 -0800)]
There's no point in trying to continue to decode after an error was signalled.
Change-Id: I2a2410cac9444eadd85be5d104799703171f1a24
related-to-bug:
5588658
Andreas Huber [Wed, 9 Nov 2011 18:03:07 +0000 (10:03 -0800)]
Don't believe the PV decoder's lies...
Change-Id: I97391235255afb8a4890a4ff52d4e8e9ca954f27
Glenn Kasten [Wed, 9 Nov 2011 16:41:19 +0000 (16:41 +0000)]
am
19998120: Merge "Bug
5478024 drop after decode if can\'t drop before" into ics-mr0
* commit '
19998120f53caceb620f138c6eea182f1e693660':
Bug
5478024 drop after decode if can't drop before
Eric Laurent [Wed, 9 Nov 2011 02:10:16 +0000 (18:10 -0800)]
Fix regression for SoundPool playback
Commit
19ddf0eb introduced a problem with applications (like SoundPool)
relying on an underrun condition to detect end of playback instead of
stopping the track when all data is written.
AudioFlinger would keep waiting for new data in case of partial buffer
filling and never reach the underrun condition.
Added a mechanism to wait no more than once if not enough frames are present
in the track buffer.
Issue
5585490.
Change-Id: I131e605ff6070831a01ddf734e68459e3bf2354b
Andreas Huber [Tue, 8 Nov 2011 23:31:23 +0000 (15:31 -0800)]
Send RTSP control connection keep-alive requests
default to 60 secs unless overridden by server's session-id response.
Change-Id: I7c3aff5b787dbb57cc0dccf9db3c75e5cf7e778c
related-to-bug:
5562303
Andreas Huber [Tue, 8 Nov 2011 17:58:45 +0000 (17:58 +0000)]
am
26f70db9: Merge "Remove surface legacy APIs and code." into ics-mr1
* commit '
26f70db99f483be36caa7a4c84fec5de50bec034':
Remove surface legacy APIs and code.
Eric Laurent [Tue, 8 Nov 2011 17:52:15 +0000 (09:52 -0800)]
resolved conflicts for merge of
f3a892ab to ics-aah
Change-Id: Id9c0ef089d4ed71dbf69c5969b36f9ac44a25ad3
Andreas Huber [Tue, 8 Nov 2011 16:48:31 +0000 (08:48 -0800)]
Merge "Remove surface legacy APIs and code." into ics-mr1
Eric Laurent [Tue, 8 Nov 2011 16:32:57 +0000 (08:32 -0800)]
Merge "AudioFlinger: mix track only when really ready" into ics-mr1
James Dong [Tue, 8 Nov 2011 06:58:11 +0000 (06:58 +0000)]
am
ee7ebb32: Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1
* commit '
ee7ebb3257d9337627b175835dc3d08f9b8ab339':
Fix a hang issue where the first frame can be dropped for timelapse video recording.
James Dong [Tue, 8 Nov 2011 06:57:02 +0000 (22:57 -0800)]
Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1
The Android Open Source Project [Mon, 7 Nov 2011 17:37:20 +0000 (17:37 +0000)]
am
064975c2: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
064975c27cbca412e682fa152ce00af14027ab4f':
Fix a leak in Parcel::writeBlob.
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
The Android Open Source Project [Mon, 7 Nov 2011 16:22:56 +0000 (08:22 -0800)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I9de1253d253c7d106862534570cad0c89d2fdaf2
Glenn Kasten [Sat, 5 Nov 2011 01:05:35 +0000 (18:05 -0700)]
Bug
5478024 drop after decode if can't drop before
Change-Id: Iaa64553be1a710da5d42be4e3a1e1d6dc873e371
Andreas Huber [Thu, 3 Nov 2011 18:00:21 +0000 (11:00 -0700)]
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
Change-Id: I3c288698920fe6ead0df24a52330483609821a41
related-to-bug:
5549263
Eric Laurent [Fri, 4 Nov 2011 15:32:13 +0000 (15:32 +0000)]
am
914972be: Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1
* commit '
914972be65bef1fd7e886825e7af27c29eff0a1e':
Fix device management in lvm effect bundle wrapper.
Eric Laurent [Fri, 4 Nov 2011 15:29:44 +0000 (15:29 +0000)]
am
79178b8b: Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1
* commit '
79178b8b3da8f69f34a72be13f2a374afbec4f40':
Fix problem in lvm effect bundle wrapper.
Eric Laurent [Fri, 4 Nov 2011 15:29:30 +0000 (08:29 -0700)]
Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1
Eric Laurent [Fri, 4 Nov 2011 15:27:45 +0000 (08:27 -0700)]
Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1
The Android Open Source Project [Fri, 4 Nov 2011 14:59:40 +0000 (14:59 +0000)]
am
8242cc49: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
8242cc49a90aa13a4830a735438b6e3cf73ea0f0':
Revert "Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0"
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
The Android Open Source Project [Fri, 4 Nov 2011 14:56:42 +0000 (07:56 -0700)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I81cf3b3994cb9a1c18fca3ce0049e09402543086
Dave Burke [Fri, 4 Nov 2011 12:03:26 +0000 (12:03 +0000)]
am
43e72b1f: am
32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0
* commit '
43e72b1f5692dd9e220158001317c2abc0ecafcf':
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
Dave Burke [Fri, 4 Nov 2011 11:59:27 +0000 (11:59 +0000)]
am
32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0
* commit '
32b5a7eeaf758fad0c24131603cdd54cd2883a58':
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
Andreas Huber [Thu, 3 Nov 2011 18:00:21 +0000 (11:00 -0700)]
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
Change-Id: I3c288698920fe6ead0df24a52330483609821a41
related-to-bug:
5549263
Eric Laurent [Thu, 3 Nov 2011 19:16:05 +0000 (12:16 -0700)]
AudioFlinger: mix track only when really ready
The addition of low power audio playback mode made that audio buffer consumption
by audio HAL can now happen in bursts. This makes that requesting audio data
from an AudioTrack for mixing can happen at much shorter intervals than before.
This revealed an existing problem where AudioFlinger would consider a track ready
for mixing although not enough frames were ready to completely fill one output buffer,
thus creating short periods of silence.
The fix consists in waiting for enough frames to be ready in AudioTrack buffer before
declaring a track ready for mixing. This minimum is not applied when the track is stopped
to allow the buffer to be emptied completely.
Change-Id: I6d04f9b65db5af85b0b53f0a5674be7ec02f9e9f
Andreas Huber [Thu, 3 Nov 2011 18:10:44 +0000 (18:10 +0000)]
am
e395f645: Poll input data with a small timeout and don\'t consume a full core.
* commit '
e395f645aa4c30a4fad8beb3da6f8fad72338617':
Poll input data with a small timeout and don't consume a full core.
Andreas Huber [Thu, 3 Nov 2011 18:00:21 +0000 (11:00 -0700)]
Poll input data with a small timeout and don't consume a full core.
Change-Id: I3c288698920fe6ead0df24a52330483609821a41
related-to-bug:
5549263
The Android Automerger [Thu, 3 Nov 2011 03:59:04 +0000 (20:59 -0700)]
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
This reverts commit
4b6353ea0265bfed52d0637abd1b17596ce25ff0, reversing
changes made to
af675222f6340a8a9edbe9e8635014a18521e5e0.
The Android Automerger [Thu, 3 Nov 2011 03:53:06 +0000 (20:53 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Open Source Project [Wed, 2 Nov 2011 17:56:48 +0000 (17:56 +0000)]
am
11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
11b49ba933bab7ff8262139141eef0e5f3c45a18':
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
The Android Open Source Project [Wed, 2 Nov 2011 17:52:48 +0000 (10:52 -0700)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I493695d0ea182f32bbfe0e148e192ad1f60ff001
The Android Automerger [Wed, 2 Nov 2011 17:14:18 +0000 (10:14 -0700)]
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
This reverts commit
4b6353ea0265bfed52d0637abd1b17596ce25ff0, reversing
changes made to
af675222f6340a8a9edbe9e8635014a18521e5e0.
Eric Laurent [Tue, 1 Nov 2011 00:36:03 +0000 (17:36 -0700)]
Fix problem in lvm effect bundle wrapper.
When an effect is disabled, the process function should either
copy or accumulate the content of the input buffer to the output buffer
depending on the behavior requested by the framework.
Current implementation is copying the input buffer unconditionally.
Related to issue
5433942.
Change-Id: Ic488ca97eadcc4c763de570d7e6c6f5b7a979415
Eric Laurent [Tue, 1 Nov 2011 01:48:15 +0000 (18:48 -0700)]
Fix device management in lvm effect bundle wrapper.
The virtualizer and bass boost effects should be disabled when
not playing throught headsets or headphones.
There is a bug in current wrapper implementation that makes that those
effects are not disabled if the effect is enabled by the user after
the headset has been removed (current logic only works if the device selection
occurs while the effect is enabled).
Change-Id: I7c66b15a0339d95fb9ed13c8320d66379725d3b6
Chih-Chung Chang [Tue, 1 Nov 2011 04:09:00 +0000 (04:09 +0000)]
am
11ba6da4: am
4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0
* commit '
11ba6da460572b9ce9cb9dc0d5a76b710e7efdb3':
Update camera continuous autofocus javadoc.
Chih-Chung Chang [Tue, 1 Nov 2011 04:05:45 +0000 (04:05 +0000)]
am
4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0
* commit '
4b6353ea0265bfed52d0637abd1b17596ce25ff0':
Update camera continuous autofocus javadoc.
Chih-Chung Chang [Tue, 1 Nov 2011 04:04:01 +0000 (21:04 -0700)]
Merge "Update camera continuous autofocus javadoc." into ics-mr0
Ed Heyl [Mon, 31 Oct 2011 13:06:27 +0000 (06:06 -0700)]
merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed)
Change-Id: I86d1111d86cd1646ebc8a88d58aa393089e9f928
Ed Heyl [Fri, 28 Oct 2011 19:05:53 +0000 (19:05 +0000)]
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)