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

Android: Fix warnings

Browse Source 
TBR=sakal@webrtc.org

Bug: webrtc:6597,webrtc:8534
Change-Id: I39f96d9e0e6d604051b1cc13368dd44fc82b30b0
Reviewed-on: https://webrtc-review.googlesource.com/23622
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20719}
This commit is contained in:
Magnus Jedvert
2017-11-16 16:53:12 +01:00
committed by Commit Bot
parent df0822b102
commit 6062f372c7
19 changed files with 107 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -544,9 +544,9 @@ void JavaToNativeRtpParameters(JNIEnv* jni,
RTC_CHECK(parameters != nullptr);
jclass parameters_class = jni->FindClass("org/webrtc/RtpParameters");
jfieldID encodings_id =
GetFieldID(jni, parameters_class, "encodings", "Ljava/util/LinkedList;");
GetFieldID(jni, parameters_class, "encodings", "Ljava/util/List;");
jfieldID codecs_id =
GetFieldID(jni, parameters_class, "codecs", "Ljava/util/LinkedList;");
GetFieldID(jni, parameters_class, "codecs", "Ljava/util/List;");
// Convert encodings.
jobject j_encodings = GetObjectField(jni, j_parameters, encodings_id);
@ -630,7 +630,7 @@ jobject NativeToJavaRtpParameters(JNIEnv* jni,
jclass encoding_class = jni->FindClass("org/webrtc/RtpParameters$Encoding");
jmethodID encoding_ctor = GetMethodID(jni, encoding_class, "<init>", "()V");
jfieldID encodings_id =
GetFieldID(jni, parameters_class, "encodings", "Ljava/util/LinkedList;");
GetFieldID(jni, parameters_class, "encodings", "Ljava/util/List;");
jobject j_encodings = GetObjectField(jni, j_parameters, encodings_id);
jmethodID encodings_add = GetMethodID(jni, GetObjectClass(jni, j_encodings),
"add", "(Ljava/lang/Object;)Z");
@ -675,7 +675,7 @@ jobject NativeToJavaRtpParameters(JNIEnv* jni,
jclass codec_class = jni->FindClass("org/webrtc/RtpParameters$Codec");
jmethodID codec_ctor = GetMethodID(jni, codec_class, "<init>", "()V");
jfieldID codecs_id =
GetFieldID(jni, parameters_class, "codecs", "Ljava/util/LinkedList;");
GetFieldID(jni, parameters_class, "codecs", "Ljava/util/List;");
jobject j_codecs = GetObjectField(jni, j_parameters, codecs_id);
jmethodID codecs_add = GetMethodID(jni, GetObjectClass(jni, j_codecs), "add",
"(Ljava/lang/Object;)Z");

16
sdk/android/src/jni/pc/peerconnectionobserver_jni.cc
View File

@ -179,8 +179,8 @@ void PeerConnectionObserverJni::AddNativeAudioTrackToJavaStream(
CHECK_EXCEPTION(jni()) << "error during NewObject";
// Now add to the audioTracks linked list.
jfieldID audio_tracks_id = GetFieldID(
jni(), *j_media_stream_class_, "audioTracks", "Ljava/util/LinkedList;");
jfieldID audio_tracks_id = GetFieldID(jni(), *j_media_stream_class_,
"audioTracks", "Ljava/util/List;");
jobject audio_tracks = GetObjectField(jni(), j_stream, audio_tracks_id);
jmethodID add = GetMethodID(jni(), GetObjectClass(jni(), audio_tracks), "add",
"(Ljava/lang/Object;)Z");
@ -201,8 +201,8 @@ void PeerConnectionObserverJni::AddNativeVideoTrackToJavaStream(
CHECK_EXCEPTION(jni()) << "error during NewObject";
// Now add to the videoTracks linked list.
jfieldID video_tracks_id = GetFieldID(
jni(), *j_media_stream_class_, "videoTracks", "Ljava/util/LinkedList;");
jfieldID video_tracks_id = GetFieldID(jni(), *j_media_stream_class_,
"videoTracks", "Ljava/util/List;");
jobject video_tracks = GetObjectField(jni(), j_stream, video_tracks_id);
jmethodID add = GetMethodID(jni(), GetObjectClass(jni(), video_tracks), "add",
"(Ljava/lang/Object;)Z");
@ -253,8 +253,8 @@ void PeerConnectionObserverJni::OnAudioTrackRemovedFromStream(
MediaStreamInterface* stream) {
ScopedLocalRefFrame local_ref_frame(jni());
jobject j_stream = GetOrCreateJavaStream(stream);
jfieldID audio_tracks_id = GetFieldID(
jni(), *j_media_stream_class_, "audioTracks", "Ljava/util/LinkedList;");
jfieldID audio_tracks_id = GetFieldID(jni(), *j_media_stream_class_,
"audioTracks", "Ljava/util/List;");
jobject audio_tracks = GetObjectField(jni(), j_stream, audio_tracks_id);
RemoveAndDisposeNativeTrackFromJavaTrackList(track, audio_tracks);
}
@ -264,8 +264,8 @@ void PeerConnectionObserverJni::OnVideoTrackRemovedFromStream(
MediaStreamInterface* stream) {
ScopedLocalRefFrame local_ref_frame(jni());
jobject j_stream = GetOrCreateJavaStream(stream);
jfieldID video_tracks_id = GetFieldID(
jni(), *j_media_stream_class_, "videoTracks", "Ljava/util/LinkedList;");
jfieldID video_tracks_id = GetFieldID(jni(), *j_media_stream_class_,
"videoTracks", "Ljava/util/List;");
jobject video_tracks = GetObjectField(jni(), j_stream, video_tracks_id);
RemoveAndDisposeNativeTrackFromJavaTrackList(track, video_tracks);
}