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

Side by Side Diff: webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: Created 3 years, 5 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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
11 #ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_
12 #define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_
13 13
14 #include <map> 14 #include <map>
15 #include <set> 15 #include <set>
16 16
17 #include "webrtc/api/audio_codecs/audio_format.h" 17 #include "webrtc/api/audio_codecs/audio_format.h"
18 #include "webrtc/base/criticalsection.h"
18 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" 19 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
19 #include "webrtc/rtc_base/criticalsection.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 22
23 struct CodecInst; 23 struct CodecInst;
24 class VideoCodec; 24 class VideoCodec;
25 25
26 class RTPPayloadRegistry { 26 class RTPPayloadRegistry {
27 public: 27 public:
28 RTPPayloadRegistry(); 28 RTPPayloadRegistry();
29 ~RTPPayloadRegistry(); 29 ~RTPPayloadRegistry();
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 // video, DCHECK that no instance is used for both audio and video. 132 // video, DCHECK that no instance is used for both audio and video.
133 #if RTC_DCHECK_IS_ON 133 #if RTC_DCHECK_IS_ON
134 bool used_for_audio_ GUARDED_BY(crit_sect_) = false; 134 bool used_for_audio_ GUARDED_BY(crit_sect_) = false;
135 bool used_for_video_ GUARDED_BY(crit_sect_) = false; 135 bool used_for_video_ GUARDED_BY(crit_sect_) = false;
136 #endif 136 #endif
137 }; 137 };
138 138
139 } // namespace webrtc 139 } // namespace webrtc
140 140
141 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_ 141 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h ('k') | webrtc/modules/rtp_rtcp/include/rtp_rtcp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698