441 Commits

Author SHA1 Message Date
Eric Laurent
cede6340c2 am e9a480fe: am 50c579e8: am a4fe0167: Issue 2276684: Kernel audio driver should fully support AUDIO_SET_CONFIG.
Merge commit 'e9a480fe201677be5514dce651d0673b6c35cec6'

* commit 'e9a480fe201677be5514dce651d0673b6c35cec6':
  Issue 2276684: Kernel audio driver should fully support AUDIO_SET_CONFIG.
2009-11-23 08:23:02 -08:00
Eric Laurent
18bc60c29a am 50c579e8: am a4fe0167: Issue 2276684: Kernel audio driver should fully support AUDIO_SET_CONFIG.
Merge commit '50c579e86f257a7bc22e43c4c7b791994d38bb7e' into eclair-mr2-plus-aosp

* commit '50c579e86f257a7bc22e43c4c7b791994d38bb7e':
  Issue 2276684: Kernel audio driver should fully support AUDIO_SET_CONFIG.
2009-11-23 08:18:53 -08:00
Eric Laurent
e339ff0e60 am a4fe0167: Issue 2276684: Kernel audio driver should fully support AUDIO_SET_CONFIG.
Merge commit 'a4fe0167c6cad83d88b3bc56efa1ffad85b345b5' into eclair-mr2

* commit 'a4fe0167c6cad83d88b3bc56efa1ffad85b345b5':
  Issue 2276684: Kernel audio driver should fully support AUDIO_SET_CONFIG.
2009-11-20 12:23:03 -08:00
Eric Laurent
d8c81ab5d3 Issue 2276684: Kernel audio driver should fully support AUDIO_SET_CONFIG.
Align HAL audio input buffer size with kernel driver for the time being.

For mr2 release the driver shall support AUDIO_SET_CONFIG.
2009-11-20 09:57:40 -08:00
Jean-Michel Trivi
c12fcf997e am e6bb8325: am 0fd7c5be: am 58cf88a5: Patch from HTC related to use of camcorder with wired headset plugged in: - libaudio: incorrect ACDB setting was used when starting to record with wired headset. - libaudio: remove unnecessary audio path switch when camcorder
Merge commit 'e6bb8325b55cc1087d84004166a97d2b9bef98bb'

* commit 'e6bb8325b55cc1087d84004166a97d2b9bef98bb':
  Patch from HTC related to use of camcorder with wired headset plugged in:
2009-11-19 17:39:38 -08:00
Jean-Michel Trivi
2400a8a44c am 0fd7c5be: am 58cf88a5: Patch from HTC related to use of camcorder with wired headset plugged in: - libaudio: incorrect ACDB setting was used when starting to record with wired headset. - libaudio: remove unnecessary audio path switch when camcorder is started
Merge commit '0fd7c5be0e7e7f1013617ed2da24941c596a2137' into eclair-mr2-plus-aosp

* commit '0fd7c5be0e7e7f1013617ed2da24941c596a2137':
  Patch from HTC related to use of camcorder with wired headset plugged in:
2009-11-19 11:48:53 -08:00
Jean-Michel Trivi
075640c97d am 58cf88a5: Patch from HTC related to use of camcorder with wired headset plugged in: - libaudio: incorrect ACDB setting was used when starting to record with wired headset. - libaudio: remove unnecessary audio path switch when camcorder is started with wired he
Merge commit '58cf88a5a91d82ae2fb3e23365eaa4524a9cd089' into eclair-mr2

* commit '58cf88a5a91d82ae2fb3e23365eaa4524a9cd089':
  Patch from HTC related to use of camcorder with wired headset plugged in:
2009-11-19 11:41:10 -08:00
Jean-Michel Trivi
e00f5f2bb9 Patch from HTC related to use of camcorder with wired headset plugged in:
- libaudio: incorrect ACDB setting was used when starting to record
   with wired headset.
- libaudio: remove unnecessary audio path switch when camcorder is started
  with wired headset.
