532 Commits

Author SHA1 Message Date
Mathias Agopian
e9f20b8bb1 Merge "part of fix for [2363506] [Sapphire] Video playback broken" 2010-01-20 13:44:47 -08:00
Mathias Agopian
fd92f42c39 part of fix for [2363506] [Sapphire] Video playback broken
make sure to reject incompatible buffers in special function
  GRALLOC_MODULE_PERFORM_CREATE_HANDLE_FROM_BUFFER

we use ioctl(PMEM_GET_SIZE) to validate that the given buffer is indeed
a pmem buffer.
2010-01-20 13:22:35 -08:00
Eric Laurent
6ea73d4d15 Merge "Create base class for audio policy manager." 2010-01-20 10:03:54 -08:00
Jean-Michel Trivi
15d4830e82 am f8bb5674: am a73c739f: Patch from HTC: fine-tuned acoustic parameters for car-dock wasn\'t loaded correctly.
Merge commit 'f8bb5674bf8d7c4890a021b01bab4f0a0aaa661c'

* commit 'f8bb5674bf8d7c4890a021b01bab4f0a0aaa661c':
  Patch from HTC: fine-tuned acoustic parameters for car-dock wasn't loaded correctly.
2010-01-13 16:40:47 -08:00
Jean-Michel Trivi
9a3a36b091 am a73c739f: Patch from HTC: fine-tuned acoustic parameters for car-dock wasn\'t loaded correctly.
Merge commit 'a73c739fbc7641c4d81960328aced549ef3f5c0b' into eclair-plus-aosp

* commit 'a73c739fbc7641c4d81960328aced549ef3f5c0b':
  Patch from HTC: fine-tuned acoustic parameters for car-dock wasn't loaded correctly.
2010-01-13 16:37:48 -08:00
Jean-Michel Trivi
54c67204c7 Patch from HTC: fine-tuned acoustic parameters for car-dock wasn't loaded correctly. 2010-01-13 16:11:52 -08:00
Eric Laurent
94cd0af537 Create base class for audio policy manager.
First implementations of audio policy manager in Eclair branch have shown that most code is common to all platforms.
Creating AudioPolicyManagerBase base class will improve code maintainability and readability.
2010-01-13 14:23:26 -08:00
Eric Laurent
1ec76adf9f am cc10c5e9: am 372b6255: Fix issue 2336461: [Passion] one issue about in-call downlink volume degration.
Merge commit 'cc10c5e9e10a04e9cb7d0f24027105f0d399ba1f'

* commit 'cc10c5e9e10a04e9cb7d0f24027105f0d399ba1f':
  Fix issue 2336461: [Passion] one issue about in-call downlink volume degration.
2010-01-11 13:51:39 -08:00
Eric Laurent
1e4eb98d7f am 372b6255: Fix issue 2336461: [Passion] one issue about in-call downlink volume degration.
Merge commit '372b6255604d1c54d31e79f1ea31472fe5bc8956' into eclair-plus-aosp

* commit '372b6255604d1c54d31e79f1ea31472fe5bc8956':
  Fix issue 2336461: [Passion] one issue about in-call downlink volume degration.
2010-01-11 12:26:18 -08:00
Joe Onorato
c75e97e555 less log spew 2010-01-07 21:48:55 -05:00
Eric Laurent
ad9454a375 Fix issue 2336461: [Passion] one issue about in-call downlink volume degration.
This change reverts modifications made earlier on software voice volume control in audio policy manager.
These modifications are not needed anymore and are partly responsible of this issue now that voice volume is controlled by audio DSP.
2009-12-23 02:40:46 -08:00
Eric Laurent
7308a49a36 am 54e025fb: am 7500eded: Fix issues 2333450 and 2333559:
Merge commit '54e025fbc43420fae17d7bb56407fab74c4945b7'

* commit '54e025fbc43420fae17d7bb56407fab74c4945b7':
  Fix issues 2333450 and 2333559:
2009-12-22 23:46:21 -08:00
Eric Laurent
1d3e56aaa2 am 7500eded: Fix issues 2333450 and 2333559:
Merge commit '7500eded35ce173525d7fc1e8172679188d3b33a' into eclair-plus-aosp

* commit '7500eded35ce173525d7fc1e8172679188d3b33a':
  Fix issues 2333450 and 2333559:
