admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use RTCError instead of string for PostCreateSessionDescriptionFailed

Browse Source 
which allows exposing more granular errors from CreateOffer/CreateAnswer

BUG=webrtc:15499

Change-Id: If72a84515e220d1e7ca739318bf0b6e8a662f60e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/320600
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@microsoft.com>
Cr-Commit-Position: refs/heads/main@{#40763}
This commit is contained in:
Philipp Hancke 2023-09-18 13:06:24 +02:00 committed by WebRTC LUCI CQ
parent 3e1484e280
commit b916a70c9d
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
pc/webrtc_session_description_factory.cc
View File

@ -194,15 +194,15 @@ void WebRtcSessionDescriptionFactory::CreateOffer(
std::string error = "CreateOffer";
if (certificate_request_state_ == CERTIFICATE_FAILED) {
error += kFailedDueToIdentityFailed;
RTC_LOG(LS_ERROR) << error;
PostCreateSessionDescriptionFailed(observer, error);
PostCreateSessionDescriptionFailed(
observer, RTCError(RTCErrorType::INTERNAL_ERROR, std::move(error)));
return;
}
if (!ValidMediaSessionOptions(session_options)) {
error += " called with invalid session options";
RTC_LOG(LS_ERROR) << error;
PostCreateSessionDescriptionFailed(observer, error);
PostCreateSessionDescriptionFailed(
observer, RTCError(RTCErrorType::INTERNAL_ERROR, std::move(error)));
return;
}
@ -223,27 +223,27 @@ void WebRtcSessionDescriptionFactory::CreateAnswer(
std::string error = "CreateAnswer";
if (certificate_request_state_ == CERTIFICATE_FAILED) {
error += kFailedDueToIdentityFailed;
RTC_LOG(LS_ERROR) << error;
PostCreateSessionDescriptionFailed(observer, error);
PostCreateSessionDescriptionFailed(
observer, RTCError(RTCErrorType::INTERNAL_ERROR, std::move(error)));
return;
}
if (!sdp_info_->remote_description()) {
error += " can't be called before SetRemoteDescription.";
RTC_LOG(LS_ERROR) << error;
PostCreateSessionDescriptionFailed(observer, error);
PostCreateSessionDescriptionFailed(
observer, RTCError(RTCErrorType::INTERNAL_ERROR, std::move(error)));
return;
}
if (sdp_info_->remote_description()->GetType() != SdpType::kOffer) {
error += " failed because remote_description is not an offer.";
RTC_LOG(LS_ERROR) << error;
PostCreateSessionDescriptionFailed(observer, error);
PostCreateSessionDescriptionFailed(
observer, RTCError(RTCErrorType::INTERNAL_ERROR, std::move(error)));
return;
}
if (!ValidMediaSessionOptions(session_options)) {
error += " called with invalid session options.";
RTC_LOG(LS_ERROR) << error;
PostCreateSessionDescriptionFailed(observer, error);
PostCreateSessionDescriptionFailed(
observer, RTCError(RTCErrorType::INTERNAL_ERROR, std::move(error)));
return;
}
@ -286,8 +286,9 @@ void WebRtcSessionDescriptionFactory::InternalCreateOffer(
? sdp_info_->local_description()->description()
: nullptr);
if (!desc) {
PostCreateSessionDescriptionFailed(request.observer.get(),
"Failed to initialize the offer.");
PostCreateSessionDescriptionFailed(
request.observer.get(), RTCError(RTCErrorType::INTERNAL_ERROR,
"Failed to initialize the offer."));
return;
}
@ -348,8 +349,9 @@ void WebRtcSessionDescriptionFactory::InternalCreateAnswer(
? sdp_info_->local_description()->description()
: nullptr);
if (!desc) {
PostCreateSessionDescriptionFailed(request.observer.get(),
"Failed to initialize the answer.");
PostCreateSessionDescriptionFailed(
request.observer.get(), RTCError(RTCErrorType::INTERNAL_ERROR,
"Failed to initialize the answer."));
return;
}
@ -387,24 +389,22 @@ void WebRtcSessionDescriptionFactory::FailPendingRequests(
create_session_description_requests_.front();
PostCreateSessionDescriptionFailed(
request.observer.get(),
((request.type == CreateSessionDescriptionRequest::kOffer)
? "CreateOffer"
: "CreateAnswer") +
reason);
RTCError(RTCErrorType::INTERNAL_ERROR,
((request.type == CreateSessionDescriptionRequest::kOffer)
? "CreateOffer"
: "CreateAnswer") +
reason));
create_session_description_requests_.pop();
}
}
void WebRtcSessionDescriptionFactory::PostCreateSessionDescriptionFailed(
CreateSessionDescriptionObserver* observer,
const std::string& error) {
RTCError error) {
Post([observer =
rtc::scoped_refptr<CreateSessionDescriptionObserver>(observer),
error]() mutable {
observer->OnFailure(
RTCError(RTCErrorType::INTERNAL_ERROR, std::move(error)));
});
RTC_LOG(LS_ERROR) << "Create SDP failed: " << error;
error]() mutable { observer->OnFailure(error); });
RTC_LOG(LS_ERROR) << "CreateSessionDescription failed: " << error.message();
}
void WebRtcSessionDescriptionFactory::PostCreateSessionDescriptionSucceeded(

2
pc/webrtc_session_description_factory.h
View File

@ -119,7 +119,7 @@ class WebRtcSessionDescriptionFactory {
void FailPendingRequests(const std::string& reason);
void PostCreateSessionDescriptionFailed(
CreateSessionDescriptionObserver* observer,
const std::string& error);
RTCError error);
void PostCreateSessionDescriptionSucceeded(
CreateSessionDescriptionObserver* observer,
std::unique_ptr<SessionDescriptionInterface> description);