Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Add a method to associate MediaDrm session with MediaCrypto" | Jeff Tinker | 2015-04-10 | 1 | -0/+5 |
|\ | |||||
| * | Add a method to associate MediaDrm session with MediaCrypto | Jeff Tinker | 2015-04-10 | 1 | -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 Hung | 2015-04-10 | 3 | -2/+65 |
|\ \ | |||||
| * | | Add playback rate to AudioTrack | Andy Hung | 2015-04-09 | 3 | -2/+65 |
| | | | | | | | | | | | | | | | Bug: 19196501 Change-Id: I6411e1d3ce652b711a71a6d9df020cb5f60d4714 | ||||
* | | | Merge "Add playback rate to AudioMixer" | Andy Hung | 2015-04-10 | 1 | -0/+8 |
|\ \ \ | |/ / | |||||
| * | | Add playback rate to AudioMixer | Andy Hung | 2015-04-09 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | Bug: 19196501 Change-Id: I42d1f90e6297cf3f1304860d1691a5dfedd4c37d | ||||
* | | | Merge "MediaClock: allow user to query playback rate." | Wei Jia | 2015-04-09 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | MediaClock: allow user to query playback rate. | Wei Jia | 2015-04-09 | 1 | -0/+1 |
| |/ | | | | | | | | | Bug: 19666434 Change-Id: I306579e481cfcf923422d50d3d5cfae045ef2227 | ||||
* | | Merge "stagefright: define CB_CODEC_RELEASED and ReleaseReason enum." | Ronghua Wu | 2015-04-09 | 1 | -1/+7 |
|\ \ | |||||
| * | | stagefright: define CB_CODEC_RELEASED and ReleaseReason enum. | Ronghua Wu | 2015-04-09 | 1 | -1/+7 |
| |/ | | | | | | | | | Bug: 19620911 Change-Id: I95e257c8aea2ef218f27ffaa2e62a8f12554d824 | ||||
* | | Merge "Pass crypto source data using a shared buffer" | Jeff Tinker | 2015-04-09 | 2 | -2/+7 |
|\ \ | |/ |/| | |||||
| * | Pass crypto source data using a shared buffer | Jeff Tinker | 2015-04-08 | 2 | -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 AudioFlinger | Andy Hung | 2015-04-08 | 1 | -0/+19 |
| | | | | | | | | | | | | | | Update sampling rate handling as well. Bug: 19570772 Change-Id: I872248e64c0578b2e48869a68fee0d51bd0640c3 | ||||
* | | Merge "Adding explicit routing API to AudioTrack" | Paul McLean | 2015-04-08 | 3 | -8/+34 |
|\ \ | |/ |/| | |||||
| * | Adding explicit routing API to AudioTrack | Paul McLean | 2015-04-08 | 3 | -8/+34 |
| | | | | | | | | Change-Id: I40c048c7644c46f4e4f7103875206c0785c4b1dc | ||||
* | | Merge "stagefright: add new MediaCodec callback CB_RESOURCE_RECLAIMED." | Ronghua Wu | 2015-04-07 | 1 | -0/+1 |
|\ \ | |/ |/| | |||||
| * | stagefright: add new MediaCodec callback CB_RESOURCE_RECLAIMED. | Ronghua Wu | 2015-03-19 | 1 | -0/+1 |
| | | | | | | | | | | Bug: 19620911 Change-Id: I8db19cdbb1b93a7a6401e158f91285e7c395b719 | ||||
* | | Merge "HLS: misc bug fixes" | Chong Zhang | 2015-04-03 | 2 | -0/+18 |
|\ \ | |||||
| * | | HLS: misc bug fixes | Chong Zhang | 2015-04-02 | 2 | -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 clients | Eric Laurent | 2015-04-01 | 1 | -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 Brunk | 2015-03-31 | 1 | -1/+18 |
|/ / | | | | | | | | | Bug: 19186859 Change-Id: I172a2ce46c8e8a131ae7e8dd99d60c5f4f0d6668 | ||||
* | | Remove deprecation FIXMEs for TRANSFER_OBTAIN mode | Glenn Kasten | 2015-03-25 | 2 | -15/+4 |
| | | | | | | | | Change-Id: I7f43aabdb092e1465d79cd0eea5944fff18b93db | ||||
* | | Merge "Camera: fix metadata assertion" | Yin-Chia Yeh | 2015-03-25 | 1 | -2/+2 |
|\ \ | |||||
| * | | Camera: fix metadata assertion | Yin-Chia Yeh | 2015-03-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | Bug: 19897963 Change-Id: I6b383c4750f31691a1c02e927bbeb0c1998a9eff | ||||
* | | | Merge "AudioRecord::read() can be non-blocking to match AudioTrack" | Glenn Kasten | 2015-03-24 | 1 | -1/+4 |
|\ \ \ | |||||
| * | | | AudioRecord::read() can be non-blocking to match AudioTrack | Glenn Kasten | 2015-03-23 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | Change-Id: I23b9466b81ab6037d0bccd5e6f5974b7bd4aeacb | ||||
* | | | | Merge "set() in AudioRecord and AudioTracks needs no lock" | Glenn Kasten | 2015-03-24 | 2 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | set() in AudioRecord and AudioTracks needs no lock | Glenn Kasten | 2015-03-23 | 2 | -0/+2 |
| |/ / / | | | | | | | | | | | | | Change-Id: I9d61b3d117e9b21fbbfad772d8981a5abb8fafae | ||||
* | | | | Merge "Remove AudioRecord::notificationFrames()" | Glenn Kasten | 2015-03-24 | 1 | -5/+0 |
|\ \ \ \ | |||||
| * | | | | Remove AudioRecord::notificationFrames() | Glenn Kasten | 2015-03-23 | 1 | -5/+0 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | This API was unused, and is not present in AudioTrack Change-Id: I66a1eedc149af085269c0f438c3c8d4e226a0e5b | ||||
* | | | | Merge "media: add ResourceManagerService" | Ronghua Wu | 2015-03-24 | 4 | -0/+209 |
|\ \ \ \ | |||||
| * | | | | media: add ResourceManagerService | Ronghua Wu | 2015-03-23 | 4 | -0/+209 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: Iea173d310d31781bc50effe3d9bd6553cb5139eb | ||||
* | | | | | Merge "MediaSync: support MediaSync in native code." | Wei Jia | 2015-03-24 | 2 | -11/+252 |
|\ \ \ \ \ | |||||
| * | | | | | MediaSync: support MediaSync in native code. | Wei Jia | 2015-03-20 | 2 | -11/+252 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: Ib6678153f43f5063bdaaf53dd8ad5e8d26434e1e | ||||
* | | | | | Merge "Report key request message type for unprefixed EME" | Jeff Tinker | 2015-03-24 | 1 | -1/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Report key request message type for unprefixed EME | Jeff Tinker | 2015-03-16 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19771299 Change-Id: I02f0a4532b5ea8a7e680d71f45ac0da06879f3d6 | ||||
* | | | | | Merge "Update AudioRecord comments to match AudioTrack" | Glenn Kasten | 2015-03-23 | 1 | -2/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Update AudioRecord comments to match AudioTrack | Glenn Kasten | 2015-03-23 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I02cb51af058277991ad0b1b5dce45744b8e8c129 | ||||
* | | | | | | Merge "Update AudioTrack constructor and set() comments" | Glenn Kasten | 2015-03-23 | 2 | -6/+13 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Update AudioTrack constructor and set() comments | Glenn Kasten | 2015-03-23 | 2 | -6/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comments were missing for recently added parameters. Change-Id: I414594fed56317112be5f3b415871d77e7f7e282 | ||||
* | | | | | | Merge "Update AudioTrack comments to match AudioRecord" | Glenn Kasten | 2015-03-23 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Update AudioTrack comments to match AudioRecord | Glenn Kasten | 2015-03-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I176a4830513a0b37c38f86815fe637093b9ad52f | ||||
* | | | | | | Merge "AudioTrack::dump() comment" | Glenn Kasten | 2015-03-23 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | AudioTrack::dump() comment | Glenn Kasten | 2015-03-23 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id3b5210293a77404189555a0c797fb099e3c6c04 | ||||
* | | | | | | Merge "AudioRecord::releaseBuffer() buffer is const *, like AudioTrack" | Glenn Kasten | 2015-03-23 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | AudioRecord::releaseBuffer() buffer is const *, like AudioTrack | Glenn Kasten | 2015-03-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If09689a8411392281ad06fcf781f3198941c642d | ||||
* | | | | | | Merge "Remove dead AudioTrack::setAttributesFromStreamType()" | Glenn Kasten | 2015-03-23 | 1 | -2/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Remove dead AudioTrack::setAttributesFromStreamType() | Glenn Kasten | 2015-03-23 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I34feb3f9df49458f8a81ddcced4dd769fdaca945 | ||||
* | | | | | | Merge "Deprecate AudioRecord::getInput() and AudioTrack::getOutput()" | Glenn Kasten | 2015-03-23 | 2 | -1/+8 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Deprecate AudioRecord::getInput() and AudioTrack::getOutput() | Glenn Kasten | 2015-03-23 | 2 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Does not completely fix the bug, but is a step in the right direction. Bug: 12593118 Change-Id: Id591cd700ab58fd927ae44c71c81dac55b5cac2d |