Paul McLean
9ab869acfd
Technical Debt Paydown - move/rename files
...
Moved audio (alsa actually) utils files to system/core/alsa_utils.
Renamed "audio" utilities to "alsa" to better relect their purpose.
Renamed audio_hw.c -> to audio_hal. c to better reflect its purpose.
Change-Id: I67c7d47ee02abafd3e12c4c99d605a62e0f59122
2015-01-13 09:37:06 -08:00
Eric Laurent
5b16836d67
am e6499429
: Merge commit \'83b47a68\' into manualmerge
...
* commit 'e64994292cb02fae66f04002e1121d29979503d1':
usb audio: Fix incorrect bytes returned for recording
2015-01-10 01:13:38 +00:00
Eric Laurent
e64994292c
Merge commit '83b47a68' into manualmerge
2015-01-09 17:04:40 -08:00
Paul McLean
31844086a6
Merge "Multi-USB device support & read device on open."
2015-01-09 23:11:44 +00:00
Pavan Chikkala
83b47a6891
usb audio: Fix incorrect bytes returned for recording
...
In a recording session , the number of bytes read is
not updated when pcm_read() fails. This results in
silence/invalid data being added during a device switch
from USB headset to handset.
Fix is to reset the number of bytes read if pcm_read()
returns an error indicating removal of USB headset.
Bug: 18611518
Change-Id: I10d578c3cf1037c90a891e63be2bd1c2b7e6126b
2015-01-09 14:14:41 -08:00
Eric Laurent
c654dc6c1f
am 7e9abab1
: am b338957d
: Merge "usbaudio: Return 0 bytes on failure in capture"
...
* commit '7e9abab1940091b4c4d7589160855870fdda437e':
usbaudio: Return 0 bytes on failure in capture
2015-01-09 18:04:14 +00:00
Eric Laurent
7e9abab194
am b338957d
: Merge "usbaudio: Return 0 bytes on failure in capture"
...
* commit 'b338957d02528e5b51a15c5ce21e96fad4ff4a6f':
usbaudio: Return 0 bytes on failure in capture
2015-01-09 17:58:33 +00:00
Eric Laurent
b338957d02
Merge "usbaudio: Return 0 bytes on failure in capture"
2015-01-09 17:49:31 +00:00
Viswanath L
8c7e1114a3
usbaudio: Return 0 bytes on failure in capture
...
Return 0 bytes from in_read() in failure conditions so that invalid
data is not recorded.
Change-Id: I9a6294e4162fa642fd7e160a32d1ad16f255ff62
2015-01-09 22:38:54 +05:30
Paul McLean
0f1753ead0
Multi-USB device support & read device on open.
...
Change-Id: I8b6dd33be1915db764eeaefec5a5da1e9d02dc87
2015-01-08 08:44:15 -08:00
Glenn Kasten
c9a9133be6
Merge "Line length 100"
2014-12-30 18:53:01 +00:00
Glenn Kasten
6b6f19d0a8
Line length 100
...
Change-Id: Iaef5bcaec19a9e383432c8c8460bcdf1115f1072
2014-12-30 08:32:04 -08:00
Elliott Hughes
e4a211d6ce
am 06fcfc50
: am 02e30945
: Merge "Fix missing #includes in hardware/libhardware."
...
* commit '06fcfc506c44724bbd8089e8971b77aa8edfdde8':
Fix missing #includes in hardware/libhardware.
2014-12-30 12:27:44 +00:00
Elliott Hughes
06fcfc506c
am 02e30945
: Merge "Fix missing #includes in hardware/libhardware."
...
* commit '02e3094598ced8b05c9614d6070556d20328ef43':
Fix missing #includes in hardware/libhardware.
2014-12-30 12:21:17 +00:00
Elliott Hughes
02e3094598
Merge "Fix missing #includes in hardware/libhardware."
2014-12-29 21:17:12 +00:00
Elliott Hughes
6cdd2b37d7
Fix missing #includes in hardware/libhardware.
...
Change-Id: If7c72054bf79b89c3d7a544956da671c3b404269
2014-12-29 12:59:11 -08:00
soon1.choi
376f182c3d
am 7b30900d
: (-s ours) am 781bb3f7
: DO NOT MERGE - fix: memory leak
...
* commit '7b30900df70f34cb24c676e458c322ba9e8525d6':
DO NOT MERGE - fix: memory leak
2014-12-18 23:22:09 +00:00
Eric Laurent
077c704c7d
am 68be24b1
: am ce0bbb97
: Merge "fix: memory leak"
...
* commit '68be24b1cc2bad01d9257f76faabd92dbfc6c3e8':
fix: memory leak
2014-12-18 23:21:51 +00:00
soon1.choi
7b30900df7
am 781bb3f7
: DO NOT MERGE - fix: memory leak
...
* commit '781bb3f72e2706f07ee8bcc0c140201faf07c35c':
DO NOT MERGE - fix: memory leak
2014-12-18 21:58:40 +00:00
Eric Laurent
68be24b1cc
am ce0bbb97
: Merge "fix: memory leak"
...
* commit 'ce0bbb97c12b712b75d0df42ce2f6e3f35d8db72':
fix: memory leak
2014-12-18 21:50:36 +00:00
soon1.choi
781bb3f72e
DO NOT MERGE - fix: memory leak
...
free momory for str_parms to prevent memory leak.
cherry-pcik from aosp c357157e28
Bug: 18798194.
Change-Id: I7df5567d665554dbd4646c881f0f48b0c568c5fe
2014-12-18 09:55:05 -08:00
Eric Laurent
ce0bbb97c1
Merge "fix: memory leak"
2014-12-18 16:42:11 +00:00
soon1.choi
c357157e28
fix: memory leak
...
free momory for str_parms to prevent memory leak.
Change-Id: I7df5567d665554dbd4646c881f0f48b0c568c5fe
2014-12-18 16:03:43 +09:00
Jinsuk Kim
33b5ed70ea
am 981a952c
: am 4b280b0c
: CEC: Add a parameter port ID to set_audio_return_channel
...
* commit '981a952c5f182727ec306b4e194c50792b303667':
CEC: Add a parameter port ID to set_audio_return_channel
2014-12-17 21:31:28 +00:00
Jinsuk Kim
981a952c5f
am 4b280b0c
: CEC: Add a parameter port ID to set_audio_return_channel
...
* commit '4b280b0cd07a380feb4653b911ddcb3a31e73797':
CEC: Add a parameter port ID to set_audio_return_channel
2014-12-17 21:24:45 +00:00
Jinsuk Kim
4b280b0cd0
CEC: Add a parameter port ID to set_audio_return_channel
...
This CL addresses the cases where TV has more than one ARC-supported
HDMI ports.
Bug: 18781204
Change-Id: I4eaeb755caf2552b826a7322d19ee671407ee43f
2014-12-17 17:35:14 +09:00
Dan Albert
e854d1c5de
am 6bafdcb5
: am 4f1fe2f5
: Merge "Fix build in C++11 mode"
...
* commit '6bafdcb5083b81d295676ee0ff75f62b31214150':
Fix build in C++11 mode
2014-12-17 02:48:22 +00:00
Dan Albert
6bafdcb508
am 4f1fe2f5
: Merge "Fix build in C++11 mode"
...
* commit '4f1fe2f59889d88ed026596c1841043db7edbc6f':
Fix build in C++11 mode
2014-12-17 02:43:50 +00:00
Dan Albert
4f1fe2f598
Merge "Fix build in C++11 mode"
2014-12-17 02:29:27 +00:00
Ying Wang
8e2cfcd19c
am 14a4dd89
: am cecfb56c
: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
...
* commit '14a4dd8907557760cc0d7d72246444a21e9ddfe1':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
2014-12-16 21:49:49 +00:00
Ying Wang
14a4dd8907
am cecfb56c
: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
...
* commit 'cecfb56c5192fe1517a8e1b5910f16961db4a231':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
2014-12-16 20:53:38 +00:00
Ying Wang
cecfb56c51
Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
2014-12-16 20:40:03 +00:00
Ying Wang
23853ead7d
Cleanup Obsolete LOCAL_PRELINK_MODULE.
...
Bug: 18675947
Change-Id: I62157cd4bfab0edb445dd6543eb47a981e642848
2014-12-16 12:33:37 -08:00
Paul McLean
271444af38
Renaming generic-sounding filenames to indicate "audio".
...
Change-Id: Iba6403a3493379c39d22d23b438f028efc2e15b7
2014-12-15 18:18:52 +00:00
Paul McLean
416b4431c6
Technical debt paydown
...
Removed unused function.
Removed unused data table.
Cleaned up TAG strings.
Change-Id: I4c5dbd72f7363dd0a7a60eb2498e122adda43211
2014-12-15 08:24:50 -08:00
Bernhard Rosenkränzer
1f1d79732f
Fix build in C++11 mode
...
Fix build in C++11 mode instead of reverting to C++98 mode.
(Fixes some constructs that were mistaken for C++11 literals and
a use of the std::ostream(NULL) constructor).
Building in C++98 mode causes clang to fall over conflicting definitions
of char16_t.
Change-Id: I66230eeb960f4a894d6c98fe7935ec932569c5a4
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-12-12 22:16:55 +01:00
Haynes Mathew George
43aaf6d97e
am 5c8b899d
: am 2cbdfa9c
: usbaudio: reset profile on device disconnect
...
* commit '5c8b899d7c80f012599b984143cb31334ee61372':
usbaudio: reset profile on device disconnect
2014-12-12 20:21:30 +00:00
Haynes Mathew George
5c8b899d7c
am 2cbdfa9c
: usbaudio: reset profile on device disconnect
...
* commit '2cbdfa9c991fc63f52f48831e5509fcc2889db77':
usbaudio: reset profile on device disconnect
2014-12-12 14:39:15 +00:00
Haynes Mathew George
2cbdfa9c99
usbaudio: reset profile on device disconnect
...
Reset ALSA device profile on disconnect event. Entries like
supported sample rates, channel counts, formats will be repopulated
on next connect.
CRs-Fixed: 765434
Change-Id: I27d3b7fd7ff22646996f58c53de08547b1a1fb6a
Bug: 18606219
2014-12-11 09:14:19 -08:00
Jean-Michel Trivi
6cc4df1245
am de148628
: am 257fde6e
: Reroute submix HAL: fix race condition on output state
...
* commit 'de148628b9850492fad26c801d0eb663d14400cb':
Reroute submix HAL: fix race condition on output state
2014-12-10 22:42:18 +00:00
Jean-Michel Trivi
de148628b9
am 257fde6e
: Reroute submix HAL: fix race condition on output state
...
* commit '257fde6eb533b890776c8c45be8b61c48ab04945':
Reroute submix HAL: fix race condition on output state
2014-12-10 22:36:20 +00:00
Jean-Michel Trivi
257fde6eb5
Reroute submix HAL: fix race condition on output state
...
When reading from a pipe, the output may have been previously
closed, therefore the output state should only be read if it
is still available.
This fixes a race condition observed between in_read() (which
accesses the output stream) and adev_close_output_stream()
(which sets the output reference to NULL).
No issue with out_write() which checks the input reference.
Bug 16009464
Change-Id: I979bc12c8fe91fad9b6f6c9e0be107c1bacae360
2014-12-09 20:27:11 -08:00
Elliott Hughes
b728945d97
am c5f5daff
: am 719b8423
: Merge "Remove ARCH_X86."
...
* commit 'c5f5daffb520017f2d6d99d245866b448723c876':
Remove ARCH_X86.
2014-12-05 18:25:18 +00:00
Elliott Hughes
c5f5daffb5
am 719b8423
: Merge "Remove ARCH_X86."
...
* commit '719b8423102e469b5a537321f02011415b376dbe':
Remove ARCH_X86.
2014-12-05 18:01:52 +00:00
Elliott Hughes
719b842310
Merge "Remove ARCH_X86."
2014-12-05 17:47:29 +00:00
Elliott Hughes
65d51a15a7
Remove ARCH_X86.
...
Should have been __GLIBC__, but the code is dead anyway.
Change-Id: I773f296a9c31949fa631cad863b841584c71f0ef
2014-12-04 16:20:52 -08:00
Kenny Root
dfacaae0ef
am c18a034e
: am 47c0fcd0
: Merge "initialization of defined variables"
...
* commit 'c18a034e1654f3c6dfbb73212630465c33f0a07e':
initialization of defined variables
2014-12-05 00:16:02 +00:00
Kenny Root
c18a034e16
am 47c0fcd0
: Merge "initialization of defined variables"
...
* commit '47c0fcd0841764a50d05e1fa4831f3002258ae22':
initialization of defined variables
2014-12-04 23:37:34 +00:00
Kenny Root
47c0fcd084
Merge "initialization of defined variables"
2014-12-04 23:25:47 +00:00
Andre Eisenbach
e447298222
am 34a93da9
: am 285fed09
: Add server-side callback for change in MTU (1/4)
...
* commit '34a93da9bab2e9a1a56a2b9d7ce664c172e2e041':
Add server-side callback for change in MTU (1/4)
2014-12-02 08:20:35 +00:00