Make CameraCapturer.switchCamera try again if session is still opening.

Make CameraCapturer.switchCamera try again if session is still opening.

R=magjed@webrtc.org

Committed: https://crrev.com/92c09509bdf0287c7af5c1bbde87dd188acf1879
Cr-Commit-Position: refs/heads/master@{#13747}

[sakal, 2016-08-12 12:56:08]

Magnus, PTAL.

To be noted is that Java threads are quite expensive (even more expensive than
native threads). So, we want to limit the amount of Java threads we have.
However, I see no other alternative here than adding a new thread. (Other
alternatives are very complicated.)

[sakal, 2016-08-15 08:49:08]

New approach doesn't use a add new thread. PTAL.

[magjed_webrtc, 2016-08-15 09:13:29]

https://codereview.webrtc.org/2238263002/diff/60001/webrtc/api/android/java/s...
File webrtc/api/android/java/src/org/webrtc/Camera2Session.java (right):

https://codereview.webrtc.org/2238263002/diff/60001/webrtc/api/android/java/s...
webrtc/api/android/java/src/org/webrtc/Camera2Session.java:325:
cameraThreadHandler.post(new Runnable() {
Comment that you post stopInternal() instead of executing it immediately in
order to return early. Or add a comment in this function that stop() will wait
until 'state = SessionState.STOPPED' is done, but not wait for stopInternal().

https://codereview.webrtc.org/2238263002/diff/60001/webrtc/api/android/java/s...
File webrtc/api/android/java/src/org/webrtc/CameraCapturer.java (right):

https://codereview.webrtc.org/2238263002/diff/60001/webrtc/api/android/java/s...
webrtc/api/android/java/src/org/webrtc/CameraCapturer.java:98: private boolean
switchPending;                   /* guarded by stateLock */
The names of these two variables and what state they represent are a bit
confusing. At least comment, or add a new enum for this, something like:
enum SwitchState {
  IDLE,         // No switch requested.
  PENDING,      // Waiting for previous capture session to open.
  IN_PROGRESS,  // Waiting for new switched capture session to start.
}

https://codereview.webrtc.org/2238263002/diff/60001/webrtc/api/android/java/s...
webrtc/api/android/java/src/org/webrtc/CameraCapturer.java:247: if
(switchInProgress) {
You need to check |switchPending| here as well, otherwise multiple calls to
switchCamera() while the session is opening will result in only one of the
switchEventsHandler to be notified.

[sakal, 2016-08-15 09:40:30]

https://codereview.webrtc.org/2238263002/diff/60001/webrtc/api/android/java/s...
File webrtc/api/android/java/src/org/webrtc/Camera2Session.java (right):

https://codereview.webrtc.org/2238263002/diff/60001/webrtc/api/android/java/s...
webrtc/api/android/java/src/org/webrtc/Camera2Session.java:325:
cameraThreadHandler.post(new Runnable() {
On 2016/08/15 09:13:29, magjed_webrtc wrote:
> Comment that you post stopInternal() instead of executing it immediately in
> order to return early. Or add a comment in this function that stop() will wait
> until 'state = SessionState.STOPPED' is done, but not wait for stopInternal().

Done.

https://codereview.webrtc.org/2238263002/diff/60001/webrtc/api/android/java/s...
File webrtc/api/android/java/src/org/webrtc/CameraCapturer.java (right):

https://codereview.webrtc.org/2238263002/diff/60001/webrtc/api/android/java/s...
webrtc/api/android/java/src/org/webrtc/CameraCapturer.java:98: private boolean
switchPending;                   /* guarded by stateLock */
On 2016/08/15 09:13:29, magjed_webrtc wrote:
> The names of these two variables and what state they represent are a bit
> confusing. At least comment, or add a new enum for this, something like:
> enum SwitchState {
>   IDLE,         // No switch requested.
>   PENDING,      // Waiting for previous capture session to open.
>   IN_PROGRESS,  // Waiting for new switched capture session to start.
> }

Done.

https://codereview.webrtc.org/2238263002/diff/60001/webrtc/api/android/java/s...
webrtc/api/android/java/src/org/webrtc/CameraCapturer.java:247: if
(switchInProgress) {
On 2016/08/15 09:13:29, magjed_webrtc wrote:
> You need to check |switchPending| here as well, otherwise multiple calls to
> switchCamera() while the session is opening will result in only one of the
> switchEventsHandler to be notified.

Done.

[magjed_webrtc, 2016-08-15 09:57:49]

lgtm

[sakal, 2016-08-15 10:12:35]

The CQ bit was checked by sakal@webrtc.org

[commit-bot: I haz the power, 2016-08-15 10:12:44]

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, 2016-08-15 12:13:07]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-15 12:13:08]

Try jobs failed on following builders:
  android_arm64_rel on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)

[sakal, 2016-08-15 12:37:58]

Description was changed from

==========
Make CameraCapturer.switchCamera try again if session is still opening.

A new camera control thread is created for this purpose. In the future,
this thread could be used for other purposes as well such as detecting
camera stop deadlocks.

R=magjed@webrtc.org
==========

to

==========
Make CameraCapturer.switchCamera try again if session is still opening.

R=magjed@webrtc.org
==========

[sakal, 2016-08-15 13:17:53]

The CQ bit was checked by sakal@webrtc.org

[commit-bot: I haz the power, 2016-08-15 13:17:58]

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, 2016-08-15 13:19:37]

Description was changed from

==========
Make CameraCapturer.switchCamera try again if session is still opening.

R=magjed@webrtc.org
==========

to

==========
Make CameraCapturer.switchCamera try again if session is still opening.

R=magjed@webrtc.org
==========

[commit-bot: I haz the power, 2016-08-15 13:19:39]

Committed patchset #5 (id:80001)

[commit-bot: I haz the power, 2016-08-15 13:19:45]

Description was changed from

==========
Make CameraCapturer.switchCamera try again if session is still opening.

R=magjed@webrtc.org
==========

to

==========
Make CameraCapturer.switchCamera try again if session is still opening.

R=magjed@webrtc.org

Committed: https://crrev.com/92c09509bdf0287c7af5c1bbde87dd188acf1879
Cr-Commit-Position: refs/heads/master@{#13747}
==========

[commit-bot: I haz the power, 2016-08-15 13:19:45]

Patchset 5 (id:??) landed as
https://crrev.com/92c09509bdf0287c7af5c1bbde87dd188acf1879
Cr-Commit-Position: refs/heads/master@{#13747}