summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-124-23/+29
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-114-23/+29
| | |\ \ \ \ \
| | | * | | | | Offer a type-safe album art interface.Elliott Hughes2014-06-114-23/+29
* | | | | | | | Merge "Remove dependency on Parcel::{read,write}IntPtr"Jeff Tinker2014-06-111-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove dependency on Parcel::{read,write}IntPtrJeff Tinker2014-06-101-2/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | am ca44dc79: am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."Christopher Ferris2014-06-112-3/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."Christopher Ferris2014-06-102-3/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Add libcrypto for users of libstagefright.Christopher Ferris2014-06-102-3/+1
| | | |/ / / / | | |/| | | |
* | | | | | | Merge "MediaProfiles: Add 4K video related constants"Zhijun He2014-06-101-0/+2
|\ \ \ \ \ \ \
| * | | | | | | MediaProfiles: Add 4K video related constantsZhijun He2014-06-101-0/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | resolved conflicts for merge of 281b884c to masterChristopher Ferris2014-06-111-0/+7
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am d3af4265: Merge "Link libcrypto for MD5_* functions."Christopher Ferris2014-06-101-0/+7
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Link libcrypto for MD5_* functions.Christopher Ferris2014-06-091-0/+7
| * | | | | | am 17a6dd60: DO NOT MERGE: MediaCodecList: remove force-added codecs for vide...Lajos Molnar2014-06-051-9/+0
| |\ \ \ \ \ \
| | * | | | | | DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditorLajos Molnar2014-05-291-9/+0
* | | | | | | | Log an error when audio/video encoder failed to createChong Zhang2014-06-111-1/+5
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge "Remove unneeded code"Marco Nelissen2014-06-101-6/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Remove unneeded codeMarco Nelissen2014-06-101-6/+0
* | | | | | | add back HEVC SoftOMX decoderLajos Molnar2014-06-063-0/+853
* | | | | | | Remove SoftOMX HEVC decoderLajos Molnar2014-06-063-849/+0
* | | | | | | am 8a454611: Merge "stagefright: added support, and SoftOMX decoder, for HEVC...Lajos Molnar2014-06-069-8/+1023
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge "stagefright: added support, and SoftOMX decoder, for HEVC" into lmp-pr...Lajos Molnar2014-06-069-8/+1023
| |\ \ \ \ \ \
| | * | | | | | stagefright: added support, and SoftOMX decoder, for HEVCHarish Mahendrakar2014-06-069-8/+1023
* | | | | | | | Merge "Guard against malformed files"Marco Nelissen2014-06-061-4/+28
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Guard against malformed filesMarco Nelissen2014-06-061-4/+28
* | | | | | | | Merge "do not drop TS packet on discontinuity at payload start"Chong Zhang2014-06-061-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | do not drop TS packet on discontinuity at payload startChong Zhang2014-06-061-1/+3
* | | | | | | | | Merge "check camera permission for video source other than SURFACE"Chong Zhang2014-06-061-1/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | check camera permission for video source other than SURFACEChong Zhang2014-06-061-1/+2
| |/ / / / / / /
* | | | | | | | Merge "Make AAC decoder behavior after flush consistent with non-flush"Marco Nelissen2014-06-061-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Make AAC decoder behavior after flush consistent with non-flushMarco Nelissen2014-06-051-0/+1
* | | | | | | | am 270facca: We still need the raw codecMarco Nelissen2014-06-051-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | We still need the raw codecMarco Nelissen2014-06-051-0/+1
| * | | | | | Merge "Squashed commit of the following:" into lmp-preview-devGlenn Kasten2014-06-052-22/+35
| |\ \ \ \ \ \
| | * | | | | | Squashed commit of the following:Glenn Kasten2014-06-052-22/+35
* | | | | | | | Merge "Added paused state to NuPlayerDecoder"Wei Jia2014-06-052-2/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Added paused state to NuPlayerDecoderWei Jia2014-06-052-2/+20
* | | | | | | | | Merge "add sound trigger native service"Eric Laurent2014-06-052-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add sound trigger native serviceEric Laurent2014-06-042-2/+6
* | | | | | | | | | am 9042b116: Merge "MediaCodecList: remove force-added codecs for videoeditor...Lajos Molnar2014-06-051-5/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "MediaCodecList: remove force-added codecs for videoeditor" into lmp-pr...Lajos Molnar2014-06-051-5/+0
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | MediaCodecList: remove force-added codecs for videoeditorLajos Molnar2014-05-291-5/+0
* | | | | | | | | | am cc839bd4: Merge "DNG: Fix OpcodeList2 length field." into lmp-preview-devRuben Brunk2014-06-051-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "DNG: Fix OpcodeList2 length field." into lmp-preview-devRuben Brunk2014-06-041-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | DNG: Fix OpcodeList2 length field.Ruben Brunk2014-06-041-1/+1
* | | | | | | | | | am 26594add: Merge "audio policy: new setAudioPortConfig implementation" into...Eric Laurent2014-06-041-2/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Merge "audio policy: new setAudioPortConfig implementation" into lmp-preview-devEric Laurent2014-06-041-2/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | audio policy: new setAudioPortConfig implementationEric Laurent2014-06-041-2/+0
| * | | | | | | | Merge "Fix typos, remove callback functions - do not merge" into lmp-preview-devMarco Nelissen2014-06-046-8/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix typos, remove callback functions - do not mergeMarco Nelissen2014-06-036-8/+10
| | |/ / / / / / /