2009-12-22 23:42:05 -08:00
Eric Laurent
747fe9dee4 Fix issues 2333450 and 2333559:
Add new config values for usage AudioSystem::FOR_DOCK in setForceUse() to differenciate car and desk docks.
For the desk dock, the sonification strategy will use the phone speaker only as there is no guaranty that
a device is connected to the dock's output jack.
For the car dock, the sonification strategy will use the A2DP output as before.
2009-12-17 10:25:47 -08:00
Android (Google) Code Review
208afbe3e2 Merge change If41d4088
* changes:
  simplify the lock/unlock hooks of msm7k gralloc
2009-12-16 14:31:00 -08:00
Jean-Michel Trivi
c6c0cca71c am eb3af645: am 9ffa8682: Use the media.enable1026 system property to indicate whether the dual microphone noise suppression should be used during a phone call in handset mode. The disabling is performed by using the same A1026 settings as those used in Voice Recognit
Merge commit 'eb3af645781d858eea3bccfe193411e23474e11d'

* commit 'eb3af645781d858eea3bccfe193411e23474e11d':
  Use the media.enable1026 system property to indicate whether the
2009-12-16 13:06:12 -08:00
Jean-Michel Trivi
b188c2ad08 am 9ffa8682: Use the media.enable1026 system property to indicate whether the dual microphone noise suppression should be used during a phone call in handset mode. The disabling is performed by using the same A1026 settings as those used in Voice Recognition when not
Merge commit '9ffa86825c57c8bf82669b438bd0e8feb865d4b7' into eclair-plus-aosp

* commit '9ffa86825c57c8bf82669b438bd0e8feb865d4b7':
  Use the media.enable1026 system property to indicate whether the
2009-12-16 13:02:43 -08:00
Jean-Michel Trivi
44f3cda621 Use the media.enable1026 system property to indicate whether the
dual microphone noise suppression should be used during a phone call
in handset mode. The disabling is performed by using the same A1026
settings as those used in Voice Recognition when not using the
Noise Suppression algorithm. This mode uses the exact same input
and gains as the incall receiver mode (A1026_PATH_INCALL_RECEIVER)
A new mode (A1026_PATH_INCALL_NO_NS_RECEIVER) is defined for code
clarity.
2009-12-15 20:43:36 -08:00
Mathias Agopian
e72eb0c833 simplify the lock/unlock hooks of msm7k gralloc
this gralloc module is only used on msm7k and doesn't need
synchronization in lock/unlock because we don't allow EGLImageKHR
with the GPU renderer on this platform.

hopefully this will remove some of the confusion about how gralloc
should be implemented.
2009-12-15 17:19:46 -08:00
Android Git Automerger
83db4d97be Merge commit 'goog/eclair-plus-aosp' 2009-12-15 00:44:45 -08:00
Eric Laurent
b2128ff471 am 6a5d84a3: am 82f9e100: am e0042598: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
Merge commit '6a5d84a36d894b4ac24d51b592e20d842397e0f1'

* commit '6a5d84a36d894b4ac24d51b592e20d842397e0f1':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
2009-12-14 15:29:45 -08:00
Eric Laurent
458014e402 am 82f9e100: am e0042598: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
Merge commit '82f9e10095156bbfdd208216c286304ea0dad260' into eclair-mr2-plus-aosp

* commit '82f9e10095156bbfdd208216c286304ea0dad260':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
2009-12-14 12:08:16 -08:00
Eric Laurent
6b84c7deaf am e0042598: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
Merge commit 'e0042598585e4ad8b74561c00511bf85c9bf88f8' into eclair-mr2

* commit 'e0042598585e4ad8b74561c00511bf85c9bf88f8':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
2009-12-14 10:51:38 -08:00
Eric Laurent
0c8b243d33 am e0042598: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
Merge commit 'e0042598585e4ad8b74561c00511bf85c9bf88f8' into eclair-plus-aosp

* commit 'e0042598585e4ad8b74561c00511bf85c9bf88f8':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
2009-12-14 10:51:37 -08:00
Eric Laurent
c7e6a92679 Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
This correction in AudioPolicyManager does not directly fix the issue but a potential problem identified when working on the resolution.
The problem is that audio output path is not updated immediately when a headset is unplugged if music or notifications are active. This is however not observable because:
- music is paused by music app when the headset is unplugged, and correct path is re-established when music is resumed.
- ringtones and notifications are playing on both headset and speaker and are still audible on speaker when the headset is unplugged even if
the actual output path is not changed to speaker only.

