2015-10-02 13:56:04 +02:00
|
|
|
/*
|
2016-02-10 07:54:43 -08:00
|
|
|
* Copyright 2015 The WebRTC project authors. All Rights Reserved.
|
2015-10-02 13:56:04 +02:00
|
|
|
*
|
2016-02-10 07:54:43 -08:00
|
|
|
* Use of this source code is governed by a BSD-style license
|
|
|
|
|
* that can be found in the LICENSE file in the root of the source
|
|
|
|
|
* tree. An additional intellectual property rights grant can be found
|
|
|
|
|
* in the file PATENTS. All contributing project authors may
|
|
|
|
|
* be found in the AUTHORS file in the root of the source tree.
|
2015-10-02 13:56:04 +02:00
|
|
|
*/
|
|
|
|
|
|
2016-12-06 04:29:37 -08:00
|
|
|
#include "webrtc/sdk/android/src/jni/native_handle_impl.h"
|
2015-10-02 13:56:04 +02:00
|
|
|
|
2016-04-27 06:47:29 -07:00
|
|
|
#include <memory>
|
|
|
|
|
|
2015-12-10 06:23:33 -08:00
|
|
|
#include "webrtc/base/bind.h"
|
2015-10-02 13:56:04 +02:00
|
|
|
#include "webrtc/base/checks.h"
|
2015-11-30 22:15:45 -08:00
|
|
|
#include "webrtc/base/keep_ref_until_done.h"
|
Move talk/media to webrtc/media
I removed the 'libjingle' target in talk/libjingle.gyp and replaced
all users of it with base/base.gyp:rtc_base. It seems the jsoncpp
and expat dependencies were not used by it's previous references.
The files in talk/media/testdata were uploaded to Google Storage and
added .sha1 files in resources/media instead of simply moving them.
The previously disabled warnings that were inherited from
talk/build/common.gypi are now replaced by target-specific disabling
of only the failing warnings. Additional disabling was needed since the stricter
compilation warnings that applies to code in webrtc/.
License headers will be updated in a follow-up CL in order to not
break Git history.
Other modifications:
* Updated the header guards.
* Sorted the includes using chromium/src/tools/sort-headers.py
except for these files:
talk/app/webrtc/peerconnectionendtoend_unittest.cc
talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
talk/app/webrtc/java/jni/androidmediaencoder_jni.cc
webrtc/media/devices/win32devicemanager.cc.
* Unused GYP reference to libjingle_tests_additional_deps was removed.
* Removed duplicated GYP entries of
webrtc/base/testutils.cc
webrtc/base/testutils.h
The HAVE_WEBRTC_VIDEO and HAVE_WEBRTC_VOICE defines were used by only talk/media,
so they were moved to the media.gyp.
I also checked that none of
EXPAT_RELATIVE_PATH,
FEATURE_ENABLE_VOICEMAIL,
GTEST_RELATIVE_PATH,
JSONCPP_RELATIVE_PATH,
LOGGING=1,
SRTP_RELATIVE_PATH,
FEATURE_ENABLE_SSL,
FEATURE_ENABLE_VOICEMAIL,
FEATURE_ENABLE_PSTN,
HAVE_SCTP,
HAVE_SRTP,
are used by the talk/media code.
For Chromium, the following changes will need to be applied to the roll CL that updates the
DEPS for WebRTC and libjingle: https://codereview.chromium.org/1604303002/
BUG=webrtc:5420
NOPRESUBMIT=True
TBR=tommi@webrtc.org
Review URL: https://codereview.webrtc.org/1587193006
Cr-Commit-Position: refs/heads/master@{#11495}
2016-02-04 23:52:28 -08:00
|
|
|
#include "webrtc/base/logging.h"
|
2015-11-30 22:15:45 -08:00
|
|
|
#include "webrtc/base/scoped_ref_ptr.h"
|
2017-06-16 10:08:23 +02:00
|
|
|
#include "webrtc/base/timeutils.h"
|
2017-06-07 13:06:06 +02:00
|
|
|
#include "webrtc/common_video/include/video_frame_buffer.h"
|
2017-06-16 10:08:23 +02:00
|
|
|
#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
|
Reland of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #1 id:1 of https://codereview.webrtc.org/2853383005/ )
Reason for revert:
Downstream projects have been fixed.
Original issue's description:
> Revert of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #1 id:1 of https://codereview.webrtc.org/2854873003/ )
>
> Reason for revert:
> More downstream breakage discovered.
>
> Original issue's description:
> > Reland of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #1 id:1 of https://codereview.webrtc.org/2854883002/ )
> >
> > Reason for revert:
> > Will make another attempt to track down and fix downstream projects.
> >
> > Original issue's description:
> > > Revert of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #1 id:1 of https://codereview.webrtc.org/2852303002/ )
> > >
> > > Reason for revert:
> > > Unfortunately, more downstream updates needed.
> > >
> > > Original issue's description:
> > > > Reland of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #1 id:1 of https://codereview.webrtc.org/2845333002/ )
> > > >
> > > > Reason for revert:
> > > > Downstream projects being updated.
> > > >
> > > > For Chrome, relanding depends on cl
> > > > https://codereview.chromium.org/2855783003/
> > > >
> > > > Original issue's description:
> > > > > Revert of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #17 id:320001 of https://codereview.webrtc.org/2622263002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Broke Chrome build, see, e.g.,
> > > > > http://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/16237
> > > > >
> > > > > Original issue's description:
> > > > > > Delete deprecated and transitional stuff related to video frame refactoring.
> > > > > >
> > > > > > BUG=webrtc:5880
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2622263002
> > > > > > Cr-Commit-Position: refs/heads/master@{#17928}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/713a3bbcc74a4c1a1f54d6dbd0bdaa715f5c1ae1
> > > > >
> > > > > TBR=mflodman@webrtc.org,perkj@webrtc.org
> > > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > > NOPRESUBMIT=true
> > > > > NOTREECHECKS=true
> > > > > NOTRY=true
> > > > > BUG=webrtc:5880
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2845333002
> > > > > Cr-Commit-Position: refs/heads/master@{#17929}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/aec49d2b49e1beceb286cbb29ad220aefd0ac648
> > > >
> > > > TBR=mflodman@webrtc.org,perkj@webrtc.org
> > > > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > > > BUG=webrtc:5880
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2852303002
> > > > Cr-Commit-Position: refs/heads/master@{#17974}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/d71ebd70f6c40a37559a7ee2930002a804ad3f13
> > >
> > > TBR=mflodman@webrtc.org,perkj@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:5880
> > >
> > > Review-Url: https://codereview.webrtc.org/2854883002
> > > Cr-Commit-Position: refs/heads/master@{#17978}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/6e6a485a028799501ea4753ceefc811dd826f52f
> >
> > TBR=mflodman@webrtc.org,perkj@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> >
> > BUG=webrtc:5880
> >
> > Review-Url: https://codereview.webrtc.org/2854873003
> > Cr-Commit-Position: refs/heads/master@{#18006}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/3870a071c452dc2e782196bc5bba0375d019b653
>
> TBR=mflodman@webrtc.org,perkj@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:5880
>
> Review-Url: https://codereview.webrtc.org/2853383005
> Cr-Commit-Position: refs/heads/master@{#18008}
> Committed: https://chromium.googlesource.com/external/webrtc/+/61b22dde133aff91a0db6a628d87b2ea9134fa15
TBR=mflodman@webrtc.org,perkj@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:5880
Review-Url: https://codereview.webrtc.org/2867703002
Cr-Commit-Position: refs/heads/master@{#18081}
2017-05-10 05:25:59 -07:00
|
|
|
#include "webrtc/sdk/android/src/jni/jni_helpers.h"
|
2017-06-07 13:06:06 +02:00
|
|
|
#include "webrtc/system_wrappers/include/aligned_malloc.h"
|
2015-10-02 13:56:04 +02:00
|
|
|
|
2016-05-25 08:47:01 -07:00
|
|
|
namespace webrtc_jni {
|
|
|
|
|
|
|
|
|
|
Matrix::Matrix(JNIEnv* jni, jfloatArray a) {
|
|
|
|
|
RTC_CHECK_EQ(16, jni->GetArrayLength(a));
|
|
|
|
|
jfloat* ptr = jni->GetFloatArrayElements(a, nullptr);
|
|
|
|
|
for (int i = 0; i < 16; ++i) {
|
|
|
|
|
elem_[i] = ptr[i];
|
|
|
|
|
}
|
|
|
|
|
jni->ReleaseFloatArrayElements(a, ptr, 0);
|
|
|
|
|
}
|
2015-12-11 09:32:37 +01:00
|
|
|
|
2017-06-16 10:08:23 +02:00
|
|
|
Matrix Matrix::fromAndroidGraphicsMatrix(JNIEnv* jni, jobject j_matrix) {
|
|
|
|
|
jfloatArray array_3x3 = jni->NewFloatArray(9);
|
|
|
|
|
jclass j_matrix_class = jni->FindClass("android/graphics/Matrix");
|
|
|
|
|
jni->CallVoidMethod(j_matrix,
|
|
|
|
|
GetMethodID(jni, j_matrix_class, "getValues", "([F)V"),
|
|
|
|
|
array_3x3);
|
|
|
|
|
jfloat* array_3x3_ptr = jni->GetFloatArrayElements(array_3x3, nullptr);
|
|
|
|
|
Matrix matrix;
|
|
|
|
|
memset(matrix.elem_, 0, sizeof(matrix.elem_));
|
|
|
|
|
for (int y = 0; y < 3; ++y) {
|
|
|
|
|
for (int x = 0; x < 3; ++x) {
|
|
|
|
|
matrix.elem_[y * 4 + x] = array_3x3_ptr[x + y * 3];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
matrix.elem_[3 + 3 * 3] = 1; // Bottom-right corner should be 1.
|
|
|
|
|
return matrix;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jfloatArray Matrix::ToJava(JNIEnv* jni) const {
|
2016-05-25 08:47:01 -07:00
|
|
|
jfloatArray matrix = jni->NewFloatArray(16);
|
|
|
|
|
jni->SetFloatArrayRegion(matrix, 0, 16, elem_);
|
|
|
|
|
return matrix;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Matrix::Rotate(webrtc::VideoRotation rotation) {
|
2015-12-11 09:32:37 +01:00
|
|
|
// Texture coordinates are in the range 0 to 1. The transformation of the last
|
|
|
|
|
// row in each rotation matrix is needed for proper translation, e.g, to
|
|
|
|
|
// mirror x, we don't replace x by -x, but by 1-x.
|
|
|
|
|
switch (rotation) {
|
|
|
|
|
case webrtc::kVideoRotation_0:
|
|
|
|
|
break;
|
|
|
|
|
case webrtc::kVideoRotation_90: {
|
|
|
|
|
const float ROTATE_90[16] =
|
2016-05-25 08:47:01 -07:00
|
|
|
{ elem_[4], elem_[5], elem_[6], elem_[7],
|
|
|
|
|
-elem_[0], -elem_[1], -elem_[2], -elem_[3],
|
|
|
|
|
elem_[8], elem_[9], elem_[10], elem_[11],
|
|
|
|
|
elem_[0] + elem_[12], elem_[1] + elem_[13],
|
|
|
|
|
elem_[2] + elem_[14], elem_[3] + elem_[15]};
|
|
|
|
|
memcpy(elem_, ROTATE_90, sizeof(elem_));
|
2015-12-11 09:32:37 +01:00
|
|
|
} break;
|
|
|
|
|
case webrtc::kVideoRotation_180: {
|
|
|
|
|
const float ROTATE_180[16] =
|
2016-05-25 08:47:01 -07:00
|
|
|
{ -elem_[0], -elem_[1], -elem_[2], -elem_[3],
|
|
|
|
|
-elem_[4], -elem_[5], -elem_[6], -elem_[7],
|
|
|
|
|
elem_[8], elem_[9], elem_[10], elem_[11],
|
|
|
|
|
elem_[0] + elem_[4] + elem_[12], elem_[1] + elem_[5] + elem_[13],
|
|
|
|
|
elem_[2] + elem_[6] + elem_[14], elem_[3] + elem_[11]+ elem_[15]};
|
|
|
|
|
memcpy(elem_, ROTATE_180, sizeof(elem_));
|
|
|
|
|
} break;
|
2015-12-11 09:32:37 +01:00
|
|
|
case webrtc::kVideoRotation_270: {
|
|
|
|
|
const float ROTATE_270[16] =
|
2016-05-25 08:47:01 -07:00
|
|
|
{ -elem_[4], -elem_[5], -elem_[6], -elem_[7],
|
|
|
|
|
elem_[0], elem_[1], elem_[2], elem_[3],
|
|
|
|
|
elem_[8], elem_[9], elem_[10], elem_[11],
|
|
|
|
|
elem_[4] + elem_[12], elem_[5] + elem_[13],
|
|
|
|
|
elem_[6] + elem_[14], elem_[7] + elem_[15]};
|
|
|
|
|
memcpy(elem_, ROTATE_270, sizeof(elem_));
|
2015-12-11 09:32:37 +01:00
|
|
|
} break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-05-13 12:51:04 +02:00
|
|
|
// Calculates result = a * b, in column-major order.
|
2016-05-25 08:47:01 -07:00
|
|
|
void Matrix::Multiply(const float a[16], const float b[16], float result[16]) {
|
2016-05-13 12:51:04 +02:00
|
|
|
for (int i = 0; i < 4; ++i) {
|
|
|
|
|
for (int j = 0; j < 4; ++j) {
|
|
|
|
|
float sum = 0;
|
|
|
|
|
for (int k = 0; k < 4; ++k) {
|
|
|
|
|
sum += a[k * 4 + j] * b[i * 4 + k];
|
|
|
|
|
}
|
|
|
|
|
result[i * 4 + j] = sum;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Center crop by keeping xFraction of the width and yFraction of the height,
|
|
|
|
|
// so e.g. cropping from 640x480 to 640x360 would use
|
|
|
|
|
// xFraction=1, yFraction=360/480.
|
2016-05-25 08:47:01 -07:00
|
|
|
void Matrix::Crop(float xFraction,
|
|
|
|
|
float yFraction,
|
|
|
|
|
float xOffset,
|
|
|
|
|
float yOffset) {
|
|
|
|
|
const float crop_matrix[16] =
|
|
|
|
|
{xFraction, 0, 0, 0,
|
|
|
|
|
0, yFraction, 0, 0,
|
|
|
|
|
0, 0, 1, 0,
|
|
|
|
|
xOffset, yOffset, 0, 1};
|
|
|
|
|
const Matrix old = *this;
|
|
|
|
|
Multiply(crop_matrix, old.elem_, this->elem_);
|
2016-05-13 12:51:04 +02:00
|
|
|
}
|
|
|
|
|
|
2015-12-10 06:23:33 -08:00
|
|
|
// Aligning pointer to 64 bytes for improved performance, e.g. use SIMD.
|
|
|
|
|
static const int kBufferAlignment = 64;
|
|
|
|
|
|
2016-05-25 08:47:01 -07:00
|
|
|
NativeHandleImpl::NativeHandleImpl(int id, const Matrix& matrix)
|
|
|
|
|
: oes_texture_id(id), sampling_matrix(matrix) {}
|
|
|
|
|
|
2015-11-19 10:43:36 +01:00
|
|
|
NativeHandleImpl::NativeHandleImpl(JNIEnv* jni,
|
|
|
|
|
jint j_oes_texture_id,
|
|
|
|
|
jfloatArray j_transform_matrix)
|
2016-05-25 08:47:01 -07:00
|
|
|
: oes_texture_id(j_oes_texture_id),
|
|
|
|
|
sampling_matrix(jni, j_transform_matrix) {}
|
2015-10-02 13:56:04 +02:00
|
|
|
|
2015-10-12 06:53:20 -07:00
|
|
|
AndroidTextureBuffer::AndroidTextureBuffer(
|
|
|
|
|
int width,
|
|
|
|
|
int height,
|
2015-11-19 10:43:36 +01:00
|
|
|
const NativeHandleImpl& native_handle,
|
2015-12-10 06:23:33 -08:00
|
|
|
jobject surface_texture_helper,
|
2015-10-12 06:53:20 -07:00
|
|
|
const rtc::Callback0<void>& no_longer_used)
|
2017-06-07 13:06:06 +02:00
|
|
|
: width_(width),
|
|
|
|
|
height_(height),
|
2015-10-12 06:53:20 -07:00
|
|
|
native_handle_(native_handle),
|
2015-12-10 06:23:33 -08:00
|
|
|
surface_texture_helper_(surface_texture_helper),
|
2015-10-12 06:53:20 -07:00
|
|
|
no_longer_used_cb_(no_longer_used) {}
|
|
|
|
|
|
|
|
|
|
AndroidTextureBuffer::~AndroidTextureBuffer() {
|
|
|
|
|
no_longer_used_cb_();
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-07 13:06:06 +02:00
|
|
|
webrtc::VideoFrameBuffer::Type AndroidTextureBuffer::type() const {
|
|
|
|
|
return Type::kNative;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
NativeHandleImpl AndroidTextureBuffer::native_handle_impl() const {
|
|
|
|
|
return native_handle_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int AndroidTextureBuffer::width() const {
|
|
|
|
|
return width_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int AndroidTextureBuffer::height() const {
|
|
|
|
|
return height_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rtc::scoped_refptr<webrtc::I420BufferInterface> AndroidTextureBuffer::ToI420() {
|
2017-06-19 15:04:19 +02:00
|
|
|
int uv_width = (width() + 7) / 8;
|
2015-12-10 06:23:33 -08:00
|
|
|
int stride = 8 * uv_width;
|
2017-06-19 15:04:19 +02:00
|
|
|
int uv_height = (height() + 1) / 2;
|
2015-12-10 06:23:33 -08:00
|
|
|
size_t size = stride * (height() + uv_height);
|
|
|
|
|
// The data is owned by the frame, and the normal case is that the
|
|
|
|
|
// data is deleted by the frame's destructor callback.
|
|
|
|
|
//
|
|
|
|
|
// TODO(nisse): Use an I420BufferPool. We then need to extend that
|
|
|
|
|
// class, and I420Buffer, to support our memory layout.
|
Reland of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #1 id:1 of https://codereview.webrtc.org/2853383005/ )
Reason for revert:
Downstream projects have been fixed.
Original issue's description:
> Revert of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #1 id:1 of https://codereview.webrtc.org/2854873003/ )
>
> Reason for revert:
> More downstream breakage discovered.
>
> Original issue's description:
> > Reland of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #1 id:1 of https://codereview.webrtc.org/2854883002/ )
> >
> > Reason for revert:
> > Will make another attempt to track down and fix downstream projects.
> >
> > Original issue's description:
> > > Revert of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #1 id:1 of https://codereview.webrtc.org/2852303002/ )
> > >
> > > Reason for revert:
> > > Unfortunately, more downstream updates needed.
> > >
> > > Original issue's description:
> > > > Reland of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #1 id:1 of https://codereview.webrtc.org/2845333002/ )
> > > >
> > > > Reason for revert:
> > > > Downstream projects being updated.
> > > >
> > > > For Chrome, relanding depends on cl
> > > > https://codereview.chromium.org/2855783003/
> > > >
> > > > Original issue's description:
> > > > > Revert of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #17 id:320001 of https://codereview.webrtc.org/2622263002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Broke Chrome build, see, e.g.,
> > > > > http://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/16237
> > > > >
> > > > > Original issue's description:
> > > > > > Delete deprecated and transitional stuff related to video frame refactoring.
> > > > > >
> > > > > > BUG=webrtc:5880
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2622263002
> > > > > > Cr-Commit-Position: refs/heads/master@{#17928}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/713a3bbcc74a4c1a1f54d6dbd0bdaa715f5c1ae1
> > > > >
> > > > > TBR=mflodman@webrtc.org,perkj@webrtc.org
> > > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > > NOPRESUBMIT=true
> > > > > NOTREECHECKS=true
> > > > > NOTRY=true
> > > > > BUG=webrtc:5880
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2845333002
> > > > > Cr-Commit-Position: refs/heads/master@{#17929}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/aec49d2b49e1beceb286cbb29ad220aefd0ac648
> > > >
> > > > TBR=mflodman@webrtc.org,perkj@webrtc.org
> > > > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > > > BUG=webrtc:5880
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2852303002
> > > > Cr-Commit-Position: refs/heads/master@{#17974}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/d71ebd70f6c40a37559a7ee2930002a804ad3f13
> > >
> > > TBR=mflodman@webrtc.org,perkj@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:5880
> > >
> > > Review-Url: https://codereview.webrtc.org/2854883002
> > > Cr-Commit-Position: refs/heads/master@{#17978}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/6e6a485a028799501ea4753ceefc811dd826f52f
> >
> > TBR=mflodman@webrtc.org,perkj@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> >
> > BUG=webrtc:5880
> >
> > Review-Url: https://codereview.webrtc.org/2854873003
> > Cr-Commit-Position: refs/heads/master@{#18006}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/3870a071c452dc2e782196bc5bba0375d019b653
>
> TBR=mflodman@webrtc.org,perkj@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:5880
>
> Review-Url: https://codereview.webrtc.org/2853383005
> Cr-Commit-Position: refs/heads/master@{#18008}
> Committed: https://chromium.googlesource.com/external/webrtc/+/61b22dde133aff91a0db6a628d87b2ea9134fa15
TBR=mflodman@webrtc.org,perkj@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:5880
Review-Url: https://codereview.webrtc.org/2867703002
Cr-Commit-Position: refs/heads/master@{#18081}
2017-05-10 05:25:59 -07:00
|
|
|
// TODO(nisse): Depending on
|
|
|
|
|
// system_wrappers/include/aligned_malloc.h violate current DEPS
|
|
|
|
|
// rules. We get away for now only because it is indirectly included
|
|
|
|
|
// by i420_buffer.h
|
2016-04-27 06:47:29 -07:00
|
|
|
std::unique_ptr<uint8_t, webrtc::AlignedFreeDeleter> yuv_data(
|
2015-12-10 06:23:33 -08:00
|
|
|
static_cast<uint8_t*>(webrtc::AlignedMalloc(size, kBufferAlignment)));
|
2016-10-19 15:29:02 +02:00
|
|
|
// See YuvConverter.java for the required layout.
|
2015-12-10 06:23:33 -08:00
|
|
|
uint8_t* y_data = yuv_data.get();
|
|
|
|
|
uint8_t* u_data = y_data + height() * stride;
|
|
|
|
|
uint8_t* v_data = u_data + stride/2;
|
|
|
|
|
|
2017-06-07 13:06:06 +02:00
|
|
|
rtc::scoped_refptr<webrtc::I420BufferInterface> copy =
|
|
|
|
|
new rtc::RefCountedObject<webrtc::WrappedI420Buffer>(
|
|
|
|
|
width(), height(), y_data, stride, u_data, stride, v_data, stride,
|
|
|
|
|
rtc::Bind(&webrtc::AlignedFree, yuv_data.release()));
|
2015-12-10 06:23:33 -08:00
|
|
|
|
|
|
|
|
JNIEnv* jni = AttachCurrentThreadIfNeeded();
|
|
|
|
|
ScopedLocalRefFrame local_ref_frame(jni);
|
|
|
|
|
|
|
|
|
|
jmethodID transform_mid = GetMethodID(
|
|
|
|
|
jni,
|
|
|
|
|
GetObjectClass(jni, surface_texture_helper_),
|
|
|
|
|
"textureToYUV",
|
|
|
|
|
"(Ljava/nio/ByteBuffer;IIII[F)V");
|
|
|
|
|
|
|
|
|
|
jobject byte_buffer = jni->NewDirectByteBuffer(y_data, size);
|
|
|
|
|
|
2016-05-25 08:47:01 -07:00
|
|
|
jfloatArray sampling_matrix = native_handle_.sampling_matrix.ToJava(jni);
|
2015-12-10 06:23:33 -08:00
|
|
|
jni->CallVoidMethod(surface_texture_helper_,
|
|
|
|
|
transform_mid,
|
|
|
|
|
byte_buffer, width(), height(), stride,
|
|
|
|
|
native_handle_.oes_texture_id, sampling_matrix);
|
|
|
|
|
CHECK_EXCEPTION(jni) << "textureToYUV throwed an exception";
|
|
|
|
|
|
|
|
|
|
return copy;
|
2015-10-12 06:53:20 -07:00
|
|
|
}
|
|
|
|
|
|
2017-06-16 10:08:23 +02:00
|
|
|
AndroidVideoBuffer::AndroidVideoBuffer(JNIEnv* jni,
|
|
|
|
|
jmethodID j_retain_id,
|
|
|
|
|
jmethodID j_release_id,
|
|
|
|
|
int width,
|
|
|
|
|
int height,
|
|
|
|
|
const Matrix& matrix,
|
|
|
|
|
jobject j_video_frame_buffer)
|
|
|
|
|
: j_release_id_(j_release_id),
|
|
|
|
|
width_(width),
|
|
|
|
|
height_(height),
|
|
|
|
|
matrix_(matrix),
|
|
|
|
|
j_video_frame_buffer_(jni, j_video_frame_buffer) {
|
|
|
|
|
jni->CallVoidMethod(j_video_frame_buffer, j_retain_id);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
AndroidVideoBuffer::~AndroidVideoBuffer() {
|
|
|
|
|
JNIEnv* jni = AttachCurrentThreadIfNeeded();
|
|
|
|
|
jni->CallVoidMethod(*j_video_frame_buffer_, j_release_id_);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jobject AndroidVideoBuffer::video_frame_buffer() const {
|
|
|
|
|
return *j_video_frame_buffer_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
webrtc::VideoFrameBuffer::Type AndroidVideoBuffer::type() const {
|
|
|
|
|
return Type::kNative;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int AndroidVideoBuffer::width() const {
|
|
|
|
|
return width_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int AndroidVideoBuffer::height() const {
|
|
|
|
|
return height_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rtc::scoped_refptr<webrtc::I420BufferInterface> AndroidVideoBuffer::ToI420() {
|
|
|
|
|
// TODO(magjed): Implement using Java ToI420.
|
|
|
|
|
return nullptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jobject AndroidVideoBuffer::ToJavaI420Frame(JNIEnv* jni,
|
|
|
|
|
int width,
|
|
|
|
|
int height,
|
|
|
|
|
int rotation) {
|
|
|
|
|
jclass j_byte_buffer_class = jni->FindClass("java/nio/ByteBuffer");
|
|
|
|
|
jclass j_i420_frame_class =
|
|
|
|
|
FindClass(jni, "org/webrtc/VideoRenderer$I420Frame");
|
|
|
|
|
jmethodID j_i420_frame_ctor_id =
|
|
|
|
|
GetMethodID(jni, j_i420_frame_class, "<init>",
|
|
|
|
|
"(III[FLorg/webrtc/VideoFrame$Buffer;J)V");
|
|
|
|
|
// Java code just uses the native frame to hold a reference to the buffer so
|
|
|
|
|
// this is okay.
|
|
|
|
|
webrtc::VideoFrame* native_frame = new webrtc::VideoFrame(
|
|
|
|
|
this, 0 /* timestamp */, 0 /* render_time_ms */,
|
|
|
|
|
webrtc::VideoRotation::kVideoRotation_0 /* rotation */);
|
|
|
|
|
return jni->NewObject(j_i420_frame_class, j_i420_frame_ctor_id, width, height,
|
|
|
|
|
rotation, matrix_.ToJava(jni), *j_video_frame_buffer_,
|
|
|
|
|
jlongFromPointer(native_frame));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
AndroidVideoBufferFactory::AndroidVideoBufferFactory(JNIEnv* jni)
|
|
|
|
|
: j_video_frame_class_(jni, FindClass(jni, "org/webrtc/VideoFrame")),
|
|
|
|
|
j_get_buffer_id_(GetMethodID(jni,
|
|
|
|
|
*j_video_frame_class_,
|
|
|
|
|
"getBuffer",
|
|
|
|
|
"()Lorg/webrtc/VideoFrame$Buffer;")),
|
|
|
|
|
j_get_width_id_(
|
|
|
|
|
GetMethodID(jni, *j_video_frame_class_, "getWidth", "()I")),
|
|
|
|
|
j_get_height_id_(
|
|
|
|
|
GetMethodID(jni, *j_video_frame_class_, "getHeight", "()I")),
|
|
|
|
|
j_get_rotation_id_(
|
|
|
|
|
GetMethodID(jni, *j_video_frame_class_, "getRotation", "()I")),
|
|
|
|
|
j_get_transform_matrix_id_(GetMethodID(jni,
|
|
|
|
|
*j_video_frame_class_,
|
|
|
|
|
"getTransformMatrix",
|
|
|
|
|
"()Landroid/graphics/Matrix;")),
|
|
|
|
|
j_get_timestamp_ns_id_(
|
|
|
|
|
GetMethodID(jni, *j_video_frame_class_, "getTimestampNs", "()J")),
|
|
|
|
|
j_video_frame_buffer_class_(
|
|
|
|
|
jni,
|
|
|
|
|
FindClass(jni, "org/webrtc/VideoFrame$Buffer")),
|
|
|
|
|
j_retain_id_(
|
|
|
|
|
GetMethodID(jni, *j_video_frame_buffer_class_, "retain", "()V")),
|
|
|
|
|
j_release_id_(
|
|
|
|
|
GetMethodID(jni, *j_video_frame_buffer_class_, "release", "()V")) {}
|
|
|
|
|
|
|
|
|
|
webrtc::VideoFrame AndroidVideoBufferFactory::CreateFrame(
|
|
|
|
|
JNIEnv* jni,
|
|
|
|
|
jobject j_video_frame,
|
|
|
|
|
uint32_t timestamp_rtp) const {
|
|
|
|
|
jobject j_video_frame_buffer =
|
|
|
|
|
jni->CallObjectMethod(j_video_frame, j_get_buffer_id_);
|
|
|
|
|
int width = jni->CallIntMethod(j_video_frame, j_get_width_id_);
|
|
|
|
|
int height = jni->CallIntMethod(j_video_frame, j_get_height_id_);
|
|
|
|
|
int rotation = jni->CallIntMethod(j_video_frame, j_get_rotation_id_);
|
|
|
|
|
jobject j_matrix =
|
|
|
|
|
jni->CallObjectMethod(j_video_frame, j_get_transform_matrix_id_);
|
|
|
|
|
Matrix matrix = Matrix::fromAndroidGraphicsMatrix(jni, j_matrix);
|
|
|
|
|
uint32_t timestamp_ns =
|
|
|
|
|
jni->CallLongMethod(j_video_frame, j_get_timestamp_ns_id_);
|
|
|
|
|
rtc::scoped_refptr<AndroidVideoBuffer> buffer =
|
|
|
|
|
CreateBuffer(width, height, matrix, j_video_frame_buffer);
|
|
|
|
|
return webrtc::VideoFrame(buffer, timestamp_rtp,
|
|
|
|
|
timestamp_ns / rtc::kNumNanosecsPerMillisec,
|
|
|
|
|
static_cast<webrtc::VideoRotation>(rotation));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rtc::scoped_refptr<AndroidVideoBuffer> AndroidVideoBufferFactory::CreateBuffer(
|
|
|
|
|
int width,
|
|
|
|
|
int height,
|
|
|
|
|
const Matrix& matrix,
|
|
|
|
|
jobject j_video_frame_buffer) const {
|
|
|
|
|
JNIEnv* jni = AttachCurrentThreadIfNeeded();
|
|
|
|
|
return new rtc::RefCountedObject<AndroidVideoBuffer>(
|
|
|
|
|
jni, j_retain_id_, j_release_id_, width, height, matrix,
|
|
|
|
|
j_video_frame_buffer);
|
|
|
|
|
}
|
|
|
|
|
|
2015-10-02 13:56:04 +02:00
|
|
|
} // namespace webrtc_jni
|