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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/video_receive_stream.h

Issue 1373903003: Unify newapi::RtcpMode and RTCPMethod. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: ehm, compile the code Created 5 years, 3 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/video_engine/vie_channel.cc ('k') | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video_receive_stream.h
diff --git a/webrtc/video_receive_stream.h b/webrtc/video_receive_stream.h
index b44bf1e16adf956e864c0dbf4abe6a004be5243d..68751ddab883725060dd26553552c43befaabdf2 100644
--- a/webrtc/video_receive_stream.h
+++ b/webrtc/video_receive_stream.h
@@ -24,12 +24,6 @@
namespace webrtc {
-namespace newapi {
-// RTCP mode to use. Compound mode is described by RFC 4585 and reduced-size
-// RTCP mode is described by RFC 5506.
-enum RtcpMode { kRtcpCompound, kRtcpReducedSize };
-} // namespace newapi
-
class VideoDecoder;
class VideoReceiveStream : public ReceiveStream {
@@ -107,7 +101,7 @@ class VideoReceiveStream : public ReceiveStream {
uint32_t local_ssrc = 0;
// See RtcpMode for description.
- newapi::RtcpMode rtcp_mode = newapi::kRtcpCompound;
+ RtcpMode rtcp_mode = RtcpMode::kCompound;
// Extended RTCP settings.
struct RtcpXr {
« no previous file with comments | « webrtc/video_engine/vie_channel.cc ('k') | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698