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

Unified Diff: talk/media/webrtc/webrtcvideoengine2.cc

Issue 1429753003: Filter overlapping RTP header extensions. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: size_t conversion fix Created 5 years, 2 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 | « talk/media/webrtc/webrtcmediaengine.cc ('k') | talk/media/webrtc/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/webrtc/webrtcvideoengine2.cc
diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc
index ed75c0d427a1f54b26084790bcea8446264d6731..bcd513ee2dac2c7d55c8b891fbf75a4a7c76852b 100644
--- a/talk/media/webrtc/webrtcvideoengine2.cc
+++ b/talk/media/webrtc/webrtcvideoengine2.cc
@@ -36,6 +36,7 @@
#include "talk/media/base/videorenderer.h"
#include "talk/media/webrtc/constants.h"
#include "talk/media/webrtc/simulcast.h"
+#include "talk/media/webrtc/webrtcmediaengine.h"
#include "talk/media/webrtc/webrtcvideoencoderfactory.h"
#include "talk/media/webrtc/webrtcvideoframe.h"
#include "talk/media/webrtc/webrtcvoiceengine.h"
@@ -1544,7 +1545,8 @@ bool WebRtcVideoChannel2::SetSendRtpHeaderExtensions(
return false;
std::vector<webrtc::RtpExtension> filtered_extensions =
- FilterRtpExtensions(extensions);
+ FilterRtpExtensions(FilterRedundantRtpExtensions(
+ extensions, kBweExtensionPriorities, kBweExtensionPrioritiesLength));
if (!RtpExtensionsHaveChanged(send_rtp_extensions_, filtered_extensions)) {
LOG(LS_INFO) << "Ignoring call to SetSendRtpHeaderExtensions because "
"header extensions haven't changed.";
« no previous file with comments | « talk/media/webrtc/webrtcmediaengine.cc ('k') | talk/media/webrtc/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698