Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(354)

Unified Diff: webrtc/pc/mediasession.cc

Issue 2675173003: Adding "adapter" ORTC objects on top of ChannelManager/BaseChannel/etc. (Closed)
Patch Set: Add memcheck suppression for end-to-end tests. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/pc/mediasession.h ('k') | webrtc/pc/ortcfactory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/mediasession.cc
diff --git a/webrtc/pc/mediasession.cc b/webrtc/pc/mediasession.cc
index 5e380883896728d14d285f5ad00070e273f28d89..05e6ccbd5c4d844c8f3f4157c938fcf63d9a192a 100644
--- a/webrtc/pc/mediasession.cc
+++ b/webrtc/pc/mediasession.cc
@@ -404,12 +404,10 @@ class UsedPayloadTypes : public UsedIds<Codec> {
class UsedRtpHeaderExtensionIds : public UsedIds<webrtc::RtpExtension> {
public:
UsedRtpHeaderExtensionIds()
- : UsedIds<webrtc::RtpExtension>(kLocalIdMin, kLocalIdMax) {}
+ : UsedIds<webrtc::RtpExtension>(webrtc::RtpExtension::kMinId,
+ webrtc::RtpExtension::kMaxId) {}
private:
- // Min and Max local identifier for one-byte header extensions, per RFC5285.
- static const int kLocalIdMin = 1;
- static const int kLocalIdMax = 14;
};
static bool IsSctp(const MediaContentDescription* desc) {
@@ -1281,7 +1279,6 @@ MediaSessionDescriptionFactory::MediaSessionDescriptionFactory(
transport_desc_factory_(transport_desc_factory) {
channel_manager->GetSupportedAudioSendCodecs(&audio_send_codecs_);
channel_manager->GetSupportedAudioReceiveCodecs(&audio_recv_codecs_);
- channel_manager->GetSupportedAudioSendCodecs(&audio_send_codecs_);
channel_manager->GetSupportedAudioRtpHeaderExtensions(&audio_rtp_extensions_);
channel_manager->GetSupportedVideoCodecs(&video_codecs_);
channel_manager->GetSupportedVideoRtpHeaderExtensions(&video_rtp_extensions_);
« no previous file with comments | « webrtc/pc/mediasession.h ('k') | webrtc/pc/ortcfactory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698