summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove unneeded code"Marco Nelissen2014-06-101-6/+0
|\
| * Remove unneeded codeMarco Nelissen2014-06-101-6/+0
| | | | | | | | Change-Id: I33c7424f1858e9f3f7f7ab5fb46db09c2714e02e
* | add back HEVC SoftOMX decoderLajos Molnar2014-06-063-0/+853
| | | | | | | | | | Bug: 14571712 Change-Id: Iea399e0cfec1f78584c74089f01821d8552ced40
* | Remove SoftOMX HEVC decoderLajos Molnar2014-06-063-849/+0
| | | | | | | | | | Bug: 14571712 Change-Id: Ie3fb3743ec27a0cfdea612052ba15a06f2c891db
* | am 8a454611: Merge "stagefright: added support, and SoftOMX decoder, for ↵Lajos Molnar2014-06-069-8/+1023
|\ \ | | | | | | | | | | | | | | | | | | HEVC" into lmp-preview-dev * commit '8a45461198c69e9e15f133c2e11ded47fc4c708b': stagefright: added support, and SoftOMX decoder, for HEVC
| * \ Merge "stagefright: added support, and SoftOMX decoder, for HEVC" into ↵Lajos Molnar2014-06-069-8/+1023
| |\ \ | | | | | | | | | | | | lmp-preview-dev
| | * | stagefright: added support, and SoftOMX decoder, for HEVCHarish Mahendrakar2014-06-069-8/+1023
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also fixed QuerySupportedProfileLevels in SoftVideoDecoderOMXComponent.cpp Bug: 14571712 Change-Id: Ifa3793f7c1b18ac5e8c0a096848c998cabd9e777
* | | | Merge "Guard against malformed files"Marco Nelissen2014-06-061-4/+28
|\ \ \ \ | | |_|/ | |/| |
| * | | Guard against malformed filesMarco Nelissen2014-06-061-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | b/15433074 Change-Id: I35363def42d38eba49dd5aece566fd345743937e
* | | | Merge "do not drop TS packet on discontinuity at payload start"Chong Zhang2014-06-061-1/+3
|\ \ \ \
| * | | | do not drop TS packet on discontinuity at payload startChong Zhang2014-06-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15470543 Change-Id: Ia96a295fbc7e9f1b1d5c0d9091ac62184d44dcfa
* | | | | Merge "check camera permission for video source other than SURFACE"Chong Zhang2014-06-061-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | check camera permission for video source other than SURFACEChong Zhang2014-06-061-1/+2
| |/ / / | | | | | | | | | | | | | | | | Bug: 15448704 Change-Id: I5f5417037b877a6da3a46700ebb5a80ea59aac36
* | | | Merge "Make AAC decoder behavior after flush consistent with non-flush"Marco Nelissen2014-06-061-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Make AAC decoder behavior after flush consistent with non-flushMarco Nelissen2014-06-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Timestamps don't start at zero, but at least they're consistent. Change-Id: I2ce9cd60655a4ece787802902b679fda01cb6182
* | | | am 270facca: We still need the raw codecMarco Nelissen2014-06-051-0/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '270facca297275a4889d1cc49ec4d2768ed38bb7': We still need the raw codec
| * | We still need the raw codecMarco Nelissen2014-06-051-0/+1
| | | | | | | | | | | | | | | | | | | | | It's used for FLAC and PCM Wav, which output PCM data. b/15320804 Change-Id: I67921a45dd4a3a175fce412e055728859e2309ba
| * | Merge "Squashed commit of the following:" into lmp-preview-devGlenn Kasten2014-06-052-22/+35
| |\ \
| | * | 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
* | | | Merge "Added paused state to NuPlayerDecoder"Wei Jia2014-06-052-2/+20
|\ \ \ \
| * | | | Added paused state to NuPlayerDecoderWei Jia2014-06-052-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents decoder from requesting new buffer until the decoder is resumed, and prevents processing a potential DISCONTINUITY while the player is still flushing. Bug: 13133027 Change-Id: I2f9fa9f00c8583aa6908809cb7c31ddde07cfaf0
* | | | | Merge "add sound trigger native service"Eric Laurent2014-06-052-2/+6
|\ \ \ \ \
| * | | | | add sound trigger native serviceEric Laurent2014-06-042-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0cd954c1c7d28a334e786d0004431d4f6a1227ec
* | | | | | am 9042b116: Merge "MediaCodecList: remove force-added codecs for ↵Lajos Molnar2014-06-051-5/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | videoeditor" into lmp-preview-dev * commit '9042b116b62a287bb86a18af6b428c7a2b7720aa': MediaCodecList: remove force-added codecs for videoeditor
| * | | | | Merge "MediaCodecList: remove force-added codecs for videoeditor" into ↵Lajos Molnar2014-06-051-5/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | lmp-preview-dev
| | * | | | MediaCodecList: remove force-added codecs for videoeditorLajos Molnar2014-05-291-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15320804 Change-Id: I1c2f0f75aeaabc20cb94e79e47b70f7faefe0a9e
* | | | | | am cc839bd4: Merge "DNG: Fix OpcodeList2 length field." into lmp-preview-devRuben Brunk2014-06-051-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'cc839bd4727be02d9352f46d043a7e9cc9c7d642': DNG: Fix OpcodeList2 length field.
| * | | | | Merge "DNG: Fix OpcodeList2 length field." into lmp-preview-devRuben Brunk2014-06-041-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | DNG: Fix OpcodeList2 length field.Ruben Brunk2014-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15432434 Change-Id: I2a0e017f72c31cdbd30df1fdb32cdd5ff4af3649
* | | | | | 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
| * | | | Merge "audio policy: new setAudioPortConfig implementation" into lmp-preview-devEric Laurent2014-06-041-2/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | 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
| * | | | Merge "Fix typos, remove callback functions - do not merge" into lmp-preview-devMarco Nelissen2014-06-046-8/+10
| |\ \ \ \
| | * | | | Fix typos, remove callback functions - do not mergeMarco Nelissen2014-06-036-8/+10
| | |/ / / | | | | | | | | | | | | | | | | | | | | b/15414091 Change-Id: I2f7b7ea6a7943a808de2c6a54fe810eefdee133e
| * | | | Merge "DNG: Add additional TIFF/EP tag definitions." into lmp-preview-devRuben Brunk2014-06-031-0/+48
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | DNG: Add additional TIFF/EP tag definitions.Ruben Brunk2014-06-021-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15112503 Change-Id: Ib06d9a5e70e6e3d5063a95a7109538ef64f03334
* | | | | DNG: Add additional TIFF/EP tag definitions.Ruben Brunk2014-06-041-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15112503 Change-Id: Ib06d9a5e70e6e3d5063a95a7109538ef64f03334
* | | | | am b6af7c63: am 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b6af7c635113d288d16a4f549679beffd86822d8': Mp3decoder: Remove unused arm assembly files
| * \ \ \ \ am 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '05eaf105a2a1445c2c13801ee4533ded47f1df1b': Mp3decoder: Remove unused arm assembly files
| | * \ \ \ \ Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
| | |\ \ \ \ \
| | | * | | | | Mp3decoder: Remove unused arm assembly filesAshok Bhat2014-05-275-1413/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unused ARM assembly files were written for legacy proprietary ARM compilers. They are not needed when gcc or clang compiler is used. Change-Id: I8dfe9ad458efbb34922094e943ad334cc34f59a3 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | | 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
* | | | | | | | Merge "MPEG4Extractor: guard against missing stbl."Robert Shih2014-06-021-1/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | MPEG4Extractor: guard against missing stbl.Robert Shih2014-05-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14320131 Change-Id: I33f65117c9c5365bddd96bb41cc4379a0c7ebcbd
* | | | | | | | Merge "Disable verbose logging"Marco Nelissen2014-06-026-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Disable verbose loggingMarco Nelissen2014-05-306-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If9c87615707ed67f209258f9207d56f671cd0f08
* | | | | | | | | 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: libstagefright: Add Opus support to ACodec::getPortFormatVignesh Venkatasubramanian2014-05-291-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15114855 Change-Id: Idb184ae15986450423fc8cf116cf077600b3ea67 (cherry picked from commit 8c6693b73cb4aed9d1dcb8d5d0828a77b7471a55)
| * | | | | | | DO NOT MERGE - IAudioPolicyService interface extension for patch panelEric Laurent2014-05-282-2/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0a62e5416edc41c3a0e816275085ab18a23066f1