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

Roll chromium_revision 3546854f59..2e285ebae2 (612694:613019) + fix JNI

Browse Source 
This changelist is based on Chromium autoroller CL
https://webrtc-review.googlesource.com/c/src/+/112847
with additional JNI fixes needed to propagate upstream changes
introduced in
c99e905516


Change log: 3546854f59..2e285ebae2
Full diff: 3546854f59..2e285ebae2

Changed dependencies
* src/base: 0551460b2b..62febbdbd7
* src/build: 59f4bb0792..8b1ff06550
* src/ios: 0c78d113b3..2c8e8f83db
* src/testing: d387a4a97a..da3cc6c84a
* src/third_party: e31ab38349..a862efe9b4
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/1b98245e3c..6f862e54f2
* src/third_party/depot_tools: 016601cc21..0b287c5bca
* src/third_party/r8: uM1IGlYVeBYwmhwRCSMVqRvmu4YFlL7M2yLwZ1DWUvAC..ndmKWh0vZhDc2iLXEETOuWXVfafHbqwI_FcSgJJIfpoC
* src/tools: 476768d37c..cc443eb2fd
DEPS diff: 3546854f59..2e285ebae2/DEPS

No update to Clang.

No-Try: True
Bug: chromium:898660
Change-Id: I8be89e16d9639d96fc09f053e29414381a486846
Reviewed-on: https://webrtc-review.googlesource.com/c/112595
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Commit-Queue: Artem Titarenko <artit@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25900}
This commit is contained in:
Artem Titarenko
2018-12-03 11:02:28 +01:00
committed by Commit Bot
parent 04744aee2f
commit e5e36ddc40
36 changed files with 32 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sdk/android/src/jni/androidhistogram.cc
View File

