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

Unified Diff: webrtc/video/vie_channel.h

Issue 1654913002: Untangle ViEChannel and ViEEncoder. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: deregister protection callback before destroying vie_channel_ Created 4 years, 11 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
Index: webrtc/video/vie_channel.h
diff --git a/webrtc/video/vie_channel.h b/webrtc/video/vie_channel.h
index 7737d6acbfb3e25ae4a8ca968e3911f1f8a85a41..78fcf2a6ac69024c614ccdc3720ea4c21c3954b8 100644
--- a/webrtc/video/vie_channel.h
+++ b/webrtc/video/vie_channel.h
@@ -68,6 +68,8 @@ class ViEChannel : public VCMFrameTypeCallback,
ViEChannel(uint32_t number_of_cores,
Transport* transport,
ProcessThread* module_process_thread,
+ PayloadRouter* send_payload_router,
+ VideoCodingModule* vcm,
RtcpIntraFrameObserver* intra_frame_observer,
RtcpBandwidthObserver* bandwidth_observer,
TransportFeedbackObserver* transport_feedback_observer,
@@ -214,7 +216,6 @@ class ViEChannel : public VCMFrameTypeCallback,
// Gets the modules used by the channel.
RtpRtcp* rtp_rtcp();
- rtc::scoped_refptr<PayloadRouter> send_payload_router();
VCMProtectionCallback* vcm_protection_callback();
@@ -401,12 +402,12 @@ class ViEChannel : public VCMFrameTypeCallback,
const bool sender_;
ProcessThread* const module_process_thread_;
+ PayloadRouter* const send_payload_router_;
// Used for all registered callbacks except rendering.
mutable rtc::CriticalSection crit_;
// Owned modules/classes.
- rtc::scoped_refptr<PayloadRouter> send_payload_router_;
rtc::scoped_ptr<ViEChannelProtectionCallback> vcm_protection_callback_;
VideoCodingModule* const vcm_;

Powered by Google App Engine
This is Rietveld 408576698