Android VideoSource: Add adaptOutputFormat function

Android VideoSource: Add adaptOutputFormat function

The Java VideoSource class wraps the C++ AndroidVideoTrackSource.
AndroidVideoTrackSource is the object actually owning the VideoAdapter.
We currently control the VideoAdapter through the Java VideoCapturer,
but it is more natural and direct to control it through the Java
VideoSource class. This CL adds the necessary function to do this, and
the function in VideoCapturer is deprecated.

BUG=webrtc:6391
R=sakal@webrtc.org

Committed: https://crrev.com/7640fcf6ed29c3c08843ec8651bcb090e158b27e
Cr-Commit-Position: refs/heads/master@{#14332}

[magjed_webrtc, 2016-09-20 11:14:50]

Patchset #1 (id:1) has been deleted

[magjed_webrtc, 2016-09-20 11:16:09]

Description was changed from

==========
Android VideoSource: Add adaptOutputFormat function

The Java VideoSource class wraps the C++ AndroidVideoTrackSource.
AndroidVideoTrackSource is the object actually owning the VideoAdapter.
We currently control the VideoAdapter through the Java VideoCapturer,
but it is more natural and direct to control it through the Java
VideoSource class. This CL adds the necessary function to do this, and
the function in VideoCapturer is deprecated.

BUG=webrtc:6391
==========

to

==========
Android VideoSource: Add adaptOutputFormat function

The Java VideoSource class wraps the C++ AndroidVideoTrackSource.
AndroidVideoTrackSource is the object actually owning the VideoAdapter.
We currently control the VideoAdapter through the Java VideoCapturer,
but it is more natural and direct to control it through the Java
VideoSource class. This CL adds the necessary function to do this, and
the function in VideoCapturer is deprecated.

BUG=webrtc:6391
==========

[magjed_webrtc, 2016-09-20 11:16:09]

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

[magjed_webrtc, 2016-09-20 11:16:18]

Sami - please take a look.

[sakal, 2016-09-20 11:55:03]

https://codereview.webrtc.org/2350933006/diff/40001/webrtc/api/android/java/s...
File webrtc/api/android/java/src/org/webrtc/VideoSource.java (right):

https://codereview.webrtc.org/2350933006/diff/40001/webrtc/api/android/java/s...
webrtc/api/android/java/src/org/webrtc/VideoSource.java:26: // Calling this
function will cause frames to be scaled down to the requested resolution. Also,
nit: Can you use the javadoc comment syntax? It is already used on the class
description. This type of comment should be used for implementation comments in
Java.

https://codereview.webrtc.org/2350933006/diff/40001/webrtc/api/android/jni/an...
File webrtc/api/android/jni/androidvideotracksource_jni.cc (right):

https://codereview.webrtc.org/2350933006/diff/40001/webrtc/api/android/jni/an...
webrtc/api/android/jni/androidvideotracksource_jni.cc:90: JOW(void,
VideoSource_nativeAdaptOutputFormat)
I don't feel like this is the file this method belongs in. I think a new file
should be created or it should be place in peerconnection_jni.cc (like some
other miscellaneous method like MediaSource.free).

https://codereview.webrtc.org/2350933006/diff/40001/webrtc/api/android/jni/an...
webrtc/api/android/jni/androidvideotracksource_jni.cc:95:
source->OnOutputFormatRequest(j_width, j_height, j_fps);
This path is also going to be changed in a follow-up CL, right?

[magjed_webrtc, 2016-09-20 12:27:41]

https://codereview.webrtc.org/2350933006/diff/40001/webrtc/api/android/java/s...
File webrtc/api/android/java/src/org/webrtc/VideoSource.java (right):

https://codereview.webrtc.org/2350933006/diff/40001/webrtc/api/android/java/s...
webrtc/api/android/java/src/org/webrtc/VideoSource.java:26: // Calling this
function will cause frames to be scaled down to the requested resolution. Also,
On 2016/09/20 11:55:03, sakal wrote:
> nit: Can you use the javadoc comment syntax? It is already used on the class
> description. This type of comment should be used for implementation comments
in
> Java.

Done.

https://codereview.webrtc.org/2350933006/diff/40001/webrtc/api/android/jni/an...
File webrtc/api/android/jni/androidvideotracksource_jni.cc (right):

https://codereview.webrtc.org/2350933006/diff/40001/webrtc/api/android/jni/an...
webrtc/api/android/jni/androidvideotracksource_jni.cc:90: JOW(void,
VideoSource_nativeAdaptOutputFormat)
On 2016/09/20 11:55:03, sakal wrote:
> I don't feel like this is the file this method belongs in. I think a new file
> should be created or it should be place in peerconnection_jni.cc (like some
> other miscellaneous method like MediaSource.free).

I hear you, and I know that this file is only used for
AndroidVideoTrackSourceObserver so far. However, I think this file
(androidvideotracksource_jni.cc) should be used for all AndroidVideoTrackSource
JNI implementation details, and this is one of them. I prefer this over creating
a new file or putting it in the kitchen sink file (peerconnection_jni.cc).

https://codereview.webrtc.org/2350933006/diff/40001/webrtc/api/android/jni/an...
webrtc/api/android/jni/androidvideotracksource_jni.cc:95:
source->OnOutputFormatRequest(j_width, j_height, j_fps);
On 2016/09/20 11:55:03, sakal wrote:
> This path is also going to be changed in a follow-up CL, right?

You mean change the function name of OnOutputFormatRequest? Yes, we should do
that. The name is strange, it's not a callback function. I want to wait until we
have removed the deprecated OnOutputFormatRequest before doing that though.

[sakal, 2016-09-20 12:31:10]

lgtm

[magjed_webrtc, 2016-09-20 12:51:52]

The CQ bit was checked by magjed@webrtc.org

[commit-bot: I haz the power, 2016-09-20 12:52:08]

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-09-20 14:52:34]

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

