summaryrefslogtreecommitdiffstats
path: root/include/media
Commit message (Collapse)AuthorAgeFilesLines
* 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 "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-102-0/+31
|\ \ \
| * | | Add playback rate to AudioTrackAndy Hung2015-04-092-0/+31
| | | | | | | | | | | | | | | | | | | | 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
* | Remove deprecation FIXMEs for TRANSFER_OBTAIN modeGlenn Kasten2015-03-252-15/+4
| | | | | | | | Change-Id: I7f43aabdb092e1465d79cd0eea5944fff18b93db
* | 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
* | | Merge "Remove AudioRecord::notificationFrames()"Glenn Kasten2015-03-241-5/+0
|\ \ \
| * | | Remove AudioRecord::notificationFrames()Glenn Kasten2015-03-231-5/+0
| |/ / | | | | | | | | | | | | | | | This API was unused, and is not present in AudioTrack Change-Id: I66a1eedc149af085269c0f438c3c8d4e226a0e5b
* | | Merge "media: add ResourceManagerService"Ronghua Wu2015-03-244-0/+209
|\ \ \
| * | | media: add ResourceManagerServiceRonghua Wu2015-03-234-0/+209
| | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: Iea173d310d31781bc50effe3d9bd6553cb5139eb
* | | | Merge "MediaSync: support MediaSync in native code."Wei Jia2015-03-242-11/+252
|\ \ \ \
| * | | | MediaSync: support MediaSync in native code.Wei Jia2015-03-202-11/+252
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: Ib6678153f43f5063bdaaf53dd8ad5e8d26434e1e
* | | | | Merge "Report key request message type for unprefixed EME"Jeff Tinker2015-03-241-1/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Report key request message type for unprefixed EMEJeff Tinker2015-03-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 19771299 Change-Id: I02f0a4532b5ea8a7e680d71f45ac0da06879f3d6
* | | | | Merge "Update AudioRecord comments to match AudioTrack"Glenn Kasten2015-03-231-2/+8
|\ \ \ \ \
| * | | | | Update AudioRecord comments to match AudioTrackGlenn Kasten2015-03-231-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I02cb51af058277991ad0b1b5dce45744b8e8c129
* | | | | | Merge "Update AudioTrack constructor and set() comments"Glenn Kasten2015-03-232-6/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Update AudioTrack constructor and set() commentsGlenn Kasten2015-03-232-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comments were missing for recently added parameters. Change-Id: I414594fed56317112be5f3b415871d77e7f7e282
* | | | | | Merge "Update AudioTrack comments to match AudioRecord"Glenn Kasten2015-03-231-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Update AudioTrack comments to match AudioRecordGlenn Kasten2015-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I176a4830513a0b37c38f86815fe637093b9ad52f
* | | | | | Merge "AudioTrack::dump() comment"Glenn Kasten2015-03-231-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | AudioTrack::dump() commentGlenn Kasten2015-03-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id3b5210293a77404189555a0c797fb099e3c6c04