Add support for scaling textures in AndroidVideoCapturer.

Add support for scaling textures in AndroidVideoCapturer.
The idea is to also reuse AndroidTextureBuffer::CropAndScale when scaling in the encoder.

BUG=webrtc:4993
R=magjed@webrtc.org

Committed: https://chromium.googlesource.com/external/webrtc/+/a3c20bb9a096495c5f8a876329b5edcedcf04ab8

[perkj_webrtc, 2015-11-25 12:41:33]

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

[perkj_webrtc, 2015-11-25 12:41:33]

Please review.

[magjed_webrtc, 2015-11-25 13:38:29]

https://codereview.webrtc.org/1471333003/diff/20001/talk/app/webrtc/androidte...
File
talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java
(right):

https://codereview.webrtc.org/1471333003/diff/20001/talk/app/webrtc/androidte...
talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java:53:
width = frame.width;
Maybe use frame.rotatedWidth(), because you don't care about the frames internal
rotation.

https://codereview.webrtc.org/1471333003/diff/20001/talk/app/webrtc/androidvi...
File talk/app/webrtc/androidvideocapturer.cc (right):

https://codereview.webrtc.org/1471333003/diff/20001/talk/app/webrtc/androidvi...
talk/app/webrtc/androidvideocapturer.cc:104:
rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer(buffer_);
Move this inside the if-statement, i.e.
rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer =
    static_cast<webrtc_jni::AndroidTextureBuffer*>(buffer_.get())
        ->CropAndScale(cropped_input_width, cropped_input_height,
                       output_width, output_height);

https://codereview.webrtc.org/1471333003/diff/20001/talk/app/webrtc/java/jni/...
File talk/app/webrtc/java/jni/native_handle_impl.cc (right):

https://codereview.webrtc.org/1471333003/diff/20001/talk/app/webrtc/java/jni/...
talk/app/webrtc/java/jni/native_handle_impl.cc:39: void
ScaledFrameNotInUse(scoped_refptr<NativeHandleBuffer> original) {}
I have seen this dummy function being added a hundred times. Maybe it's time to
define one in e.g. webrtc/base/scoped_ref_ptr.h. Something like this:
template<typename T>
void ReleaseRef(scoped_refptr<T>) {}

[perkj_webrtc, 2015-11-25 20:56:21]

PTAL

https://codereview.webrtc.org/1471333003/diff/20001/talk/app/webrtc/androidte...
File
talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java
(right):

https://codereview.webrtc.org/1471333003/diff/20001/talk/app/webrtc/androidte...
talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java:53:
width = frame.width;
On 2015/11/25 13:38:28, magjed_webrtc wrote:
> Maybe use frame.rotatedWidth(), because you don't care about the frames
internal
> rotation.

Done.

https://codereview.webrtc.org/1471333003/diff/20001/talk/app/webrtc/androidvi...
File talk/app/webrtc/androidvideocapturer.cc (right):

https://codereview.webrtc.org/1471333003/diff/20001/talk/app/webrtc/androidvi...
talk/app/webrtc/androidvideocapturer.cc:104:
rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer(buffer_);
On 2015/11/25 13:38:28, magjed_webrtc wrote:
> Move this inside the if-statement, i.e.
> rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer =
>     static_cast<webrtc_jni::AndroidTextureBuffer*>(buffer_.get())
>         ->CropAndScale(cropped_input_width, cropped_input_height,
>                        output_width, output_height);

Done.

https://codereview.webrtc.org/1471333003/diff/20001/talk/app/webrtc/java/jni/...
File talk/app/webrtc/java/jni/native_handle_impl.cc (right):

https://codereview.webrtc.org/1471333003/diff/20001/talk/app/webrtc/java/jni/...
talk/app/webrtc/java/jni/native_handle_impl.cc:39: void
ScaledFrameNotInUse(scoped_refptr<NativeHandleBuffer> original) {}
On 2015/11/25 13:38:28, magjed_webrtc wrote:
> I have seen this dummy function being added a hundred times. Maybe it's time
to
> define one in e.g. webrtc/base/scoped_ref_ptr.h. Something like this:
> template<typename T>
> void ReleaseRef(scoped_refptr<T>) {}

ok- but I would like to do that in a separate cl.

[magjed_webrtc, 2015-11-26 10:08:33]

https://codereview.webrtc.org/1471333003/diff/40001/talk/app/webrtc/androidte...
File
talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java
(right):

