summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Camera API1: remove unnecessary buffer count checkZhijun He2014-08-221-9/+0
* Merge "Camera: fix triggerId logic" into lmp-devYin-Chia Yeh2014-08-222-2/+13
|\
| * Camera: fix triggerId logicYin-Chia Yeh2014-08-212-2/+13
* | Merge "Fix SoundPool and MediaPlayerService buffer overflow" into lmp-devAndy Hung2014-08-223-13/+57
|\ \
| * | Fix SoundPool and MediaPlayerService buffer overflowAndy Hung2014-08-213-13/+57
| |/
* | Merge "camera2: Fix CameraUtils orientation for front camera." into lmp-devRuben Brunk2014-08-211-6/+6
|\ \
| * | camera2: Fix CameraUtils orientation for front camera.Ruben Brunk2014-08-211-6/+6
* | | Merge "camera: Configure streams immediately when API2 does configuration" in...Igor Murashkin2014-08-216-3/+49
|\ \ \
| * | | camera: Configure streams immediately when API2 does configurationIgor Murashkin2014-08-206-3/+49
| |/ /
* | | Merge "camera: zsl: remove AF check if no focser presents" into lmp-devYin-Chia Yeh2014-08-212-15/+26
|\ \ \
| * | | camera: zsl: remove AF check if no focser presentsYin-Chia Yeh2014-08-212-15/+26
| | |/ | |/|
* | | Merge "NuPlayerDriver: include lapsed time when reporting current position." ...Wei Jia2014-08-212-1/+12
|\ \ \
| * | | NuPlayerDriver: include lapsed time when reporting current position.Wei Jia2014-08-202-1/+12
| | |/ | |/|
* | | Merge "disable AwesomePlayer for Ogg vorbis" into lmp-devChong Zhang2014-08-202-12/+14
|\ \ \ | |/ / |/| |
| * | disable AwesomePlayer for Ogg vorbisChong Zhang2014-08-202-12/+14
| * | merge in lmp-release history after reset to 1b786a35ddd072765348eee2bffa2009c...The Android Automerger2014-08-190-0/+0
| |\ \
| | * \ merge in lmp-release history after reset to 426c719a5f3b4d88480eb35a7b0b373f6...The Android Automerger2014-08-180-0/+0
| | |\ \
| | | * \ merge in lmp-release history after reset to 426c719a5f3b4d88480eb35a7b0b373f6...The Android Automerger2014-08-170-0/+0
| | | |\ \ | | |/ / /
| | | * | use dedicated looper for GenericSourceChong Zhang2014-08-158-45/+45
| | | * | merge in lmp-release history after reset to 44a5a202101614302f607228d4357496b...The Android Automerger2014-08-140-0/+0
| | | |\ \
| | | | * \ merge in lmp-release history after reset to e6e18e8de729316b3fac7733f9ebc7f1b...The Android Automerger2014-08-130-0/+0
| | | | |\ \
| | | | | * | Camera API1: Ignore the video size change during recordingZhijun He2014-08-121-14/+19
* | | | | | | Merge "Fix typo in comment" into lmp-devMarco Nelissen2014-08-201-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix typo in commentMarco Nelissen2014-08-201-1/+1
* | | | | | | | Merge "handle error during flush in MediaPlayer.reset()" into lmp-devMarco Nelissen2014-08-193-5/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | handle error during flush in MediaPlayer.reset()Marco Nelissen2014-08-203-5/+18
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "Fix NuPlayer deadlock" into lmp-devMarco Nelissen2014-08-192-14/+20
|\ \ \ \ \ \ \
| * | | | | | | Fix NuPlayer deadlockMarco Nelissen2014-08-202-14/+20
* | | | | | | | Merge "StagefrightRecorder: add VIDEO_ENCODER_VP8 case in setupVideoEncoder" ...Robert Shih2014-08-191-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | StagefrightRecorder: add VIDEO_ENCODER_VP8 case in setupVideoEncoderRobert Shih2014-08-201-0/+4
* | | | | | | | | Merge "Don't crash for bitstream errors in AMPEG4ElementaryAssembler" into lm...Chong Zhang2014-08-161-5/+10
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Don't crash for bitstream errors in AMPEG4ElementaryAssemblerChong Zhang2014-08-191-5/+10
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge "Allow audio and video flushed separately." into lmp-devWei Jia2014-08-192-55/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow audio and video flushed separately.Wei Jia2014-08-192-55/+14
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge changes I116ee711,Ieb3fc61f into lmp-devIgor Murashkin2014-08-197-44/+62
|\ \ \ \ \ \ \ \
| * | | | | | | | camera: hal3: Remove register_stream setprop checkIgor Murashkin2014-08-191-12/+1
| * | | | | | | | camera: Allow shutter sounds to be disabled from camera2 apiIgor Murashkin2014-08-196-32/+61
* | | | | | | | | Merge "NuPlayerRenderer: allow flush() to be called multiple times." into lmp...Wei Jia2014-08-191-25/+43
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | NuPlayerRenderer: allow flush() to be called multiple times.Wei Jia2014-08-191-25/+43
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "NuPlayer: use generation to detect stale requests from old decoders." ...Wei Jia2014-08-192-4/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | NuPlayer: use generation to detect stale requests from old decoders.Wei Jia2014-08-192-4/+31
| |/ / / / / / /
* | | | | | | | Merge "stagefright: Fix thumbnail generation for some clips." into lmp-devRonghua Wu2014-08-181-7/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | stagefright: Fix thumbnail generation for some clips.Ronghua Wu2014-08-191-7/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge "NuPlayer: disable deep audio buffer in offload mode." into lmp-devRonghua Wu2014-08-181-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | NuPlayer: disable deep audio buffer in offload mode.Ronghua Wu2014-08-181-0/+1
* | | | | | | | | Merge "NuPlayerRenderer: only query audio sink for position for the first ent...Ronghua Wu2014-08-181-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | NuPlayerRenderer: only query audio sink for position for the first entry.Ronghua Wu2014-08-191-2/+3
* | | | | | | | | | Merge "NuPlayer: add support for proper stop" into lmp-devLajos Molnar2014-08-192-3/+64
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | NuPlayer: add support for proper stopLajos Molnar2014-08-082-3/+64
* | | | | | | | | | Merge "cameraservice: update supportedFocusModes for api1" into lmp-devYin-Chia Yeh2014-08-191-2/+11
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |