Skip to content

修复media_constraints不能启用的问题 #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 11, 2022
Merged

修复media_constraints不能启用的问题 #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/rtc_peerconnection_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,8 @@ bool RTCPeerConnectionImpl::Initialize() {

RTCMediaConstraintsImpl* media_constraints =
static_cast<RTCMediaConstraintsImpl*>(constraints_.get());
CopyConstraintsIntoRtcConfiguration(media_constraints, &config);
webrtc::MediaConstraints rtc_constraints(media_constraints->GetMandatory(),media_constraints->GetOptional());
CopyConstraintsIntoRtcConfiguration(&rtc_constraints, &config);

webrtc::PeerConnectionFactoryInterface::Options options;
options.disable_encryption =
Expand Down Expand Up @@ -565,7 +566,8 @@ void RTCPeerConnectionImpl::CreateOffer(
RTCMediaConstraintsImpl* media_constraints =
static_cast<RTCMediaConstraintsImpl*>(constraints.get());
webrtc::PeerConnectionInterface::RTCOfferAnswerOptions offer_answer_options;
if (CopyConstraintsIntoOfferAnswerOptions(media_constraints,
webrtc::MediaConstraints rtc_constraints(media_constraints->GetMandatory(),media_constraints->GetOptional());
if (CopyConstraintsIntoOfferAnswerOptions(&rtc_constraints,
&offer_answer_options) == false) {
offer_answer_options = offer_answer_options_;
}
Expand All @@ -587,7 +589,8 @@ void RTCPeerConnectionImpl::CreateAnswer(
RTCMediaConstraintsImpl* media_constraints =
static_cast<RTCMediaConstraintsImpl*>(constraints.get());
webrtc::PeerConnectionInterface::RTCOfferAnswerOptions offer_answer_options;
if (CopyConstraintsIntoOfferAnswerOptions(media_constraints,
webrtc::MediaConstraints rtc_constraints(media_constraints->GetMandatory(),media_constraints->GetOptional());
if (CopyConstraintsIntoOfferAnswerOptions(&rtc_constraints,
&offer_answer_options) == false) {
offer_answer_options = offer_answer_options_;
}
Expand Down