summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* camera2: Set orientation flags for hardware composer.Ruben Brunk2014-07-141-0/+49
| | | | | Bug: 15116722 Change-Id: I3fcc9aea38afcbd665f86c511a9929fe9a6a3a8f
* Merge "MediaCodec: change onError cb to return CodecException"Chong Zhang2014-07-111-1/+1
|\
| * MediaCodec: change onError cb to return CodecExceptionChong Zhang2014-07-111-1/+1
| | | | | | | | | | Bug: 11990118 Change-Id: I3278aecb20df88c42fa2709a66e6166eb3cbe56f
* | Merge "MediaCodec async callbacks"Chong Zhang2014-07-101-0/+19
|\ \ | |/
| * MediaCodec async callbacksChong Zhang2014-07-111-0/+19
| | | | | | | | | | | | Bug: 11990118 Change-Id: I6fe4b407d9c85cddec8d958620d5d356735273cf
* | stagefright: Pass audio aac sub formats in offloadinfoaarti jadhav-gaikwad2014-07-111-0/+3
|/ | | | | | | | Pass audio aac sub formats in offloadinfo according to aac profile. Audio HAL can take decision about offload using DSP capabilities Change-Id: If269a3654b5d2b09c183212b0646ef03e06f2d8f
* stagefright: add indexed buffer and format getters to MediaCodecLajos Molnar2014-07-111-0/+15
| | | | | | | | | | These are designed to be called from the same thread as the one calling dequeue?Buffer, and use a mutex to avoid switching context. All other calls of MediaCodec are designed to be blocking and synchronous. Bug: 14297827 Change-Id: If341c6e4407ca6f10f5e0d47008dddc0e20b0a50
* Merge "handle emulation_prevention_three_bytes for AVC"Chong Zhang2014-07-081-3/+19
|\
| * handle emulation_prevention_three_bytes for AVCChong Zhang2014-07-081-3/+19
| | | | | | | | | | bug: 15917805 Change-Id: I824fe7eea807f8faba6b149c31890b7a5df87825
* | Merge "AString: add startsWithIgnoreCase and endsWithIgnoreCase"Lajos Molnar2014-07-081-0/+2
|\ \
| * | AString: add startsWithIgnoreCase and endsWithIgnoreCaseLajos Molnar2014-06-181-0/+2
| | | | | | | | | | | | Change-Id: I340159aa14d4d3d28ea675c6c5b8a82f7e731069
* | | stagefright: update ACodec to use CodecBase enumerations directlyLajos Molnar2014-07-071-15/+0
| | | | | | | | | | | | | | | Bug: 11784825 Change-Id: I9f322b78b52bfcc5040fda951486df4354cdba4f
* | | stagefright: update MediaCodec to use CodecBase instead of ACodecLajos Molnar2014-07-071-2/+2
| | | | | | | | | | | | | | | | | | | | | MediaCodec still creates an ACodec instance in init() Bug: 11784825 Change-Id: Ifba1e1582c788056c0e59afdf68cd3a504ab3679
* | | stagefright: create CodecBase interface (abstract class)Lajos Molnar2014-07-073-28/+123
| | | | | | | | | | | | | | | | | | | | | This abstracts out the ACodec dependency in MediaCodec. Bug: 11784825 Change-Id: I0aa8b56c6414865fd4b0646e2c5bd1b62d030682
* | | Merge "IAudioFlinger::openRecord now suggests notificationFrames"Glenn Kasten2014-07-021-0/+1
|\ \ \
| * | | IAudioFlinger::openRecord now suggests notificationFramesGlenn Kasten2014-07-031-0/+1
| | | | | | | | | | | | | | | | Change-Id: I08885cc381d03c522a23289e74f0e1ed46563863
* | | | Merge "Add new API AudioRecord::notificationFrames()"Glenn Kasten2014-07-021-0/+5
|\ \ \ \ | |/ / /
| * | | Add new API AudioRecord::notificationFrames()Glenn Kasten2014-07-031-0/+5
| | | | | | | | | | | | | | | | Change-Id: I27fb888f01ed547242ffaa8d4626d38c7999ad53
* | | | audio: deprecate audio_stream_frame_size()Eric Laurent2014-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 15000850. Change-Id: I955a6efa620b8f70fa5193c7853cbe88e879c9c3
* | | | Merge "Remove obsolete IAudioFlinger::channelCount()"Glenn Kasten2014-07-021-3/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove obsolete IAudioFlinger::channelCount()Glenn Kasten2014-06-021-3/+0
| | | | | | | | | | | | | | | | Change-Id: Ie623edae2e795f9155f1f452fe4e6c7217a4a4c8
* | | | Support for audio attributes on audio output of media playerJean-Michel Trivi2014-07-012-4/+10
| | | | | | | | | | | | | | | | Change-Id: Iae4995c98e64add1ab9e6c8ae6501515032755f5
* | | | Merge "Add HEVC encoder support to ACodec"Rachad2014-06-271-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add HEVC encoder support to ACodecRachad2014-06-261-0/+1
| | | | | | | | | | | | | | | | | | | | Bug: 14571712 Change-Id: Idaec2394d569541f3963befe722f46f6b0007937
* | | | cameraservice: Implement HAL1 and higher HAL API coexistenceZhijun He2014-06-192-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A higher hal version device like HAL3.2 can be opened as HAL1.0 device if HAL supports it. This only applies to camera API1. Change-Id: I4ae9f59f4317158cc1bd7ed7726e4032cdd1fa07
* | | | AudioTrack: add support for compressed audioEric Laurent2014-06-192-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for compressed audio playback by use of an AudioTrack attached to a direct output thread. Bug: 9428304. Change-Id: I4a61be9cf0e31003ca85935d6e0ee38ca8192e03
* | | | Merge changes I0fef0584,I322b91faJean-Michel Trivi2014-06-183-2/+22
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | * changes: AudioPolicyManager: return output for audio attributes AudioTrack construction with audio attributes
| * | | AudioPolicyManager: return output for audio attributesJean-Michel Trivi2014-06-182-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In AudioPolicyManager, support querying an output or playback strategy for audio attributes, instead of a stream type, In AudioTrack creation, use the output returned for the track's attributes. Change-Id: I0fef05845ba676404775e2e338c10e6a96237268
| * | | AudioTrack construction with audio attributesJean-Michel Trivi2014-06-171-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store audio attributes in AudioTrack class. When an AudioTrack is "set" with non null audio attributes, derive a stream type that reflects the attributes. When an AudioTrack is "set" without attributes, and only has a stream type, derive default audio attributes. Change-Id: I322b91fa9a7e193118960c5e78cdddd85d66f9ad
* | | | camera: Add #getLegacyParameters, #supportsCameraApi to ICameraServiceIgor Murashkin2014-06-171-0/+20
| | | | | | | | | | | | | | | | Change-Id: Ic86c8df3d703e7cf89caa856387e2c0a1b977401
* | | | Merge "support for CEA-608 closed caption"Chong Zhang2014-06-141-0/+1
|\ \ \ \
| * | | | support for CEA-608 closed captionChong Zhang2014-06-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15470448 Change-Id: Ic6a527f5c35a8ee0a08a5b043336e4d193216083
* | | | | Merge "refactor getTrackInfo()"Chong Zhang2014-06-121-0/+1
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | refactor getTrackInfo()Chong Zhang2014-06-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (this is in preparation for supporting other cc source) - split into two methods: getTrackCount() and getTrackInfo() - move track info parcelling to NuPlayer - parcel in the mime type of the subtitle format Bug: 15470448 Change-Id: If00724d8c3a2b2319cb9c5f29d3fe76347bfe947
* | | | Merge "AudioSystem: remove unused stream type"Jean-Michel Trivi2014-06-121-2/+0
|\ \ \ \
| * | | | AudioSystem: remove unused stream typeJean-Michel Trivi2014-06-111-2/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The audio stream type is not used in the getSampleRate() and getFrameCount() methods. Change-Id: I3d065ae272bd039204cd323cdab9b60460034f2d
* | | | am 6bf02664: am ccaffa8d: Merge "Use char x[] rather than char x[0]."Elliott Hughes2014-06-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '6bf02664bbe4955d4818fe308b00ce0d97f38c8f': Use char x[] rather than char x[0].
| * \ \ \ am ccaffa8d: Merge "Use char x[] rather than char x[0]."Elliott Hughes2014-06-131-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ccaffa8df0e201da6bfabb6d616e62904cfb5534': Use char x[] rather than char x[0].
| | * \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15514223 Change-Id: I895ea8ef7e391fd14cdf8976e048385e01c90f8f
| * | | | | | resolved conflicts for merge of cbd74fcb to klp-modular-dev-plus-aospNarayan Kamath2014-06-132-3/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | Change-Id: I00270ef6fe813c0d3649483cbc3aba6af789e033
| | * | | | | Update OMX messages for 64 bitAndy Hung2014-06-122-3/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change node_id and buffer_id to uint32_t. Ensure IOMX messages are fixed size. Remove 64 bit compile warnings in associated files. Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | am 2a8270e6: am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-124-61/+28
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '2a8270e6944fb3addfcba87f6885aaad196b8b88': Offer a type-safe album art interface.
| * | | | | am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-124-61/+28
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'c323737dd46d724b4c1ec230b283f26ae2a22b4f': Offer a type-safe album art interface.
| | * | | | Offer a type-safe album art interface.Elliott Hughes2014-06-114-61/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15514223 Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
* | | | | | MediaProfiles: Add 4K video related constantsZhijun He2014-06-101-2/+4
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | Bug: 15287656 Change-Id: I4c49640a349afb336f52db1636902fc216bff6ad
* | | | | am 8a454611: Merge "stagefright: added support, and SoftOMX decoder, for ↵Lajos Molnar2014-06-062-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HEVC" into lmp-preview-dev * commit '8a45461198c69e9e15f133c2e11ded47fc4c708b': stagefright: added support, and SoftOMX decoder, for HEVC
| * | | | | stagefright: added support, and SoftOMX decoder, for HEVCHarish Mahendrakar2014-06-062-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also fixed QuerySupportedProfileLevels in SoftVideoDecoderOMXComponent.cpp Bug: 14571712 Change-Id: Ifa3793f7c1b18ac5e8c0a096848c998cabd9e777
| * | | | | Fix typos, remove callback functions - do not mergeMarco Nelissen2014-06-032-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/15414091 Change-Id: I2f7b7ea6a7943a808de2c6a54fe810eefdee133e
* | | | | | add sound trigger native serviceEric Laurent2014-06-045-0/+280
| |_|_|_|/ |/| | | | | | | | | | | | | | Change-Id: I0cd954c1c7d28a334e786d0004431d4f6a1227ec