@ -21,7 +21,6 @@ namespace webrtc {
namespace jni {
static jlong JNI_Histogram_CreateCounts(JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jstring>& j_name,
jint min,
jint max,
@ -33,7 +32,6 @@ static jlong JNI_Histogram_CreateCounts(JNIEnv* jni,
static jlong JNI_Histogram_CreateEnumeration(
JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jstring>& j_name,
jint max) {
std::string name = JavaToStdString(jni, j_name);
@ -41,7 +39,6 @@ static jlong JNI_Histogram_CreateEnumeration(
}
static void JNI_Histogram_AddSample(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong histogram,
jint sample) {
if (histogram) {

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

@ -772,7 +772,6 @@ const char* MediaCodecVideoDecoder::ImplementationName() const {
static jlong JNI_MediaCodecVideoDecoder_CreateDecoder(
JNIEnv* env,
const JavaParamRef<jclass>&,
const JavaParamRef<jstring>& codec,
jboolean use_surface) {
ScopedLocalRefFrame local_ref_frame(env);

2
sdk/android/src/jni/androidmediaencoder.cc
View File

@ -1209,7 +1209,6 @@ MediaCodecVideoEncoder::GetScalingSettingsInternal() const {
static void JNI_MediaCodecVideoEncoder_FillInputBuffer(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong native_encoder,
jint input_buffer,
const JavaParamRef<jobject>& j_buffer_y,
@ -1239,7 +1238,6 @@ static void JNI_MediaCodecVideoEncoder_FillInputBuffer(
static jlong JNI_MediaCodecVideoEncoder_CreateEncoder(
JNIEnv* env,
const JavaParamRef<jclass>&,
const JavaParamRef<jobject>& format,
jboolean has_egl_context) {
ScopedLocalRefFrame local_ref_frame(env);

6
sdk/android/src/jni/androidmetrics.cc
View File

@ -20,14 +20,12 @@
namespace webrtc {
namespace jni {
static void JNI_Metrics_Enable(JNIEnv* jni, const JavaParamRef<jclass>&) {
static void JNI_Metrics_Enable(JNIEnv* jni) {
metrics::Enable();
}
// Gets and clears native histograms.
static ScopedJavaLocalRef<jobject> JNI_Metrics_GetAndReset(
JNIEnv* jni,
const JavaParamRef<jclass>& jcaller) {
static ScopedJavaLocalRef<jobject> JNI_Metrics_GetAndReset(JNIEnv* jni) {
ScopedJavaLocalRef<jobject> j_metrics = Java_Metrics_Constructor(jni);
std::map<std::string, std::unique_ptr<metrics::SampleInfo>> histograms;

1
sdk/android/src/jni/audio_device/java_audio_device_module.cc
View File

@ -18,7 +18,6 @@ namespace jni {
static jlong JNI_JavaAudioDeviceModule_CreateAudioDeviceModule(
JNIEnv* env,
const JavaParamRef<jclass>& j_caller,
const JavaParamRef<jobject>& j_context,
const JavaParamRef<jobject>& j_audio_manager,
const JavaParamRef<jobject>& j_webrtc_audio_record,

3
sdk/android/src/jni/builtinaudiodecoderfactoryfactory.cc
View File

@ -19,8 +19,7 @@ namespace jni {
static jlong
JNI_BuiltinAudioDecoderFactoryFactory_CreateBuiltinAudioDecoderFactory(
JNIEnv* env,
const JavaParamRef<jclass>& jcaller) {
JNIEnv* env) {
return NativeToJavaPointer(CreateBuiltinAudioDecoderFactory().release());
}

3
sdk/android/src/jni/builtinaudioencoderfactoryfactory.cc
View File

@ -19,8 +19,7 @@ namespace jni {
static jlong
JNI_BuiltinAudioEncoderFactoryFactory_CreateBuiltinAudioEncoderFactory(
JNIEnv* env,
const JavaParamRef<jclass>& jcaller) {
JNIEnv* env) {
return NativeToJavaPointer(CreateBuiltinAudioEncoderFactory().release());
}

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

@ -18,7 +18,6 @@ namespace jni {
static jboolean JNI_H264Utils_IsSameH264Profile(
JNIEnv* env,
const JavaParamRef<jclass>&,
const JavaParamRef<jobject>& params1,
const JavaParamRef<jobject>& params2) {
return H264::IsSameH264Profile(JavaToNativeStringMap(env, params1),

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

@ -16,7 +16,6 @@ namespace jni {
static void JNI_JavaI420Buffer_CropAndScaleI420(
JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jobject>& j_src_y,
jint src_stride_y,
const JavaParamRef<jobject>& j_src_u,

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

@ -16,14 +16,12 @@ namespace webrtc {
namespace jni {
static void JNI_JniCommon_AddRef(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_native_ref_counted_pointer) {
reinterpret_cast<rtc::RefCountInterface*>(j_native_ref_counted_pointer)
->AddRef();
}
static void JNI_JniCommon_ReleaseRef(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_native_ref_counted_pointer) {
reinterpret_cast<rtc::RefCountInterface*>(j_native_ref_counted_pointer)
->Release();
@ -31,7 +29,6 @@ static void JNI_JniCommon_ReleaseRef(JNIEnv* jni,
static ScopedJavaLocalRef<jobject> JNI_JniCommon_AllocateByteBuffer(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jint size) {
void* new_data = ::operator new(size);
return NewDirectByteBuffer(jni, new_data, size);
@ -39,7 +36,6 @@ static ScopedJavaLocalRef<jobject> JNI_JniCommon_AllocateByteBuffer(
static void JNI_JniCommon_FreeByteBuffer(
JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jobject>& byte_buffer) {
void* data = jni->GetDirectBufferAddress(byte_buffer.obj());
::operator delete(data);

3
sdk/android/src/jni/nativecapturerobserver.cc
View File

@ -36,7 +36,6 @@ ScopedJavaLocalRef<jobject> CreateJavaNativeCapturerObserver(
static void JNI_NativeCapturerObserver_OnFrameCaptured(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_source,
jint j_width,
jint j_height,
@ -52,7 +51,6 @@ static void JNI_NativeCapturerObserver_OnFrameCaptured(
static void JNI_NativeCapturerObserver_CapturerStarted(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_source,
jboolean j_success) {
RTC_LOG(LS_INFO) << "NativeCapturerObserver_nativeCapturerStarted";
@ -64,7 +62,6 @@ static void JNI_NativeCapturerObserver_CapturerStarted(
static void JNI_NativeCapturerObserver_CapturerStopped(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_source) {
RTC_LOG(LS_INFO) << "NativeCapturerObserver_nativeCapturerStopped";
AndroidVideoTrackSource* source =

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

@ -21,7 +21,6 @@ namespace webrtc {
namespace jni {
static void JNI_NV12Buffer_CropAndScale(JNIEnv* jni,
const JavaParamRef<jclass>&,
jint crop_x,
jint crop_y,
jint crop_width,

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

@ -22,7 +22,6 @@ namespace webrtc {
namespace jni {
static void JNI_NV21Buffer_CropAndScale(JNIEnv* jni,
const JavaParamRef<jclass>&,
jint crop_x,
jint crop_y,
jint crop_width,

1
sdk/android/src/jni/pc/audiotrack.cc
View File

@ -15,7 +15,6 @@ namespace webrtc {
namespace jni {
static void JNI_AudioTrack_SetVolume(JNIEnv*,
const JavaParamRef<jclass>&,
jlong j_p,
jdouble volume) {
rtc::scoped_refptr<AudioSourceInterface> source(

3
sdk/android/src/jni/pc/callsessionfilerotatinglogsink.cc
View File

@ -18,7 +18,6 @@ namespace jni {
static jlong JNI_CallSessionFileRotatingLogSink_AddSink(
JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jstring>& j_dirPath,
jint j_maxFileSize,
jint j_severity) {
@ -39,7 +38,6 @@ static jlong JNI_CallSessionFileRotatingLogSink_AddSink(
static void JNI_CallSessionFileRotatingLogSink_DeleteSink(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_sink) {
rtc::CallSessionFileRotatingLogSink* sink =
reinterpret_cast<rtc::CallSessionFileRotatingLogSink*>(j_sink);
@ -50,7 +48,6 @@ static void JNI_CallSessionFileRotatingLogSink_DeleteSink(
static ScopedJavaLocalRef<jbyteArray>
JNI_CallSessionFileRotatingLogSink_GetLogData(
JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jstring>& j_dirPath) {
std::string dir_path = JavaToStdString(jni, j_dirPath);
std::unique_ptr<rtc::CallSessionFileRotatingStream> stream(

5
sdk/android/src/jni/pc/dtmfsender.cc
View File

@ -17,14 +17,12 @@ namespace webrtc {
namespace jni {
static jboolean JNI_DtmfSender_CanInsertDtmf(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_dtmf_sender_pointer) {
return reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)
->CanInsertDtmf();
}
static jboolean JNI_DtmfSender_InsertDtmf(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_dtmf_sender_pointer,
const JavaParamRef<jstring>& tones,
jint duration,
@ -35,7 +33,6 @@ static jboolean JNI_DtmfSender_InsertDtmf(JNIEnv* jni,
static ScopedJavaLocalRef<jstring> JNI_DtmfSender_Tones(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_dtmf_sender_pointer) {
return NativeToJavaString(
jni,
@ -43,14 +40,12 @@ static ScopedJavaLocalRef<jstring> JNI_DtmfSender_Tones(
}
static jint JNI_DtmfSender_Duration(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_dtmf_sender_pointer) {
return reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)
->duration();
}
static jint JNI_DtmfSender_InterToneGap(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_dtmf_sender_pointer) {
return reinterpret_cast<DtmfSenderInterface*>(j_dtmf_sender_pointer)
->inter_tone_gap();

4
sdk/android/src/jni/pc/mediasource.cc
View File

@ -14,8 +14,8 @@
namespace webrtc {
namespace jni {
static ScopedJavaLocalRef<jobject>
JNI_MediaSource_GetState(JNIEnv* jni, const JavaParamRef<jclass>&, jlong j_p) {
static ScopedJavaLocalRef<jobject> JNI_MediaSource_GetState(JNIEnv* jni,
jlong j_p) {
return Java_State_fromNativeIndex(
jni, reinterpret_cast<MediaSourceInterface*>(j_p)->state());
}

8
sdk/android/src/jni/pc/mediastream.cc
View File

@ -102,7 +102,6 @@ jclass GetMediaStreamClass(JNIEnv* env) {
static jboolean JNI_MediaStream_AddAudioTrackToNativeStream(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong pointer,
jlong j_audio_track_pointer) {
return reinterpret_cast<MediaStreamInterface*>(pointer)->AddTrack(
@ -111,7 +110,6 @@ static jboolean JNI_MediaStream_AddAudioTrackToNativeStream(
static jboolean JNI_MediaStream_AddVideoTrackToNativeStream(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong pointer,
jlong j_video_track_pointer) {
return reinterpret_cast<MediaStreamInterface*>(pointer)->AddTrack(
@ -119,7 +117,6 @@ static jboolean JNI_MediaStream_AddVideoTrackToNativeStream(
}
static jboolean JNI_MediaStream_RemoveAudioTrack(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong pointer,
jlong j_audio_track_pointer) {
return reinterpret_cast<MediaStreamInterface*>(pointer)->RemoveTrack(
@ -127,15 +124,14 @@ static jboolean JNI_MediaStream_RemoveAudioTrack(JNIEnv* jni,
}
static jboolean JNI_MediaStream_RemoveVideoTrack(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong pointer,
jlong j_video_track_pointer) {
return reinterpret_cast<MediaStreamInterface*>(pointer)->RemoveTrack(
reinterpret_cast<VideoTrackInterface*>(j_video_track_pointer));
}
static ScopedJavaLocalRef<jstring>
JNI_MediaStream_GetId(JNIEnv* jni, const JavaParamRef<jclass>&, jlong j_p) {
static ScopedJavaLocalRef<jstring> JNI_MediaStream_GetId(JNIEnv* jni,
jlong j_p) {
return NativeToJavaString(jni,
reinterpret_cast<MediaStreamInterface*>(j_p)->id());
}

5
sdk/android/src/jni/pc/mediastreamtrack.cc
View File

@ -32,7 +32,6 @@ cricket::MediaType JavaToNativeMediaType(JNIEnv* jni,
static ScopedJavaLocalRef<jstring> JNI_MediaStreamTrack_GetId(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_p) {
return NativeToJavaString(
jni, reinterpret_cast<MediaStreamTrackInterface*>(j_p)->id());
@ -40,28 +39,24 @@ static ScopedJavaLocalRef<jstring> JNI_MediaStreamTrack_GetId(
static ScopedJavaLocalRef<jstring> JNI_MediaStreamTrack_GetKind(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_p) {
return NativeToJavaString(
jni, reinterpret_cast<MediaStreamTrackInterface*>(j_p)->kind());
}
static jboolean JNI_MediaStreamTrack_GetEnabled(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_p) {
return reinterpret_cast<MediaStreamTrackInterface*>(j_p)->enabled();
}
static ScopedJavaLocalRef<jobject> JNI_MediaStreamTrack_GetState(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_p) {
return Java_State_fromNativeIndex(
jni, reinterpret_cast<MediaStreamTrackInterface*>(j_p)->state());
}
static jboolean JNI_MediaStreamTrack_SetEnabled(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_p,
jboolean enabled) {
return reinterpret_cast<MediaStreamTrackInterface*>(j_p)->set_enabled(

2
sdk/android/src/jni/pc/peerconnection.cc
View File

@ -423,14 +423,12 @@ OwnedPeerConnection::~OwnedPeerConnection() {
static jlong JNI_PeerConnection_CreatePeerConnectionObserver(
JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jobject>& j_observer) {
return jlongFromPointer(new PeerConnectionObserverJni(jni, j_observer));
}
static void JNI_PeerConnection_FreeOwnedPeerConnection(
JNIEnv*,
const JavaParamRef<jclass>&,
jlong j_p) {
delete reinterpret_cast<OwnedPeerConnection*>(j_p);
}

36
sdk/android/src/jni/pc/peerconnectionfactory.cc
View File

@ -122,9 +122,7 @@ jobject NativeToJavaPeerConnectionFactory(
.Release();
}
static void JNI_PeerConnectionFactory_InitializeAndroidGlobals(
JNIEnv* jni,
const JavaParamRef<jclass>&) {
static void JNI_PeerConnectionFactory_InitializeAndroidGlobals(JNIEnv* jni) {
if (!factory_static_initialized) {
JVM::Initialize(GetJVM());
factory_static_initialized = true;
@ -133,7 +131,6 @@ static void JNI_PeerConnectionFactory_InitializeAndroidGlobals(
static void JNI_PeerConnectionFactory_InitializeFieldTrials(
JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jstring>& j_trials_init_string) {
std::unique_ptr<std::string>& field_trials_init_string =
GetStaticObjects().field_trials_init_string;
@ -149,16 +146,13 @@ static void JNI_PeerConnectionFactory_InitializeFieldTrials(
field_trial::InitFieldTrialsFromString(field_trials_init_string->c_str());
}
static void JNI_PeerConnectionFactory_InitializeInternalTracer(
JNIEnv* jni,
const JavaParamRef<jclass>&) {
static void JNI_PeerConnectionFactory_InitializeInternalTracer(JNIEnv* jni) {
rtc::tracing::SetupInternalTracer();
}
static ScopedJavaLocalRef<jstring>
JNI_PeerConnectionFactory_FindFieldTrialsFullName(
JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jstring>& j_name) {
return NativeToJavaString(
jni, field_trial::FindFullName(JavaToStdString(jni, j_name)));
@ -166,7 +160,6 @@ JNI_PeerConnectionFactory_FindFieldTrialsFullName(
static jboolean JNI_PeerConnectionFactory_StartInternalTracingCapture(
JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jstring>& j_event_tracing_filename) {
if (j_event_tracing_filename.is_null())
return false;
@ -179,15 +172,11 @@ static jboolean JNI_PeerConnectionFactory_StartInternalTracingCapture(
return ret;
}
static void JNI_PeerConnectionFactory_StopInternalTracingCapture(
JNIEnv* jni,
const JavaParamRef<jclass>&) {
static void JNI_PeerConnectionFactory_StopInternalTracingCapture(JNIEnv* jni) {
rtc::tracing::StopInternalCapture();
}
static void JNI_PeerConnectionFactory_ShutdownInternalTracer(
JNIEnv* jni,
const JavaParamRef<jclass>&) {
static void JNI_PeerConnectionFactory_ShutdownInternalTracer(JNIEnv* jni) {
rtc::tracing::ShutdownInternalTracer();
}
@ -282,7 +271,6 @@ jlong CreatePeerConnectionFactoryForJava(
static jlong JNI_PeerConnectionFactory_CreatePeerConnectionFactory(
JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jobject>& jcontext,
const JavaParamRef<jobject>& joptions,
jlong native_audio_device_module,
@ -322,7 +310,6 @@ static jlong JNI_PeerConnectionFactory_CreatePeerConnectionFactory(
}
static void JNI_PeerConnectionFactory_FreeFactory(JNIEnv*,
const JavaParamRef<jclass>&,
jlong j_p) {
delete reinterpret_cast<OwnedFactoryAndThreads*>(j_p);
field_trial::InitFieldTrialsFromString(nullptr);
@ -331,7 +318,6 @@ static void JNI_PeerConnectionFactory_FreeFactory(JNIEnv*,
static void JNI_PeerConnectionFactory_InvokeThreadsCallbacks(
JNIEnv*,
const JavaParamRef<jclass>&,
jlong j_p) {
OwnedFactoryAndThreads* factory =
reinterpret_cast<OwnedFactoryAndThreads*>(j_p);
@ -340,7 +326,6 @@ static void JNI_PeerConnectionFactory_InvokeThreadsCallbacks(
static jlong JNI_PeerConnectionFactory_CreateLocalMediaStream(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong native_factory,
const JavaParamRef<jstring>& label) {
rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
@ -352,7 +337,6 @@ static jlong JNI_PeerConnectionFactory_CreateLocalMediaStream(
static jlong JNI_PeerConnectionFactory_CreateAudioSource(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong native_factory,
const JavaParamRef<jobject>& j_constraints) {
std::unique_ptr<MediaConstraintsInterface> constraints =
@ -368,7 +352,6 @@ static jlong JNI_PeerConnectionFactory_CreateAudioSource(
jlong JNI_PeerConnectionFactory_CreateAudioTrack(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong native_factory,
const JavaParamRef<jstring>& id,
jlong native_source) {
@ -382,7 +365,6 @@ jlong JNI_PeerConnectionFactory_CreateAudioTrack(
static jboolean JNI_PeerConnectionFactory_StartAecDump(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong native_factory,
jint file,
jint filesize_limit_bytes) {
@ -392,7 +374,6 @@ static jboolean JNI_PeerConnectionFactory_StartAecDump(
}
static void JNI_PeerConnectionFactory_StopAecDump(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong native_factory) {
rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
factoryFromJava(native_factory));
@ -401,7 +382,6 @@ static void JNI_PeerConnectionFactory_StopAecDump(JNIEnv* jni,
static jlong JNI_PeerConnectionFactory_CreatePeerConnection(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong factory,
const JavaParamRef<jobject>& j_rtc_config,
const JavaParamRef<jobject>& j_constraints,
@ -458,7 +438,6 @@ static jlong JNI_PeerConnectionFactory_CreatePeerConnection(
static jlong JNI_PeerConnectionFactory_CreateVideoSource(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong native_factory,
jboolean is_screencast,
jboolean align_timestamps) {
@ -471,7 +450,6 @@ static jlong JNI_PeerConnectionFactory_CreateVideoSource(
static jlong JNI_PeerConnectionFactory_CreateVideoTrack(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong native_factory,
const JavaParamRef<jstring>& id,
jlong native_source) {
@ -485,14 +463,12 @@ static jlong JNI_PeerConnectionFactory_CreateVideoTrack(
static jlong JNI_PeerConnectionFactory_GetNativePeerConnectionFactory(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong native_factory) {
return jlongFromPointer(factoryFromJava(native_factory));
}
static void JNI_PeerConnectionFactory_InjectLoggable(
JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jobject>& j_logging,
jint nativeSeverity) {
std::unique_ptr<JNILogSink>& jni_log_sink = GetStaticObjects().jni_log_sink;
@ -507,9 +483,7 @@ static void JNI_PeerConnectionFactory_InjectLoggable(
rtc::LogMessage::LogToDebug(rtc::LS_NONE);
}
static void JNI_PeerConnectionFactory_DeleteLoggable(
JNIEnv* jni,
const JavaParamRef<jclass>&) {
static void JNI_PeerConnectionFactory_DeleteLoggable(JNIEnv* jni) {
std::unique_ptr<JNILogSink>& jni_log_sink = GetStaticObjects().jni_log_sink;
if (jni_log_sink) {

1
sdk/android/src/jni/pc/rtccertificate.cc
View File

@ -42,7 +42,6 @@ ScopedJavaLocalRef<jobject> NativeToJavaRTCCertificatePEM(
static ScopedJavaLocalRef<jobject> JNI_RtcCertificatePem_GenerateCertificate(
JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jobject>& j_key_type,
jlong j_expires) {
rtc::KeyType key_type = JavaToNativeKeyType(jni, j_key_type);

7
sdk/android/src/jni/pc/rtpreceiver.cc
View File

@ -65,7 +65,6 @@ JavaRtpReceiverGlobalOwner::~JavaRtpReceiverGlobalOwner() {
}
static jlong JNI_RtpReceiver_GetTrack(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_rtp_receiver_pointer) {
// MediaStreamTrack will have shared ownership by the MediaStreamTrack Java
// object.
@ -77,7 +76,6 @@ static jlong JNI_RtpReceiver_GetTrack(JNIEnv* jni,
static jboolean JNI_RtpReceiver_SetParameters(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_rtp_receiver_pointer,
const JavaParamRef<jobject>& j_parameters) {
RtpParameters parameters = JavaToNativeRtpParameters(jni, j_parameters);
@ -87,7 +85,6 @@ static jboolean JNI_RtpReceiver_SetParameters(
static ScopedJavaLocalRef<jobject> JNI_RtpReceiver_GetParameters(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_rtp_receiver_pointer) {
RtpParameters parameters =
reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)
@ -97,7 +94,6 @@ static ScopedJavaLocalRef<jobject> JNI_RtpReceiver_GetParameters(
static ScopedJavaLocalRef<jstring> JNI_RtpReceiver_GetId(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_rtp_receiver_pointer) {
return NativeToJavaString(
jni,
@ -106,7 +102,6 @@ static ScopedJavaLocalRef<jstring> JNI_RtpReceiver_GetId(
static jlong JNI_RtpReceiver_SetObserver(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_rtp_receiver_pointer,
const JavaParamRef<jobject>& j_observer) {
RtpReceiverObserverJni* rtpReceiverObserver =
@ -117,7 +112,6 @@ static jlong JNI_RtpReceiver_SetObserver(
}
static void JNI_RtpReceiver_UnsetObserver(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_rtp_receiver_pointer,
jlong j_observer_pointer) {
reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)
@ -130,7 +124,6 @@ static void JNI_RtpReceiver_UnsetObserver(JNIEnv* jni,
}
static void JNI_RtpReceiver_SetFrameDecryptor(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_rtp_sender_pointer,
jlong j_frame_decryptor_pointer) {
reinterpret_cast<RtpReceiverInterface*>(j_rtp_sender_pointer)

7
sdk/android/src/jni/pc/rtpsender.cc
View File

@ -29,7 +29,6 @@ ScopedJavaLocalRef<jobject> NativeToJavaRtpSender(
}
static jboolean JNI_RtpSender_SetTrack(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_rtp_sender_pointer,
jlong j_track_pointer) {
return reinterpret_cast<RtpSenderInterface*>(j_rtp_sender_pointer)
@ -37,7 +36,6 @@ static jboolean JNI_RtpSender_SetTrack(JNIEnv* jni,
}
jlong JNI_RtpSender_GetTrack(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_rtp_sender_pointer) {
// MediaStreamTrack will have shared ownership by the MediaStreamTrack Java
// object.
@ -48,7 +46,6 @@ jlong JNI_RtpSender_GetTrack(JNIEnv* jni,
}
jlong JNI_RtpSender_GetDtmfSender(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_rtp_sender_pointer) {
return jlongFromPointer(
reinterpret_cast<RtpSenderInterface*>(j_rtp_sender_pointer)
@ -58,7 +55,6 @@ jlong JNI_RtpSender_GetDtmfSender(JNIEnv* jni,
jboolean JNI_RtpSender_SetParameters(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_rtp_sender_pointer,
const JavaParamRef<jobject>& j_parameters) {
if (IsNull(jni, j_parameters)) {
@ -72,7 +68,6 @@ jboolean JNI_RtpSender_SetParameters(
ScopedJavaLocalRef<jobject> JNI_RtpSender_GetParameters(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_rtp_sender_pointer) {
RtpParameters parameters =
reinterpret_cast<RtpSenderInterface*>(j_rtp_sender_pointer)
@ -81,14 +76,12 @@ ScopedJavaLocalRef<jobject> JNI_RtpSender_GetParameters(
}
ScopedJavaLocalRef<jstring> JNI_RtpSender_GetId(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_rtp_sender_pointer) {
return NativeToJavaString(
jni, reinterpret_cast<RtpSenderInterface*>(j_rtp_sender_pointer)->id());
}
static void JNI_RtpSender_SetFrameEncryptor(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_rtp_sender_pointer,
jlong j_frame_encryptor_pointer) {
reinterpret_cast<RtpSenderInterface*>(j_rtp_sender_pointer)

9
sdk/android/src/jni/pc/rtptransceiver.cc
View File

@ -78,7 +78,6 @@ JavaRtpTransceiverGlobalOwner::~JavaRtpTransceiverGlobalOwner() {
ScopedJavaLocalRef<jobject> JNI_RtpTransceiver_GetMediaType(
JNIEnv* jni,
const base::android::JavaParamRef<jclass>&,
jlong j_rtp_transceiver_pointer) {
return NativeToJavaMediaType(
jni, reinterpret_cast<RtpTransceiverInterface*>(j_rtp_transceiver_pointer)
@ -87,7 +86,6 @@ ScopedJavaLocalRef<jobject> JNI_RtpTransceiver_GetMediaType(
ScopedJavaLocalRef<jstring> JNI_RtpTransceiver_GetMid(
JNIEnv* jni,
const base::android::JavaParamRef<jclass>&,
jlong j_rtp_transceiver_pointer) {
absl::optional<std::string> mid =
reinterpret_cast<RtpTransceiverInterface*>(j_rtp_transceiver_pointer)
@ -97,7 +95,6 @@ ScopedJavaLocalRef<jstring> JNI_RtpTransceiver_GetMid(
ScopedJavaLocalRef<jobject> JNI_RtpTransceiver_GetSender(
JNIEnv* jni,
const base::android::JavaParamRef<jclass>&,
jlong j_rtp_transceiver_pointer) {
return NativeToJavaRtpSender(
jni, reinterpret_cast<RtpTransceiverInterface*>(j_rtp_transceiver_pointer)
@ -106,7 +103,6 @@ ScopedJavaLocalRef<jobject> JNI_RtpTransceiver_GetSender(
ScopedJavaLocalRef<jobject> JNI_RtpTransceiver_GetReceiver(
JNIEnv* jni,
const base::android::JavaParamRef<jclass>&,
jlong j_rtp_transceiver_pointer) {
return NativeToJavaRtpReceiver(
jni, reinterpret_cast<RtpTransceiverInterface*>(j_rtp_transceiver_pointer)
@ -114,7 +110,6 @@ ScopedJavaLocalRef<jobject> JNI_RtpTransceiver_GetReceiver(
}
jboolean JNI_RtpTransceiver_Stopped(JNIEnv* jni,
const base::android::JavaParamRef<jclass>&,
jlong j_rtp_transceiver_pointer) {
return reinterpret_cast<RtpTransceiverInterface*>(j_rtp_transceiver_pointer)
->stopped();
@ -122,7 +117,6 @@ jboolean JNI_RtpTransceiver_Stopped(JNIEnv* jni,
ScopedJavaLocalRef<jobject> JNI_RtpTransceiver_Direction(
JNIEnv* jni,
const base::android::JavaParamRef<jclass>&,
jlong j_rtp_transceiver_pointer) {
return NativeToJavaRtpTransceiverDirection(
jni, reinterpret_cast<RtpTransceiverInterface*>(j_rtp_transceiver_pointer)
@ -131,7 +125,6 @@ ScopedJavaLocalRef<jobject> JNI_RtpTransceiver_Direction(
ScopedJavaLocalRef<jobject> JNI_RtpTransceiver_CurrentDirection(
JNIEnv* jni,
const base::android::JavaParamRef<jclass>&,
jlong j_rtp_transceiver_pointer) {
absl::optional<RtpTransceiverDirection> direction =
reinterpret_cast<RtpTransceiverInterface*>(j_rtp_transceiver_pointer)
@ -141,14 +134,12 @@ ScopedJavaLocalRef<jobject> JNI_RtpTransceiver_CurrentDirection(
}
void JNI_RtpTransceiver_Stop(JNIEnv* jni,
const base::android::JavaParamRef<jclass>&,
jlong j_rtp_transceiver_pointer) {
reinterpret_cast<RtpTransceiverInterface*>(j_rtp_transceiver_pointer)->Stop();
}
void JNI_RtpTransceiver_SetDirection(
JNIEnv* jni,
const base::android::JavaParamRef<jclass>&,
jlong j_rtp_transceiver_pointer,
const base::android::JavaParamRef<jobject>& j_rtp_transceiver_direction) {
if (IsNull(jni, j_rtp_transceiver_direction)) {

1
sdk/android/src/jni/pc/turncustomizer.cc
View File

@ -27,7 +27,6 @@ TurnCustomizer* GetNativeTurnCustomizer(
static void JNI_TurnCustomizer_FreeTurnCustomizer(
JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_turn_customizer_pointer) {
delete reinterpret_cast<TurnCustomizer*>(j_turn_customizer_pointer);
}

10
sdk/android/src/jni/timestampaligner.cc
View File

@ -18,28 +18,22 @@
namespace webrtc {
namespace jni {
static jlong JNI_TimestampAligner_RtcTimeNanos(
JNIEnv* env,
const JavaParamRef<jclass>& j_caller) {
static jlong JNI_TimestampAligner_RtcTimeNanos(JNIEnv* env) {
return rtc::TimeNanos();
}
static jlong JNI_TimestampAligner_CreateTimestampAligner(
JNIEnv* env,
const JavaParamRef<jclass>& j_caller) {
static jlong JNI_TimestampAligner_CreateTimestampAligner(JNIEnv* env) {
return jlongFromPointer(new rtc::TimestampAligner());
}
static void JNI_TimestampAligner_ReleaseTimestampAligner(
JNIEnv* env,
const JavaParamRef<jclass>& j_caller,
jlong timestamp_aligner) {
delete reinterpret_cast<rtc::TimestampAligner*>(timestamp_aligner);
}
static jlong JNI_TimestampAligner_TranslateTimestamp(
JNIEnv* env,
const JavaParamRef<jclass>& j_caller,
jlong timestamp_aligner,
jlong camera_time_ns) {
return reinterpret_cast<rtc::TimestampAligner*>(timestamp_aligner)

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

@ -20,7 +20,6 @@ namespace jni {
static jlong JNI_VideoDecoderFallback_CreateDecoder(
JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jobject>& j_fallback_decoder,
const JavaParamRef<jobject>& j_primary_decoder) {
std::unique_ptr<VideoDecoder> fallback_decoder =

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

@ -20,7 +20,6 @@ namespace jni {
static jlong JNI_VideoEncoderFallback_CreateEncoder(
JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jobject>& j_fallback_encoder,
const JavaParamRef<jobject>& j_primary_encoder) {
std::unique_ptr<VideoEncoder> fallback_encoder =

2
sdk/android/src/jni/videosource.cc
View File

@ -25,13 +25,11 @@ AndroidVideoTrackSource* AndroidVideoTrackSourceFromJavaProxy(jlong j_proxy) {
} // namespace
static jlong JNI_VideoSource_GetInternalSource(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_source) {
return NativeToJavaPointer(AndroidVideoTrackSourceFromJavaProxy(j_source));
}
static void JNI_VideoSource_AdaptOutputFormat(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_source,
jint j_landscape_width,
jint j_landscape_height,

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

@ -19,7 +19,6 @@ namespace webrtc {
namespace jni {
static void JNI_VideoTrack_AddSink(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_native_track,
jlong j_native_sink) {
reinterpret_cast<VideoTrackInterface*>(j_native_track)
@ -29,7 +28,6 @@ static void JNI_VideoTrack_AddSink(JNIEnv* jni,
}
static void JNI_VideoTrack_RemoveSink(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_native_track,
jlong j_native_sink) {
reinterpret_cast<VideoTrackInterface*>(j_native_track)
@ -38,13 +36,11 @@ static void JNI_VideoTrack_RemoveSink(JNIEnv* jni,
}
static jlong JNI_VideoTrack_WrapSink(JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jobject>& sink) {
return jlongFromPointer(new VideoSinkWrapper(jni, sink));
}
static void JNI_VideoTrack_FreeSink(JNIEnv* jni,
const JavaParamRef<jclass>&,
jlong j_native_sink) {
delete reinterpret_cast<rtc::VideoSinkInterface<VideoFrame>*>(j_native_sink);
}

6
sdk/android/src/jni/vp8codec.cc
View File

@ -18,13 +18,11 @@
namespace webrtc {
namespace jni {
static jlong JNI_LibvpxVp8Encoder_CreateEncoder(JNIEnv* jni,
const JavaParamRef<jclass>&) {
static jlong JNI_LibvpxVp8Encoder_CreateEncoder(JNIEnv* jni) {
return jlongFromPointer(VP8Encoder::Create().release());
}
static jlong JNI_LibvpxVp8Decoder_CreateDecoder(JNIEnv* jni,
const JavaParamRef<jclass>&) {
static jlong JNI_LibvpxVp8Decoder_CreateDecoder(JNIEnv* jni) {
return jlongFromPointer(VP8Decoder::Create().release());
}

12
sdk/android/src/jni/vp9codec.cc
View File

@ -18,23 +18,19 @@
namespace webrtc {
namespace jni {
static jlong JNI_LibvpxVp9Encoder_CreateEncoder(JNIEnv* jni,
const JavaParamRef<jclass>& w) {
static jlong JNI_LibvpxVp9Encoder_CreateEncoder(JNIEnv* jni) {
return jlongFromPointer(VP9Encoder::Create().release());
}
static jboolean JNI_LibvpxVp9Encoder_IsSupported(JNIEnv* jni,
const JavaParamRef<jclass>&) {
static jboolean JNI_LibvpxVp9Encoder_IsSupported(JNIEnv* jni) {
return !SupportedVP9Codecs().empty();
}
static jlong JNI_LibvpxVp9Decoder_CreateDecoder(JNIEnv* jni,
const JavaParamRef<jclass>& w) {
static jlong JNI_LibvpxVp9Decoder_CreateDecoder(JNIEnv* jni) {
return jlongFromPointer(VP9Decoder::Create().release());
}
static jboolean JNI_LibvpxVp9Decoder_IsSupported(JNIEnv* jni,
const JavaParamRef<jclass>&) {
static jboolean JNI_LibvpxVp9Decoder_IsSupported(JNIEnv* jni) {
return !SupportedVP9Codecs().empty();
}

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

@ -19,7 +19,6 @@ namespace webrtc {
namespace jni {
void JNI_YuvHelper_CopyPlane(JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jobject>& j_src,
jint src_stride,
const JavaParamRef<jobject>& j_dst,
@ -35,7 +34,6 @@ void JNI_YuvHelper_CopyPlane(JNIEnv* jni,
}
void JNI_YuvHelper_I420Copy(JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jobject>& j_src_y,
jint src_stride_y,
const JavaParamRef<jobject>& j_src_u,
@ -69,7 +67,6 @@ void JNI_YuvHelper_I420Copy(JNIEnv* jni,
}
static void JNI_YuvHelper_I420ToNV12(JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jobject>& j_src_y,
jint src_stride_y,
const JavaParamRef<jobject>& j_src_u,
@ -99,7 +96,6 @@ static void JNI_YuvHelper_I420ToNV12(JNIEnv* jni,
}
void JNI_YuvHelper_I420Rotate(JNIEnv* jni,
const JavaParamRef<jclass>&,
const JavaParamRef<jobject>& j_src_y,
jint src_stride_y,
const JavaParamRef<jobject>& j_src_u,