Submitted on behalf of HK Chen <hk_chen@htc.com>
2009-11-18 19:32:44 -08:00
Jean-Michel Trivi
59f56ea9b9 am b1eac5ed: am 28306cf7: am f8d3aebe: Remove workaround introduced in 956f7ba5ee0f087c91b5fefd2718dae30f8c1e29 to fix issue 2229040. This workaround is considered no longer useful by HTC since the changes in the A1026 configuration. Removing workaround on behalf of H
Merge commit 'b1eac5edfbe4d0eb12c96d5da7ceeb54e290b1ad'

* commit 'b1eac5edfbe4d0eb12c96d5da7ceeb54e290b1ad':
  Remove workaround introduced in 956f7ba5ee0f087c91b5fefd2718dae30f8c1e29
2009-11-17 07:31:46 -08:00
Eric Laurent
38c902e1a6 am 3008e8f5: am 0a210585: am 979de023: Fix issue 2245963: incoming call rings in ringtone-volume level through a wired headset is while listening to music.
Merge commit '3008e8f5b947d7b7f88427dcf54f11e800d007df'

* commit '3008e8f5b947d7b7f88427dcf54f11e800d007df':
  Fix issue 2245963: incoming call rings in ringtone-volume level through a wired headset is while listening to music.
2009-11-17 07:31:42 -08:00
Jean-Michel Trivi
7d53bb2164 am 28306cf7: am f8d3aebe: Remove workaround introduced in 956f7ba5ee0f087c91b5fefd2718dae30f8c1e29 to fix issue 2229040. This workaround is considered no longer useful by HTC since the changes in the A1026 configuration. Removing workaround on behalf of HK Chen (HTC).
Merge commit '28306cf74f6662f3dfa0748e6430b965427983cf' into eclair-mr2-plus-aosp

* commit '28306cf74f6662f3dfa0748e6430b965427983cf':
  Remove workaround introduced in 956f7ba5ee0f087c91b5fefd2718dae30f8c1e29
2009-11-16 14:39:02 -08:00
Eric Laurent
4102e0b5d0 am 0a210585: am 979de023: Fix issue 2245963: incoming call rings in ringtone-volume level through a wired headset is while listening to music.
Merge commit '0a210585758e1b3ede232b9dddb1494a55dc157a' into eclair-mr2-plus-aosp

* commit '0a210585758e1b3ede232b9dddb1494a55dc157a':
  Fix issue 2245963: incoming call rings in ringtone-volume level through a wired headset is while listening to music.
2009-11-16 14:38:59 -08:00
Jean-Michel Trivi
78028e9769 am f8d3aebe: Remove workaround introduced in 956f7ba5ee0f087c91b5fefd2718dae30f8c1e29 to fix issue 2229040. This workaround is considered no longer useful by HTC since the changes in the A1026 configuration. Removing workaround on behalf of HK Chen (HTC).
Merge commit 'f8d3aebe4c19283eb34fb89e5932b3399d3bd753' into eclair-mr2

* commit 'f8d3aebe4c19283eb34fb89e5932b3399d3bd753':
  Remove workaround introduced in 956f7ba5ee0f087c91b5fefd2718dae30f8c1e29
2009-11-16 10:43:55 -08:00
Eric Laurent
8dbccbb73f am 979de023: Fix issue 2245963: incoming call rings in ringtone-volume level through a wired headset is while listening to music.
Merge commit '979de023050ebe82680c665259fc833b0a17d3f5' into eclair-mr2

* commit '979de023050ebe82680c665259fc833b0a17d3f5':
  Fix issue 2245963: incoming call rings in ringtone-volume level through a wired headset is while listening to music.
2009-11-16 10:43:52 -08:00
Jean-Baptiste Queru
ce454bad43 am ae89e9cd: merge from open-source master
Merge commit 'ae89e9cd8b6bbdb578e64d51939a34a6d129e6f9'

* commit 'ae89e9cd8b6bbdb578e64d51939a34a6d129e6f9':
  eclair snapshot