There could be an impact on applications using MUSIC stream and not reacting to Intent AudioManager.ACTION_AUDIO_BECOMING_NOISY though.
2009-12-14 02:56:04 -08:00
Dima Zavin
a08cfad71d am 57d3b368: am 6a6befc0: am 2754389d: gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
Merge commit '57d3b3680a6d37ffe04e1f24be25b4907bcbaa20'

* commit '57d3b3680a6d37ffe04e1f24be25b4907bcbaa20':
  gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
2009-12-10 23:45:13 -08:00
Dima Zavin
3365529b73 am 6a6befc0: am 2754389d: gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
Merge commit '6a6befc0430820ab5d837694f1b71b63c34f8b14' into eclair-mr2-plus-aosp

* commit '6a6befc0430820ab5d837694f1b71b63c34f8b14':
  gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
2009-12-10 18:08:20 -08:00
Dima Zavin
8533232290 am 2754389d: gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
Merge commit '2754389d0e7638b3065ecb3c965b1f262d2205ed' into eclair-mr2

* commit '2754389d0e7638b3065ecb3c965b1f262d2205ed':
  gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
2009-12-10 17:56:59 -08:00
Jean-Michel Trivi
cc95936aec am 39098205: am 259ede35: am 9df12adc: Merge change I667fff6d into eclair
Merge commit '3909820584e35b696f8387bda4313fb417cd8ab0'

* commit '3909820584e35b696f8387bda4313fb417cd8ab0':
  Fix bug 2111240 When docked to a BT dock, give priority to wired
2009-12-10 17:15:33 -08:00
Mathias Agopian
fe59112b7b am 96a46011: am 8efc64ae: am f7e40a33: improve cache behavior of gralloc allocations on qsd8k
Merge commit '96a460114cfb663789c6990e56a17325bea1ecda'

* commit '96a460114cfb663789c6990e56a17325bea1ecda':
  improve cache behavior of gralloc allocations on qsd8k
2009-12-10 17:15:30 -08:00
Jean-Michel Trivi
dfa9174e19 am 259ede35: am 9df12adc: Merge change I667fff6d into eclair
Merge commit '259ede35b4d8d50d0394624780733e4c061fbe7e' into eclair-mr2-plus-aosp

* commit '259ede35b4d8d50d0394624780733e4c061fbe7e':
  Fix bug 2111240 When docked to a BT dock, give priority to wired
2009-12-10 16:58:42 -08:00
Mathias Agopian
d36a65ee14 am 8efc64ae: am f7e40a33: improve cache behavior of gralloc allocations on qsd8k
Merge commit '8efc64aec14e80e7dff8eb4e7708195c6d693ec8' into eclair-mr2-plus-aosp

* commit '8efc64aec14e80e7dff8eb4e7708195c6d693ec8':
  improve cache behavior of gralloc allocations on qsd8k
2009-12-10 16:58:39 -08:00
Jean-Michel Trivi
7f32c36ce4 am 9df12adc: Merge change I667fff6d into eclair
Merge commit '9df12adc2ff87eef733b948255f2960ca070981a' into eclair-mr2

* commit '9df12adc2ff87eef733b948255f2960ca070981a':
  Fix bug 2111240 When docked to a BT dock, give priority to wired
2009-12-10 16:46:17 -08:00
Mathias Agopian
cbe53680bf am f7e40a33: improve cache behavior of gralloc allocations on qsd8k
Merge commit 'f7e40a3311ae78b3edd9259980c224a5a9d91653' into eclair-mr2

* commit 'f7e40a3311ae78b3edd9259980c224a5a9d91653':
  improve cache behavior of gralloc allocations on qsd8k
2009-12-10 16:43:17 -08:00
Dima Zavin
be70353ef5 am 2754389d: gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
Merge commit '2754389d0e7638b3065ecb3c965b1f262d2205ed' into eclair-plus-aosp

* commit '2754389d0e7638b3065ecb3c965b1f262d2205ed':
  gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
2009-12-09 21:19:13 -08:00
Dima Zavin
7e8932dad3 gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
Change-Id: Ic05b895c09a55d746c737aa0c3356edc511d7c96
Signed-off-by: Dima Zavin <dima@android.com>
2009-12-09 21:13:44 -08:00
Jean-Michel Trivi
7a6a73ce90 am 9df12adc: Merge change I667fff6d into eclair
Merge commit '9df12adc2ff87eef733b948255f2960ca070981a' into eclair-plus-aosp

