summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* HLS: misc bug fixesChong Zhang2015-04-022-0/+18
* Remove deprecation FIXMEs for TRANSFER_OBTAIN modeGlenn Kasten2015-03-252-15/+4
* Merge "Camera: fix metadata assertion"Yin-Chia Yeh2015-03-251-2/+2
|\
| * Camera: fix metadata assertionYin-Chia Yeh2015-03-241-2/+2
* | 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
* | | 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
| |/ /
* | | Merge "Remove AudioRecord::notificationFrames()"Glenn Kasten2015-03-241-5/+0
|\ \ \
| * | | Remove AudioRecord::notificationFrames()Glenn Kasten2015-03-231-5/+0
| |/ /
* | | Merge "media: add ResourceManagerService"Ronghua Wu2015-03-244-0/+209
|\ \ \
| * | | media: add ResourceManagerServiceRonghua Wu2015-03-234-0/+209
* | | | 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
| | |_|/ | |/| |
* | | | 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
* | | | Merge "Update AudioRecord comments to match AudioTrack"Glenn Kasten2015-03-231-2/+8
|\ \ \ \
| * | | | Update AudioRecord comments to match AudioTrackGlenn Kasten2015-03-231-2/+8
* | | | | Merge "Update AudioTrack constructor and set() comments"Glenn Kasten2015-03-232-6/+13
|\ \ \ \ \ | |/ / / /
| * | | | Update AudioTrack constructor and set() commentsGlenn Kasten2015-03-232-6/+13
* | | | | Merge "Update AudioTrack comments to match AudioRecord"Glenn Kasten2015-03-231-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Update AudioTrack comments to match AudioRecordGlenn Kasten2015-03-231-1/+1
* | | | | Merge "AudioTrack::dump() comment"Glenn Kasten2015-03-231-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | AudioTrack::dump() commentGlenn Kasten2015-03-231-0/+1
* | | | | 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
* | | | | Merge "Remove dead AudioTrack::setAttributesFromStreamType()"Glenn Kasten2015-03-231-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | Remove dead AudioTrack::setAttributesFromStreamType()Glenn Kasten2015-03-231-2/+0
* | | | | 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
* | | | | Merge "Move AudioTrack::isOffloaded() and isDirect() variants"Glenn Kasten2015-03-231-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Move AudioTrack::isOffloaded() and isDirect() variantsGlenn Kasten2015-03-231-4/+4
* | | | | Merge "Whitespace"Glenn Kasten2015-03-232-5/+5
|\ \ \ \ \ | |/ / / /
| * | | | WhitespaceGlenn Kasten2015-03-232-5/+5
* | | | | 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
* | | | | Merge "Update AudioRecord comments to match AudioTrack"Glenn Kasten2015-03-231-13/+21
|\ \ \ \ \ | |/ / / /
| * | | | Update AudioRecord comments to match AudioTrackGlenn Kasten2015-03-231-13/+21
* | | | | Merge "Fix typos"Glenn Kasten2015-03-232-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Fix typosGlenn Kasten2015-03-232-3/+3
| | |/ / | |/| |
* | | | am f1300d31: am cdf96ffa: Merge "ulaw and alaw aren\'t limited to 8kHz"Marco Nelissen2015-03-222-2/+2
|\ \ \ \
| * | | | ulaw and alaw aren't limited to 8kHzMarco Nelissen2015-03-202-2/+2
| * | | | Merge commit '56fbb4d7bcb34af71a08cd126891afafdec217f1' into HEADBill Yi2015-02-1922-58/+384
| |\ \ \ \
* | | | | | camera2: Remove ProCamera.Ruben Brunk2015-03-204-500/+0
| |_|/ / / |/| | | |
* | | | | 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
* | | | | Merge "Camera: plumbing rotation field through"Yin-Chia Yeh2015-03-192-3/+54
|\ \ \ \ \
| * | | | | Camera: plumbing rotation field throughYin-Chia Yeh2015-03-182-3/+54
* | | | | | Merge "camera2: Add camera client eviction enforcement."Ruben Brunk2015-03-191-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | camera2: Add camera client eviction enforcement.Ruben Brunk2015-03-181-0/+3