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

Parameterize PeerConnection integration tests for Unified Plan

Browse Source 
Bug: webrtc:8765
Change-Id: I572966c57fd8d8f9293fc05a8be579dd982102f7
Reviewed-on: https://webrtc-review.googlesource.com/52800
Commit-Queue: Seth Hampson <shampson@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22111}
This commit is contained in:
Seth Hampson 2018-02-20 11:54:42 -08:00 committed by Commit Bot
parent afb0bb73de
commit 2f0d70287e
2 changed files with 797 additions and 448 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pc/peerconnection.cc
View File

@ -1185,7 +1185,8 @@ PeerConnection::FindFirstTransceiverForAddedTrack(
if (!transceiver->sender()->track() &&
cricket::MediaTypeToString(transceiver->media_type()) ==
track->kind() &&
!transceiver->internal()->has_ever_been_used_to_send()) {
!transceiver->internal()->has_ever_been_used_to_send() &&
!transceiver->stopped()) {
return transceiver;
}
}
@ -2228,12 +2229,16 @@ RTCError PeerConnection::ApplyRemoteDescription(
// the RTCSessionDescription: If direction is sendrecv or recvonly, and
// transceiver's current direction is neither sendrecv nor recvonly,
// process the addition of a remote track for the media description.
//
// Create a sync label in the case of an unsignalled msid.
std::string sync_label = rtc::CreateRandomUuid();
if (!media_desc->streams().empty()) {
sync_label = media_desc->streams()[0].sync_label;
}
if (RtpTransceiverDirectionHasRecv(local_direction) &&
(!transceiver->current_direction() ||
!RtpTransceiverDirectionHasRecv(
*transceiver->current_direction())) &&
!media_desc->streams().empty()) {
const std::string& sync_label = media_desc->streams()[0].sync_label;
*transceiver->current_direction()))) {
rtc::scoped_refptr<MediaStreamInterface> stream =
remote_streams_->find(sync_label);
if (!stream) {
@ -2259,9 +2264,14 @@ RTCError PeerConnection::ApplyRemoteDescription(
if (content->rejected && !transceiver->stopped()) {
transceiver->Stop();
}
if (!content->rejected && !media_desc->streams().empty()) {
transceiver->internal()->receiver_internal()->SetupMediaChannel(
media_desc->streams()[0].first_ssrc());
if (!content->rejected &&
RtpTransceiverDirectionHasRecv(local_direction)) {
// Set ssrc to 0 in the case of an unsignalled ssrc.
uint32_t ssrc = 0;
if (!media_desc->streams().empty()) {
ssrc = media_desc->streams()[0].first_ssrc();
}
transceiver->internal()->receiver_internal()->SetupMediaChannel(ssrc);
}
}
// Once all processing has finished, fire off callbacks.

1221
pc/peerconnection_integrationtest.cc
View File

File diff suppressed because it is too large Load Diff