* commit '9df12adc2ff87eef733b948255f2960ca070981a':
  Fix bug 2111240 When docked to a BT dock, give priority to wired
2009-12-09 11:50:40 -08:00
Android (Google) Code Review
8451e38453 Merge change I667fff6d into eclair
* changes:
  Fix bug 2111240 When docked to a BT dock, give priority to wired accessories over BT, and don't duplicate outputs for notifications.
2009-12-09 11:47:01 -08:00
Jean-Michel Trivi
4fc9cbccc1 Fix bug 2111240 When docked to a BT dock, give priority to wired
accessories over BT, and don't duplicate outputs for notifications.
2009-12-09 10:32:03 -08:00
Mathias Agopian
f0b1589f21 am f7e40a33: improve cache behavior of gralloc allocations on qsd8k
Merge commit 'f7e40a3311ae78b3edd9259980c224a5a9d91653' into eclair-plus-aosp

* commit 'f7e40a3311ae78b3edd9259980c224a5a9d91653':
  improve cache behavior of gralloc allocations on qsd8k
2009-12-09 05:36:20 -08:00
Mathias Agopian
e17d093d0c improve cache behavior of gralloc allocations on qsd8k
make sure to use cached buffers only when frequent cpu access is needed.
also, always flush buffers after they are allocated and cleared.
2009-12-08 19:34:43 -08:00
Eric Laurent
9fcfda77c8 am 894b48e4: am 15793970: am 9c3ea922: Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Merge commit '894b48e4552c5375bebf6bae6a238013aeca9e06'

* commit '894b48e4552c5375bebf6bae6a238013aeca9e06':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 18:34:21 -08:00
Dima Zavin
d46f8cce63 am 798bd593: am 288cb24b: am dc80f522: gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
Merge commit '798bd5939d62e6c064832880830476735d9ea52d'

* commit '798bd5939d62e6c064832880830476735d9ea52d':
  gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
2009-12-07 14:57:42 -08:00
Dima Zavin
dd235fc679 am 4842a5ea: am 7422163d: am c3f00492: gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
Merge commit '4842a5eaee0b93950297f52dd1ce56d13f7628eb'

* commit '4842a5eaee0b93950297f52dd1ce56d13f7628eb':
  gralloc-qsd8k: Change composition_complete being a glfinish from stopship to a TODO
2009-12-07 14:57:22 -08:00
Eric Laurent
538a0e3f43 am 93aac87b: am dc8efbf8: am cda6ed31: Fix issue 2304701: Media streams can remain muted on A2DP output.
Merge commit '93aac87b8b9498c117f59c643779dacd3ca1dc73'

* commit '93aac87b8b9498c117f59c643779dacd3ca1dc73':
  Fix issue 2304701: Media streams can remain muted on A2DP output.
2009-12-07 14:57:18 -08:00
Eric Laurent
baedcde0f0 am 15793970: am 9c3ea922: Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Merge commit '15793970b52db6b64ee3d0c591287200fd882429' into eclair-mr2-plus-aosp

* commit '15793970b52db6b64ee3d0c591287200fd882429':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 11:06:24 -08:00
Eric Laurent
f8e13f24f5 am 9c3ea922: Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Merge commit '9c3ea9222f761ae445062a706d77804fcc7a5703' into eclair-plus-aosp

* commit '9c3ea9222f761ae445062a706d77804fcc7a5703':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 11:03:45 -08:00
Eric Laurent
5bfddd3d45 am 9c3ea922: Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Merge commit '9c3ea9222f761ae445062a706d77804fcc7a5703' into eclair-mr2

* commit '9c3ea9222f761ae445062a706d77804fcc7a5703':
  Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
2009-12-07 11:03:21 -08:00
Eric Laurent
148f11328f Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Fixed AudioPolicyManager::getInput() broken in change ddb78e7753be03937ad57ce7c3c842c52bdad65e
so that an invalid IO handle (0) is returned in case of failure.
Applied the same correction to getOutput().
2009-12-07 04:23:46 -08:00
Dima Zavin
12bfa4344a am 288cb24b: am dc80f522: gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
Merge commit '288cb24be01d065843a2a98ed6c0fdbb5faa8268' into eclair-mr2-plus-aosp

* commit '288cb24be01d065843a2a98ed6c0fdbb5faa8268':
  gralloc-qsd8k: If using gpu composition, request rgba8888 instead of rgbx8888
2009-12-04 20:28:16 -08:00