summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | am bcb2ea56: Merge "Add missing includes."Elliott Hughes2015-01-302-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'bcb2ea56173dd5b0ba72e4cdb4396f0a72650366': Add missing includes.
| | * \ \ Merge "Add missing includes."Elliott Hughes2015-01-302-0/+2
| | |\ \ \
| | | * | | Add missing includes.Elliott Hughes2015-01-292-0/+2
| | |/ / / | | | | | | | | | | | | | | | Change-Id: If374206e6bee008823af7b3b5df1ee0a1992e2f0
* | | | | am 36324c9c: am 724f9650: Merge "Use audio_utils fifo instead of MonoPipe in ↵Glenn Kasten2015-01-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slesTestFeedback" * commit '36324c9cca4ebc5419ae756b748a3e0c54c875be': Use audio_utils fifo instead of MonoPipe in slesTestFeedback
| * | | | am 724f9650: Merge "Use audio_utils fifo instead of MonoPipe in ↵Glenn Kasten2015-01-152-34/+23
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slesTestFeedback" * commit '724f9650442d1ee34a6c5e9be6a979f789eba779': Use audio_utils fifo instead of MonoPipe in slesTestFeedback
| | * | | Merge "Use audio_utils fifo instead of MonoPipe in slesTestFeedback"Glenn Kasten2015-01-152-34/+23
| | |\ \ \
| | | * | | Use audio_utils fifo instead of MonoPipe in slesTestFeedbackGlenn Kasten2015-01-152-34/+23
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I71f2363607ec686d287ac074610c7cc4c1fc498e
* | | | | | resolved conflicts for merge of a3e56fda to masterGlenn Kasten2015-01-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I24ba9f973ae814ca7845fcebc69f549cae9f5e9b
| * | | | | am 7867de90: Merge "Remove unnecessary libutils"Glenn Kasten2015-01-157-41/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7867de9073714633e51af8d4b84791f06a43d69c': Remove unnecessary libutils
| | * | | | Merge "Remove unnecessary libutils"Glenn Kasten2015-01-157-41/+0
| | |\| | |
| | | * | | Remove unnecessary libutilsGlenn Kasten2015-01-157-41/+0
| | |/ / / | | | | | | | | | | | | | | | Change-Id: Ic6a98334d5662b5f063323ab69be93bda2e65890
* | | | | Use audio_utils fifo instead of MonoPipe in playbqGlenn Kasten2015-01-121-27/+21
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia2ec117bb265e17ccded166a0e9809dba791c06b
* | | | | Use audio_utils fifo instead of MonoPipe in slesTestFeedbackGlenn Kasten2015-01-122-34/+23
| | | | | | | | | | | | | | | | | | | | Change-Id: I71f2363607ec686d287ac074610c7cc4c1fc498e
* | | | | Fix argument count warningGlenn Kasten2015-01-121-4/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I98ec924c519937e40718f0de1554205aed107068
* | | | | Fix unsigned warningsGlenn Kasten2015-01-075-6/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: I8d174235cb8092d4e879ec43228e7f7f6fdad462
* | | | | Remove unnecessary libutilsGlenn Kasten2015-01-077-41/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic6a98334d5662b5f063323ab69be93bda2e65890
* | | | | Fix unused parameter warningsGlenn Kasten2015-01-0727-53/+52
| | | | | | | | | | | | | | | | | | | | Change-Id: I5fe531745c58bfab9f6c0373190c49ec881b18c2
* | | | | Line length 100Glenn Kasten2014-12-303-5/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic27cdff0edc815284ce4bc0cecd84b0e00d1f3a4
* | | | | am 71933e26: am b73cd339: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang2014-12-162-4/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '71933e26e947164e542ed4b5b2a80846633fd9fb': Cleanup Obsolete LOCAL_PRELINK_MODULE.
| * | | | am b73cd339: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang2014-12-162-4/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'b73cd3393bada4f4a99d9099c08bbb6b01388083': Cleanup Obsolete LOCAL_PRELINK_MODULE.
| | * | | Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang2014-12-162-4/+0
| | |\ \ \
| | | * | | Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang2014-12-162-4/+0
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 18675947 Change-Id: Id84541b59ab172a092059dba564f64b73fa0c319
* | | | | am a96671c1: am 7fe8bdd1: Merge "Add std=gnu++11 flag to compile .c files as ↵Chih-Hung Hsieh2014-12-051-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C++." * commit 'a96671c1021d0ff0584aff4d562f6b6b574cea31': Add std=gnu++11 flag to compile .c files as C++.
| * | | | am 7fe8bdd1: Merge "Add std=gnu++11 flag to compile .c files as C++."Chih-Hung Hsieh2014-12-051-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '7fe8bdd1af9dec49682f3249856963860b073472': Add std=gnu++11 flag to compile .c files as C++.
| | * | | Merge "Add std=gnu++11 flag to compile .c files as C++."Chih-Hung Hsieh2014-12-051-3/+3
| | |\ \ \
| | | * | | Add std=gnu++11 flag to compile .c files as C++.Chih-Hung Hsieh2014-12-041-3/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the -x c++ flag is used to compile .c files as C++. For clang compilers, default extra C flags for Android .c files is -std=gnu99. Clang compiler rejects -std=gnu99 in C++ mode. Until we rename all .c file in this directory to .cpp, we can use this patch to force compilation in -x c++ and -std=gnu++11. Change-Id: Ibbb1c1394ac1cb45c6508a62986edf669e722cbd
* | | | | am fe44276c: am 0f6da1a2: Reduce audio output latencyRaph Levien2014-11-183-25/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'fe44276c433864352d96a9bc2e9abf676b725a34': Reduce audio output latency
| * | | | am 0f6da1a2: Reduce audio output latencyRaph Levien2014-11-183-25/+26
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | * commit '0f6da1a299c8dd924d19714ee69d343915c32d2c': Reduce audio output latency
| | * | Reduce audio output latencyRaph Levien2014-11-143-25/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch reduces latency in the OpenSL ES player path by calling the callback immediately before data is consumed, rather than after. Bug: 12246268 Change-Id: I8273b4a03f16011beec21dd52545f8ad1a25fd95
* | | | am bdbcdf52: Merge "Add support for measuring round-trip latency"Glenn Kasten2014-11-120-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'bdbcdf52bb5aa9fbd20d2e2d7877eb6549962c89': Add support for measuring round-trip latency
| * | | Merge "Add support for measuring round-trip latency"Glenn Kasten2014-11-122-4/+102
| |\ \ \
| | * | | Add support for measuring round-trip latencyGlenn Kasten2014-11-122-4/+102
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Add -o option to log output to .wav file Add -i# option to inject impulse after # milliseconds Change-Id: I9784603e43ccb300c42f6865e78b6b27f53ed6f6
* | | | am 769b5d55: Merge "Check that the ABQ mime type matches the expectations"Glenn Kasten2014-11-101-0/+8
|\| | | | | | | | | | | | | | | | | | | * commit '769b5d55d6733e02dc9ea36c3922ba3880838c9c': Check that the ABQ mime type matches the expectations
| * | | Merge "Check that the ABQ mime type matches the expectations"Glenn Kasten2014-11-101-0/+8
| |\ \ \
| | * | | Check that the ABQ mime type matches the expectationsMartin Storsjo2014-05-271-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code in audioPlayer_getAndroidObjectTypeForSourceSink assumes that an android buffer queue source combined with an output mix sink is an mpegts source, while it it assumes that it is an adts source if it is combined with a simple buffer queue sink. This assumption never was verified before, making the set up actually seem to succeed even though the data is interpreted as the wrong format. Change-Id: I7e031ec8139fa2d770737935eb9acd3506d3fa3f
* | | | | Add support for measuring round-trip latencyGlenn Kasten2014-10-022-4/+102
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Add -o option to log output to .wav file Add -i# option to inject impulse after # milliseconds Change-Id: I9784603e43ccb300c42f6865e78b6b27f53ed6f6
* | | | am 5a55e234: Merge "Move wilhelm over to pthread_gettid_np."Elliott Hughes2014-09-122-7/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '5a55e234fc79b0da96a2e158d90cd5ba2f12d9ef': Move wilhelm over to pthread_gettid_np.
| * \ \ \ Merge "Move wilhelm over to pthread_gettid_np."Elliott Hughes2014-09-122-7/+3
| |\ \ \ \
| | * | | | Move wilhelm over to pthread_gettid_np.Elliott Hughes2014-09-122-7/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 17476168 Change-Id: Ib8f00d0934deaefbb5bc07f4f0ab6dc7a4e30988
* | | | / am 2d7215f2: Merge "Clean up makefile cruft."Dan Albert2014-09-122-40/+10
|\| | | | | |_|_|/ |/| | | | | | | | | | | * commit '2d7215f2bafd3fdb42df72f95f3b9e4b11119e90': Clean up makefile cruft.
| * | | Merge "Clean up makefile cruft."Dan Albert2014-09-122-40/+10
| |\ \ \
| | * | | Clean up makefile cruft.Dan Albert2014-09-112-40/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Don't manually include/link stlport, don't include private bionic headers. Change-Id: I2b04462f14eca2ba965489c89b6ae5eb9c269984
* | | / am 15bb40ea: Merge "Audio recorder missing a callback protector"Glenn Kasten2014-08-270-0/+0
|\| | | | |_|/ |/| | | | | | | | * commit '15bb40eaebf1e1d0445fb9bcfc9c2b6eb57dff5f': Audio recorder missing a callback protector
| * | Merge "Audio recorder missing a callback protector"Glenn Kasten2014-08-275-0/+33
| |\ \ | | |/ | |/|
| | * Audio recorder missing a callback protectorGlenn Kasten2014-08-275-0/+33
| |/ | | | | | | | | Bug: 14291968 Change-Id: I620d5e82f58e57e87097984a649b5c3a25c42963
* | Audio recorder missing a callback protectorstaging/cm-12.0-cafGlenn Kasten2014-08-275-0/+33
| | | | | | | | | | Bug: 14291968 Change-Id: I620d5e82f58e57e87097984a649b5c3a25c42963
* | rename AudioSystem::newAudioSessionId()Eric Laurent2014-07-272-2/+2
| | | | | | | | | | | | | | | | | | | | Rename AudioSystem::newAudioSessionId() to AudioSystem::newAudioUniqueId() as it can be used also for I/O handles. Bug: 12378680. Change-Id: I5f0eaaadc21ff2aacf81670490ad42c54537d86b
* | audio: fixed channel count determination from channel maskEric Laurent2014-07-011-1/+1
| | | | | | | | | | | | | | Do not use popcount() to derive channel count from channel mask. Bug: 15000850. Change-Id: I7af794e4515cd0f85e5b9744bd4e53e33aa0d5eb
* | am fdef5de1: Squashed commit of the following:Glenn Kasten2014-06-062-3/+97
|\ \ | | | | | | | | | | | | * commit 'fdef5de17abc6c30b293861ca276259a7dd93837': Squashed commit of the following:
| * | Squashed commit of the following:Glenn Kasten2014-06-0512-86/+388
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 4f3540e6953ad28cbb743cfe9f480bc4b3e979a9 Author: Glenn Kasten <gkasten@google.com> Date: Wed May 14 07:30:02 2014 -0700 Updates to slesTest_feedback Configure for 48 kHz, 240 frames per buffer Use Pipe This smaller pipe still works with -t1 -r1 Change-Id: Ib1c40905017f3ebfedb70df145ef3018538ea0c2 commit b4b546279693f23733e8b803fdd1eb559b8db04b Author: Andy Hung <hunga@google.com> Date: Fri May 23 16:40:16 2014 -0700 Add float playback capability to OpenSL ES Add SLAndroidDataFormat_PCM_EX to match OpenSLES 1.1 header file, together with related SL_ANDROID_PCM_REPRESENTATION_* constants. Use slesTest_playbq as the test application. Change-Id: I04bcd170f5c517051a799bacf8f52da5f1353ad6 commit f0642023f9660c2fdec9c48cef76e35570abe177 Author: Glenn Kasten <gkasten@google.com> Date: Tue May 27 17:17:26 2014 -0700 Fix regression in AudioRecorder Interfaces were out of order Change-Id: I027dc9d8ed93514d93a5b05063a8711b9841aaf4 commit 8c83595b784559f146e08b2d5500215e76cf5ba9 Author: Andy Hung <hunga@google.com> Date: Fri May 23 16:24:25 2014 -0700 Add 24 bit and 32 bit playback capability to OpenSL ES slesTest_playbq is the test application. Change-Id: Iaa453471d2e9ff4e6b11ac5c68690993179fea2b Change-Id: I07515d0d3cae65c0e0d9a600527a90d64c5241d7