Commit Graph

231 Commits

Author SHA1 Message Date
Mike Lockwood
c30f1df66e am 8aab2bba: Merge change 23299 into eclair
Merge commit '8aab2bba26dde82efc77afdc001e32cc199e039d'

* commit '8aab2bba26dde82efc77afdc001e32cc199e039d':
  liblights: Use constants instead of hard coded file paths.
2009-08-31 16:44:53 -07:00
Eric Laurent
a55a4376a0 am aa1d75e6: Fix issue 2085911: Volume control is broken when A2DP headset is connected.
Merge commit 'aa1d75e66a38efdce21e944b5ddbe42ad634480f'

* commit 'aa1d75e66a38efdce21e944b5ddbe42ad634480f':
  Fix issue 2085911: Volume control is broken when A2DP headset is connected.
2009-08-31 16:43:43 -07:00
Android (Google) Code Review
09c284b754 Merge change 23299 into eclair
* changes:
  liblights: Use constants instead of hard coded file paths.
2009-08-31 12:25:16 -07:00
Mike Lockwood
30e54207f5 liblights: Use constants instead of hard coded file paths.
Change-Id: I87d1b64a2d67ef3674232aa0c48fac4f8f8f3ace
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-31 13:32:51 -04:00
Eric Laurent
28cc97ea3e Fix issue 2085911: Volume control is broken when A2DP headset is connected.
A regression on volume control was introduced by change 22899. When a volume change was requested on 2 different outputs for the same stream, the change on the second output was ignored because the requested value was the same as current one.
The fix consists in storing current stream volume for each output instead of globally for all outputs.
2009-08-31 00:24:53 -07:00
Eric Laurent
35c457f6b5 am 63ca66ea: Fix issue 2080258: audio routing is not reset when call ends.
Merge commit '63ca66ea9da5ea61806ee547f3aa1c498ac235fe'

* commit '63ca66ea9da5ea61806ee547f3aa1c498ac235fe':
  Fix issue 2080258: audio routing is not reset when call ends.
2009-08-27 23:53:16 -07:00
Eric Laurent
060f98e062 Fix issue 2080258: audio routing is not reset when call ends.
Modify AudioPolicyManager::setPhoneState() to force a routing command to audio output when call ends or starts even if the same device is selected.
Implement AudioHardware::setMode() to force routing change to be taken into account when phone state changes.
2009-08-27 11:49:33 -07:00
Eric Laurent
0d0ebdd8e1 am ab33521b: Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
Merge commit 'ab33521bf196ab29cc308d745f53ecadfd4a4499'

* commit 'ab33521bf196ab29cc308d745f53ecadfd4a4499':
  Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
2009-08-27 11:41:51 -07:00
Eric Laurent
c33b88974d Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
The problem is partly due to the fact that if music is playing in the headset, a routing change is done to play the shutter sound in both headset+speaker. When the shutter sound ends, the routing is reset to headset, but the change is immediate and there is still audio data pertaining to the shutter sound in the audio hardware buffer queue. As the shutter sound is short, sometimes none of it is output to the speaker before the audio path is reset to the headset.
Another factor is the long time taken by the audio hardware to execute some routing or volume change commands (especially in call volume). Current AudioPolicyManager design reapplies all stream volumes when the output device is changed which adds an unecessary delay in the routing command execution.
Another side problem is that althoough the music is muted while the shutter sound is played, the audio latency makes that some music is heard briefly before the shutter sound in the speaker.
In addition a regression in change 21083 broke the mute mechanism.

This fix consists in:
1 Delay the routing change when the shutter sound stops by a duration longer than the audio output latency.
2 Do not send unecessary volume changes by comparing current value with requested value.
3 Wait until the music is muted before proceding with the reset of the audio routing change when starting the shutter sound.
4 fix mute regression
2009-08-27 06:10:56 -07:00
Simon Wilson
02ced34fbc am a2a01e7b: Enforce 32 pixel alignment for Adreno 200
Merge commit 'a2a01e7b3f6db152eab6f074ea4cc17c80ab52c4'

* commit 'a2a01e7b3f6db152eab6f074ea4cc17c80ab52c4':
  Enforce 32 pixel alignment for Adreno 200
2009-08-25 14:26:29 -07:00
Simon Wilson
fde8e11201 Enforce 32 pixel alignment for Adreno 200 2009-08-25 14:01:36 -07:00
Mathias Agopian
f6aa14c214 am dae6f22e: fix a bug with RGBX_8888 surfaces would be rendered incorrectly by the MDP.
Merge commit 'dae6f22eb3b062aee703886796645fa480c714aa'

* commit 'dae6f22eb3b062aee703886796645fa480c714aa':
  fix a bug with RGBX_8888 surfaces would be rendered incorrectly by the MDP.