2009-11-15 15:10:02 -08:00
Jean-Baptiste Queru
2ba3104dbc merge from open-source master 2009-11-15 14:55:21 -08:00
Jean-Baptiste Queru
ba6bb43382 merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
2009-11-15 14:06:34 -08:00
Jean-Michel Trivi
b5f536cb89 Remove workaround introduced in 956f7ba5ee0f087c91b5fefd2718dae30f8c1e29
to fix issue 2229040. This workaround is considered no longer useful
by HTC since the changes in the A1026 configuration.
Removing workaround on behalf of HK Chen (HTC).
2009-11-15 13:48:42 -08:00
Jean-Baptiste Queru
873dd3316f merge from eclair 2009-11-15 12:06:41 -08:00
Eric Laurent
dc2b08fd2a Fix issue 2245963: incoming call rings in ringtone-volume level through a wired headset is while listening to music.
When the ringtone is not looped (non factory ringtone), a new AudioTrack is started every time the ringtone is repeated. The second time the track is started, the condition that triggers volume limitation is not true any more as music has been stopped for more than SONIFICATION_HEADSET_MUSIC_DELAY seconds and ringtone volume is not limited.

The fix consists in checking the condition (music playing or stopped for less than SONIFICATION_HEADSET_MUSIC_DELAY) when entering ringtone mode and latch it until we exit ringtone mode.
2009-11-13 02:57:12 -08:00
Eric Laurent
c682bc3e4d am ecc9989f: am 0d93253c: am dd65e389: Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
Merge commit 'ecc9989f2c8394cad87ad4ebcb4f6b9f7706861c'

* commit 'ecc9989f2c8394cad87ad4ebcb4f6b9f7706861c':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-12 23:23:55 -08:00
Eric Laurent
d64d406883 am 0d93253c: am dd65e389: Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
Merge commit '0d93253c31af46df60283329daa44db74f81dde4' into eclair-mr2-plus-aosp

* commit '0d93253c31af46df60283329daa44db74f81dde4':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-12 23:18:20 -08:00
Eric Laurent
b89ce69b11 am dd65e389: Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
Merge commit 'dd65e38951ed174f9d3d34886795438440f7eea0' into eclair-mr2

* commit 'dd65e38951ed174f9d3d34886795438440f7eea0':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-12 23:10:22 -08:00
Eric Laurent
50b4c8d87f am dd65e389: Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
Merge commit 'dd65e38951ed174f9d3d34886795438440f7eea0' into eclair-plus-aosp

* commit 'dd65e38951ed174f9d3d34886795438440f7eea0':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-12 22:49:55 -08:00
Jean-Baptiste Queru
81cd37b750 eclair snapshot 2009-11-12 18:46:07 -08:00
Eric Laurent
b0987a90f9 Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
Removed platform specific devices from the list of devices listed in AudioSystem.
2009-11-12 12:18:31 -08:00
Mathias Agopian
f754afe950 am 90626684: am bcd5273d: am 072b5f0d: Merge change I42e2860a into eclair
Merge commit '90626684d776a54dfeb3fade05f0b356a52e880a'

* commit '90626684d776a54dfeb3fade05f0b356a52e880a':
  should help [2223746] qsd8k MDP locks up, logs show copyBits failed (Connection timed out) in Passion camera zoom level 1
2009-11-11 17:39:54 -08:00
Eric Laurent
f5286df0dd am 274334cc: am d285af56: am 956f7ba5: Workaround for issue 2229040: [Passion] Audio driver stuck when changing input routing while recording is active.
Merge commit '274334ccea85996b5b23eebf8111b6e55d20b162'

* commit '274334ccea85996b5b23eebf8111b6e55d20b162':
  Workaround for issue 2229040: 	[Passion] Audio driver stuck when changing input routing while recording is active.
2009-11-11 17:39:51 -08:00
Mathias Agopian
2376dcc6f6 am bcd5273d: am 072b5f0d: Merge change I42e2860a into eclair
Merge commit 'bcd5273d6aa77cc961261202c8c9eee950ddc8b7' into eclair-mr2-plus-aosp

* commit 'bcd5273d6aa77cc961261202c8c9eee950ddc8b7':
  should help [2223746] qsd8k MDP locks up, logs show copyBits failed (Connection timed out) in Passion camera zoom level 1
2009-11-11 17:28:53 -08:00
Eric Laurent
51bc3712bd am d285af56: am 956f7ba5: Workaround for issue 2229040: [Passion] Audio driver stuck when changing input routing while recording is active.
Merge commit 'd285af5636ac54b37da3b4048b17855ac9c32a42' into eclair-mr2-plus-aosp

