summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add client side support for more AUDIO_FORMAT_PCM_*"Glenn Kasten2014-05-082-9/+22
|\
| * Add client side support for more AUDIO_FORMAT_PCM_*Glenn Kasten2014-05-072-9/+22
| | | | | | | | | | | | | | As much as possible, the checks for specific formats are done on server side. The only exception is 8-bit, which needs a client side workaround. Change-Id: I52fe086c039460c8dac009de03b67eb54c56a836
* | Merge "Make AMediaCodec_create* APIs more like their Java counterparts"Marco Nelissen2014-05-082-11/+16
|\ \
| * | Make AMediaCodec_create* APIs more like their Java counterpartsMarco Nelissen2014-05-082-11/+16
| | | | | | | | | | | | | | | | | | and add configure flags. Change-Id: Ibfb7f8cad724fa1db2320966828104d40b5e6590
* | | Merge "Add a per-thread heap that is read-only to clients"Glenn Kasten2014-05-082-0/+19
|\ \ \ | |/ / |/| |
| * | Add a per-thread heap that is read-only to clientsGlenn Kasten2014-05-072-0/+19
| | | | | | | | | | | | Change-Id: I401263566ca20fbfb565689c8fa99458d3b283b2
* | | Merge "audio policy: cleanup AudioPolicyService destructor"Eric Laurent2014-05-081-3/+1
|\ \ \
| * | | audio policy: cleanup AudioPolicyService destructorEric Laurent2014-05-071-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to clear strong pointers in the destuctor. Add explicit exit() command to mOutputCommandThread. Change-Id: I60bb248fe6a20bfd8a55358ef139692b93df0238
* | | | Merge "Expand AMediaFormat"Marco Nelissen2014-05-072-12/+64
|\ \ \ \ | |_|/ / |/| | |
| * | | Expand AMediaFormatMarco Nelissen2014-05-072-12/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove getDouble and getSize methods, since these are not used and/or not present in the corresponding Java MediaFormat API. Add setBuffer/getBuffer, needed for making formats for encoding, and add other setters. Change-Id: I528d51b4ed571d852b949637f7ae3a95d31da7c1
* | | | Merge "Add NDK version of MediaMuxer"Marco Nelissen2014-05-077-5/+180
|\ \ \ \ | |/ / /
| * | | Add NDK version of MediaMuxerMarco Nelissen2014-05-077-5/+180
| | |/ | |/| | | | | | | | | | | | | and add some constness here and there. Change-Id: Ib3caa8310691e8f27aaa1afcfaec0b384513d4f1
* | | Merge "Fix a couple of fast capture typo bugs"Glenn Kasten2014-05-072-4/+4
|\ \ \
| * | | Fix a couple of fast capture typo bugsGlenn Kasten2014-05-072-4/+4
| |/ / | | | | | | | | | | | | | | | | | | AudioRecord constructor was not passing flags through to set(). Server-side check was using wrong kind of channel mask. Change-Id: Ifaa880ec323771e9fd168262be05f3e539f53390
* | | Merge "Remove legacy omx_message variables"Andy Hung2014-05-074-52/+12
|\ \ \
| * | | Remove legacy omx_message variablesAndy Hung2014-05-064-52/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove platform_private and data_ptr from omx_message. These were used for legacy deferred buffer creation. See OMXCodec quirks: kDefersOutputBufferAllocation and kRequiresAllocateBufferOnOutputPorts. Change-Id: I94da56bc64f3b46ee1276e93d67b36c1662e2eaf Signed-off-by: Andy Hung <hunga@google.com>
* | | | audio policy: fix typo in AudioPolicyManager constructorEric Laurent2014-05-071-6/+6
| |_|/ |/| | | | | | | | | | | | | | | | | Fix cut/paste error in new AudioPolicyManager constructor causing the same index variable to be reused in nested for loops. Change-Id: Id57ff19bf6dd8974486b07c8252029e377df2747
* | | Merge "audio policy: update from libhardware_legacy"Eric Laurent2014-05-072-108/+349
|\ \ \ | |_|/ |/| |
| * | audio policy: update from libhardware_legacyEric Laurent2014-05-062-108/+349
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Merge changes made to AudioPolicyManagerBase in libhardware_legacy since it was forked here: fd61179 Update policy handling for USB inputs c7b6e3c audio: allow compiling for 64-bit c26f454 Initial implementation of USB Audio output. a7b1bc9 Audio policy is 32-bit only 26101ad audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable Change-Id: I22bc883c20603a6598c6ee3ded636e9cc4d9ec03
* | Merge "MediaFormat owns its strings"Marco Nelissen2014-05-062-4/+19
|\ \
| * | MediaFormat owns its stringsMarco Nelissen2014-05-062-4/+19
| | | | | | | | | | | | | | | | | | | | | Have MediaFormat own the strings it returns from toString and getString, reducing the chance of memory leaks. Change-Id: I0ddd593874c8b3af0b7714f2d8a106edf8121108
* | | Merge "Camera3: fix missing string in logging code"Zhijun He2014-05-061-1/+1
|\ \ \ | |_|/ |/| |
| * | Camera3: fix missing string in logging codeZhijun He2014-05-061-1/+1
| | | | | | | | | | | | Change-Id: I15da6bb8b586b4641837f42d2145530fb45dd0bd
* | | am 71171988: am f655acf1: am 8fb04d47: Merge "Fix memory leak when filtering ↵Eric Laurent2014-05-062-10/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | commands in insertCommand_l()" * commit '711719885d7563068579abf347c366cf6bc906f5': Fix memory leak when filtering commands in insertCommand_l()
| * \ \ am f655acf1: am 8fb04d47: Merge "Fix memory leak when filtering commands in ↵Eric Laurent2014-05-062-10/+27
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | insertCommand_l()" * commit 'f655acf15e587dbf5d7120e9f2bf4b5bcb89941c': Fix memory leak when filtering commands in insertCommand_l()
| | * \ \ am 8fb04d47: Merge "Fix memory leak when filtering commands in ↵Eric Laurent2014-05-062-10/+27
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | insertCommand_l()" * commit '8fb04d474ed9e0d1302ae223ee76fafbe5fb41a3': Fix memory leak when filtering commands in insertCommand_l()
| | | * \ \ Merge "Fix memory leak when filtering commands in insertCommand_l()"Eric Laurent2014-05-062-10/+27
| | | |\ \ \
| | | | * | | Fix memory leak when filtering commands in insertCommand_l()Jesper Tragardh2014-04-112-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When AudioPolicyService::AudioCommandThread::insertCommand_l filters a command from the queue, the AudioCommand* is removed from the vector mAudioCommands by calling mAudioCommands.removeAt(). This will destroy the pointer and compact the vector, but not delete the AudioCommand object. This patch adds code to delete a filtered out AudioCommand and its data object mParam. However, mParam was void* and deleting a void pointer is undefined behavior according to the C++ standard. Therefore, the data classes are modified to inherit from an abstract base class with a virtual destructor. The deletion of non-filtered commands in AudioPolicyService::AudioCommandThread::threadLoop() was already correct, as each case casts mParam to the proper type before deleting. This also fixes AOSP issue 36370. Change-Id: I2b63838aff3608132aa496f964a929f78c4b6267
* | | | | | | Merge "Remove warnings in recordvideo"Andy Hung2014-05-061-5/+9
|\ \ \ \ \ \ \
| * | | | | | | Remove warnings in recordvideoAndy Hung2014-05-051-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2ed72836210fd3a02c7bceeb5fccadf8dcb92fbc Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | | | Merge "Fix audioloop test program"Andy Hung2014-05-061-62/+108
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix audioloop test programAndy Hung2014-05-051-62/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic31966095d719cf2b33322675d7d0a2e6a203268 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | | Merge "Don't build libmediandk for PDK"Marco Nelissen2014-05-051-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Don't build libmediandk for PDKMarco Nelissen2014-05-051-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9b2e5f5c8cc0fad59d4a4268c8767f540d536d10
* | | | | | | | Merge "WIP: MediaCodec and friends NDK APIs, plain C version"Marco Nelissen2014-05-058-0/+1066
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | WIP: MediaCodec and friends NDK APIs, plain C versionMarco Nelissen2014-05-058-0/+1066
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Change-Id: I9ed6b9c5afb026a1b5fe8b652e75635bbcc223df
* | | | | | | Merge "Use audio_is_linear_pcm()"Glenn Kasten2014-05-051-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Use audio_is_linear_pcm()Glenn Kasten2014-05-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I17b30fdb6dbb6454ad0a20dd703fd603a37a8397
* | | | | | | | Merge "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-054-15/+192
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-024-15/+192
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12134423 Change-Id: I97dc955ee9dd78ace93a7946296d6d9b0e407d43
* | | | | | | Merge "NULL check in ConnectPro"Natalie Silvanovich2014-05-051-0/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | NULL check in ConnectProNatalie Silvanovich2014-05-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents service crash Bug: 13744720 Change-Id: I7a5cdba830b4f96660f890ede6b94c38fc3108dd
* | | | | | | Merge "Revert "camera3: Update CameraMetadata vendor tag handling.""Ruben Brunk2014-05-034-191/+14
|\ \ \ \ \ \ \
| * | | | | | | Revert "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-034-191/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4764324d2704f1b08bb7407014bf203924ff2363. Change-Id: I86d7fcc11423502b73fab2a82af6aa89804f0b76
* | | | | | | | Merge "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-024-14/+191
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-024-14/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12134423 Change-Id: I1d1be6792b6a4c9f08e042a8b2c89146bde5665e
* | | | | | | | Merge "Fix bug for direct track with PCM != 16-bit"Glenn Kasten2014-05-022-5/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix bug for direct track with PCM != 16-bitGlenn Kasten2014-05-022-5/+4
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AUDIO_FORMAT_PCM_8_BIT format was being converted to AUDIO_FORMAT_PCM_16_BIT on client side even for direct tracks. That conversion was incorrect; it should only be done for mixed tracks. Also remove checks for specific PCM formats in the generic part of server side of createTrack. Those format checks should only be done by the thread. This will allow direct tracks for PCM 8-bit, PCM 24-bit, etc. Change-Id: If5b9fd79f8642ed93e2aeabcaf4809b2ed798978
* | | | | | | | Merge "Camera3: Don't notifyError for non-fatal errors"Zhijun He2014-05-021-3/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Camera3: Don't notifyError for non-fatal errorsZhijun He2014-05-011-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14448494 Change-Id: Ie2e2dc6a8475189707c556845adb77f20f270df5