2009-08-22 07:50:15 -07:00
Mathias Agopian
1e11826433 fix a bug with RGBX_8888 surfaces would be rendered incorrectly by the MDP. 2009-08-21 18:19:16 -07:00
Mathias Agopian
a8e047e59a am e84bc637: fix gralloc qsd8k. we actually don\'t need to use /pmem/gpu1, since the gpu is now able to use regular PMEM.
Merge commit 'e84bc637603d34b11a35658a7dbb511bc76aebda'

* commit 'e84bc637603d34b11a35658a7dbb511bc76aebda':
  fix gralloc qsd8k. we actually don't need to use /pmem/gpu1, since the gpu is now able to use regular PMEM.
2009-08-20 16:56:10 -07:00
Mathias Agopian
717cf60b7a fix gralloc qsd8k. we actually don't need to use /pmem/gpu1, since the gpu is now able to use regular PMEM.
this module is now closer to the generic gralloc module, although it will have to evolve in the near future.
2009-08-20 15:41:34 -07:00
Dima Zavin
2b961a3c8d am 5f6cd7bb: Update to the correct location of msm_hw3d.h - Fix build
Merge commit '5f6cd7bb896b3608c808ac41a6ed7a9f9c329e26'

* commit '5f6cd7bb896b3608c808ac41a6ed7a9f9c329e26':
  Update to the correct location of msm_hw3d.h - Fix build
2009-08-19 22:04:44 -07:00
Dima Zavin
dcb8e74a93 Update to the correct location of msm_hw3d.h - Fix build
Signed-off-by: Dima Zavin <dima@android.com>
2009-08-19 21:58:59 -07:00
Mathias Agopian
b7997567b8 am bef85866: use the same magic value for native_handle in 7k and 8k, since the handles are actually identical
Merge commit 'bef8586620c3d4f74d6f624804253f70cf5fd767'

* commit 'bef8586620c3d4f74d6f624804253f70cf5fd767':
  use the same magic value for native_handle in 7k and 8k, since the handles are actually identical
2009-08-19 16:49:39 -07:00
Mathias Agopian
bf21b57c58 am e544968d: fix the build
Merge commit 'e544968dac861e71de2b31056d8d80028b729cf9'

* commit 'e544968dac861e71de2b31056d8d80028b729cf9':
  fix the build
2009-08-19 16:49:38 -07:00
Mathias Agopian
4e219983b4 am e7d05d5e: make gralloc_priv.h for msm7k and qsd8k identical and C friendly
Merge commit 'e7d05d5e31803b94c2d468bddb0525c1cd3baafd'

* commit 'e7d05d5e31803b94c2d468bddb0525c1cd3baafd':
  make gralloc_priv.h for msm7k and qsd8k identical and C friendly
2009-08-19 16:49:36 -07:00
Mathias Agopian
878913ebde am ad641e7d: reenabled partial updates in msm7k/qsd8k
Merge commit 'ad641e7dda01a1fc787ee55e868344dce2c26fdb'

* commit 'ad641e7dda01a1fc787ee55e868344dce2c26fdb':
  reenabled partial updates in msm7k/qsd8k
2009-08-19 16:49:35 -07:00
Mathias Agopian
1fdfd9dd77 am 87808108: add (disabled) support for partial updates and use MDP for single-buffer framebuffer updates. the reason for this change is to make the msm7k and qsd8k modules as identical as possible.
Merge commit '878081087a3175f08d89452ac5af23609183e883'

* commit '878081087a3175f08d89452ac5af23609183e883':
  add (disabled) support for partial updates and use MDP for single-buffer framebuffer updates. the reason for this change is to make the msm7k and qsd8k modules as identical as possible.
2009-08-19 16:49:33 -07:00
Mathias Agopian
457768c408 am 79c9ceea: make gralloc-qsd8k closer to the generic gralloc so it\'s easier to maintain
Merge commit '79c9ceea6ec3ac708ec7e27ab3af54ffdaf9338f'

* commit '79c9ceea6ec3ac708ec7e27ab3af54ffdaf9338f':
  make gralloc-qsd8k closer to the generic gralloc so it's easier to maintain
2009-08-19 16:49:32 -07:00
Mathias Agopian
74542b1de5 am f882f8e2: update gralloc to match the generic version structure
Merge commit 'f882f8e29b6dca40cf93da467120e31b97e27d91'

* commit 'f882f8e29b6dca40cf93da467120e31b97e27d91':
  update gralloc to match the generic version structure
