summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 3a94ca56: am fc36efee: Merge "Fix comparison of String8 to char* literal"Glenn Kasten2014-09-261-1/+1
|\
| * am fc36efee: Merge "Fix comparison of String8 to char* literal"Glenn Kasten2014-09-261-1/+1
| |\
| | * Merge "Fix comparison of String8 to char* literal"Glenn Kasten2014-09-261-1/+1
| | |\
| | | * Fix comparison of String8 to char* literalBernhard Rosenkraenzer2014-09-181-1/+1
* | | | am 5f5d0544: Merge "Camera1 shim: If there\'s no flash, the keys need to be n...Eino-Ville Talvala2014-09-261-10/+13
|\ \ \ \
| * \ \ \ Merge "Camera1 shim: If there's no flash, the keys need to be null." into lmp...Eino-Ville Talvala2014-09-261-10/+13
| |\ \ \ \
| | * | | | Camera1 shim: If there's no flash, the keys need to be null.Eino-Ville Talvala2014-09-251-10/+13
* | | | | | am 0ed72488: Merge "NuPlayer: use format obtained from source to tell if vide...Wei Jia2014-09-261-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "NuPlayer: use format obtained from source to tell if video exists." in...Wei Jia2014-09-261-1/+1
| |\ \ \ \ \
| | * | | | | NuPlayer: use format obtained from source to tell if video exists.Wei Jia2014-09-251-1/+1
* | | | | | | am ea55da94: Merge "Fix SoftAAC2 flush" into lmp-devMarco Nelissen2014-09-261-4/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix SoftAAC2 flush" into lmp-devMarco Nelissen2014-09-251-4/+8
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix SoftAAC2 flushMarco Nelissen2014-09-251-4/+8
| | |/ / / /
* | | | | | am e0711f26: camera: add traces for KPI measurementRuchit Sharma2014-09-262-2/+16
|\ \ \ \ \ \ | |/ / / / /
| * | | | | camera: add traces for KPI measurementRuchit Sharma2014-09-252-2/+16
| |/ / / /
* | | | | am c0d17e34: Merge "NuPlayer: Fix decoder error handling" into lmp-devAndy Hung2014-09-253-15/+40
|\ \ \ \ \ | |/ / / /
| * | | | Merge "NuPlayer: Fix decoder error handling" into lmp-devAndy Hung2014-09-253-15/+40
| |\ \ \ \
| | * | | | NuPlayer: Fix decoder error handlingAndy Hung2014-09-243-15/+40
* | | | | | am 9a70c2c4: Merge "Fix Widevine classic playback errors with NuPlayer" into ...Lajos Molnar2014-09-251-1/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix Widevine classic playback errors with NuPlayer" into lmp-devLajos Molnar2014-09-251-1/+8
| |\ \ \ \ \
| | * | | | | Fix Widevine classic playback errors with NuPlayerJeff Tinker2014-09-241-1/+8
* | | | | | | am a935c76f: stagefright: Advertise 16x16 alignment requirement for PV codecsLajos Molnar2014-09-251-6/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | stagefright: Advertise 16x16 alignment requirement for PV codecsLajos Molnar2014-09-241-6/+6
* | | | | | | am 207fc297: Merge "mediaplayer: handle bad input in VideoFrameScheduler" int...Lajos Molnar2014-09-252-4/+17
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "mediaplayer: handle bad input in VideoFrameScheduler" into lmp-devLajos Molnar2014-09-252-4/+17
| |\ \ \ \ \ \
| | * | | | | | mediaplayer: handle bad input in VideoFrameSchedulerLajos Molnar2014-09-242-4/+17
* | | | | | | | am 4a34b9a4: Merge "stagefright: use frame height if slice height is 0" into ...Lajos Molnar2014-09-251-7/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "stagefright: use frame height if slice height is 0" into lmp-devLajos Molnar2014-09-251-7/+14
| |\ \ \ \ \ \ \
| | * | | | | | | stagefright: use frame height if slice height is 0Lajos Molnar2014-09-241-7/+14
* | | | | | | | | am 70a250ab: Merge "SoftVideoDecoderOMXComponent: re-config the buffer size w...Ronghua Wu2014-09-251-0/+34
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "SoftVideoDecoderOMXComponent: re-config the buffer size when port defi...Ronghua Wu2014-09-251-0/+34
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | SoftVideoDecoderOMXComponent: re-config the buffer size when port definition ...Ronghua Wu2014-09-241-0/+34
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | am cae1c0fa: Merge "stagefright: fix cropping handling for SoftAVC and SoftME...Ronghua Wu2014-09-255-18/+31
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "stagefright: fix cropping handling for SoftAVC and SoftMEPEG4." into l...Ronghua Wu2014-09-255-18/+31
| |\ \ \ \ \ \ \
| | * | | | | | | stagefright: fix cropping handling for SoftAVC and SoftMEPEG4.Ronghua Wu2014-09-245-18/+31
| | |/ / / / / /
* | | | | | | | am ec5206c9: Merge "LiveSession: do not drop seek request" into lmp-devRobert Shih2014-09-251-10/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "LiveSession: do not drop seek request" into lmp-devRobert Shih2014-09-251-10/+17
| |\ \ \ \ \ \ \
| | * | | | | | | LiveSession: do not drop seek requestRobert Shih2014-09-181-10/+17
* | | | | | | | | am 50373731: Merge "NuPlayerDecoder: release MediaBuffers when decoder is del...Wei Jia2014-09-251-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "NuPlayerDecoder: release MediaBuffers when decoder is deleted." into l...Wei Jia2014-09-241-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | NuPlayerDecoder: release MediaBuffers when decoder is deleted.Wei Jia2014-09-241-0/+4
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | am f74023f0: Merge "stagefright: return encrypted input buffer for secure cod...Lajos Molnar2014-09-251-1/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "stagefright: return encrypted input buffer for secure codecs" into lmp...Lajos Molnar2014-09-241-1/+6
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | stagefright: return encrypted input buffer for secure codecsLajos Molnar2014-09-231-1/+6
* | | | | | | | | am 846202f5: Merge "NuCachedSource2: more fixes for source read hang" into lm...Chong Zhang2014-09-241-2/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "NuCachedSource2: more fixes for source read hang" into lmp-devChong Zhang2014-09-241-2/+14
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | NuCachedSource2: more fixes for source read hangChong Zhang2014-09-241-2/+14
* | | | | | | | | am 80ec934a: Merge "stagefright: add adaptive playback support to SoftHEVC de...Ronghua Wu2014-09-244-84/+141
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "stagefright: add adaptive playback support to SoftHEVC decoder." into ...Ronghua Wu2014-09-244-84/+141
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | stagefright: add adaptive playback support to SoftHEVC decoder.Ronghua Wu2014-09-234-84/+141
| | | |/ / / / / | | |/| | | | |