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

Side by Side Diff: media/cast/video_sender/video_sender.h

Issue 70713002: Cast: Restructure RTCP interface to better fit our usage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added missing line lost in merge Created 7 years, 1 month 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
« no previous file with comments | « media/cast/video_receiver/video_receiver.cc ('k') | media/cast/video_sender/video_sender.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_CAST_VIDEO_SENDER_VIDEO_SENDER_H_ 5 #ifndef MEDIA_CAST_VIDEO_SENDER_VIDEO_SENDER_H_
6 #define MEDIA_CAST_VIDEO_SENDER_VIDEO_SENDER_H_ 6 #define MEDIA_CAST_VIDEO_SENDER_VIDEO_SENDER_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 void ResendFrame(uint32 resend_frame_id); 95 void ResendFrame(uint32 resend_frame_id);
96 void ReceivedAck(uint32 acked_frame_id); 96 void ReceivedAck(uint32 acked_frame_id);
97 void UpdateFramesInFlight(); 97 void UpdateFramesInFlight();
98 98
99 void SendEncodedVideoFrameMainThread( 99 void SendEncodedVideoFrameMainThread(
100 scoped_ptr<EncodedVideoFrame> video_frame, 100 scoped_ptr<EncodedVideoFrame> video_frame,
101 const base::TimeTicks& capture_time); 101 const base::TimeTicks& capture_time);
102 102
103 void InitializeTimers(); 103 void InitializeTimers();
104 104
105 const uint32 incoming_feedback_ssrc_;
106 const base::TimeDelta rtp_max_delay_; 105 const base::TimeDelta rtp_max_delay_;
107 const int max_frame_rate_; 106 const int max_frame_rate_;
108 107
109 scoped_refptr<CastEnvironment> cast_environment_; 108 scoped_refptr<CastEnvironment> cast_environment_;
110 scoped_ptr<LocalRtcpVideoSenderFeedback> rtcp_feedback_; 109 scoped_ptr<LocalRtcpVideoSenderFeedback> rtcp_feedback_;
111 scoped_ptr<LocalRtpVideoSenderStatistics> rtp_video_sender_statistics_; 110 scoped_ptr<LocalRtpVideoSenderStatistics> rtp_video_sender_statistics_;
112 scoped_refptr<VideoEncoder> video_encoder_; 111 scoped_refptr<VideoEncoder> video_encoder_;
113 scoped_ptr<Rtcp> rtcp_; 112 scoped_ptr<Rtcp> rtcp_;
114 scoped_ptr<RtpSender> rtp_sender_; 113 scoped_ptr<RtpSender> rtp_sender_;
115 VideoEncoderController* video_encoder_controller_; 114 VideoEncoderController* video_encoder_controller_;
(...skipping 10 matching lines...) Expand all
126 base::WeakPtrFactory<VideoSender> weak_factory_; 125 base::WeakPtrFactory<VideoSender> weak_factory_;
127 126
128 DISALLOW_COPY_AND_ASSIGN(VideoSender); 127 DISALLOW_COPY_AND_ASSIGN(VideoSender);
129 }; 128 };
130 129
131 } // namespace cast 130 } // namespace cast
132 } // namespace media 131 } // namespace media
133 132
134 #endif // MEDIA_CAST_VIDEO_SENDER_VIDEO_SENDER_H_ 133 #endif // MEDIA_CAST_VIDEO_SENDER_VIDEO_SENDER_H_
135 134
OLDNEW
« no previous file with comments | « media/cast/video_receiver/video_receiver.cc ('k') | media/cast/video_sender/video_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698