2009-08-19 16:49:30 -07:00
Mathias Agopian
854a1e77bb use the same magic value for native_handle in 7k and 8k, since the handles are actually identical 2009-08-19 15:16:48 -07:00
Mathias Agopian
faaf609f89 fix the build 2009-08-19 15:14:59 -07:00
Mathias Agopian
c779b2b67d make gralloc_priv.h for msm7k and qsd8k identical and C friendly 2009-08-19 14:17:17 -07:00
Mathias Agopian
6e83a30251 reenabled partial updates in msm7k/qsd8k 2009-08-19 13:45:02 -07:00
Mathias Agopian
6b8826c7c0 add (disabled) support for partial updates and use MDP for single-buffer framebuffer updates. the reason for this change is to make the msm7k and qsd8k modules as identical as possible. 2009-08-19 13:15:21 -07:00
Mathias Agopian
78087b2664 make gralloc-qsd8k closer to the generic gralloc so it's easier to maintain 2009-08-19 13:14:55 -07:00
Mathias Agopian
edc0cd6c3f update gralloc to match the generic version structure 2009-08-18 17:58:41 -07:00
Danke Xie
b1ab30f157 am 15e7acb8: librpc: fix bug in xdr_std_recv_bytes()
Merge commit '15e7acb85fc24dd6036027656dc354ce93ef9f20'

* commit '15e7acb85fc24dd6036027656dc354ce93ef9f20':
  librpc: fix bug in xdr_std_recv_bytes()
2009-08-14 15:13:24 -07:00
Danke Xie
1b8c82a0a2 librpc: fix bug in xdr_std_recv_bytes()
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-14 17:27:59 -04:00
Dima Zavin
26ded4c7c3 Fix merge for changes that were both in master and eclair
Merge commit '870718f0c3e27c9311e0c666059af16b34209509'
2009-08-13 19:12:20 -07:00
Dima Zavin
0c7b6963a6 gralloc8k: make sure to set the physical address of the framebuffer
Signed-off-by: Dima Zavin <dima@android.com>
2009-08-13 16:43:21 -07:00
Dima Zavin
0f1f4c1ac8 gralloc8k: fix partial updates, some cleanups
Signed-off-by: Dima Zavin <dima@android.com>
2009-08-13 16:43:19 -07:00
Dima Zavin
4799671722 qsd8k: add gralloc for 8k
Signed-off-by: Dima Zavin <dima@android.com>
2009-08-13 16:43:18 -07:00
Android (Google) Code Review
df80ef8941 Merge changes 20249,20250,21068
* changes:
  gralloc8k: make sure to set the physical address of the framebuffer
  gralloc8k: fix partial updates, some cleanups
  qsd8k: add gralloc for 8k
2009-08-13 16:36:34 -07:00
Eric Laurent
f3a1a6032c Fix issue 2001369 take 2.
The fix in build 8601 did not address the in call mode.
We now consider the headphones without mic as a valid device for phone strategy.
2009-08-13 09:27:45 -07:00
Eric Laurent
673e5375a4 Fix issue 2051565.
AudioPolicyManager must prevent that VOICE_CALL stream volume is changed while BT SCO route is on for voice call and also that BLUETOOTH_SCO stream volume is changed when BT SCO route is off.
This rule was only applied to volume change requests coming from outside AudioPolicyManager.
Make sure that this rule applies also to internal requests.
2009-08-13 02:29:09 -07:00
Dima Zavin
cbece3c829 gralloc8k: make sure to set the physical address of the framebuffer
Signed-off-by: Dima Zavin <dima@android.com>
2009-08-12 22:59:28 -07:00
Dima Zavin
3ad1a951ac gralloc8k: fix partial updates, some cleanups
Signed-off-by: Dima Zavin <dima@android.com>
2009-08-12 22:59:28 -07:00
Dima Zavin
c3cf7def5a qsd8k: add gralloc for 8k
Signed-off-by: Dima Zavin <dima@android.com>
2009-08-12 22:59:27 -07:00
Eric Laurent
1903ddedde Workaround for issue 2046783.
Apparently the problem is caused by the fact that A2dpAudioStreamOut::standby() calls a2dp_stop() after the headset has been powered down.
The workaround consists in indicating to A2DP audio hardware that a close request is pending and that stanby() must be bypassed.
2009-08-12 06:06:50 -07:00
Wu-cheng Li
a5c28285ed Merge commit '6df9ffc1' into manualmerge 2009-08-11 13:30:43 +08:00
Wu-cheng Li
9699cda001 Change the default effect value from "off" to "none". 2009-08-10 15:07:38 +08:00
Mathias Agopian
e4a7ee0e30 don't memset ashmem region, especially before they're mmapped 2009-08-08 17:01:42 -07:00
Mathias Agopian
5eabeaf821 add support for RGBX_8888. HOWEVER MDP doesn't support it yet, so we use XRGB which looks wrong for now 2009-08-07 20:56:29 -07:00
Mathias Agopian
32a0f80413 make sure to use the right 32-bit pixelformat on msm7k when using the gpu 2009-08-07 19:09:35 -07:00
Mathias Agopian
5b70faa81d make sure to clear surface's buffers when they are allocated 2009-08-07 18:12:56 -07:00