summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* cameraservice: Implement HAL1 and higher HAL API coexistenceZhijun He2014-06-192-0/+21
* AudioTrack: add support for compressed audioEric Laurent2014-06-192-0/+10
* Merge changes I0fef0584,I322b91faJean-Michel Trivi2014-06-183-2/+22
|\
| * AudioPolicyManager: return output for audio attributesJean-Michel Trivi2014-06-182-1/+14
| * AudioTrack construction with audio attributesJean-Michel Trivi2014-06-171-1/+8
* | camera: Add #getLegacyParameters, #supportsCameraApi to ICameraServiceIgor Murashkin2014-06-171-0/+20
* | Merge "support for CEA-608 closed caption"Chong Zhang2014-06-141-0/+1
|\ \
| * | support for CEA-608 closed captionChong Zhang2014-06-131-0/+1
* | | Merge "refactor getTrackInfo()"Chong Zhang2014-06-121-0/+1
|\ \ \ | |/ / | | / | |/ |/|
| * refactor getTrackInfo()Chong Zhang2014-06-131-0/+1
* | Merge "AudioSystem: remove unused stream type"Jean-Michel Trivi2014-06-121-2/+0
|\ \
| * | AudioSystem: remove unused stream typeJean-Michel Trivi2014-06-111-2/+0
| |/
* | am 6bf02664: am ccaffa8d: Merge "Use char x[] rather than char x[0]."Elliott Hughes2014-06-131-1/+1
|\ \
| * \ am ccaffa8d: Merge "Use char x[] rather than char x[0]."Elliott Hughes2014-06-131-1/+1
| |\ \
| | * \ Merge "Use char x[] rather than char x[0]."Elliott Hughes2014-06-121-1/+1
| | |\ \
| | | * | Use char x[] rather than char x[0].Elliott Hughes2014-06-121-1/+1
| * | | | resolved conflicts for merge of cbd74fcb to klp-modular-dev-plus-aospNarayan Kamath2014-06-132-3/+3
| |\ \ \ \ | | |/ / /
| | * | | Update OMX messages for 64 bitAndy Hung2014-06-122-3/+3
| | |/ /
* | | | am 2a8270e6: am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-124-61/+28
|\ \ \ \ | |/ / /
| * | | am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-124-61/+28
| |\ \ \ | | |/ /
| | * | Offer a type-safe album art interface.Elliott Hughes2014-06-114-61/+28
* | | | MediaProfiles: Add 4K video related constantsZhijun He2014-06-101-2/+4
| |_|/ |/| |
* | | am 8a454611: Merge "stagefright: added support, and SoftOMX decoder, for HEVC...Lajos Molnar2014-06-062-0/+5
|\ \ \
| * | | stagefright: added support, and SoftOMX decoder, for HEVCHarish Mahendrakar2014-06-062-0/+5
| * | | Fix typos, remove callback functions - do not mergeMarco Nelissen2014-06-032-12/+1
* | | | add sound trigger native serviceEric Laurent2014-06-045-0/+280
* | | | resolved conflicts for merge of b52c152d to masterEric Laurent2014-05-303-1/+82
|\ \ \ \ | |/ / /
| * | | audio policy: add routing update client interfaceEric Laurent2014-05-293-1/+82
| * | | DO NOT MERGE - IAudioPolicyService interface extension for patch panelEric Laurent2014-05-282-0/+50
| * | | DO NOT MERGE - IAudioFlinger interface extension for patch panelEric Laurent2014-05-281-0/+21
* | | | getSampletime -> getSampleTimeMarco Nelissen2014-05-291-1/+1
* | | | Merge "IAudioPolicyService interface extension for patch panel"Eric Laurent2014-05-282-0/+50
|\ \ \ \
| * | | | IAudioPolicyService interface extension for patch panelEric Laurent2014-05-272-0/+50
* | | | | Merge "IAudioFlinger interface extension for patch panel"Eric Laurent2014-05-281-0/+21
|\ \ \ \ \ | |/ / / /
| * | | | IAudioFlinger interface extension for patch panelEric Laurent2014-05-271-0/+21
| |/ / /
* | | | Merge "Remove codec callback for now."Marco Nelissen2014-05-271-11/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove codec callback for now.Marco Nelissen2014-05-231-11/+0
* | | | camera2: Update CameraService for HAL1 shim.Ruben Brunk2014-05-212-0/+34
|/ / /
* | | Remove the last of the references.Marco Nelissen2014-05-211-1/+1
* | | Fix includeMarco Nelissen2014-05-201-1/+1
* | | Use pointers instead of references because CMarco Nelissen2014-05-201-22/+22
* | | Merge "Add docs, releaseOutputBufferAtTime, seekTo."Marco Nelissen2014-05-204-8/+107
|\ \ \
| * | | Add docs, releaseOutputBufferAtTime, seekTo.Marco Nelissen2014-05-194-8/+107
* | | | Merge "Add HEVC decoder support to ACodec bug: 14571712"Rachad2014-05-191-0/+1
|\ \ \ \
| * | | | Add HEVC decoder support to ACodecRachad2014-05-141-0/+1
* | | | | Pass stereo gains as packed minifloatGlenn Kasten2014-05-191-8/+6
| |/ / / |/| | |
* | | | Fix build.Marco Nelissen2014-05-151-1/+1
* | | | Merge "Unify error/status codes"Marco Nelissen2014-05-156-73/+78
|\ \ \ \
| * | | | Unify error/status codesMarco Nelissen2014-05-156-73/+78
| |/ / /
* | | | Merge "Hook up event handling in NDK MediaDrm API"Jeff Tinker2014-05-151-1/+1
|\ \ \ \