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

Delete deprecated StartRtcEventLog override with PlatformFile

Browse Source 
Bug: webrtc:6463
Change-Id: I57c2372a232d72b054d8e3e4f423e11b3fb22430
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/134460
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Reviewed-by: Elad Alon <eladalon@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28131}
This commit is contained in:
Niels Möller
2019-05-13 12:27:23 +02:00
committed by Commit Bot
parent f330183727
commit 695cf6ac42
12 changed files with 23 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sdk/android/src/jni/pc/peer_connection.cc
View File

@ -34,11 +34,13 @@
#include "absl/memory/memory.h"
#include "api/peer_connection_interface.h"
#include "api/rtc_event_log_output_file.h"
#include "api/rtp_receiver_interface.h"
#include "api/rtp_sender_interface.h"
#include "api/rtp_transceiver_interface.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "sdk/android/generated_peerconnection_jni/jni/PeerConnection_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
@ -741,8 +743,12 @@ static jboolean JNI_PeerConnection_StartRtcEventLog(
const JavaParamRef<jobject>& j_pc,
int file_descriptor,
int max_size_bytes) {
return ExtractNativePC(jni, j_pc)->StartRtcEventLog(file_descriptor,
max_size_bytes);
// TODO(eladalon): It would be better to not allow negative values into PC.
const size_t max_size = (max_size_bytes < 0)
? RtcEventLog::kUnlimitedOutput
: rtc::saturated_cast<size_t>(max_size_bytes);
return ExtractNativePC(jni, j_pc)->StartRtcEventLog(
absl::make_unique<RtcEventLogOutputFile>(file_descriptor, max_size));
}
static void JNI_PeerConnection_StopRtcEventLog(