Android: Handle SurfaceTextureHelper ctor failure for decoder and capturer

Android: Handle SurfaceTextureHelper ctor failure for decoder and capturer

BUG=webrtc:5874
TEST=Manually throw an exception inside the SurfaceTextureHelper ctor and run AppRTCDemo.

Committed: https://crrev.com/2aa84260d8a61f28dee4010e3f04b969abd8a502
Cr-Commit-Position: refs/heads/master@{#12665}

[magjed_webrtc, 2016-03-31 08:57:47]

Patchset #1 (id:1) has been deleted

[magjed_webrtc, 2016-03-31 11:29:08]

Patchset #1 (id:20001) has been deleted

[magjed_webrtc, 2016-03-31 11:39:14]

Patchset #1 (id:40001) has been deleted

[magjed_webrtc, 2016-03-31 11:40:09]

Description was changed from

==========
Android: Handle SurfaceTextureHelper ctor failure for decoder and capturer

BUG=b/27581640
==========

to

==========
Android: Handle SurfaceTextureHelper ctor failure for decoder and capturer

BUG=b/27581640
TEST=Manually throw an exception inside the SurfaceTextureHelper ctor and run
AppRTCDemo.
==========

[magjed_webrtc, 2016-03-31 11:40:35]

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

[magjed_webrtc, 2016-03-31 11:40:53]

Please take a look.

[AlexG, 2016-03-31 23:03:22]

https://codereview.webrtc.org/1840193007/diff/60001/webrtc/api/java/jni/andro...
File webrtc/api/java/jni/androidmediadecoder_jni.cc (right):

https://codereview.webrtc.org/1840193007/diff/60001/webrtc/api/java/jni/andro...
webrtc/api/java/jni/androidmediadecoder_jni.cc:349: if
(!surface_texture_helper_) {
Better to fallback to SW codec in this case - byte buffer decoding is very slow
on some platforms (NVidia) - slower than SW decoding

https://codereview.webrtc.org/1840193007/diff/60001/webrtc/api/java/jni/andro...
File webrtc/api/java/jni/androidvideocapturer_jni.cc (right):

https://codereview.webrtc.org/1840193007/diff/60001/webrtc/api/java/jni/andro...
webrtc/api/java/jni/androidvideocapturer_jni.cc:41: surface_texture_helper_(
surface_texture_helper_ is not needed for byte buffer capture

[magjed_webrtc, 2016-05-04 09:51:51]

https://codereview.webrtc.org/1840193007/diff/60001/webrtc/api/java/jni/andro...
File webrtc/api/java/jni/androidmediadecoder_jni.cc (right):

https://codereview.webrtc.org/1840193007/diff/60001/webrtc/api/java/jni/andro...
webrtc/api/java/jni/androidmediadecoder_jni.cc:349: if
(!surface_texture_helper_) {
On 2016/03/31 23:03:22, AlexG wrote:
> Better to fallback to SW codec in this case - byte buffer decoding is very
slow
> on some platforms (NVidia) - slower than SW decoding

Done.

https://codereview.webrtc.org/1840193007/diff/60001/webrtc/api/java/jni/andro...
File webrtc/api/java/jni/androidvideocapturer_jni.cc (right):

https://codereview.webrtc.org/1840193007/diff/60001/webrtc/api/java/jni/andro...
webrtc/api/java/jni/androidvideocapturer_jni.cc:41: surface_texture_helper_(
On 2016/03/31 23:03:22, AlexG wrote:
> surface_texture_helper_ is not needed for byte buffer capture

I reverted the fallback path in VideoCapturerAndroid. Now
surface_texture_helper_ is always needed again - if it fails to create then
VideoCapturerAndroid.startCapture will report onCameraError and stop without
crashing.

[AlexG, 2016-05-06 17:45:25]

lgtm

https://codereview.webrtc.org/1840193007/diff/120001/webrtc/api/java/jni/surf...
File webrtc/api/java/jni/surfacetexturehelper_jni.h (right):

https://codereview.webrtc.org/1840193007/diff/120001/webrtc/api/java/jni/surf...
webrtc/api/java/jni/surfacetexturehelper_jni.h:43: create(JNIEnv* jni, const
char* thread_name, jobject j_egl_context);
alignment? create is on previous line?

[magjed_webrtc, 2016-05-09 09:51:07]

Per - ping.

https://codereview.webrtc.org/1840193007/diff/120001/webrtc/api/java/jni/surf...
File webrtc/api/java/jni/surfacetexturehelper_jni.h (right):

https://codereview.webrtc.org/1840193007/diff/120001/webrtc/api/java/jni/surf...
webrtc/api/java/jni/surfacetexturehelper_jni.h:43: create(JNIEnv* jni, const
char* thread_name, jobject j_egl_context);
On 2016/05/06 17:45:24, AlexG wrote:
> alignment? create is on previous line?

It's the result of 'clang format', but it looks a bit strange. I manually broke
the line after the function name and indented 4 spaces now instead.

[perkj_webrtc, 2016-05-09 13:28:36]

lgtm with the comments below at least considered.

https://codereview.webrtc.org/1840193007/diff/140001/webrtc/api/java/android/...
File webrtc/api/java/android/org/webrtc/SurfaceTextureHelper.java (right):

https://codereview.webrtc.org/1840193007/diff/140001/webrtc/api/java/android/...
webrtc/api/java/android/org/webrtc/SurfaceTextureHelper.java:325: // Both these
statements have been observed to fail on rare occasions.
Can you file an open source bug with information on how they have failed and add
a link here as documentation?

https://codereview.webrtc.org/1840193007/diff/140001/webrtc/api/java/jni/surf...
File webrtc/api/java/jni/surfacetexturehelper_jni.h (right):

https://codereview.webrtc.org/1840193007/diff/140001/webrtc/api/java/jni/surf...
webrtc/api/java/jni/surfacetexturehelper_jni.h:57: // RefCountedObject needs
access to the private ctor.
just make the ctor protected instead.

[magjed_webrtc, 2016-05-09 14:26:59]

Description was changed from

==========
Android: Handle SurfaceTextureHelper ctor failure for decoder and capturer

BUG=b/27581640
TEST=Manually throw an exception inside the SurfaceTextureHelper ctor and run
AppRTCDemo.
==========

to

==========
Android: Handle SurfaceTextureHelper ctor failure for decoder and capturer

BUG=webrtc:5874
TEST=Manually throw an exception inside the SurfaceTextureHelper ctor and run
AppRTCDemo.
==========

[magjed_webrtc, 2016-05-09 14:30:22]

https://codereview.webrtc.org/1840193007/diff/140001/webrtc/api/java/android/...
File webrtc/api/java/android/org/webrtc/SurfaceTextureHelper.java (right):

https://codereview.webrtc.org/1840193007/diff/140001/webrtc/api/java/android/...
webrtc/api/java/android/org/webrtc/SurfaceTextureHelper.java:325: // Both these
statements have been observed to fail on rare occasions.
On 2016/05/09 13:28:36, perkj_webrtc wrote:
> Can you file an open source bug with information on how they have failed and
add
> a link here as documentation? 

Done.

https://codereview.webrtc.org/1840193007/diff/140001/webrtc/api/java/jni/surf...
File webrtc/api/java/jni/surfacetexturehelper_jni.h (right):

https://codereview.webrtc.org/1840193007/diff/140001/webrtc/api/java/jni/surf...
webrtc/api/java/jni/surfacetexturehelper_jni.h:57: // RefCountedObject needs
access to the private ctor.
On 2016/05/09 13:28:36, perkj_webrtc wrote:
> just make the ctor protected instead.

Done.

[magjed_webrtc, 2016-05-09 14:30:36]

The CQ bit was checked by magjed@webrtc.org

[magjed_webrtc, 2016-05-09 14:30:37]

The patchset sent to the CQ was uploaded after l-g-t-m from glaznev@webrtc.org,
perkj@webrtc.org
Link to the patchset: https://codereview.webrtc.org/1840193007/#ps160001 (title:
"Addressing perkj@s comments")

[commit-bot: I haz the power, 2016-05-09 14:30:46]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1840193007/160001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1840193007/160001

[commit-bot: I haz the power, 2016-05-09 15:28:49]

Description was changed from

==========
Android: Handle SurfaceTextureHelper ctor failure for decoder and capturer

BUG=webrtc:5874
TEST=Manually throw an exception inside the SurfaceTextureHelper ctor and run
AppRTCDemo.
==========

to

==========
Android: Handle SurfaceTextureHelper ctor failure for decoder and capturer

BUG=webrtc:5874
TEST=Manually throw an exception inside the SurfaceTextureHelper ctor and run
AppRTCDemo.
==========

[commit-bot: I haz the power, 2016-05-09 15:28:50]

Committed patchset #6 (id:160001)

[commit-bot: I haz the power, 2016-05-09 15:29:01]

Description was changed from

==========
Android: Handle SurfaceTextureHelper ctor failure for decoder and capturer

BUG=webrtc:5874
TEST=Manually throw an exception inside the SurfaceTextureHelper ctor and run
AppRTCDemo.
==========

to

==========
Android: Handle SurfaceTextureHelper ctor failure for decoder and capturer

BUG=webrtc:5874
TEST=Manually throw an exception inside the SurfaceTextureHelper ctor and run
AppRTCDemo.

Committed: https://crrev.com/2aa84260d8a61f28dee4010e3f04b969abd8a502
Cr-Commit-Position: refs/heads/master@{#12665}
==========

[commit-bot: I haz the power, 2016-05-09 15:29:02]

Patchset 6 (id:??) landed as
https://crrev.com/2aa84260d8a61f28dee4010e3f04b969abd8a502
Cr-Commit-Position: refs/heads/master@{#12665}