https://codereview.webrtc.org/1471333003/diff/40001/talk/app/webrtc/androidte...
talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java:577:
capturer.onOutputFormatRequest(scaledWidth, scaledHeight, frameRate);
I know why this works now. The order does not matter in onOutputFormatRequest(),
i.e. onOutputFormatRequest(640, 480, 30) is exactly the same as
onOutputFormatRequest(480, 640, 30), because width/height is only used in the
following way in cricket::VideoAdapter:
view_desired_num_pixels_ = format.width * format.height;
This test looks good now, but can you add a comment in
VideoCapturerAndroid.onOutputFormatRequest() that the order of width/height does
not matter.

https://codereview.webrtc.org/1471333003/diff/40001/talk/app/webrtc/java/jni/...
File talk/app/webrtc/java/jni/native_handle_impl.cc (right):

https://codereview.webrtc.org/1471333003/diff/40001/talk/app/webrtc/java/jni/...
talk/app/webrtc/java/jni/native_handle_impl.cc:80: // TODO(perkj) Implement
cropping.
Add a CHECK_EQ(cropped_input_width, width()) and CHECK_EQ(cropped_input_height,
height()) below the TODO to make sure this does not happen.

[perkj_webrtc, 2015-11-26 10:56:00]

Patchset #4 (id:60001) has been deleted

[perkj_webrtc, 2015-11-26 10:56:14]

PTAL

https://codereview.webrtc.org/1471333003/diff/40001/talk/app/webrtc/androidte...
File
talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java
(right):

https://codereview.webrtc.org/1471333003/diff/40001/talk/app/webrtc/androidte...
talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java:577:
capturer.onOutputFormatRequest(scaledWidth, scaledHeight, frameRate);
On 2015/11/26 10:08:33, magjed_webrtc wrote:
> I know why this works now. The order does not matter in
onOutputFormatRequest(),
> i.e. onOutputFormatRequest(640, 480, 30) is exactly the same as
> onOutputFormatRequest(480, 640, 30), because width/height is only used in the
> following way in cricket::VideoAdapter:
> view_desired_num_pixels_ = format.width * format.height;
> This test looks good now, but can you add a comment in
> VideoCapturerAndroid.onOutputFormatRequest() that the order of width/height
does
> not matter.

Done.

https://codereview.webrtc.org/1471333003/diff/40001/talk/app/webrtc/java/jni/...
File talk/app/webrtc/java/jni/native_handle_impl.cc (right):

https://codereview.webrtc.org/1471333003/diff/40001/talk/app/webrtc/java/jni/...
talk/app/webrtc/java/jni/native_handle_impl.cc:80: // TODO(perkj) Implement
cropping.
On 2015/11/26 10:08:33, magjed_webrtc wrote:
> Add a CHECK_EQ(cropped_input_width, width()) and
CHECK_EQ(cropped_input_height,
> height()) below the TODO to make sure this does not happen.

Done.

[magjed_webrtc, 2015-11-26 11:29:28]

lgtm

[perkj_webrtc, 2015-11-26 11:30:35]

The CQ bit was checked by perkj@webrtc.org

[commit-bot: I haz the power, 2015-11-26 11:30:42]

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

[commit-bot: I haz the power, 2015-11-26 12:41:57]

Description was changed from

==========
Add support for scaling textures in AndroidVideoCapturer.
The idea is to also reuse AndroidTextureBuffer::CropAndScale when scaling in the
encoder.

BUG=webrtc:4993
==========

to

==========
Add support for scaling textures in AndroidVideoCapturer.
The idea is to also reuse AndroidTextureBuffer::CropAndScale when scaling in the
encoder.

BUG=webrtc:4993
R=magjed@webrtc.org

Committed: https://crrev.com/a3c20bb9a096495c5f8a876329b5edcedcf04ab8
Cr-Commit-Position: refs/heads/master@{#10802}
==========

[perkj_webrtc, 2015-11-26 12:41:57]

Description was changed from

==========
Add support for scaling textures in AndroidVideoCapturer.
The idea is to also reuse AndroidTextureBuffer::CropAndScale when scaling in the
encoder.

BUG=webrtc:4993
==========

to

==========
Add support for scaling textures in AndroidVideoCapturer.
The idea is to also reuse AndroidTextureBuffer::CropAndScale when scaling in the
encoder.

BUG=webrtc:4993
R=magjed@webrtc.org

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

[commit-bot: I haz the power, 2015-11-26 12:41:58]

Patchset 4 (id:??) landed as
https://crrev.com/a3c20bb9a096495c5f8a876329b5edcedcf04ab8
Cr-Commit-Position: refs/heads/master@{#10802}

[perkj_webrtc, 2015-11-26 12:41:59]

Committed patchset #4 (id:10006) manually as
a3c20bb9a096495c5f8a876329b5edcedcf04ab8 (presubmit successful).