[commit-bot: I haz the power, 2016-09-20 14:52:35]

Try jobs failed on following builders:
  android_arm64_rel on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
  android_dbg on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
  android_rel on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
  win_clang_dbg on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
  win_clang_rel on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
  win_dbg on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
  win_drmemory_light on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
  win_rel on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
  win_x64_clang_dbg on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
  win_x64_clang_rel on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
  win_x64_dbg on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
  win_x64_gyp_dbg on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
  win_x64_gyp_rel on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
  win_x64_rel on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)

[magjed_webrtc, 2016-09-21 11:23:54]

On 2016/09/20 14:52:35, commit-bot: I haz the power wrote:
> Try jobs failed on following builders:
>   android_arm64_rel on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
>   android_dbg on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
>   android_rel on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
>   win_clang_dbg on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
>   win_clang_rel on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
>   win_dbg on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
>   win_drmemory_light on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
>   win_rel on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
>   win_x64_clang_dbg on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
>   win_x64_clang_rel on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
>   win_x64_dbg on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
>   win_x64_gyp_dbg on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
>   win_x64_gyp_rel on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)
>   win_x64_rel on master.tryserver.webrtc (JOB_TIMED_OUT, no build URL)

A thread check hits in AndroidVideoTrackSource::OnOutputFormatRequest.
cricket::VideoAdapter is thread safe, so we don't need that, so I removed the
thread check.

[magjed_webrtc, 2016-09-21 11:24:02]

The CQ bit was checked by magjed@webrtc.org

[magjed_webrtc, 2016-09-21 11:24:02]

The patchset sent to the CQ was uploaded after l-g-t-m from sakal@webrtc.org
Link to the patchset: https://codereview.webrtc.org/2350933006/#ps80001 (title:
"Remove thread check in OnOutputFormatRequest")

[commit-bot: I haz the power, 2016-09-21 11:24:06]

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-09-21 13:24:48]

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

[commit-bot: I haz the power, 2016-09-21 13:24:49]

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

[magjed_webrtc, 2016-09-21 14:20:20]

Description was changed from

==========
Android VideoSource: Add adaptOutputFormat function

The Java VideoSource class wraps the C++ AndroidVideoTrackSource.
AndroidVideoTrackSource is the object actually owning the VideoAdapter.
We currently control the VideoAdapter through the Java VideoCapturer,
but it is more natural and direct to control it through the Java
VideoSource class. This CL adds the necessary function to do this, and
the function in VideoCapturer is deprecated.

BUG=webrtc:6391
==========

to

==========
Android VideoSource: Add adaptOutputFormat function

The Java VideoSource class wraps the C++ AndroidVideoTrackSource.
AndroidVideoTrackSource is the object actually owning the VideoAdapter.
We currently control the VideoAdapter through the Java VideoCapturer,
but it is more natural and direct to control it through the Java
VideoSource class. This CL adds the necessary function to do this, and
the function in VideoCapturer is deprecated.

BUG=webrtc:6391
R=sakal@webrtc.org

Committed:
https://chromium.googlesource.com/external/webrtc/+/7640fcf6ed29c3c08843ec865...
==========

[magjed_webrtc, 2016-09-21 14:20:21]

Committed patchset #4 (id:80001) manually as
7640fcf6ed29c3c08843ec8651bcb090e158b27e (presubmit successful).

[commit-bot: I haz the power, 2016-09-21 14:20:21]

Description was changed from

==========
Android VideoSource: Add adaptOutputFormat function

The Java VideoSource class wraps the C++ AndroidVideoTrackSource.
AndroidVideoTrackSource is the object actually owning the VideoAdapter.
We currently control the VideoAdapter through the Java VideoCapturer,
but it is more natural and direct to control it through the Java
VideoSource class. This CL adds the necessary function to do this, and
the function in VideoCapturer is deprecated.

BUG=webrtc:6391
R=sakal@webrtc.org

Committed:
https://chromium.googlesource.com/external/webrtc/+/7640fcf6ed29c3c08843ec865...
==========

to

==========
Android VideoSource: Add adaptOutputFormat function

The Java VideoSource class wraps the C++ AndroidVideoTrackSource.
AndroidVideoTrackSource is the object actually owning the VideoAdapter.
We currently control the VideoAdapter through the Java VideoCapturer,
but it is more natural and direct to control it through the Java
VideoSource class. This CL adds the necessary function to do this, and
the function in VideoCapturer is deprecated.

BUG=webrtc:6391
R=sakal@webrtc.org

Committed: https://crrev.com/7640fcf6ed29c3c08843ec8651bcb090e158b27e
Cr-Commit-Position: refs/heads/master@{#14332}
==========