* commit 'd285af5636ac54b37da3b4048b17855ac9c32a42':
  Workaround for issue 2229040: 	[Passion] Audio driver stuck when changing input routing while recording is active.
2009-11-11 17:28:49 -08:00
Mathias Agopian
619e0358c9 am 072b5f0d: Merge change I42e2860a into eclair
Merge commit '072b5f0df424b2a0c50cdb7b605d3a749dcac7cf' into eclair-mr2

* commit '072b5f0df424b2a0c50cdb7b605d3a749dcac7cf':
  should help [2223746] qsd8k MDP locks up, logs show copyBits failed (Connection timed out) in Passion camera zoom level 1
2009-11-11 17:16:09 -08:00
Eric Laurent
419618500a am 956f7ba5: Workaround for issue 2229040: [Passion] Audio driver stuck when changing input routing while recording is active.
Merge commit '956f7ba5ee0f087c91b5fefd2718dae30f8c1e29' into eclair-mr2

* commit '956f7ba5ee0f087c91b5fefd2718dae30f8c1e29':
  Workaround for issue 2229040: 	[Passion] Audio driver stuck when changing input routing while recording is active.
2009-11-11 17:16:05 -08:00
Mathias Agopian
3f492f927e am 072b5f0d: Merge change I42e2860a into eclair
Merge commit '072b5f0df424b2a0c50cdb7b605d3a749dcac7cf' into eclair-plus-aosp

* commit '072b5f0df424b2a0c50cdb7b605d3a749dcac7cf':
  should help [2223746] qsd8k MDP locks up, logs show copyBits failed (Connection timed out) in Passion camera zoom level 1
2009-11-11 16:47:44 -08:00
Eric Laurent
837588691e am 956f7ba5: Workaround for issue 2229040: [Passion] Audio driver stuck when changing input routing while recording is active.
Merge commit '956f7ba5ee0f087c91b5fefd2718dae30f8c1e29' into eclair-plus-aosp

* commit '956f7ba5ee0f087c91b5fefd2718dae30f8c1e29':
  Workaround for issue 2229040: 	[Passion] Audio driver stuck when changing input routing while recording is active.
2009-11-11 16:47:41 -08:00
Android (Google) Code Review
e961f58156 Merge change I42e2860a into eclair
* changes:
  should help [2223746] qsd8k MDP locks up, logs show copyBits failed (Connection timed out) in Passion camera zoom level 1
2009-11-11 16:45:41 -08:00
Mathias Agopian
ef686c51fd should help [2223746] qsd8k MDP locks up, logs show copyBits failed (Connection timed out) in Passion camera zoom level 1
make sure to return an error when mdp limits are exceeded
2009-11-11 16:28:21 -08:00
Eric Laurent
e210a8ccce Workaround for issue 2229040: [Passion] Audio driver stuck when changing input routing while recording is active.
This change avoids the audio driver lockup when changing audio input path configuration. It does not solve the root cause in audio driver or dsp.
When applied lockups observed in the folling use cases are eliminated:
- use back mic for camcorder recording (issue 2194140)
- switch input device when headset is plugged in or out during record (issue 2226658).

Also removes warnings.

	Submitted on behalf of H.K Chen <hk_chen@htc.com>
2009-11-11 10:49:32 -08:00
Iliyan Malchev
aab6275034 am 1d902f52: am 8495e338: am d74adff0: Merge change I08516fe5 into eclair
Merge commit '1d902f5294b6c476e81f2ba666bdd4fc6b6d2700'

* commit '1d902f5294b6c476e81f2ba666bdd4fc6b6d2700':
  libaudio-qsd8k: update a1026.h header and improve firmware-loading code
2009-11-10 18:15:58 -08:00
Iliyan Malchev
e085b18294 am 8495e338: am d74adff0: Merge change I08516fe5 into eclair
Merge commit '8495e3383d78fab7b281dc8f1f1233e07cfea21b' into eclair-mr2-plus-aosp

* commit '8495e3383d78fab7b281dc8f1f1233e07cfea21b':
  libaudio-qsd8k: update a1026.h header and improve firmware-loading code
2009-11-10 18:12:21 -08:00
Iliyan Malchev
63100efee5 am d74adff0: Merge change I08516fe5 into eclair
Merge commit 'd74adff01615816857b075325ffa01eb8a58e854' into eclair-mr2

