aboutsummaryrefslogtreecommitdiff
path: root/pc
diff options
context:
space:
mode:
authorMarkus Handell <handellm@webrtc.org>2020-03-11 10:51:13 +0100
committerCommit Bot <commit-bot@chromium.org>2020-03-11 11:19:51 +0000
commit45c104b4fd6a594d68af7331211cacb6358cece5 (patch)
tree2f0340ce587c4a7746f99cf25e06ed53daf26fab /pc
parent78964c1e0afa60d8e628f4cac304ae550ee92490 (diff)
downloadwebrtc-45c104b4fd6a594d68af7331211cacb6358cece5.tar.gz
RtpTransceiver: add kStopped enumeration value.
This change introduces a new kStopped enumeration value to RtpTransceiverDirection, preparing for later CLs which implement RTP header extension control, https://chromestatus.com/feature/5680189201711104. The new enumeration value is unused in the code. Intent to prototype: https://groups.google.com/a/chromium.org/g/blink-dev/c/65YdUi02yZk Bug: chromium:980879 Change-Id: Id8cab9891236884542689fbf1b300e64a2cb636d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/170050 Commit-Queue: Markus Handell <handellm@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30756}
Diffstat (limited to 'pc')
-rw-r--r--pc/media_session.cc10
-rw-r--r--pc/media_session_unittest.cc2
-rw-r--r--pc/rtp_media_utils.cc7
-rw-r--r--pc/webrtc_sdp.cc5
-rw-r--r--pc/webrtc_sdp_unittest.cc4
5 files changed, 22 insertions, 6 deletions
diff --git a/pc/media_session.cc b/pc/media_session.cc
index 110258d2b3..9190f6eaf3 100644
--- a/pc/media_session.cc
+++ b/pc/media_session.cc
@@ -1749,9 +1749,10 @@ const AudioCodecs& MediaSessionDescriptionFactory::GetAudioCodecsForOffer(
return audio_send_codecs_;
case RtpTransceiverDirection::kRecvOnly:
return audio_recv_codecs_;
+ case RtpTransceiverDirection::kStopped:
+ RTC_NOTREACHED();
+ return audio_sendrecv_codecs_;
}
- RTC_NOTREACHED();
- return audio_sendrecv_codecs_;
}
const AudioCodecs& MediaSessionDescriptionFactory::GetAudioCodecsForAnswer(
@@ -1768,9 +1769,10 @@ const AudioCodecs& MediaSessionDescriptionFactory::GetAudioCodecsForAnswer(
return audio_send_codecs_;
case RtpTransceiverDirection::kRecvOnly:
return audio_recv_codecs_;
+ case RtpTransceiverDirection::kStopped:
+ RTC_NOTREACHED();
+ return audio_sendrecv_codecs_;
}
- RTC_NOTREACHED();
- return audio_sendrecv_codecs_;
}
void MergeCodecsFromDescription(
diff --git a/pc/media_session_unittest.cc b/pc/media_session_unittest.cc
index 41e2767601..548b778681 100644
--- a/pc/media_session_unittest.cc
+++ b/pc/media_session_unittest.cc
@@ -4785,6 +4785,8 @@ void TestAudioCodecsAnswer(RtpTransceiverDirection offer_direction,
kResultSendrecv_SendrecvCodecs);
}
break;
+ default:
+ RTC_NOTREACHED();
}
auto format_codecs = [](const std::vector<AudioCodec>& codecs) {
diff --git a/pc/rtp_media_utils.cc b/pc/rtp_media_utils.cc
index 6e8be589c7..8fbfca1f98 100644
--- a/pc/rtp_media_utils.cc
+++ b/pc/rtp_media_utils.cc
@@ -47,9 +47,10 @@ RtpTransceiverDirection RtpTransceiverDirectionReversed(
return RtpTransceiverDirection::kRecvOnly;
case RtpTransceiverDirection::kRecvOnly:
return RtpTransceiverDirection::kSendOnly;
+ default:
+ RTC_NOTREACHED();
+ return direction;
}
- RTC_NOTREACHED();
- return direction;
}
RtpTransceiverDirection RtpTransceiverDirectionWithSendSet(
@@ -76,6 +77,8 @@ const char* RtpTransceiverDirectionToString(RtpTransceiverDirection direction) {
return "kRecvOnly";
case RtpTransceiverDirection::kInactive:
return "kInactive";
+ case RtpTransceiverDirection::kStopped:
+ return "kStopped";
}
RTC_NOTREACHED();
return "";
diff --git a/pc/webrtc_sdp.cc b/pc/webrtc_sdp.cc
index 29a9030483..7846e5e389 100644
--- a/pc/webrtc_sdp.cc
+++ b/pc/webrtc_sdp.cc
@@ -1596,7 +1596,12 @@ void BuildRtpContentAttributes(const MediaContentDescription* media_desc,
InitAttrLine(kAttributeRecvOnly, &os);
break;
case RtpTransceiverDirection::kSendRecv:
+ InitAttrLine(kAttributeSendRecv, &os);
+ break;
+ case RtpTransceiverDirection::kStopped:
default:
+ // kStopped shouldn't be used in signalling.
+ RTC_NOTREACHED();
InitAttrLine(kAttributeSendRecv, &os);
break;
}
diff --git a/pc/webrtc_sdp_unittest.cc b/pc/webrtc_sdp_unittest.cc
index 476955d26b..f79fbb8786 100644
--- a/pc/webrtc_sdp_unittest.cc
+++ b/pc/webrtc_sdp_unittest.cc
@@ -979,7 +979,11 @@ static void ReplaceDirection(RtpTransceiverDirection direction,
new_direction = "a=recvonly";
break;
case RtpTransceiverDirection::kSendRecv:
+ new_direction = "a=sendrecv";
+ break;
+ case RtpTransceiverDirection::kStopped:
default:
+ RTC_NOTREACHED();
new_direction = "a=sendrecv";
break;
}