summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |/ | | |/|
* | | | am fc55783d: Merge "NuPlayer will notify SeekComplete only when requested so....Wei Jia2014-09-243-19/+29
|\ \ \ \ | |/ / /
| * | | Merge "NuPlayer will notify SeekComplete only when requested so." into lmp-devWei Jia2014-09-243-19/+29
| |\ \ \
| | * | | NuPlayer will notify SeekComplete only when requested so.Wei Jia2014-09-233-19/+29
* | | | | am a4b08944: Merge "audio policy: add hw hotword flag for inputs" into lmp-devEric Laurent2014-09-242-31/+69
|\ \ \ \ \ | |/ / / /
| * | | | Merge "audio policy: add hw hotword flag for inputs" into lmp-devEric Laurent2014-09-242-31/+69
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | audio policy: add hw hotword flag for inputsEric Laurent2014-09-192-31/+69
* | | | | am 7e9f7f7a: NuPlayer: change assert to conditional check.Wei Jia2014-09-241-6/+20
|\ \ \ \ \ | |/ / / /
| * | | | NuPlayer: change assert to conditional check.Wei Jia2014-09-231-6/+20
* | | | | am 3cdd6b8c: Merge "NuPlayer: add pause timeout event for offload audio." int...Ronghua Wu2014-09-232-1/+46
|\ \ \ \ \ | |/ / / /
| * | | | Merge "NuPlayer: add pause timeout event for offload audio." into lmp-devRonghua Wu2014-09-232-1/+46
| |\ \ \ \
| | * | | | NuPlayer: add pause timeout event for offload audio.Ronghua Wu2014-09-222-1/+46
* | | | | | am ad5447f6: Merge "NuPlayer: use generation to filter out stale message from...Wei Jia2014-09-232-7/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "NuPlayer: use generation to filter out stale message from renderer." i...Wei Jia2014-09-232-7/+20
| |\ \ \ \ \
| | * | | | | NuPlayer: use generation to filter out stale message from renderer.Wei Jia2014-09-222-7/+20
| | | |_|/ / | | |/| | |
* | | | | | am 88b4cc81: Merge "Camera2Client: log an error when autoFocus is called in w...Zhijun He2014-09-231-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Camera2Client: log an error when autoFocus is called in wrong state" i...Zhijun He2014-09-231-0/+2
| |\ \ \ \ \
| | * | | | | Camera2Client: log an error when autoFocus is called in wrong stateZhijun He2014-09-231-0/+2
* | | | | | | am 5110d6a0: Merge "MyHandler: set ip address to an invalid one when getsockn...Wei Jia2014-09-231-1/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "MyHandler: set ip address to an invalid one when getsockname() returns...Wei Jia2014-09-231-1/+3
| |\ \ \ \ \ \
| | * | | | | | MyHandler: set ip address to an invalid one when getsockname() returns error.Wei Jia2014-09-221-1/+3
| | | |/ / / / | | |/| | | |
* | | | | | | am a44d8f71: Merge "fix crash when makeHTTPConnection fails with null pointer...Chong Zhang2014-09-231-1/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "fix crash when makeHTTPConnection fails with null pointer" into lmp-devChong Zhang2014-09-221-1/+12
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | fix crash when makeHTTPConnection fails with null pointerChong Zhang2014-09-221-1/+12
| | | |_|_|/ | | |/| | |
* | | | | | resolved conflicts for merge of 2f87e069 to lmp-mr1-dev-plus-aospDan Albert2014-09-220-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ am 8f230382: Merge "Fix a namespace collision."Dan Albert2014-09-221-5/+5
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "Fix a namespace collision."Dan Albert2014-09-221-5/+5
| | |\ \ \ \ \ \