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

Side by Side Diff: webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.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, 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 RtpVideoCodecTypes videoCodecType; 45 RtpVideoCodecTypes videoCodecType;
46 uint32_t maxRate; 46 uint32_t maxRate;
47 }; 47 };
48 48
49 union PayloadUnion 49 union PayloadUnion
50 { 50 {
51 AudioPayload Audio; 51 AudioPayload Audio;
52 VideoPayload Video; 52 VideoPayload Video;
53 }; 53 };
54 54
55 enum RTCPMethod
56 {
57 kRtcpOff = 0,
58 kRtcpCompound = 1,
59 kRtcpNonCompound = 2
60 };
61
62 enum RTPAliveType 55 enum RTPAliveType
63 { 56 {
64 kRtpDead = 0, 57 kRtpDead = 0,
65 kRtpNoRtp = 1, 58 kRtpNoRtp = 1,
66 kRtpAlive = 2 59 kRtpAlive = 2
67 }; 60 };
68 61
69 enum ProtectionType { 62 enum ProtectionType {
70 kUnprotectedPacket, 63 kUnprotectedPacket,
71 kProtectedPacket 64 kProtectedPacket
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 class TransportSequenceNumberAllocator { 415 class TransportSequenceNumberAllocator {
423 public: 416 public:
424 TransportSequenceNumberAllocator() {} 417 TransportSequenceNumberAllocator() {}
425 virtual ~TransportSequenceNumberAllocator() {} 418 virtual ~TransportSequenceNumberAllocator() {}
426 419
427 virtual uint16_t AllocateSequenceNumber() = 0; 420 virtual uint16_t AllocateSequenceNumber() = 0;
428 }; 421 };
429 422
430 } // namespace webrtc 423 } // namespace webrtc
431 #endif // WEBRTC_MODULES_RTP_RTCP_INTERFACE_RTP_RTCP_DEFINES_H_ 424 #endif // WEBRTC_MODULES_RTP_RTCP_INTERFACE_RTP_RTCP_DEFINES_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h ('k') | webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698