* commit 'd74adff01615816857b075325ffa01eb8a58e854':
  libaudio-qsd8k: update a1026.h header and improve firmware-loading code
2009-11-10 18:07:07 -08:00
Iliyan Malchev
77e99e9010 am d74adff0: Merge change I08516fe5 into eclair
Merge commit 'd74adff01615816857b075325ffa01eb8a58e854' into eclair-plus-aosp

* commit 'd74adff01615816857b075325ffa01eb8a58e854':
  libaudio-qsd8k: update a1026.h header and improve firmware-loading code
2009-11-10 15:25:17 -08:00
Android (Google) Code Review
a6675bb910 Merge change I08516fe5 into eclair
* changes:
  libaudio-qsd8k: update a1026.h header and improve firmware-loading code
2009-11-10 15:20:02 -08:00
Eric Laurent
5939d8ca05 am 4ad4ab29: am 5fd5d902: am f06a9889: Merge change I108ada59 into eclair
Merge commit '4ad4ab296ba6bb90322ee2780e05a33c67883089'

* commit '4ad4ab296ba6bb90322ee2780e05a33c67883089':
  Fix issue 2226658: Audio path not updated when a headset is plugged or unplugged while recording.
2009-11-09 22:48:05 -08:00
Eric Laurent
097d3433bf am 5fd5d902: am f06a9889: Merge change I108ada59 into eclair
Merge commit '5fd5d902775cbdb0e9498c6708b99316de8e3e17' into eclair-mr2-plus-aosp

* commit '5fd5d902775cbdb0e9498c6708b99316de8e3e17':
  Fix issue 2226658: Audio path not updated when a headset is plugged or unplugged while recording.
2009-11-09 22:45:23 -08:00
Eric Laurent
2dd94cf938 am f06a9889: Merge change I108ada59 into eclair
Merge commit 'f06a9889288034e9bd3e54fbae3bb48ad7bd3f89' into eclair-mr2

* commit 'f06a9889288034e9bd3e54fbae3bb48ad7bd3f89':
  Fix issue 2226658: Audio path not updated when a headset is plugged or unplugged while recording.
2009-11-09 22:42:16 -08:00
Eric Laurent
3efd016543 am f06a9889: Merge change I108ada59 into eclair
Merge commit 'f06a9889288034e9bd3e54fbae3bb48ad7bd3f89' into eclair-plus-aosp

* commit 'f06a9889288034e9bd3e54fbae3bb48ad7bd3f89':
  Fix issue 2226658: Audio path not updated when a headset is plugged or unplugged while recording.
2009-11-09 22:41:56 -08:00
Android (Google) Code Review
05a1ef9930 Merge change I108ada59 into eclair
* changes:
  Fix issue 2226658: Audio path not updated when a headset is plugged or unplugged while recording.
2009-11-09 22:39:39 -08:00
Mathias Agopian
3f3f01f33f am 54dc5807: am 97772930: am b7f7f038: enable mdp debugging on error, also check for invalid inputs
Merge commit '54dc5807fe74b1d94e9c9ef52dd6929200aa0b80'

* commit '54dc5807fe74b1d94e9c9ef52dd6929200aa0b80':
  enable mdp debugging on error, also check for invalid inputs
2009-11-09 20:24:34 -08:00
Mathias Agopian
d6580e4a75 am 97772930: am b7f7f038: enable mdp debugging on error, also check for invalid inputs
Merge commit '977729303ce0a5609b3ddbd36e6801d8397ff5c4' into eclair-mr2-plus-aosp

* commit '977729303ce0a5609b3ddbd36e6801d8397ff5c4':
  enable mdp debugging on error, also check for invalid inputs
2009-11-09 20:21:46 -08:00
Mathias Agopian
8e72981f86 am b7f7f038: enable mdp debugging on error, also check for invalid inputs
Merge commit 'b7f7f038529135a5c21234ae89e4b87a1c56854a' into eclair-mr2

* commit 'b7f7f038529135a5c21234ae89e4b87a1c56854a':
  enable mdp debugging on error, also check for invalid inputs
2009-11-09 20:19:58 -08:00