zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move datagram_dtls_adaptor from p2p/base/ to pc/

Browse Source 
Datagram_dtls_adaptor needs access to rtp_rtcp modules and this moves helps to keep p2p/base/ without dependency on rtp_rtcp.

Bug: webrtc:9719
Change-Id: Ic337be3fb9f68106187a84efa815eefbe5b0fcd7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/145267
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Anton Sukhanov <sukhanov@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28533}
This commit is contained in:
Anton Sukhanov
2019-07-10 11:07:40 -07:00
committed by Commit Bot
parent 642a49d1eb
commit ee303fae48
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
p2p/BUILD.gn
View File

@ -29,8 +29,6 @@ rtc_static_library("rtc_p2p") {
"base/connection.h", "base/connection.h",
"base/connection_info.cc", "base/connection_info.cc",
"base/connection_info.h", "base/connection_info.h",
"base/datagram_dtls_adaptor.cc",
"base/datagram_dtls_adaptor.h",
"base/dtls_transport.cc", "base/dtls_transport.cc",
"base/dtls_transport.h", "base/dtls_transport.h",
"base/dtls_transport_internal.cc", "base/dtls_transport_internal.cc",

3
pc/BUILD.gn
View File

@ -36,6 +36,8 @@ rtc_static_library("rtc_pc_base") {
"channel_manager.h", "channel_manager.h",
"composite_rtp_transport.cc", "composite_rtp_transport.cc",
"composite_rtp_transport.h", "composite_rtp_transport.h",
"datagram_dtls_adaptor.cc",
"datagram_dtls_adaptor.h",
"dtls_srtp_transport.cc", "dtls_srtp_transport.cc",
"dtls_srtp_transport.h", "dtls_srtp_transport.h",
"dtls_transport.cc", "dtls_transport.cc",
@ -89,6 +91,7 @@ rtc_static_library("rtc_pc_base") {
"../call:rtp_interfaces", "../call:rtp_interfaces",
"../call:rtp_receiver", "../call:rtp_receiver",
"../common_video", "../common_video",
"../logging:ice_log",
"../logging:rtc_event_log_api", "../logging:rtc_event_log_api",
"../media:rtc_data", "../media:rtc_data",
"../media:rtc_h264_profile_id", "../media:rtc_h264_profile_id",

2
p2p/base/datagram_dtls_adaptor.cc → pc/datagram_dtls_adaptor.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "p2p/base/datagram_dtls_adaptor.h" #include "pc/datagram_dtls_adaptor.h"
#include <algorithm> #include <algorithm>
#include <memory> #include <memory>

6
p2p/base/datagram_dtls_adaptor.h → pc/datagram_dtls_adaptor.h
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef P2P_BASE_DATAGRAM_DTLS_ADAPTOR_H_ #ifndef PC_DATAGRAM_DTLS_ADAPTOR_H_
#define P2P_BASE_DATAGRAM_DTLS_ADAPTOR_H_ #define PC_DATAGRAM_DTLS_ADAPTOR_H_
#include <memory> #include <memory>
#include <string> #include <string>
@ -149,4 +149,4 @@ class DatagramDtlsAdaptor : public DtlsTransportInternal,
} // namespace cricket } // namespace cricket
#endif // P2P_BASE_DATAGRAM_DTLS_ADAPTOR_H_ #endif // PC_DATAGRAM_DTLS_ADAPTOR_H_

2
pc/jsep_transport_controller.cc
View File

@ -17,10 +17,10 @@
#include "absl/memory/memory.h" #include "absl/memory/memory.h"
#include "api/datagram_transport_interface.h" #include "api/datagram_transport_interface.h"
#include "api/media_transport_interface.h" #include "api/media_transport_interface.h"
#include "p2p/base/datagram_dtls_adaptor.h"
#include "p2p/base/ice_transport_internal.h" #include "p2p/base/ice_transport_internal.h"
#include "p2p/base/no_op_dtls_transport.h" #include "p2p/base/no_op_dtls_transport.h"
#include "p2p/base/port.h" #include "p2p/base/port.h"
#include "pc/datagram_dtls_adaptor.h"
#include "pc/srtp_filter.h" #include "pc/srtp_filter.h"
#include "rtc_base/bind.h" #include "rtc_base/bind.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"