summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* audio policy: add binder calls for audio source controlEric Laurent2015-04-152-0/+11
| | | | | | | Add binder methods to IAudioPolicyService to control activity of external audio sources (e.g FM tuner). Change-Id: I2008308a6a996baeae502b68a790d87281efe2ff
* Merge "AudioPolicyManager: notification of dynamic policy mix activity"Jean-Michel Trivi2015-04-153-2/+12
|\
| * AudioPolicyManager: notification of dynamic policy mix activityJean-Michel Trivi2015-04-143-2/+12
| | | | | | | | | | | | | | | | | | | | Implement non-stream type specific ref counting in output descriptors to keep track of mix activity. Notify audio policy client of mix activity changes. Bug 20226914 Change-Id: Iec939cb640c58056f88947b611d23b4bb6d8a11b
* | Merge "Camera2: Add prepare for output streams"Eino-Ville Talvala2015-04-152-0/+8
|\ \
| * | Camera2: Add prepare for output streamsEino-Ville Talvala2015-04-152-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | The prepare call asynchronously pre-allocates buffers for a given output stream, and then fires the onPrepared callback. Not implemented for Camera2Device or used in Camera2Client. Change-Id: I1cccdfff846dd6985133c591dbdceed823929ade
* | | Merge "Revert "stagefright: define CB_CODEC_RELEASED and ReleaseReason enum.""Ronghua Wu2015-04-151-7/+1
|\ \ \
| * | | Revert "stagefright: define CB_CODEC_RELEASED and ReleaseReason enum."Ronghua Wu2015-04-141-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ea20d117ef9b4e867ec3982c7d070e719617ba2f. Change-Id: Ia77448a81429814e6915eca9c1cd854ca0e623cc
* | | | Merge "media: use ResourceManagerService with MediaCodec"Ronghua Wu2015-04-151-0/+38
|\ \ \ \
| * | | | media: use ResourceManagerService with MediaCodecRonghua Wu2015-04-141-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I235a97e5195b28645b7834dda0dd77307d93f4a8
* | | | | Merge "HLS: parse stream resolution and set maxWidth/maxHeight"Chong Zhang2015-04-151-0/+2
|\ \ \ \ \
| * | | | | HLS: parse stream resolution and set maxWidth/maxHeightChong Zhang2015-04-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 20160436 Change-Id: Ic3adb84d3c65cc65f62fc509a99d09602db862a1
* | | | | | Merge "stagefright: metadata retriever changes for capture fps"Chong Zhang2015-04-142-0/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | stagefright: metadata retriever changes for capture fpsChong Zhang2015-04-132-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | bug: 19460202 Change-Id: I20afded0b7eec45b2f25b51cf59d9f48eada74d8
* | | | | Merge "camera2: add reprocess support"Chien-Yu Chen2015-04-142-0/+14
|\ \ \ \ \
| * | | | | camera2: add reprocess supportChien-Yu Chen2015-04-132-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to create input stream, submit reprocess capture requests, and receive reprocess capture results. Change-Id: Iee2d4313f3d52616a484eaea7a28f5ef9d8a674b
* | | | | | Merge "AudioRecord::obtainBuffer() can return nonContig like AudioTrack"Glenn Kasten2015-04-141-2/+13
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | AudioRecord::obtainBuffer() can return nonContig like AudioTrackGlenn Kasten2015-04-131-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And fix error handling in both AudioRecord and AudioTrack. Change-Id: I4853d736cc6d2c05de5b18b0eac62716edfa62ec
* | | | | | media: handle overrides and measure max codec instance.Ronghua Wu2015-04-133-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I68d5919284700f37ccc6c6b9f96cd87ccdd40e6a
* | | | | | Merge "libstagefright: parse global settings from codec xml file."Ronghua Wu2015-04-141-0/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | libstagefright: parse global settings from codec xml file.Ronghua Wu2015-04-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also parse a new codec limit "max-supported-instances". Bug: 19620911 Change-Id: I6574c168b0c2b1aa649883958d3073edc01a4a03
* | | | | | mediaplayer: support async mode for widevine legacy modeLajos Molnar2015-04-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14679336 Change-Id: Id224eb8c31ec148ca9a144758cc56ddbf5465f5c
* | | | | | libstagefright: handle MediaFormat "operating-rate" key.Ronghua Wu2015-04-101-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I846d3cc10308a13f2ed92bb82ba7e8236d9c67d1
* | | | | Merge "Add a method to associate MediaDrm session with MediaCrypto"Jeff Tinker2015-04-101-0/+5
|\ \ \ \ \
| * | | | | Add a method to associate MediaDrm session with MediaCryptoJeff Tinker2015-04-101-0/+5
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, to associate a MediaDrm session with MediaCrypto, the MediaDrm sessionId was passed as initData to the MediaCrypto constructor. This is not ideal for two reasons: it's pretty obscure and you can't change the association without tearing down the MediaCodec/MediaCrypto and starting all over. Use cases like key rotation require being able to update the MediaDrm session post-construction. This CL addresses both of these issues. bug: 19570317 Change-Id: Ieb32d04d61742fc1dee2105dd904690d44c46c7b
* | | | | Merge "Add playback rate to AudioTrack"Andy Hung2015-04-103-2/+65
|\ \ \ \ \
| * | | | | Add playback rate to AudioTrackAndy Hung2015-04-093-2/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19196501 Change-Id: I6411e1d3ce652b711a71a6d9df020cb5f60d4714
* | | | | | Merge "Add playback rate to AudioMixer"Andy Hung2015-04-101-0/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add playback rate to AudioMixerAndy Hung2015-04-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19196501 Change-Id: I42d1f90e6297cf3f1304860d1691a5dfedd4c37d
* | | | | | Merge "MediaClock: allow user to query playback rate."Wei Jia2015-04-091-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | MediaClock: allow user to query playback rate.Wei Jia2015-04-091-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I306579e481cfcf923422d50d3d5cfae045ef2227
* | | | | Merge "stagefright: define CB_CODEC_RELEASED and ReleaseReason enum."Ronghua Wu2015-04-091-1/+7
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | stagefright: define CB_CODEC_RELEASED and ReleaseReason enum.Ronghua Wu2015-04-091-1/+7
| |/ / / | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I95e257c8aea2ef218f27ffaa2e62a8f12554d824
* | | | Merge "Pass crypto source data using a shared buffer"Jeff Tinker2015-04-092-2/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Pass crypto source data using a shared bufferJeff Tinker2015-04-082-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaCodec was using a binder transaction buffer to pass encryption source data for protected content. On some 4K content, the max binder transaction buffer size was being exceeded. This change uses a shared buffer for the encryption source data instead of a binder transaction buffer, which avoids the problem and may be more efficient. bug: 20027687 Change-Id: I36a24ebf600d7e1064b78e48b167fdc29b2c65e9
* | | | Enable 8 bit and float pcm record formats for AudioFlingerAndy Hung2015-04-081-0/+19
| |_|/ |/| | | | | | | | | | | | | | | | | Update sampling rate handling as well. Bug: 19570772 Change-Id: I872248e64c0578b2e48869a68fee0d51bd0640c3
* | | Merge "Adding explicit routing API to AudioTrack"Paul McLean2015-04-083-8/+34
|\ \ \ | |/ / |/| |
| * | Adding explicit routing API to AudioTrackPaul McLean2015-04-083-8/+34
| |/ | | | | | | Change-Id: I40c048c7644c46f4e4f7103875206c0785c4b1dc
* | Merge "stagefright: add new MediaCodec callback CB_RESOURCE_RECLAIMED."Ronghua Wu2015-04-071-0/+1
|\ \ | |/ |/|
| * stagefright: add new MediaCodec callback CB_RESOURCE_RECLAIMED.Ronghua Wu2015-03-191-0/+1
| | | | | | | | | | Bug: 19620911 Change-Id: I8db19cdbb1b93a7a6401e158f91285e7c395b719
* | Merge "HLS: misc bug fixes"Chong Zhang2015-04-032-0/+18
|\ \
| * | HLS: misc bug fixesChong Zhang2015-04-022-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix no target-duration case - fix for audio-only <=> audio/video switching - disable audio-only variants if there is at least one variant with video - fix mpeg2ts PTS wraparound when bandwidth adapting - tweak up/down switch marks bug: 19567254 Change-Id: Ib46144203c56dfc96eccd6ddaa3867e8a4f2c6a9
* | | audio port: support multiple clientsEric Laurent2015-04-011-4/+9
| | | | | | | | | | | | | | | | | | Add support for more than one audio port callback client per process. Change-Id: I657c4fc28d5d2d993307551e3e69567dc60196cb
* | | camera2: Enforce client eviction on user switch.Ruben Brunk2015-03-311-1/+18
|/ / | | | | | | | | Bug: 19186859 Change-Id: I172a2ce46c8e8a131ae7e8dd99d60c5f4f0d6668
* | Remove deprecation FIXMEs for TRANSFER_OBTAIN modeGlenn Kasten2015-03-252-15/+4
| | | | | | | | Change-Id: I7f43aabdb092e1465d79cd0eea5944fff18b93db
* | Merge "Camera: fix metadata assertion"Yin-Chia Yeh2015-03-251-2/+2
|\ \
| * | Camera: fix metadata assertionYin-Chia Yeh2015-03-241-2/+2
| | | | | | | | | | | | | | | Bug: 19897963 Change-Id: I6b383c4750f31691a1c02e927bbeb0c1998a9eff
* | | Merge "AudioRecord::read() can be non-blocking to match AudioTrack"Glenn Kasten2015-03-241-1/+4
|\ \ \
| * | | AudioRecord::read() can be non-blocking to match AudioTrackGlenn Kasten2015-03-231-1/+4
| | | | | | | | | | | | | | | | Change-Id: I23b9466b81ab6037d0bccd5e6f5974b7bd4aeacb
* | | | Merge "set() in AudioRecord and AudioTracks needs no lock"Glenn Kasten2015-03-242-0/+2
|\ \ \ \
| * | | | set() in AudioRecord and AudioTracks needs no lockGlenn Kasten2015-03-232-0/+2
| |/ / / | | | | | | | | | | | | Change-Id: I9d61b3d117e9b21fbbfad772d8981a5abb8fafae