admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply include reduction to channel.h and channel_manager.h

Browse Source 
(tools_webrtc/iwyu/apply-iwyu -r)

This breaks the circular dependency between channel_manager.h and
media_session.h

Bug: webrtc:13805
Change-Id: I34c09e752b4110988ad8e0473de5d88605b5e6fe
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/255961
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36233}
This commit is contained in:
Harald Alvestrand 2022-03-17 08:39:31 +00:00 committed by WebRTC LUCI CQ
parent ae4fb618d7
commit c367346a75
2 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pc/channel.h
View File

@ -11,54 +11,35 @@
#ifndef PC_CHANNEL_H_ #ifndef PC_CHANNEL_H_
#define PC_CHANNEL_H_ #define PC_CHANNEL_H_
#include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <functional> #include <functional>
#include <map>
#include <memory> #include <memory>
#include <set>
#include <string> #include <string>
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include "api/call/audio_sink.h"
#include "api/crypto/crypto_options.h" #include "api/crypto/crypto_options.h"
#include "api/function_view.h"
#include "api/jsep.h" #include "api/jsep.h"
#include "api/media_types.h" #include "api/media_types.h"
#include "api/rtp_parameters.h" #include "api/rtp_parameters.h"
#include "api/rtp_receiver_interface.h"
#include "api/rtp_transceiver_direction.h" #include "api/rtp_transceiver_direction.h"
#include "api/scoped_refptr.h" #include "api/scoped_refptr.h"
#include "api/sequence_checker.h" #include "api/sequence_checker.h"
#include "api/video/video_sink_interface.h"
#include "api/video/video_source_interface.h"
#include "call/rtp_demuxer.h" #include "call/rtp_demuxer.h"
#include "call/rtp_packet_sink_interface.h" #include "call/rtp_packet_sink_interface.h"
#include "media/base/media_channel.h" #include "media/base/media_channel.h"
#include "media/base/media_engine.h"
#include "media/base/stream_params.h" #include "media/base/stream_params.h"
#include "modules/rtp_rtcp/source/rtp_packet_received.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h"
#include "p2p/base/dtls_transport_internal.h"
#include "p2p/base/packet_transport_internal.h"
#include "pc/channel_interface.h" #include "pc/channel_interface.h"
#include "pc/dtls_srtp_transport.h"
#include "pc/media_session.h"
#include "pc/rtp_transport.h"
#include "pc/rtp_transport_internal.h" #include "pc/rtp_transport_internal.h"
#include "pc/session_description.h" #include "pc/session_description.h"
#include "pc/srtp_filter.h"
#include "pc/srtp_transport.h"
#include "rtc_base/async_packet_socket.h" #include "rtc_base/async_packet_socket.h"
#include "rtc_base/async_udp_socket.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
#include "rtc_base/containers/flat_set.h" #include "rtc_base/containers/flat_set.h"
#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/copy_on_write_buffer.h"
#include "rtc_base/location.h"
#include "rtc_base/network.h"
#include "rtc_base/network/sent_packet.h" #include "rtc_base/network/sent_packet.h"
#include "rtc_base/network_route.h" #include "rtc_base/network_route.h"
#include "rtc_base/socket.h" #include "rtc_base/socket.h"
@ -66,17 +47,10 @@
#include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h" #include "rtc_base/thread.h"
#include "rtc_base/thread_annotations.h" #include "rtc_base/thread_annotations.h"
#include "rtc_base/thread_message.h"
#include "rtc_base/unique_id_generator.h" #include "rtc_base/unique_id_generator.h"
namespace webrtc {
class AudioSinkInterface;
} // namespace webrtc
namespace cricket { namespace cricket {
struct CryptoParams;
// BaseChannel contains logic common to voice and video, including enable, // BaseChannel contains logic common to voice and video, including enable,
// marshaling calls to a worker and network threads, and connection and media // marshaling calls to a worker and network threads, and connection and media
// monitors. // monitors.

1
pc/channel_manager.h
View File

@ -28,7 +28,6 @@
#include "media/base/media_engine.h" #include "media/base/media_engine.h"
#include "pc/channel.h" #include "pc/channel.h"
#include "pc/channel_interface.h" #include "pc/channel_interface.h"
#include "pc/rtp_transport_internal.h"
#include "pc/session_description.h" #include "pc/session_description.h"
#include "rtc_base/system/file_wrapper.h" #include "rtc_base/system/file_wrapper.h"
#include "rtc_base/thread.h" #include "rtc_base/thread.h"