zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll chromium_revision 67eba1f62b..3c3851d3ca (681379:681486) + JNI fix

Browse Source 
Change log: 67eba1f62b..3c3851d3ca
Full diff: 67eba1f62b..3c3851d3ca

This CL also includes all the required updates to remove the jcaller
object from the parameter list of methods that don't need it.

Changed dependencies
* src/base: a0992bdcd3..4ee11af5ff
* src/build: e36ae524d9..4ae7e91430
* src/ios: a87556eeec..429f84ccae
* src/testing: f391f81ac8..313b861b55
* src/third_party: dc1d83593b..dc539d589f
* src/third_party/depot_tools: e3614ad6f5..c10743f873
* src/tools: 97c481e2cf..b74bc013c1
DEPS diff: 67eba1f62b..3c3851d3ca/DEPS

No update to Clang.

TBR=chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com,
BUG=None

No-Try: True
Change-Id: I284a086d320c2df7a33152098a196f5af813375a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/147261
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28698}
This commit is contained in:
Mirko Bonadei
2019-07-29 15:33:57 +02:00
committed by Commit Bot
parent 630443aba2
commit 96ea8c00e7
11 changed files with 15 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/android/src/jni/android_video_track_source.cc
View File

@ -59,7 +59,6 @@ absl::optional<bool> AndroidVideoTrackSource::needs_denoising() const {
}
void AndroidVideoTrackSource::SetState(JNIEnv* env,
const JavaRef<jobject>& j_caller,
jboolean j_is_live) {
InternalSetState(j_is_live ? kLive : kEnded);
}
@ -88,7 +87,6 @@ bool AndroidVideoTrackSource::remote() const {
ScopedJavaLocalRef<jobject> AndroidVideoTrackSource::AdaptFrame(
JNIEnv* env,
const JavaRef<jobject>& j_caller,
jint j_width,
jint j_height,
jint j_rotation,
@ -130,7 +128,6 @@ ScopedJavaLocalRef<jobject> AndroidVideoTrackSource::AdaptFrame(
void AndroidVideoTrackSource::OnFrameCaptured(
JNIEnv* env,
const JavaRef<jobject>& j_caller,
jint j_rotation,
jlong j_timestamp_ns,
const JavaRef<jobject>& j_video_frame_buffer) {
@ -151,7 +148,6 @@ void AndroidVideoTrackSource::OnFrameCaptured(
void AndroidVideoTrackSource::AdaptOutputFormat(
JNIEnv* env,
const JavaRef<jobject>& j_caller,
jint j_landscape_width,
jint j_landscape_height,
const JavaRef<jobject>& j_max_landscape_pixel_count,

4
sdk/android/src/jni/android_video_track_source.h
View File

@ -57,7 +57,6 @@ class AndroidVideoTrackSource : public rtc::AdaptedVideoTrackSource {
// NativeAndroidVideoTrackSource.FrameAdaptationParameters, or null if the
// frame should be dropped.
ScopedJavaLocalRef<jobject> AdaptFrame(JNIEnv* env,
const JavaRef<jobject>& j_caller,
jint j_width,
jint j_height,
jint j_rotation,
@ -68,17 +67,14 @@ class AndroidVideoTrackSource : public rtc::AdaptedVideoTrackSource {
// called first and that the delivered frame conforms to those parameters.
// This function is thread safe and can be called from any thread.
void OnFrameCaptured(JNIEnv* env,
const JavaRef<jobject>& j_caller,
jint j_rotation,
jlong j_timestamp_ns,
const JavaRef<jobject>& j_video_frame_buffer);
void SetState(JNIEnv* env,
const JavaRef<jobject>& j_caller,
jboolean j_is_live);
void AdaptOutputFormat(JNIEnv* env,
const JavaRef<jobject>& j_caller,
jint j_landscape_width,
jint j_landscape_height,
const JavaRef<jobject>& j_max_landscape_pixel_count,

2
sdk/android/src/jni/audio_device/audio_track_jni.cc
View File

@ -184,7 +184,6 @@ void AudioTrackJni::AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) {
void AudioTrackJni::CacheDirectBufferAddress(
JNIEnv* env,
const JavaParamRef<jobject>&,
const JavaParamRef<jobject>& byte_buffer) {
RTC_LOG(INFO) << "OnCacheDirectBufferAddress";
RTC_DCHECK(thread_checker_.IsCurrent());
@ -201,7 +200,6 @@ void AudioTrackJni::CacheDirectBufferAddress(
// This method is called on a high-priority thread from Java. The name of
// the thread is 'AudioRecordTrack'.
void AudioTrackJni::GetPlayoutData(JNIEnv* env,
const JavaParamRef<jobject>&,
size_t length) {
RTC_DCHECK(thread_checker_java_.IsCurrent());
const size_t bytes_per_frame = audio_parameters_.channels() * sizeof(int16_t);

5
sdk/android/src/jni/audio_device/audio_track_jni.h
View File

@ -73,16 +73,13 @@ class AudioTrackJni : public AudioOutput {
// is also stored in |direct_buffer_capacity_in_bytes_|.
// Called on the same thread as the creating thread.
void CacheDirectBufferAddress(JNIEnv* env,
const JavaParamRef<jobject>& j_caller,
const JavaParamRef<jobject>& byte_buffer);
// Called periodically by the Java based WebRtcAudioTrack object when
// playout has started. Each call indicates that |length| new bytes should
// be written to the memory area |direct_buffer_address_| for playout.
// This method is called on a high-priority thread from Java. The name of
// the thread is 'AudioTrackThread'.
void GetPlayoutData(JNIEnv* env,
const JavaParamRef<jobject>& j_caller,
size_t length);
void GetPlayoutData(JNIEnv* env, size_t length);
private:
// Stores thread ID in constructor.

1
sdk/android/src/jni/video_decoder_wrapper.cc
View File

@ -155,7 +155,6 @@ const char* VideoDecoderWrapper::ImplementationName() const {
void VideoDecoderWrapper::OnDecodedFrame(
JNIEnv* env,
const JavaRef<jobject>& j_caller,
const JavaRef<jobject>& j_frame,
const JavaRef<jobject>& j_decode_time_ms,
const JavaRef<jobject>& j_qp) {

1
sdk/android/src/jni/video_decoder_wrapper.h
View File

@ -54,7 +54,6 @@ class VideoDecoderWrapper : public VideoDecoder {
// Wraps the frame to a AndroidVideoBuffer and passes it to the callback.
void OnDecodedFrame(JNIEnv* env,
const JavaRef<jobject>& j_caller,
const JavaRef<jobject>& j_frame,
const JavaRef<jobject>& j_decode_time_ms,
const JavaRef<jobject>& j_qp);

1
sdk/android/src/jni/video_encoder_wrapper.cc
View File

@ -251,7 +251,6 @@ VideoEncoderWrapper::GetResolutionBitrateLimits(JNIEnv* jni) const {
void VideoEncoderWrapper::OnEncodedFrame(
JNIEnv* jni,
const JavaRef<jobject>& j_caller,
const JavaRef<jobject>& j_encoded_image) {
EncodedImage frame = JavaToNativeEncodedImage(jni, j_encoded_image);
int64_t capture_time_ns =

1
sdk/android/src/jni/video_encoder_wrapper.h
View File

@ -50,7 +50,6 @@ class VideoEncoderWrapper : public VideoEncoder {
// Should only be called by JNI.
void OnEncodedFrame(JNIEnv* jni,
const JavaRef<jobject>& j_caller,
const JavaRef<jobject>& j_encoded_image);
private: