summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 435e0402: Merge "reset battery stats when media player service is started"...Chong Zhang2014-07-251-0/+15
|\
| * Merge "reset battery stats when media player service is started" into lmp-devChong Zhang2014-07-241-0/+15
| |\
| | * reset battery stats when media player service is startedChong Zhang2014-07-231-0/+15
* | | am f591b865: Merge "StagefrightRecorder: check for WEBM format instead of MP4...Robert Shih2014-07-251-5/+5
|\ \ \ | |/ /
| * | Merge "StagefrightRecorder: check for WEBM format instead of MP4" into lmp-devRobert Shih2014-07-241-5/+5
| |\ \
| | * | StagefrightRecorder: check for WEBM format instead of MP4Robert Shih2014-07-241-5/+5
* | | | am 858c7517: Merge "signal mFrameAvailableCondition when AudioSource is stopp...Chong Zhang2014-07-251-0/+2
|\ \ \ \ | |/ / /
| * | | Merge "signal mFrameAvailableCondition when AudioSource is stopped" into lmp-devChong Zhang2014-07-241-0/+2
| |\ \ \
| | * | | signal mFrameAvailableCondition when AudioSource is stoppedChong Zhang2014-07-231-0/+2
* | | | | am 37b216c7: Remove last user of <cutils/tztime.h>.Elliott Hughes2014-07-242-4/+2
|\ \ \ \ \ | |/ / / /
| * | | | Remove last user of <cutils/tztime.h>.Elliott Hughes2014-07-242-4/+2
* | | | | am 81e50d0c: Reset the value for Vector of pointers.Wei Jia2014-07-241-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | Reset the value for Vector of pointers.Wei Jia2014-07-241-0/+6
| | |/ / | |/| |
* | | | am db2225b2: Merge "NuPlayer: save thread id in MediaPlayer::start" into lmp-devChong Zhang2014-07-231-9/+18
|\ \ \ \ | |/ / /
| * | | Merge "NuPlayer: save thread id in MediaPlayer::start" into lmp-devChong Zhang2014-07-231-9/+18
| |\ \ \ | | |_|/ | |/| |
| | * | NuPlayer: save thread id in MediaPlayer::startChong Zhang2014-07-231-9/+18
* | | | am 4730fa07: Hook up querying of VP8 temporal layering support.Wei Jia2014-07-231-0/+44
|\ \ \ \ | |/ / /
| * | | Hook up querying of VP8 temporal layering support.Wei Jia2014-07-231-0/+44
* | | | am 4c9a0e3e: Merge "GenericSource: support track (de)selection" into lmp-devRobert Shih2014-07-234-67/+322
|\ \ \ \ | |/ / /
| * | | Merge "GenericSource: support track (de)selection" into lmp-devRobert Shih2014-07-224-67/+322
| |\ \ \
| | * | | GenericSource: support track (de)selectionRobert Shih2014-07-224-67/+322
| | |/ /
* | | | am f6f4c0d7: Merge "StagefrightRecorder: webm (video only) support" into lmp-devRobert Shih2014-07-234-33/+52
|\ \ \ \ | |/ / /
| * | | Merge "StagefrightRecorder: webm (video only) support" into lmp-devRobert Shih2014-07-224-33/+52
| |\ \ \
| | * | | StagefrightRecorder: webm (video only) supportRobert Shih2014-07-224-33/+52
* | | | | am b104d5a4: Merge "MediaWriter: make get/setStartTimeOffsetMs virtual" into ...Robert Shih2014-07-231-8/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge "MediaWriter: make get/setStartTimeOffsetMs virtual" into lmp-devRobert Shih2014-07-221-8/+8
| |\ \ \ \ | | |/ / /
| | * | | MediaWriter: make get/setStartTimeOffsetMs virtualRobert Shih2014-07-171-8/+8
| | | |/ | | |/|
* | | | am 3a2956d1: Fall back to s/w decoding when audio offloading fails.Wei Jia2014-07-233-1/+48
|\ \ \ \ | |/ / /
| * | | Fall back to s/w decoding when audio offloading fails.Wei Jia2014-07-223-1/+48
* | | | am ecc01ef0: Merge "update battery stats for video/audio" into lmp-devChong Zhang2014-07-231-6/+109
|\ \ \ \ | |/ / /
| * | | update battery stats for video/audioChong Zhang2014-07-221-6/+109
| | |/ | |/|
* | | am 225d5b20: stagefright: handle seeking to before first cue-point.Lajos Molnar2014-07-212-13/+17
|\ \ \ | |/ /
| * | stagefright: handle seeking to before first cue-point.Lajos Molnar2014-07-212-13/+17
* | | am df813a3b: audio_attributes_t for SoundPoolJean-Michel Trivi2014-07-211-6/+6
|\ \ \ | |/ /
| * | audio_attributes_t for SoundPoolJean-Michel Trivi2014-07-201-6/+6
* | | am cf1f53ba: Fix: Add MediaCodecList capabilitiesLajos Molnar2014-07-201-0/+2
|\ \ \ | |/ /
| * | Fix: Add MediaCodecList capabilitiesLajos Molnar2014-07-191-0/+2
* | | am 2096abe9: Merge "Add MediaCodecList capabilities" into lmp-devLajos Molnar2014-07-202-1/+313
|\ \ \ | |/ /
| * | Merge "Add MediaCodecList capabilities" into lmp-devLajos Molnar2014-07-172-1/+313
| |\ \
| | * | Add MediaCodecList capabilitiesLajos Molnar2014-07-182-1/+313
* | | | am c63680d8: Merge "Free MediaBuffer when ABuffer is discarded." into lmp-devWei Jia2014-07-201-0/+5
|\ \ \ \ | |/ / /
| * | | Merge "Free MediaBuffer when ABuffer is discarded." into lmp-devWei Jia2014-07-181-0/+5
| |\ \ \ | | |/ / | |/| |
| | * | Free MediaBuffer when ABuffer is discarded.Wei Jia2014-07-181-0/+5
* | | | am ada68887: Merge "stagefright: Fix seeking in MPEG4 container" into lmp-devLajos Molnar2014-07-184-118/+91
|\ \ \ \ | |/ / /
| * | | Merge "stagefright: Fix seeking in MPEG4 container" into lmp-devLajos Molnar2014-07-184-118/+91
| |\ \ \ | | |/ / | |/| |
| | * | stagefright: Fix seeking in MPEG4 containerLajos Molnar2014-07-174-118/+91
* | | | am 09524837: nuplayer: support widevine sourcesLajos Molnar2014-07-185-2/+185
|\ \ \ \ | |/ / /
| * | | nuplayer: support widevine sourcesLajos Molnar2014-07-175-2/+185
| |/ /
* | | am cc227036: nuplayer: add widevine support to GenericSourceLajos Molnar2014-07-183-11/+84
|\ \ \ | |/ /
| * | nuplayer: add widevine support to GenericSourceLajos Molnar2014-07-173-11/+84