summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ / /
| * | | | Merge "DNG: Add additional TIFF/EP tag definitions." into lmp-preview-devRuben Brunk2014-06-031-0/+48
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | DNG: Add additional TIFF/EP tag definitions.Ruben Brunk2014-06-021-0/+48
* | | | | DNG: Add additional TIFF/EP tag definitions.Ruben Brunk2014-06-041-0/+48
* | | | | am b6af7c63: am 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
|\ \ \ \ \
| * \ \ \ \ am 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
| |\ \ \ \ \
| | * \ \ \ \ Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
| | |\ \ \ \ \
| | | * | | | | Mp3decoder: Remove unused arm assembly filesAshok Bhat2014-05-275-1413/+0
* | | | | | | | Use of fast capture by normal captureGlenn Kasten2014-06-021-4/+11
* | | | | | | | Merge "MPEG4Extractor: guard against missing stbl."Robert Shih2014-06-021-1/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | MPEG4Extractor: guard against missing stbl.Robert Shih2014-05-191-1/+2
* | | | | | | | Merge "Disable verbose logging"Marco Nelissen2014-06-026-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Disable verbose loggingMarco Nelissen2014-05-306-6/+6
* | | | | | | | | resolved conflicts for merge of b52c152d to masterEric Laurent2014-05-304-2/+129
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | audio policy: add routing update client interfaceEric Laurent2014-05-294-2/+129
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | DO NOT MERGE: libstagefright: Add Opus support to ACodec::getPortFormatVignesh Venkatasubramanian2014-05-291-0/+18
| * | | | | | | DO NOT MERGE - IAudioPolicyService interface extension for patch panelEric Laurent2014-05-282-2/+275