summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Collapse)AuthorAgeFilesLines
* am 26594add: Merge "audio policy: new setAudioPortConfig implementation" ↵Eric Laurent2014-06-041-2/+0
|\ | | | | | | | | | | | | into lmp-preview-dev * commit '26594add1ec0b6255c96b39e43ccdc95b2c480aa': audio policy: new setAudioPortConfig implementation
| * audio policy: new setAudioPortConfig implementationEric Laurent2014-06-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite setAudioPortConfig() to take advantage of the new AudioPortConfig class. The configuration is now checked against AudioPort capabilities and stored in the AudioPortConfig. Fix a bug where the config mask was not set properly when calling setAudioPortConfig at the PatchPanel interface. Remove debug log in IAudioPolicyService. Bug: 14815883. Change-Id: I7eb7683a96e049581c13f2a212486507883d008d
* | Use of fast capture by normal captureGlenn Kasten2014-06-021-4/+11
| | | | | | | | | | | | | | Will only configure fast capture path if the input buffer size is less than 10 ms and the input sample rate is same as the primary output sample rate. Change-Id: I4a7cdc6069d750845412c626d27e83f72a1ab397
* | resolved conflicts for merge of b52c152d to masterEric Laurent2014-05-304-2/+129
|\ \ | |/ | | | | Change-Id: I34869bda071d511c9595ea0a5ff6571eb34da059
| * audio policy: add routing update client interfaceEric Laurent2014-05-294-2/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | Added IAudioPolicyServiceClient client binder interface for client process to receive notifications from AudioPolicyService when audio ports are added/removed or audio patches created/released. The audio patches owned by a given client are automatically released when this client binder dies. Bug: 14815883. Change-Id: I6013f6aec03b50565cffb1ad2cd1f0f8852032c5
| * DO NOT MERGE - IAudioPolicyService interface extension for patch panelEric Laurent2014-05-282-2/+275
| | | | | | | | Change-Id: I0a62e5416edc41c3a0e816275085ab18a23066f1
| * DO NOT MERGE - IAudioFlinger interface extension for patch panelEric Laurent2014-05-281-1/+171
| | | | | | | | Change-Id: Iaabe0a7e315d5725e00a74a6ed40339b98f20330
* | IAudioPolicyService interface extension for patch panelEric Laurent2014-05-272-2/+275
| | | | | | | | Change-Id: I0a62e5416edc41c3a0e816275085ab18a23066f1
* | IAudioFlinger interface extension for patch panelEric Laurent2014-05-271-1/+171
| | | | | | | | Change-Id: Iaabe0a7e315d5725e00a74a6ed40339b98f20330
* | Move validation of frameCount from set to openRecord_lGlenn Kasten2014-05-221-18/+24
|/ | | | | | | This move is needed because frameCount is validated on server side for fast tracks (as should be done for normal tracks too). Change-Id: I6d99e80869fd90fab373cf60ef348c01f075fbca
* resolved conflicts for merge of c0bf836f to masterElliott Hughes2014-05-211-31/+31
|\ | | | | | | Change-Id: I5cf238fa56d6fff443b212870cf9dd7f1110e7da
| * am ad71caf2: am 3b6da6bf: Merge "Move frameworks/av off private API."Elliott Hughes2014-05-221-31/+31
| |\ | | | | | | | | | | | | * commit 'ad71caf25e31ecfc4ecf2c925e38fd87905fbc8e': Move frameworks/av off private API.
| | * am 3b6da6bf: Merge "Move frameworks/av off private API."Elliott Hughes2014-05-221-31/+31
| | |\ | | | | | | | | | | | | | | | | * commit '3b6da6bfb50a1c0324fb4c87326d3a477944d5fe': Move frameworks/av off private API.
| | | * Move frameworks/av off private API.Elliott Hughes2014-05-211-31/+31
| | | | | | | | | | | | | | | | | | | | Bug: 11156955 Change-Id: Ib3bb9d66a2bf92977c2445b62aa074a2d7a45aea
* | | | resolved conflicts for merge of b1080917 to masterElliott Hughes2014-05-211-10/+10
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Iabbe3e95e29f28461ff722b550e8a9f35bd2528f
| * | | am acbd9492: am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-221-10/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'acbd9492996348bf4565fbaa5a14772f0f4ace38': Move frameworks/av off __futex_syscall3.
| | * | am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-221-10/+10
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'd084206d5a4a5364211af46e4201311933e83bfc': Move frameworks/av off __futex_syscall3.
| | | * Move frameworks/av off __futex_syscall3.Elliott Hughes2014-05-211-10/+10
| | | | | | | | | | | | | | | | | | | | Bug: 11156955 Change-Id: I943080bc51b6efa781059b48b5b5ecc4fa287512
* | | | Merge "Use new channel count functions for audio masks"Andy Hung2014-05-192-3/+4
|\ \ \ \
| * | | | Use new channel count functions for audio masksAndy Hung2014-05-162-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia658ab4b6320d19fdb50f123c930918724ff0ef3 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | Pass stereo gains as packed minifloatGlenn Kasten2014-05-192-6/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow (eventually) a greater dynamic range for gains. However there are still a few remaining places in effects and mixer that will also need to be changed in order to get the full benefit. Also fixes a minor bug: was not checking for NaN in AudioTrack C++. Change-Id: I63bce9e82e0a61546d8ff475fb94bcb700d99c96
* | | | Update OMX messages for 64 bitAndy Hung2014-05-141-64/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change node_id and buffer_id to uint32_t. Ensure IOMX messages are fixed size. Remove 64 bit compile warnings in associated files. Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203 Signed-off-by: Andy Hung <hunga@google.com>
* | | | Cache mCblk in local variable cblkGlenn Kasten2014-05-091-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | This is the style used throughout the rest of AudioTrackShared. Change-Id: I959a6be3064e087bb19eba41173fd130dfcb4a9a
* | | | Remove obsolete IAudioRecord::getCblk()Glenn Kasten2014-05-091-21/+1
| | | | | | | | | | | | | | | | Change-Id: Id20b5efd765b9796b0e391610e06dc928a829ebf
* | | | IAudioFlinger::openRecord returns IMemory(s)Glenn Kasten2014-05-092-12/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | openRecord() now explicitly returns the control block and data buffer as separate IMemory references. If the IMemory for data buffer is 0, this means it immediately follows the control block. Change-Id: Ic098f88f0e037f8fbe30006689e18cacacf09d06
* | | | Merge "Add client side support for more AUDIO_FORMAT_PCM_*"Glenn Kasten2014-05-081-7/+19
|\ \ \ \
| * | | | Add client side support for more AUDIO_FORMAT_PCM_*Glenn Kasten2014-05-071-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Fix a couple of fast capture typo bugsGlenn Kasten2014-05-071-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | AudioRecord constructor was not passing flags through to set(). Server-side check was using wrong kind of channel mask. Change-Id: Ifaa880ec323771e9fd168262be05f3e539f53390
* | | | Fix bug for direct track with PCM != 16-bitGlenn Kasten2014-05-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | resolved conflicts for merge of 47c888a9 to masterGlenn Kasten2014-05-027-39/+39
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I4ba2fdc6374a93a892bb7651b0d174e495f09bf6
| * | | am e580aa4a: am 86438382: Merge "When passing a size_t via binder, use ↵Glenn Kasten2014-05-027-35/+35
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | 64-bits unconditionally" * commit 'e580aa4a756d1825c440a4b4309022b1babb6de1': When passing a size_t via binder, use 64-bits unconditionally
| | * | am 86438382: Merge "When passing a size_t via binder, use 64-bits ↵Glenn Kasten2014-05-027-35/+35
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | unconditionally" * commit '86438382a381eb39ed8da53fbd16cf6730fded6c': When passing a size_t via binder, use 64-bits unconditionally
| | | * Merge "When passing a size_t via binder, use 64-bits unconditionally"Glenn Kasten2014-05-027-35/+35
| | | |\
| | | | * When passing a size_t via binder, use 64-bits unconditionallyGlenn Kasten2014-02-137-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64-bits is almost always over-kill. But it's easier and cleaner to change the binder code to be accurate, than to rename all the the API parameter types to be 32-bit. Bug: 12381724 Change-Id: Ib8f198d814a2027760ef24e9e3feacee21a973b1
* | | | | Merge "Use AUDIO_INTERLEAVE_* constants"Glenn Kasten2014-05-011-1/+1
|\ \ \ \ \
| * | | | | Use AUDIO_INTERLEAVE_* constantsGlenn Kasten2014-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6609fa75c9a57fc4ca3887d626a2f4fb8b6593a1
* | | | | | am f38e1908: am 3d9164da: am 236f8ddd: Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | * commit 'f38e190887e73bc08735af95b073ebfaabd65f95': Add missing include
| * | | | am 3d9164da: am 236f8ddd: Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '3d9164da1b3d58701e41c78e06839d61ed1b4ff9': Add missing include
| | * | | am 236f8ddd: Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '236f8ddd23af92f98f2deae86bf6e6b5c9278857': Add missing include
| | | * | Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
| | | |\ \
| | | | * | Add missing includeIgor Chernyshev2014-04-021-0/+1
| | | | |/ | | | | | | | | | | | | | | | Change-Id: I9fc3ebf60b98760611ac2071c7c519a0f8326341
| | * | | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-292-22/+39
| | |\ \ \ | | | |/ / | | |/| |
| | | * | am 6db20dcb: Merge "AudioTrack: When paused, return cached playback ↵Eric Laurent2014-03-081-3/+22
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | position" into klp-dev * commit '6db20dcb54dad932a3ea2e3a5dca41fce5802eb4': AudioTrack: When paused, return cached playback position
| | | * \ \ am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-devGlenn Kasten2014-03-081-17/+15
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2f55c2c03b17795e94b325d402ac5b409e3ba0e8': Simplify AudioTrack stream end and fix race
| | | * \ \ \ am af191eb4: Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-03-071-6/+13
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | * commit 'af191eb4feac513d17dc0362e0cea5bc9e0ffe9d': Replace size_t in shared memory by uint32_t
| | | * | | | am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-03-073-10/+10
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c9130a8a12ce962dc8d22e04243b135b9e98b01': Make frameworks/av 64-bit compatible
| | | * \ \ \ \ am 4361749d: Merge "AudioTrack: Never try to use the fast path if resampling ↵Glenn Kasten2014-03-071-0/+6
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is required" * commit '4361749d74113069aafb0620a1189404205c58d0': AudioTrack: Never try to use the fast path if resampling is required
| * | | \ \ \ \ \ am 9829344d: Merge "media: memset sizeof argument issues"Mark Salyzyn2014-04-141-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9829344d526f87ca745208f04216ec795b239581': media: memset sizeof argument issues
| | * | | | | | | media: memset sizeof argument issuesMark Salyzyn2014-04-111-1/+1
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Change-Id: I37ef154eea0f77fb7f22faf6891f3025f6ff346e
* | | | | | | | am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-011-4/+56
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f356a123bf966150965a1af1cb9bd6ff2ca020de': Support CAST V2 Authentication in MediaDrm