diff options
| author | andresp@webrtc.org <andresp@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-10 09:39:23 +0000 |
|---|---|---|
| committer | andresp@webrtc.org <andresp@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-10 09:39:23 +0000 |
| commit | 8c95e83545433c8cd6f670ea6fe3e84293af3737 (patch) | |
| tree | bcae22424180d74c1e6baa6835f81a5154acc926 /modules/rtp_rtcp/source/rtp_sender.h | |
| parent | f8bddb4a17217a4cd8e92e4b322ee8df3327e1c6 (diff) | |
| download | webrtc-8c95e83545433c8cd6f670ea6fe3e84293af3737.tar.gz | |
Refactor registerable callbacks for FrameCountObserver from rtp_rtcp module into vie_channel.
R=stefan@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/16839004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6649 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'modules/rtp_rtcp/source/rtp_sender.h')
| -rw-r--r-- | modules/rtp_rtcp/source/rtp_sender.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/modules/rtp_rtcp/source/rtp_sender.h b/modules/rtp_rtcp/source/rtp_sender.h index 0cc35cf4..265e69c3 100644 --- a/modules/rtp_rtcp/source/rtp_sender.h +++ b/modules/rtp_rtcp/source/rtp_sender.h @@ -70,7 +70,8 @@ class RTPSender : public RTPSenderInterface, public Bitrate::Observer { RTPSender(const int32_t id, const bool audio, Clock *clock, Transport *transport, RtpAudioFeedback *audio_feedback, PacedSender *paced_sender, - BitrateStatisticsObserver* bitrate_callback); + BitrateStatisticsObserver* bitrate_callback, + FrameCountObserver* frame_count_observer); virtual ~RTPSender(); void ProcessBitrate(); @@ -265,9 +266,6 @@ class RTPSender : public RTPSenderInterface, public Bitrate::Observer { int32_t SetFecParameters(const FecProtectionParams *delta_params, const FecProtectionParams *key_params); - virtual void RegisterFrameCountObserver(FrameCountObserver* observer); - virtual FrameCountObserver* GetFrameCountObserver() const; - int SendPadData(int payload_type, uint32_t timestamp, int64_t capture_time_ms, int32_t bytes, StorageType store, bool force_full_size_packets, bool only_pad_after_markerbit); @@ -373,11 +371,11 @@ class RTPSender : public RTPSenderInterface, public Bitrate::Observer { scoped_ptr<CriticalSectionWrapper> statistics_crit_; SendDelayMap send_delays_ GUARDED_BY(statistics_crit_); std::map<FrameType, uint32_t> frame_counts_ GUARDED_BY(statistics_crit_); - FrameCountObserver* frame_count_observer_ GUARDED_BY(statistics_crit_); StreamDataCounters rtp_stats_ GUARDED_BY(statistics_crit_); StreamDataCounters rtx_rtp_stats_ GUARDED_BY(statistics_crit_); StreamDataCountersCallback* rtp_stats_callback_ GUARDED_BY(statistics_crit_); BitrateStatisticsObserver* const bitrate_callback_; + FrameCountObserver* const frame_count_observer_; // RTP variables bool start_timestamp_forced_ GUARDED_BY(send_critsect_); |