summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Adding explicit routing API to AudioTrackPaul McLean2015-04-083-8/+34
| | | | Change-Id: I40c048c7644c46f4e4f7103875206c0785c4b1dc
* 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
* | | 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
* | | | | Merge "AudioRecord::releaseBuffer() buffer is const *, like AudioTrack"Glenn Kasten2015-03-231-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | AudioRecord::releaseBuffer() buffer is const *, like AudioTrackGlenn Kasten2015-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: If09689a8411392281ad06fcf781f3198941c642d
* | | | | Merge "Remove dead AudioTrack::setAttributesFromStreamType()"Glenn Kasten2015-03-231-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | Remove dead AudioTrack::setAttributesFromStreamType()Glenn Kasten2015-03-231-2/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I34feb3f9df49458f8a81ddcced4dd769fdaca945
* | | | | Merge "Deprecate AudioRecord::getInput() and AudioTrack::getOutput()"Glenn Kasten2015-03-232-1/+8
|\ \ \ \ \ | |/ / / /
| * | | | Deprecate AudioRecord::getInput() and AudioTrack::getOutput()Glenn Kasten2015-03-232-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Does not completely fix the bug, but is a step in the right direction. Bug: 12593118 Change-Id: Id591cd700ab58fd927ae44c71c81dac55b5cac2d
* | | | | Merge "Move AudioTrack::isOffloaded() and isDirect() variants"Glenn Kasten2015-03-231-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Move AudioTrack::isOffloaded() and isDirect() variantsGlenn Kasten2015-03-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be near each other. Change-Id: Ic26681716ea48886f0bfed23803240466db5d8fa
* | | | | Merge "Whitespace"Glenn Kasten2015-03-232-5/+5
|\ \ \ \ \ | |/ / / /
| * | | | WhitespaceGlenn Kasten2015-03-232-5/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I4640be948ad3caff0eb7525991398a1353e4bfe6
* | | | | Merge "Add FIXME to deprecate AudioTrack::getMinFrameCount()"Glenn Kasten2015-03-231-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Add FIXME to deprecate AudioTrack::getMinFrameCount()Glenn Kasten2015-03-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Continuation of previous change, for all APIs that assume a route Change-Id: Ia1315032cf6366f428db342b16b2e1c3b574f407
* | | | | Merge "Update AudioRecord comments to match AudioTrack"Glenn Kasten2015-03-231-13/+21
|\ \ \ \ \ | |/ / / /
| * | | | Update AudioRecord comments to match AudioTrackGlenn Kasten2015-03-231-13/+21
| | | | | | | | | | | | | | | | | | | | Change-Id: I6c3620c60c0ba159e4688b42de4ec8b91920e048
* | | | | Merge "Fix typos"Glenn Kasten2015-03-232-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Fix typosGlenn Kasten2015-03-232-3/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos in comments Add formal parameter name to declaration where it was missing Fix out of order comments Change-Id: I1de81ae82af5ca507864e4c7b959111bac898b98
* | | | am f1300d31: am cdf96ffa: Merge "ulaw and alaw aren\'t limited to 8kHz"Marco Nelissen2015-03-222-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'f1300d31fe80c8e14cf2bbca6c7b6768110cd5ba': ulaw and alaw aren't limited to 8kHz
| * | | | ulaw and alaw aren't limited to 8kHzMarco Nelissen2015-03-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=158490 Change-Id: Ib30e156c99a997db861bb85e17244a5effdd55cf
| * | | | Merge commit '56fbb4d7bcb34af71a08cd126891afafdec217f1' into HEADBill Yi2015-02-1922-58/+384
| |\ \ \ \
* | | | | | camera2: Remove ProCamera.Ruben Brunk2015-03-204-500/+0
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | Bug: 19186859 Change-Id: I4aaadb53db65b479f92cbb3c05329d1e40317900
* | | | | Merge "Event driven wake for AudioRecordThread notification changes"Andy Hung2015-03-191-1/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Event driven wake for AudioRecordThread notification changesAndy Hung2015-03-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used for setMarkerPosition and setPositionUpdatePeriod. Change-Id: Iedd1be8725dea32bdba6908b78c5166780a66fec