summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 318cd78e: Merge "audio policy: added audio HAL version in audio_policy.con...Eric Laurent2014-06-074-3/+160
|\
| * Merge "audio policy: added audio HAL version in audio_policy.conf" into lmp-p...Eric Laurent2014-06-074-3/+160
| |\
| | * audio policy: added audio HAL version in audio_policy.confEric Laurent2014-06-064-3/+160
* | | 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-0611-8/+1028
|\ \ \ | |/ /
| * | Merge "stagefright: added support, and SoftOMX decoder, for HEVC" into lmp-pr...Lajos Molnar2014-06-0611-8/+1028
| |\ \ | | |/ | |/|
| | * stagefright: added support, and SoftOMX decoder, for HEVCHarish Mahendrakar2014-06-0611-8/+1028
* | | 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 "Audio policy: new media volume curve for speaker with DRC"Jean-Michel Trivi2014-06-062-0/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Audio policy: new media volume curve for speaker with DRCJean-Michel Trivi2014-06-052-0/+8
* | | | | 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
* | | | | am 45df31f5: Merge "AudioFlinger: fix PatchPanel debug log." into lmp-preview...Eric Laurent2014-06-051-2/+2
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Merge "AudioFlinger: fix PatchPanel debug log." into lmp-preview-devEric Laurent2014-06-051-2/+2
| |\ \ \
| | * | | AudioFlinger: fix PatchPanel debug log.Eric Laurent2014-06-041-2/+2
* | | | | Merge "Added paused state to NuPlayerDecoder"Wei Jia2014-06-052-2/+20
|\ \ \ \ \
| * | | | | Added paused state to NuPlayerDecoderWei Jia2014-06-052-2/+20
* | | | | | resolved conflicts for merge of 1a392aa1 to masterGlenn Kasten2014-06-050-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "Squashed commit of the following:" into lmp-preview-devGlenn Kasten2014-06-0521-204/+1228
| |\ \ \ \ \
| | * | | | | Squashed commit of the following:Glenn Kasten2014-06-0521-204/+1228
* | | | | | | Merge "add sound trigger native service"Eric Laurent2014-06-0515-2/+1771
|\ \ \ \ \ \ \
| * | | | | | | add sound trigger native serviceEric Laurent2014-06-0415-2/+1771
* | | | | | | | 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 cb3d3a36: (-s ours) am 17a6dd60: DO NOT MERGE: MediaCodecList: remove forc...Lajos Molnar2014-06-050-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 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
* | | | | | | | | | 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
* | | | | | | | | | Merge "Update resampler to fetch exactly the frames needed"Andy Hung2014-06-051-20/+36
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update resampler to fetch exactly the frames neededAndy Hung2014-06-031-20/+36
* | | | | | | | | | | am 26594add: Merge "audio policy: new setAudioPortConfig implementation" into...Eric Laurent2014-06-043-76/+209
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge "audio policy: new setAudioPortConfig implementation" into lmp-preview-devEric Laurent2014-06-043-76/+209
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | audio policy: new setAudioPortConfig implementationEric Laurent2014-06-043-76/+209
* | | | | | | | | | | | am 4bd9d452: Merge "audio policy: removed raw pointers." into lmp-preview-devEric Laurent2014-06-042-238/+258
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "audio policy: removed raw pointers." into lmp-preview-devEric Laurent2014-06-042-238/+258
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | audio policy: removed raw pointers.Eric Laurent2014-06-032-238/+258
* | | | | | | | | | | | am 83438ce6: Merge "audio policy: add permission for routing APIs." into lmp-...Eric Laurent2014-06-043-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "audio policy: add permission for routing APIs." into lmp-preview-devEric Laurent2014-06-043-0/+26
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | / / / / / / / / | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | audio policy: add permission for routing APIs.Eric Laurent2014-06-023-0/+26
| | | |_|_|_|_|_|/ / | | |/| | | | | | |