Do not report camera disconnected event if Android camera is closing.

Do not report camera disconnected event if Android camera is closing.

Ignore CAMERA_ERROR_EVICTED error if camera is about to be closed.
This is valid use case when other app is opening camera while
WebRTC Android app is trying to close it.

BUG=b/34112992

Review-Url: https://codereview.webrtc.org/2627153002
Cr-Commit-Position: refs/heads/master@{#16039}
Committed: https://chromium.googlesource.com/external/webrtc/+/21b6cce0c498244a1a4fdb3e21fba0c837660f86

[AlexG, 2017-01-11 22:04:53]

glaznev@webrtc.org changed reviewers:
+ magjed@webrtc.org

[AlexG, 2017-01-11 22:04:53]

PTAL

[magjed_webrtc, 2017-01-12 08:54:30]

Description was changed from

==========
Do not report camera disconnected event if Android camera is closing.

Ignore CAMERA_ERROR_EVICTED error if camera is about to be closed.
This is valid use case when other app is opening camera while
WebRTC Android app is trying to close it.

BUG=b/34112992
==========

to

==========
Do not report camera disconnected event if Android camera is closing.

Ignore CAMERA_ERROR_EVICTED error if camera is about to be closed.
This is valid use case when other app is opening camera while
WebRTC Android app is trying to close it.

BUG=b/34112992
==========

[magjed_webrtc, 2017-01-12 08:54:30]

magjed@webrtc.org changed reviewers:
+ sakal@webrtc.org

[sakal, 2017-01-12 09:00:43]

lgtm

If we do this, we should also do it for CameraCapturer though.

https://codereview.webrtc.org/2627153002/diff/1/webrtc/sdk/android/api/org/we...
File webrtc/sdk/android/api/org/webrtc/VideoCapturerAndroid.java (right):

https://codereview.webrtc.org/2627153002/diff/1/webrtc/sdk/android/api/org/we...
webrtc/sdk/android/api/org/webrtc/VideoCapturerAndroid.java:103: errorMessage =
"Camera error: " + error + ". Camera running: " + cameraRunning;
nit: I don't like adding this to the error message. You can log if you want
though.

[magjed_webrtc, 2017-01-12 09:13:41]

lgtm, but please update CameraCapturer as well.

[AlexG, 2017-01-12 19:43:06]

On 2017/01/12 09:13:41, magjed_webrtc wrote:
> lgtm, but please update CameraCapturer as well.

This is a bit tricky for Camera2Session. Looks like you are reporting error if
captureSession is null during onDisconeected event.
final boolean startFailure = (captureSession == null);

But this condition will also be true if this disconnected event happens after
stop() call since stopInternal() set captureSession to null.
Magnus, Sami, can you please help to handle this case properly for camera 2
implementation. We should probably report error if disconnected happens while
camera is opening or when camera has already been opened, but ignore it when
camera is closing or has already been closed

[AlexG, 2017-01-12 19:43:26]

https://codereview.webrtc.org/2627153002/diff/1/webrtc/sdk/android/api/org/we...
File webrtc/sdk/android/api/org/webrtc/VideoCapturerAndroid.java (right):

https://codereview.webrtc.org/2627153002/diff/1/webrtc/sdk/android/api/org/we...
webrtc/sdk/android/api/org/webrtc/VideoCapturerAndroid.java:103: errorMessage =
"Camera error: " + error + ". Camera running: " + cameraRunning;
On 2017/01/12 09:00:43, sakal wrote:
> nit: I don't like adding this to the error message. You can log if you want
> though.

Done.

[AlexG, 2017-01-12 19:43:52]

The CQ bit was checked by glaznev@webrtc.org

[AlexG, 2017-01-12 19:43:53]

The patchset sent to the CQ was uploaded after l-g-t-m from magjed@webrtc.org,
sakal@webrtc.org
Link to the patchset: https://codereview.webrtc.org/2627153002/#ps20001 (title:
"Address comment")

[commit-bot: I haz the power, 2017-01-12 19:43:56]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-01-12 21:05:48]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1484250232892270,
"parent_rev": "e1082cac6989c6c1b5e0b49adb6330624c3ed10d", "commit_rev":
"21b6cce0c498244a1a4fdb3e21fba0c837660f86"}

[commit-bot: I haz the power, 2017-01-12 21:05:50]

Description was changed from

==========
Do not report camera disconnected event if Android camera is closing.

Ignore CAMERA_ERROR_EVICTED error if camera is about to be closed.
This is valid use case when other app is opening camera while
WebRTC Android app is trying to close it.

BUG=b/34112992
==========

to

==========
Do not report camera disconnected event if Android camera is closing.

Ignore CAMERA_ERROR_EVICTED error if camera is about to be closed.
This is valid use case when other app is opening camera while
WebRTC Android app is trying to close it.

BUG=b/34112992

Review-Url: https://codereview.webrtc.org/2627153002
Cr-Commit-Position: refs/heads/master@{#16039}
Committed:
https://chromium.googlesource.com/external/webrtc/+/21b6cce0c498244a1a4fdb3e2...
==========

[commit-bot: I haz the power, 2017-01-12 21:05:51]

Committed patchset #2 (id:20001) as
https://chromium.googlesource.com/external/webrtc/+/21b6cce0c498244a1a4fdb3e2...