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

Prepare to remove old OnFailure implementations

Browse Source 
This removes usage of the old OnFailure methods on CreateSessionDescriptionObserver
and SetSessionDescriptionObserver, so that WebRTC will continue to compile
once all the default implementations are removed.

Bug: chromium:589455
Change-Id: Id67295b3ad0c30d24d79589c2041acdd507a19f3
Reviewed-on: https://webrtc-review.googlesource.com/78480
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23427}
This commit is contained in:
Harald Alvestrand
2018-05-24 10:53:49 +02:00
committed by Commit Bot
parent 26bc6695cd
commit 73771a893f
10 changed files with 49 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/androidnativeapi/jni/androidcallclient.cc
View File

@ -53,7 +53,7 @@ class CreateOfferObserver : public webrtc::CreateSessionDescriptionObserver {
rtc::scoped_refptr<webrtc::PeerConnectionInterface> pc);
void OnSuccess(webrtc::SessionDescriptionInterface* desc) override;
void OnFailure(const std::string& error) override;
void OnFailure(webrtc::RTCError error) override;
private:
const rtc::scoped_refptr<webrtc::PeerConnectionInterface> pc_;
@ -69,7 +69,7 @@ class SetLocalSessionDescriptionObserver
: public webrtc::SetSessionDescriptionObserver {
public:
void OnSuccess() override;
void OnFailure(const std::string& error) override;
void OnFailure(webrtc::RTCError error) override;
};
} // namespace
@ -260,8 +260,9 @@ void CreateOfferObserver::OnSuccess(webrtc::SessionDescriptionInterface* desc) {
new rtc::RefCountedObject<SetRemoteSessionDescriptionObserver>());
}
void CreateOfferObserver::OnFailure(const std::string& error) {
RTC_LOG(LS_INFO) << "Failed to create offer: " << error;
void CreateOfferObserver::OnFailure(webrtc::RTCError error) {
RTC_LOG(LS_INFO) << "Failed to create offer: " << ToString(error.type())
<< ": " << error.message();
}
void SetRemoteSessionDescriptionObserver::OnSetRemoteDescriptionComplete(
@ -273,8 +274,9 @@ void SetLocalSessionDescriptionObserver::OnSuccess() {
RTC_LOG(LS_INFO) << "Set local description success!";
}
void SetLocalSessionDescriptionObserver::OnFailure(const std::string& error) {
RTC_LOG(LS_INFO) << "Set local description failure: " << error;
void SetLocalSessionDescriptionObserver::OnFailure(webrtc::RTCError error) {
RTC_LOG(LS_INFO) << "Set local description failure: "
<< ToString(error.type()) << ": " << error.message();
}
static jlong JNI_CallClient_CreateClient(