summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 373e21cc to masterElliott Hughes2014-07-091-2/+2
|\ | | | | | | Change-Id: I91afd8f9cba04559d21e1c84e25c5c60c990165d
| * am be44e0e0: am 0bffd2e6: Merge "Switch frameworks/av/media/libmedia to the ↵Elliott Hughes2014-07-101-1/+1
| |\ | | | | | | | | | | | | | | | | | | new icu." * commit 'be44e0e0ffda04725c4864d894a7cc80bd74b5ca': Switch frameworks/av/media/libmedia to the new icu.
| | * Switch frameworks/av/media/libmedia to the new icu.Elliott Hughes2014-07-091-1/+1
| | | | | | | | | | | | Change-Id: I45349756bac6d89b02dba082ba6d606f4c489dcf
| * | am 90732a3b: Merge "Remove dependency on Parcel::{read,write}IntPtr"Narayan Kamath2014-06-131-2/+2
| |\ \ | | |/ | | | | | | | | | * commit '90732a3be5e70156486aca94bde8aa81106329ba': Remove dependency on Parcel::{read,write}IntPtr
| | * Merge "Remove dependency on Parcel::{read,write}IntPtr"Narayan Kamath2014-06-101-2/+2
| | |\
| | | * Remove dependency on Parcel::{read,write}IntPtrJeff Tinker2014-06-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 15424960 bug: 15107693 (cherry picked from commit bcca9e072c1f288a53ce6862936f57dc36488f96) Change-Id: I3ba59fccb184e99a07f6f82ccdbd00e5204901f6
| * | | resolved conflicts for merge of cbd74fcb to klp-modular-dev-plus-aospNarayan Kamath2014-06-131-64/+68
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I00270ef6fe813c0d3649483cbc3aba6af789e033
| | * | Update OMX messages for 64 bitAndy Hung2014-06-121-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>
* | | IAudioFlinger::openRecord now suggests notificationFramesGlenn Kasten2014-07-032-0/+13
| | | | | | | | | | | | Change-Id: I08885cc381d03c522a23289e74f0e1ed46563863
* | | Support for audio attributes on audio output of media playerJean-Michel Trivi2014-07-012-5/+29
| | | | | | | | | | | | Change-Id: Iae4995c98e64add1ab9e6c8ae6501515032755f5
* | | libmedia: 64-bit compile warningsMark Salyzyn2014-06-2012-58/+76
| | | | | | | | | | | | Change-Id: I600f062fa7148c01851023c1240c39939e648002
* | | AudioTrack: add support for compressed audioEric Laurent2014-06-191-15/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for compressed audio playback by use of an AudioTrack attached to a direct output thread. Bug: 9428304. Change-Id: I4a61be9cf0e31003ca85935d6e0ee38ca8192e03
* | | AudioPolicyManager: return output for audio attributesJean-Michel Trivi2014-06-183-10/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In AudioPolicyManager, support querying an output or playback strategy for audio attributes, instead of a stream type, In AudioTrack creation, use the output returned for the track's attributes. Change-Id: I0fef05845ba676404775e2e338c10e6a96237268
* | | AudioTrack construction with audio attributesJean-Michel Trivi2014-06-171-10/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store audio attributes in AudioTrack class. When an AudioTrack is "set" with non null audio attributes, derive a stream type that reflects the attributes. When an AudioTrack is "set" without attributes, and only has a stream type, derive default audio attributes. Change-Id: I322b91fa9a7e193118960c5e78cdddd85d66f9ad
* | | Merge "AudioSystem: remove unused stream type"Jean-Michel Trivi2014-06-122-17/+11
|\ \ \
| * | | AudioSystem: remove unused stream typeJean-Michel Trivi2014-06-112-17/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The audio stream type is not used in the getSampleRate() and getFrameCount() methods. Change-Id: I3d065ae272bd039204cd323cdab9b60460034f2d
* | | | am 3bcffa13: force command flush after releasing a reference to shared memoryEric Laurent2014-06-132-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '3bcffa136909c1fb6e88ee4efd12ccac18360a85': force command flush after releasing a reference to shared memory
| * | | | force command flush after releasing a reference to shared memoryEric Laurent2014-06-132-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After releasing a reference to a shared memory interface, IPCThreadState::self()->flushCommands() must be called to ensure that the corresponding reference is also cleared immediately in the remote process. Otherwise the binder implementaiton will not push the clear systematically causing the memory region not to be freed. See issues 10711502 and 2801375. Bug: 14057166. Change-Id: If55f36f00d452d6cf00cf83bd2fba1c8f3abcb57
| * | | | Squashed commit of the following:Glenn Kasten2014-06-052-22/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 9128d6ffec43731d723f9b394f243d940f4c7e41 Author: Glenn Kasten <gkasten@google.com> Date: Tue May 13 10:38:42 2014 -0700 Use of fast capture by normal capture 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 commit 2e5e0806a5abe7499848358ef5fde5c26405000d Author: Glenn Kasten <gkasten@google.com> Date: Mon Jun 2 08:29:22 2014 -0700 Add mPrimaryOutputSampleRate Change-Id: I46b527fc3f2b5a5720a74b4f0b9a8f2e0d570b09 commit baf1d73467923996d1b1f2a9237260cc5697e050 Author: Andy Hung <hunga@google.com> Date: Fri May 30 10:42:03 2014 -0700 Change parameter type for volume to float in AudioMixer Change-Id: I4da1505ce852505f86f8e5b87f60e8edceeb30e0 commit 40fe20fa9760cd03c69778c2021cf7a490d75ece Author: Andy Hung <hunga@google.com> Date: Fri May 30 10:35:47 2014 -0700 Rename UNITY_GAIN to UNITY_GAIN_INT in AudioMixer Change-Id: Ic040311305026f0b4c4280a5b3bef7a447ac1da3 commit 37c9a2b49f876abc5ff537a9ec036d7f0a423775 Author: Andy Hung <hunga@google.com> Date: Thu May 29 21:33:13 2014 -0700 Refactor setVolumeRampVariables in AudioMixer Change-Id: I8fcf3101bcea292de7c65433fa578f1c9cdd0974 commit 397070eca31f121d5d3993de1bfea99aaea5d4f3 Author: Andy Hung <hunga@google.com> Date: Thu May 29 18:52:38 2014 -0700 Fix floating point output from mixer A buffer pointer was being erroneously reset to buffer start, potentially causing an audio glitch. The floating point output mode is not enabled at this time, but will be in the future. Change-Id: If8b6414d232f064f3a2e2c5a6da889a91b27fb24 commit 2e61aa5b33b2247bbc5d4eaa0b519df9accd4bbc Author: Andy Hung <hunga@google.com> Date: Fri May 23 21:22:17 2014 -0700 Add multiple format capability to FastMixer Floating point data from MixerThread into FastMixer. Multiple output format capability from FastMixer to Sink. Change-Id: I0da17810ee71381a39a006c46faec71108d22c26 commit b9ea653c702a785bbd23a66c5e588d40b4192c4e Author: Andy Hung <hunga@google.com> Date: Thu May 29 15:53:09 2014 -0700 Avoid resetting BufferProviders in mixer unnecessarily Change-Id: Iad85c4dfd21be1dbf89dc11906106b34219376f8 commit 7f1a6d6da21c616f80cf9ba21bea11b419ec561b Author: Andy Hung <hunga@google.com> Date: Tue May 27 12:32:17 2014 -0700 Update dynamic resampler buffer fetching Make the criteria tight for fetching to avoid storing excessive frame data internal to the resampler. This should reduce jitter in frame delivery computation. Bug: 14962343 Change-Id: I7adaf714d11c272696ccdbf218bda994c7217477 commit b5e4aac07b9a02f0c803c090058602b03ac09ebb Author: Glenn Kasten <gkasten@google.com> Date: Tue May 27 12:30:54 2014 -0700 Allow kFastTrackMultiplier to be specified per device Change-Id: I4eaaaf038df720cec4f5d9221d1b632970f9e3dd commit b93cd97a52af31122df2da2cc0415cda888c8c73 Author: Andy Hung <hunga@google.com> Date: Fri May 23 21:13:31 2014 -0700 Rename mixBuffer to mMixerBuffer in FastMixer Likewise mixBufferState becomes mMixerBufferState. This harmonizes with the naming in AF::MixerThread. Change-Id: I1255d7c07cc2c6ee925d7430925236d2bd163122 commit 8340758622b9711365a8801806cbdf934803c63f Author: Andy Hung <hunga@google.com> Date: Mon May 12 16:51:41 2014 -0700 Add multiple format capability to AudioMixer Change-Id: I04ac1cafd90b6ed652f8d51888ad07576678f0bc Signed-off-by: Andy Hung <hunga@google.com> commit 6b695b9d094820c232a897a3fabbe83d2b7193fe Author: Glenn Kasten <gkasten@google.com> Date: Thu Mar 13 14:59:31 2014 -0700 Start adding FastCapture based on FastThread WIP This version supports at most one fast capture client. Change-Id: Idf609bfc80ae22433433d66a5232c043c65506df commit e951ad05a2c388471d7e2806d91e7d51325a150a Author: Glenn Kasten <gkasten@google.com> Date: Mon May 12 11:06:26 2014 -0700 Move validation of frameCount from set to openRecord_l 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 commit 73e76992dbba794894837c38e5472312ea829cf3 Author: Glenn Kasten <gkasten@google.com> Date: Tue May 13 10:41:52 2014 -0700 Allow track buffer "allocation" to be from pipe Change-Id: Ib9ac170f8e8b7746b3588157a56cbee3b753a1cb commit 60de1d7ded05c6304037d4858b401094b1d2b4d3 Author: Andy Hung <hunga@google.com> Date: Fri May 9 15:02:21 2014 -0700 Add format parameter to getTrackName() and track_t Change-Id: Ia152a839014e235fbfb656104c15d7c1b456d02e Signed-off-by: Andy Hung <hunga@google.com> Change-Id: Ied0ade8b25d23e89bb03319a7e3135c238f735b9
* | | | | am 2a8270e6: am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-121-0/+20
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit '2a8270e6944fb3addfcba87f6885aaad196b8b88': Offer a type-safe album art interface.
| * | | | am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-121-0/+20
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit 'c323737dd46d724b4c1ec230b283f26ae2a22b4f': Offer a type-safe album art interface.
| | * | | Offer a type-safe album art interface.Elliott Hughes2014-06-111-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15514223 Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
* | | | | Merge "Remove dependency on Parcel::{read,write}IntPtr"Jeff Tinker2014-06-111-2/+2
|\ \ \ \ \
| * | | | | Remove dependency on Parcel::{read,write}IntPtrJeff Tinker2014-06-101-2/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 15424960 bug: 15107693 Change-Id: Ic3bf37f591e620985c37f345f9a5544fd20ec4a1
* | | | | MediaProfiles: Add 4K video related constantsZhijun He2014-06-101-0/+2
|/ / / / | | | | | | | | | | | | | | | | Bug: 15287656 Change-Id: I4c49640a349afb336f52db1636902fc216bff6ad
* | | | 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
generated by cgit v1.1 at 2024-05-30 11:55:41 +0000