diff --git a/DEPS b/DEPS index a7b0809f82..512ae8d5ea 100644 --- a/DEPS +++ b/DEPS @@ -5,16 +5,16 @@ vars = { # chromium waterfalls. More info at: crbug.com/570091. 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', - 'chromium_revision': '67eba1f62be32e770c7b948b80b4a8a767f83335', + 'chromium_revision': '3c3851d3ca177ce1230a2fde1491514508d90ec3', } deps = { # TODO(kjellander): Move this to be Android-only once the libevent dependency # in base/third_party/libevent is solved. 'src/base': - 'https://chromium.googlesource.com/chromium/src/base@a0992bdcd30d59137b4eac107f983c23f6803e71', + 'https://chromium.googlesource.com/chromium/src/base@4ee11af5ff9e0d4a07857815d9938edec3c1d4f9', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@e36ae524d9d41673d1601a177315d240d1f2012c', + 'https://chromium.googlesource.com/chromium/src/build@4ae7e91430cf25213423ffa3d72d1397c15f74ee', 'src/buildtools': 'https://chromium.googlesource.com/chromium/src/buildtools@74cfb57006f83cfe050817526db359d5c8a11628', # Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC. @@ -23,13 +23,13 @@ deps = { 'condition': 'checkout_android', }, 'src/ios': { - 'url': 'https://chromium.googlesource.com/chromium/src/ios@a87556eeec27c3970737587cee9ac6ae713fc355', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@429f84ccae88ce8dca990062f98a0007a0d13c33', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@f391f81ac8a11c867a82764c9a88d44fde1180f4', + 'https://chromium.googlesource.com/chromium/src/testing@313b861b558834544846ad22b0d1a5f05772c501', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@dc1d83593b9c88071448540081c2fd49f76ec34c', + 'https://chromium.googlesource.com/chromium/src/third_party@dc539d589fb257ae6a358e6a2c1998ce1d93068a', 'src/buildtools/linux64': { 'packages': [ @@ -119,7 +119,7 @@ deps = { 'src/third_party/colorama/src': 'https://chromium.googlesource.com/external/colorama.git@799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', 'src/third_party/depot_tools': - 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@e3614ad6f574a554f18dbcb1c03dd9f0df6ab3ba', + 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@c10743f873f3d4edc8a7d135303d8efdbddee196', 'src/third_party/errorprone/lib': { 'url': 'https://chromium.googlesource.com/chromium/third_party/errorprone.git@980d49e839aa4984015efed34b0134d4b2c9b6d7', 'condition': 'checkout_android', @@ -231,7 +231,7 @@ deps = { 'src/third_party/yasm/source/patched-yasm': 'https://chromium.googlesource.com/chromium/deps/yasm/patched-yasm.git@720b70524a4424b15fc57e82263568c8ba0496ad', 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@97c481e2cf02e6672a8ae689904828a602711062', + 'https://chromium.googlesource.com/chromium/src/tools@b74bc013c1bf17ca26b442f2ebb9560e53d08b17', 'src/tools/swarming_client': 'https://chromium.googlesource.com/infra/luci/client-py.git@96f125709acfd0b48fc1e5dae7d6ea42291726ac', diff --git a/examples/androidnativeapi/jni/android_call_client.cc b/examples/androidnativeapi/jni/android_call_client.cc index 3e995c3425..7bd6d3b21f 100644 --- a/examples/androidnativeapi/jni/android_call_client.cc +++ b/examples/androidnativeapi/jni/android_call_client.cc @@ -83,7 +83,6 @@ AndroidCallClient::AndroidCallClient() AndroidCallClient::~AndroidCallClient() = default; void AndroidCallClient::Call(JNIEnv* env, - const webrtc::JavaRef& cls, const webrtc::JavaRef& local_sink, const webrtc::JavaRef& remote_sink) { RTC_DCHECK_RUN_ON(&thread_checker_); @@ -106,8 +105,7 @@ void AndroidCallClient::Call(JNIEnv* env, Connect(); } -void AndroidCallClient::Hangup(JNIEnv* env, - const webrtc::JavaRef& cls) { +void AndroidCallClient::Hangup(JNIEnv* env) { RTC_DCHECK_RUN_ON(&thread_checker_); call_started_ = false; @@ -125,17 +123,14 @@ void AndroidCallClient::Hangup(JNIEnv* env, video_source_ = nullptr; } -void AndroidCallClient::Delete(JNIEnv* env, - const webrtc::JavaRef& cls) { +void AndroidCallClient::Delete(JNIEnv* env) { RTC_DCHECK_RUN_ON(&thread_checker_); delete this; } webrtc::ScopedJavaLocalRef -AndroidCallClient::GetJavaVideoCapturerObserver( - JNIEnv* env, - const webrtc::JavaRef& cls) { +AndroidCallClient::GetJavaVideoCapturerObserver(JNIEnv* env) { RTC_DCHECK_RUN_ON(&thread_checker_); return video_source_->GetJavaVideoCapturerObserver(env); diff --git a/examples/androidnativeapi/jni/android_call_client.h b/examples/androidnativeapi/jni/android_call_client.h index 979df7abe0..13992f5960 100644 --- a/examples/androidnativeapi/jni/android_call_client.h +++ b/examples/androidnativeapi/jni/android_call_client.h @@ -31,16 +31,13 @@ class AndroidCallClient { ~AndroidCallClient(); void Call(JNIEnv* env, - const webrtc::JavaRef& cls, const webrtc::JavaRef& local_sink, const webrtc::JavaRef& remote_sink); - void Hangup(JNIEnv* env, const webrtc::JavaRef& cls); + void Hangup(JNIEnv* env); // A helper method for Java code to delete this object. Calls delete this. - void Delete(JNIEnv* env, const webrtc::JavaRef& cls); + void Delete(JNIEnv* env); - webrtc::ScopedJavaLocalRef GetJavaVideoCapturerObserver( - JNIEnv* env, - const webrtc::JavaRef& cls); + webrtc::ScopedJavaLocalRef GetJavaVideoCapturerObserver(JNIEnv* env); private: class PCObserver; diff --git a/sdk/android/src/jni/android_video_track_source.cc b/sdk/android/src/jni/android_video_track_source.cc index c6c884975c..a72a3f667a 100644 --- a/sdk/android/src/jni/android_video_track_source.cc +++ b/sdk/android/src/jni/android_video_track_source.cc @@ -59,7 +59,6 @@ absl::optional AndroidVideoTrackSource::needs_denoising() const { } void AndroidVideoTrackSource::SetState(JNIEnv* env, - const JavaRef& j_caller, jboolean j_is_live) { InternalSetState(j_is_live ? kLive : kEnded); } @@ -88,7 +87,6 @@ bool AndroidVideoTrackSource::remote() const { ScopedJavaLocalRef AndroidVideoTrackSource::AdaptFrame( JNIEnv* env, - const JavaRef& j_caller, jint j_width, jint j_height, jint j_rotation, @@ -130,7 +128,6 @@ ScopedJavaLocalRef AndroidVideoTrackSource::AdaptFrame( void AndroidVideoTrackSource::OnFrameCaptured( JNIEnv* env, - const JavaRef& j_caller, jint j_rotation, jlong j_timestamp_ns, const JavaRef& j_video_frame_buffer) { @@ -151,7 +148,6 @@ void AndroidVideoTrackSource::OnFrameCaptured( void AndroidVideoTrackSource::AdaptOutputFormat( JNIEnv* env, - const JavaRef& j_caller, jint j_landscape_width, jint j_landscape_height, const JavaRef& j_max_landscape_pixel_count, diff --git a/sdk/android/src/jni/android_video_track_source.h b/sdk/android/src/jni/android_video_track_source.h index 331a308bc9..98333cb32c 100644 --- a/sdk/android/src/jni/android_video_track_source.h +++ b/sdk/android/src/jni/android_video_track_source.h @@ -57,7 +57,6 @@ class AndroidVideoTrackSource : public rtc::AdaptedVideoTrackSource { // NativeAndroidVideoTrackSource.FrameAdaptationParameters, or null if the // frame should be dropped. ScopedJavaLocalRef AdaptFrame(JNIEnv* env, - const JavaRef& 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& j_caller, jint j_rotation, jlong j_timestamp_ns, const JavaRef& j_video_frame_buffer); void SetState(JNIEnv* env, - const JavaRef& j_caller, jboolean j_is_live); void AdaptOutputFormat(JNIEnv* env, - const JavaRef& j_caller, jint j_landscape_width, jint j_landscape_height, const JavaRef& j_max_landscape_pixel_count, diff --git a/sdk/android/src/jni/audio_device/audio_track_jni.cc b/sdk/android/src/jni/audio_device/audio_track_jni.cc index 3c25183100..856e18abbe 100644 --- a/sdk/android/src/jni/audio_device/audio_track_jni.cc +++ b/sdk/android/src/jni/audio_device/audio_track_jni.cc @@ -184,7 +184,6 @@ void AudioTrackJni::AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) { void AudioTrackJni::CacheDirectBufferAddress( JNIEnv* env, - const JavaParamRef&, const JavaParamRef& 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&, size_t length) { RTC_DCHECK(thread_checker_java_.IsCurrent()); const size_t bytes_per_frame = audio_parameters_.channels() * sizeof(int16_t); diff --git a/sdk/android/src/jni/audio_device/audio_track_jni.h b/sdk/android/src/jni/audio_device/audio_track_jni.h index 25c6b6f9ff..2a7684510b 100644 --- a/sdk/android/src/jni/audio_device/audio_track_jni.h +++ b/sdk/android/src/jni/audio_device/audio_track_jni.h @@ -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& j_caller, const JavaParamRef& 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& j_caller, - size_t length); + void GetPlayoutData(JNIEnv* env, size_t length); private: // Stores thread ID in constructor. diff --git a/sdk/android/src/jni/video_decoder_wrapper.cc b/sdk/android/src/jni/video_decoder_wrapper.cc index 762b7394b5..54c6e1574c 100644 --- a/sdk/android/src/jni/video_decoder_wrapper.cc +++ b/sdk/android/src/jni/video_decoder_wrapper.cc @@ -155,7 +155,6 @@ const char* VideoDecoderWrapper::ImplementationName() const { void VideoDecoderWrapper::OnDecodedFrame( JNIEnv* env, - const JavaRef& j_caller, const JavaRef& j_frame, const JavaRef& j_decode_time_ms, const JavaRef& j_qp) { diff --git a/sdk/android/src/jni/video_decoder_wrapper.h b/sdk/android/src/jni/video_decoder_wrapper.h index a2bc072705..a7f686872c 100644 --- a/sdk/android/src/jni/video_decoder_wrapper.h +++ b/sdk/android/src/jni/video_decoder_wrapper.h @@ -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& j_caller, const JavaRef& j_frame, const JavaRef& j_decode_time_ms, const JavaRef& j_qp); diff --git a/sdk/android/src/jni/video_encoder_wrapper.cc b/sdk/android/src/jni/video_encoder_wrapper.cc index 1584ed8343..a13a019e5a 100644 --- a/sdk/android/src/jni/video_encoder_wrapper.cc +++ b/sdk/android/src/jni/video_encoder_wrapper.cc @@ -251,7 +251,6 @@ VideoEncoderWrapper::GetResolutionBitrateLimits(JNIEnv* jni) const { void VideoEncoderWrapper::OnEncodedFrame( JNIEnv* jni, - const JavaRef& j_caller, const JavaRef& j_encoded_image) { EncodedImage frame = JavaToNativeEncodedImage(jni, j_encoded_image); int64_t capture_time_ns = diff --git a/sdk/android/src/jni/video_encoder_wrapper.h b/sdk/android/src/jni/video_encoder_wrapper.h index 6b57b71c8f..3ba23dcd17 100644 --- a/sdk/android/src/jni/video_encoder_wrapper.h +++ b/sdk/android/src/jni/video_encoder_wrapper.h @@ -50,7 +50,6 @@ class VideoEncoderWrapper : public VideoEncoder { // Should only be called by JNI. void OnEncodedFrame(JNIEnv* jni, - const JavaRef& j_caller, const JavaRef& j_encoded_image); private: