OSDN Git Service
Ruchit Sharma [Mon, 18 Aug 2014 17:48:24 +0000 (13:48 -0400)]
camera: add traces for KPI measurement
Bug:
17658101
Change-Id: I1d8035c4a8fba7b88a87f205ce57c13d812e9df5
Andy Hung [Thu, 25 Sep 2014 03:50:45 +0000 (03:50 +0000)]
Merge "NuPlayer: Fix decoder error handling" into lmp-dev
Lajos Molnar [Thu, 25 Sep 2014 03:24:23 +0000 (03:24 +0000)]
Merge "Fix Widevine classic playback errors with NuPlayer" into lmp-dev
Lajos Molnar [Thu, 25 Sep 2014 01:46:45 +0000 (18:46 -0700)]
stagefright: Advertise 16x16 alignment requirement for PV codecs
Bug:
17648616
Change-Id: Iaf276467ae9361d918feee1f72e13c7a60075819
Andy Hung [Tue, 23 Sep 2014 21:59:01 +0000 (14:59 -0700)]
NuPlayer: Fix decoder error handling
Upon error, release MediaCodec after flushing data.
Report errors when they occur with ALOGE.
Fix onInputBufferFilled mInputBufferIsDequeued check.
Bug:
17423087
Bug:
17622642
Change-Id: I316601a19d5ec95cf8e14f5bc0418a05ec423041
Lajos Molnar [Thu, 25 Sep 2014 01:14:34 +0000 (01:14 +0000)]
Merge "mediaplayer: handle bad input in VideoFrameScheduler" into lmp-dev
Lajos Molnar [Thu, 25 Sep 2014 00:28:22 +0000 (00:28 +0000)]
Merge "stagefright: use frame height if slice height is 0" into lmp-dev
Ronghua Wu [Thu, 25 Sep 2014 00:24:54 +0000 (00:24 +0000)]
Merge "SoftVideoDecoderOMXComponent: re-config the buffer size when port definition changed." into lmp-dev
Lajos Molnar [Wed, 24 Sep 2014 18:30:21 +0000 (11:30 -0700)]
mediaplayer: handle bad input in VideoFrameScheduler
Bug:
17626098
Change-Id: I2ae22ed43b35ff532a47818b118dd328ce2abf63
Ronghua Wu [Thu, 25 Sep 2014 00:17:59 +0000 (00:17 +0000)]
Merge "stagefright: fix cropping handling for SoftAVC and SoftMEPEG4." into lmp-dev
Robert Shih [Thu, 25 Sep 2014 00:11:20 +0000 (00:11 +0000)]
Merge "LiveSession: do not drop seek request" into lmp-dev
Wei Jia [Wed, 24 Sep 2014 23:54:22 +0000 (23:54 +0000)]
Merge "NuPlayerDecoder: release MediaBuffers when decoder is deleted." into lmp-dev
Lajos Molnar [Wed, 24 Sep 2014 23:48:22 +0000 (23:48 +0000)]
Merge "stagefright: return encrypted input buffer for secure codecs" into lmp-dev
Ronghua Wu [Wed, 24 Sep 2014 21:55:23 +0000 (14:55 -0700)]
stagefright: fix cropping handling for SoftAVC and SoftMEPEG4.
Bug:
17326758
Change-Id: I9b0c281d92cf1803e275b1768e9edab9404ea577
Ronghua Wu [Mon, 22 Sep 2014 20:26:13 +0000 (13:26 -0700)]
SoftVideoDecoderOMXComponent: re-config the buffer size when port definition changed.
Bug:
17326758
Change-Id: I7c6b85284ae0cbfa54f999851f56db84345b65bf
Wei Jia [Wed, 24 Sep 2014 21:25:19 +0000 (14:25 -0700)]
NuPlayerDecoder: release MediaBuffers when decoder is deleted.
Bug:
17454455
Change-Id: Ic984c74826f87f5f3c27756a7e7d52295a529bed
Lajos Molnar [Wed, 24 Sep 2014 20:55:10 +0000 (13:55 -0700)]
stagefright: use frame height if slice height is 0
This is a workaround for some vendors that set slice height to 0.
Android uses slice height is the vertical stride for YUV planar
and semiplanar formats.
Bug:
13433554
Change-Id: I4da038e7a768dcd8360c33fa1a9ce95a172f16bb
Chong Zhang [Wed, 24 Sep 2014 17:41:08 +0000 (17:41 +0000)]
Merge "NuCachedSource2: more fixes for source read hang" into lmp-dev
Jeff Tinker [Wed, 24 Sep 2014 05:24:26 +0000 (22:24 -0700)]
Fix Widevine classic playback errors with NuPlayer
bug:
17589961
Change-Id: If16c61b90cf92caa89eecd66aabef5813fd7619b
Ronghua Wu [Wed, 24 Sep 2014 15:39:31 +0000 (15:39 +0000)]
Merge "stagefright: add adaptive playback support to SoftHEVC decoder." into lmp-dev
Chong Zhang [Wed, 24 Sep 2014 05:22:30 +0000 (22:22 -0700)]
NuCachedSource2: more fixes for source read hang
- Do not try to read from HTTP source if already disconnecting
- Let NuCachedSource2::readAt() return immediately when disconnecting
Bug:
17613805
Change-Id: Ibca4d3a4288ae9a9e2f5658a4240ace54efeb220
Wei Jia [Wed, 24 Sep 2014 01:39:53 +0000 (01:39 +0000)]
Merge "NuPlayer will notify SeekComplete only when requested so." into lmp-dev
Eric Laurent [Wed, 24 Sep 2014 01:21:16 +0000 (01:21 +0000)]
Merge "audio policy: add hw hotword flag for inputs" into lmp-dev
Lajos Molnar [Wed, 24 Sep 2014 00:49:02 +0000 (17:49 -0700)]
stagefright: return encrypted input buffer for secure codecs
Bug:
17630446
Change-Id: I8a9352bcd00a3f4eb6fd2797d6809a8c1edc8482
Wei Jia [Tue, 23 Sep 2014 17:55:35 +0000 (10:55 -0700)]
NuPlayer: change assert to conditional check.
Bug:
17491050
Change-Id: I657866c5342c227d57617eb89955897171eb5976
Ronghua Wu [Fri, 12 Sep 2014 18:57:27 +0000 (11:57 -0700)]
stagefright: add adaptive playback support to SoftHEVC decoder.
Bug:
17326758
Change-Id: I245e2bd1490e810094ca550fdddfa87075bc2056
Ronghua Wu [Tue, 23 Sep 2014 18:31:26 +0000 (18:31 +0000)]
Merge "NuPlayer: add pause timeout event for offload audio." into lmp-dev
Wei Jia [Tue, 23 Sep 2014 18:25:37 +0000 (18:25 +0000)]
Merge "NuPlayer: use generation to filter out stale message from renderer." into lmp-dev
Zhijun He [Tue, 23 Sep 2014 17:47:01 +0000 (17:47 +0000)]
Merge "Camera2Client: log an error when autoFocus is called in wrong state" into lmp-dev
Zhijun He [Tue, 23 Sep 2014 06:52:54 +0000 (23:52 -0700)]
Camera2Client: log an error when autoFocus is called in wrong state
Bug:
17555612
Change-Id: Ife33da712fbc8dc44d81e1e869fc75fb21026204
Wei Jia [Mon, 22 Sep 2014 22:21:11 +0000 (15:21 -0700)]
NuPlayer will notify SeekComplete only when requested so.
Bug:
17596535
Change-Id: I6b744fdcf80f11d521d26c7c8b45f7de70aa0dc3
Wei Jia [Tue, 23 Sep 2014 00:58:20 +0000 (00:58 +0000)]
Merge "MyHandler: set ip address to an invalid one when getsockname() returns error." into lmp-dev
Wei Jia [Mon, 22 Sep 2014 23:52:49 +0000 (16:52 -0700)]
MyHandler: set ip address to an invalid one when getsockname() returns error.
Bug:
17556472
Change-Id: I0387c78727d9a18abddcfdb4b480f4b1412bbc9f
Chong Zhang [Mon, 22 Sep 2014 22:17:30 +0000 (22:17 +0000)]
Merge "fix crash when makeHTTPConnection fails with null pointer" into lmp-dev
Chong Zhang [Mon, 22 Sep 2014 19:25:36 +0000 (12:25 -0700)]
fix crash when makeHTTPConnection fails with null pointer
Bug:
17608108
Change-Id: I4bdf6d09ae565418be3d6677b5ccac9072fb9b2c
Andy Hung [Mon, 22 Sep 2014 19:01:38 +0000 (19:01 +0000)]
Merge "MediaCodec: Fix deallocated pointer reference when calling reset()" into lmp-dev
Ronghua Wu [Tue, 9 Sep 2014 17:11:08 +0000 (10:11 -0700)]
NuPlayer: add pause timeout event for offload audio.
Bug:
17375249
Change-Id: Ie59c6b372e9ad2aace3d1e27b9896d79de35d722
Andy Hung [Thu, 18 Sep 2014 21:45:57 +0000 (14:45 -0700)]
MediaCodec: Fix deallocated pointer reference when calling reset()
The name pointer argument in MediaCodec::init() was being
implicitly deallocated.
Bug:
17499622
Change-Id: If9409f95674e52d1478f969f77693c4d27ff1ff2
Wei Jia [Mon, 22 Sep 2014 17:16:29 +0000 (10:16 -0700)]
NuPlayer: use generation to filter out stale message from renderer.
Clean up generation number for decoders.
Bug:
17507846
Change-Id: Ibd2cfe11f89f404882d66c384b5198dc641f5e71
Wei Jia [Mon, 22 Sep 2014 16:03:02 +0000 (16:03 +0000)]
Merge "MediaBuffer: ABuffer will release MediaBuffer when it's destructed." into lmp-dev
Robert Shih [Mon, 22 Sep 2014 15:42:49 +0000 (15:42 +0000)]
Merge "NuPlayer HLS: better subtitle toggling" into lmp-dev
Wei Jia [Fri, 19 Sep 2014 00:36:20 +0000 (17:36 -0700)]
MediaBuffer: ABuffer will release MediaBuffer when it's destructed.
Bug:
17454455
Change-Id: Ia423bcc2e1fa39137f114eac44912ed15357bb99
Eric Laurent [Sat, 20 Sep 2014 02:04:57 +0000 (19:04 -0700)]
audio policy: add hw hotword flag for inputs
Audio input profiles can indicate flag AUDIO_INPUT_FLAG_HW_HOTWORD
meaning they allow capture from the same source as HW hotword
detection.
When a client requests capture with this flag, the policy will
try to find an input profile matching this request first and
fallback to a regular input if not found.
Bug:
17575019.
Change-Id: Ia463211597d7fa363527d776389f2257f0ced9a2
Lajos Molnar [Sat, 20 Sep 2014 02:00:29 +0000 (02:00 +0000)]
Merge "mediaplayer: smooth out videoplayback based on framerate" into lmp-dev
Zhijun He [Sat, 20 Sep 2014 01:06:54 +0000 (01:06 +0000)]
Merge "API1: ZSL buffers should be skipped for manual AF mode" into lmp-dev
Lajos Molnar [Thu, 18 Sep 2014 21:14:29 +0000 (14:14 -0700)]
mediaplayer: smooth out videoplayback based on framerate
Bug:
14659809
Change-Id: I73f6c7224c51ac06487475f9ed395379111ad71f
Marco Nelissen [Sat, 20 Sep 2014 00:41:15 +0000 (00:41 +0000)]
Merge "Make prepare properly report failure again" into lmp-dev
Zhijun He [Fri, 19 Sep 2014 22:51:04 +0000 (15:51 -0700)]
API1: ZSL buffers should be skipped for manual AF mode
ZSL counts on good auto focus (CAF). It is really tricky to enable ZSL for
manual focus mode. as it is bascically a locked focus mode, you can not tell
if the focus is good or not by reading the afstate.
Bug:
17577928
Change-Id: I68ff7d143e7d56f942bb00a8da6a9faea57b52a0
Marco Nelissen [Fri, 19 Sep 2014 22:14:37 +0000 (15:14 -0700)]
Make prepare properly report failure again
Bug:
17583084
Bug:
17548451
Change-Id: I759d28eaafb520c206d54740c2c0a857b534d23c
Robert Shih [Fri, 19 Sep 2014 21:52:30 +0000 (14:52 -0700)]
NuPlayer HLS: better subtitle toggling
Bug:
17310061
Change-Id: Iacee1816285425aaad08c32b28591bb0162d5a85
Lajos Molnar [Wed, 7 May 2014 22:33:04 +0000 (15:33 -0700)]
mediaplayer: schedule video frames in VSYNC valleys
Bug:
14659809
Change-Id: Ic340ac61ad4778b493625c79c2cb4f747ff54ede
Marco Nelissen [Fri, 19 Sep 2014 19:12:35 +0000 (19:12 +0000)]
Merge "Fix ringbuffer handling" into lmp-dev
Marco Nelissen [Fri, 19 Sep 2014 18:46:44 +0000 (11:46 -0700)]
Fix ringbuffer handling
Explicitly keep track of the number of samples in the ring buffer,
rather than inferring it from the difference between the read and
write pointer, since the latter cannot distinguish between a
completely full and a completely empty buffer.
Bug:
17582331
Change-Id: I24d16ce96710209b7457ffad7c4c60201451980f
Eino-Ville Talvala [Fri, 19 Sep 2014 18:30:13 +0000 (18:30 +0000)]
Merge "CameraService: Add client name/pid to device open/close logging." into lmp-dev
Glenn Kasten [Fri, 19 Sep 2014 16:05:05 +0000 (09:05 -0700)]
Reduce log spam from getTimestamp errors
Bug:
17576481
Change-Id: I07d99e7c42b7d4f0994b5a6d9c9fe8eb29fbbe40
Robert Shih [Sat, 30 Aug 2014 01:25:05 +0000 (18:25 -0700)]
LiveSession: do not drop seek request
Bug:
17538727
Change-Id: I28658b2779ac16512ff54adbe536d01790e6449e
Eino-Ville Talvala [Fri, 19 Sep 2014 00:24:22 +0000 (17:24 -0700)]
CameraService: Add client name/pid to device open/close logging.
Bug:
15672812
Change-Id: I1162c6d9d0a1eea1dd32949a04c295b4941d2602
Marco Nelissen [Fri, 19 Sep 2014 00:20:08 +0000 (00:20 +0000)]
Merge "Always consider first buffer to be config" into lmp-dev
Eino-Ville Talvala [Thu, 18 Sep 2014 23:57:49 +0000 (23:57 +0000)]
Merge "CameraService: Fix dump methods for two clients" into lmp-dev
Eino-Ville Talvala [Thu, 18 Sep 2014 22:52:02 +0000 (15:52 -0700)]
CameraService: Fix dump methods for two clients
Actually write dump text into the provided FD, and add a bit more
dump data into CameraDeviceClient.
Bug:
17570762
Change-Id: I37b1db85188855d4e89c8050c4b13f0d22e07e0c
Marco Nelissen [Thu, 18 Sep 2014 22:09:28 +0000 (15:09 -0700)]
Always consider first buffer to be config
for backwards compatibility. Also fix a problem where writing 0
bytes to an empty ringbuffer would treat it as overflowed.
Bug:
17567501
Change-Id: I8019da76466576e1b2984e9eccf09bdec593038a
Phil Burk [Thu, 18 Sep 2014 22:37:13 +0000 (22:37 +0000)]
Merge "mediaplayer: fix buffer aggregation when video has offloaded audio" into lmp-dev
Jean-Michel Trivi [Thu, 18 Sep 2014 22:14:00 +0000 (22:14 +0000)]
Merge "AudioEffect acquires session" into lmp-dev
Jean-Michel Trivi [Thu, 18 Sep 2014 21:07:18 +0000 (14:07 -0700)]
AudioEffect acquires session
Currently, users of audio sessions, AudioTrack and AudioRecord,
are acquiring and releasing audio sessions according to their
life-cycle. AudioEffect instances were not counting as users
of an audio session. This caused an effect used on a session
to be purged by AudioFlinger::purgeStaleEffects_l() whenever
the last user of that session went away.
This CL makes AudioEffect acquire and release a session when
created and destroyed.
Bug
15432115
Change-Id: I922532150009988d43872f9b5928044a830ae0b3
Robert Shih [Thu, 18 Sep 2014 00:05:43 +0000 (00:05 +0000)]
Merge "PlaylistFetcher:don't signal a/v eos on subttitle eos" into lmp-dev
Andy Hung [Wed, 17 Sep 2014 23:31:37 +0000 (23:31 +0000)]
Merge "NuPlayer: update timestamp handling" into lmp-dev
Lajos Molnar [Wed, 17 Sep 2014 23:15:59 +0000 (23:15 +0000)]
Merge "NuPlayer: use getTimestamp instead of getPosition" into lmp-dev
Lajos Molnar [Wed, 17 Sep 2014 23:15:27 +0000 (23:15 +0000)]
Merge "Fix AudioTrack offloaded timestamp handling." into lmp-dev
Andy Hung [Fri, 12 Sep 2014 21:43:11 +0000 (14:43 -0700)]
Fix AudioTrack offloaded timestamp handling.
getTimestamp for offloaded tracks now returns WOULD_BLOCK for
situations where the timestamp is unavailable due to the
previous track still flushing or the timestamp is stale.
It is fixed for normal playback conditions.
Bug:
14659809
Bug:
17428188
Change-Id: Ic9ec07ccabc604236979769db5c4ea2dec252660
Andy Hung [Fri, 12 Sep 2014 22:12:16 +0000 (15:12 -0700)]
NuPlayer: update timestamp handling
Use getTimestamp WOULD_BLOCK error return code to clean up
initial playback/start timestamp handling.
Account for pause time and seeks.
Only send notification from driver when the media time changes.
Bug:
14659809
Bug:
17428188
Change-Id: I051bb5e2dd4fd5990474f8fb635615ad8d18eb2c
Phil Burk [Wed, 17 Sep 2014 23:03:47 +0000 (16:03 -0700)]
mediaplayer: fix buffer aggregation when video has offloaded audio
Change conditional test so we don't accidentally do buffer aggregation
on video buffers.
Bug:
17553847
Change-Id: I746452b2e62db664315732a38f982ce7faf26212
Signed-off-by: Phil Burk <philburk@google.com>
Lajos Molnar [Thu, 28 Aug 2014 14:27:44 +0000 (07:27 -0700)]
NuPlayer: use getTimestamp instead of getPosition
Bug:
14659809
Bug:
16985287
Change-Id: I59ec72fbd40a9b8d28fe548ddad082c03000c045
Eric Laurent [Wed, 17 Sep 2014 22:45:02 +0000 (22:45 +0000)]
Merge "audioflinger: remove debug log." into lmp-dev
Marco Nelissen [Wed, 17 Sep 2014 22:08:31 +0000 (22:08 +0000)]
Merge "Add support for ANDROID_LOOP to NuPlayer" into lmp-dev
Marco Nelissen [Wed, 17 Sep 2014 22:08:10 +0000 (22:08 +0000)]
Merge "Fix null pointer dereference" into lmp-dev
Marco Nelissen [Wed, 17 Sep 2014 19:38:33 +0000 (12:38 -0700)]
Fix null pointer dereference
Bug:
17544813
Change-Id: I6c94cd3056a99bb42fc71ee583938a2e3806fdc7
Eric Laurent [Wed, 17 Sep 2014 19:30:19 +0000 (12:30 -0700)]
audioflinger: remove debug log.
Remove debug log left by commit
ab5cdbaf.
bug:
17537746.
Change-Id: I10f672f607f8e87caaa8228fc05eff8aee7dfa15
Lajos Molnar [Wed, 17 Sep 2014 19:08:24 +0000 (19:08 +0000)]
Merge "mediaplayer: reset flags when pre-reading multiple buffers" into lmp-dev
Eric Laurent [Wed, 17 Sep 2014 18:59:43 +0000 (18:59 +0000)]
Merge "audio policy: fix attached devices validation" into lmp-dev
Robert Shih [Mon, 15 Sep 2014 20:36:30 +0000 (13:36 -0700)]
PlaylistFetcher:don't signal a/v eos on subttitle eos
Bug:
17310061
Change-Id: Ifbca3c12f21171a6e429dca51a250a41051fdd34
Marco Nelissen [Tue, 16 Sep 2014 22:43:44 +0000 (15:43 -0700)]
Add support for ANDROID_LOOP to NuPlayer
Bug:
17518139
Change-Id: I9355ddd4c998d967013dd8bd32d670a9a83dea31
Marco Nelissen [Wed, 17 Sep 2014 04:32:33 +0000 (21:32 -0700)]
mediaplayer: reset flags when pre-reading multiple buffers
Bug:
17521470
Change-Id: I15ee9b1d3dd4ad29f4961a642f7fadafd9fe5b24
Robert Shih [Wed, 17 Sep 2014 03:23:34 +0000 (03:23 +0000)]
Merge "HLS: fix freezes when toggling between a/v streams" into lmp-dev
Robert Shih [Wed, 17 Sep 2014 02:01:57 +0000 (02:01 +0000)]
Merge "NuPlayerDriver: restart after eos pause" into lmp-dev
Robert Shih [Wed, 17 Sep 2014 00:07:22 +0000 (17:07 -0700)]
NuPlayerDriver: restart after eos pause
Bug:
17512187
Change-Id: I204ce83790bf98bc7ffebcb76d5df1e56a6a3f66
Eric Laurent [Tue, 16 Sep 2014 23:38:20 +0000 (16:38 -0700)]
audio policy: fix attached devices validation
Consider all supported devices in an io profile and
not only the first one when looking for a match with attached
devices.
Failing to do so would cause the device validation to fail
if supported devices are not declared in a specific order
in the io profile descriptor in audio_policy.conf
Bug:
17532764.
Change-Id: Id27c9192e21de7f075076e17eb8c48e7e42847f6
Chong Zhang [Tue, 16 Sep 2014 22:29:52 +0000 (22:29 +0000)]
Merge "Disconnect HTTP-based data source upon reset" into lmp-dev
Robert Shih [Tue, 16 Sep 2014 18:34:08 +0000 (11:34 -0700)]
GenericSource: fix selectTrack parameter
Bug:
17512187
Change-Id: I19a0915fb0fb1b1ae036bf5df85b9c9e7657a7ea
Chong Zhang [Sun, 14 Sep 2014 21:28:45 +0000 (14:28 -0700)]
Disconnect HTTP-based data source upon reset
Bug:
17425250
Change-Id: Ieb4c93fd9848489f9dbf35a36474376924fd8eb9
Wei Jia [Tue, 16 Sep 2014 02:26:43 +0000 (02:26 +0000)]
Merge "ASessionDescription: allow open-ended NTP range." into lmp-dev
Robert Shih [Sat, 30 Aug 2014 01:22:44 +0000 (18:22 -0700)]
HLS: fix freezes when toggling between a/v streams
Bug:
17412740
Change-Id: Iacaf2fa1d20584056375803e1782ad6761c56fc5
Robert Shih [Tue, 16 Sep 2014 01:12:02 +0000 (01:12 +0000)]
Merge "ESQueue: do not merge aac packets" into lmp-dev
Wei Jia [Tue, 16 Sep 2014 00:34:19 +0000 (17:34 -0700)]
ASessionDescription: allow open-ended NTP range.
Bug:
17435211
Change-Id: I450d512abdc4368f5180d9859f3b4e207e3b5591
hkuang [Mon, 15 Sep 2014 23:56:40 +0000 (23:56 +0000)]
Merge "Optimize the YUV buffer copy a little bit to skip unnecessary operation." into lmp-dev
Robert Shih [Mon, 15 Sep 2014 23:56:04 +0000 (23:56 +0000)]
Merge "PlaylistFetcher: find the correct sequence number to start fetching" into lmp-dev
Robert Shih [Tue, 2 Sep 2014 23:51:37 +0000 (16:51 -0700)]
ESQueue: do not merge aac packets
Bug:
17310061
Change-Id: Ie0fb0702b0af1c4094415190fdfdf132d5fcd511
Lajos Molnar [Mon, 15 Sep 2014 23:37:50 +0000 (23:37 +0000)]
Merge "mediaplayer: handle surface dis/connection errors" into lmp-dev
hkuang [Fri, 12 Sep 2014 20:38:04 +0000 (13:38 -0700)]
Optimize the YUV buffer copy a little bit to skip unnecessary operation.
Bug:
17326758
Change-Id: I2505751cb40a53242ceeb3be8f362c3754c2ee3f
Robert Shih [Sat, 30 Aug 2014 02:01:29 +0000 (19:01 -0700)]
PlaylistFetcher: find the correct sequence number to start fetching
- skip over bad segemnts
- if we skipped too far into the future when adapting in live streams,
adjust back
Bug:
17141635
Bug:
17416657
Change-Id: I0877ceaf6e69cab751bf9e92579071f9e61643eb
Yin-Chia Yeh [Mon, 15 Sep 2014 22:11:20 +0000 (22:11 +0000)]
Merge "Camera2: handle one more videosnapshot failure" into lmp-dev