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

Side by Side Diff: trunk/src/media/cast/video_receiver/video_receiver.h

Issue 183063011: Revert 255166 "Cast: Using a min filter to compute time offset" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/media/cast/video_receiver/video_receiver.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_RECEIVER_VIDEO_RECEIVER_H_ 5 #ifndef MEDIA_CAST_VIDEO_RECEIVER_VIDEO_RECEIVER_H_
6 #define MEDIA_CAST_VIDEO_RECEIVER_VIDEO_RECEIVER_H_ 6 #define MEDIA_CAST_VIDEO_RECEIVER_VIDEO_RECEIVER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 scoped_ptr<Framer> framer_; 108 scoped_ptr<Framer> framer_;
109 const transport::VideoCodec codec_; 109 const transport::VideoCodec codec_;
110 base::TimeDelta target_delay_delta_; 110 base::TimeDelta target_delay_delta_;
111 base::TimeDelta frame_delay_; 111 base::TimeDelta frame_delay_;
112 scoped_ptr<LocalRtpVideoData> incoming_payload_callback_; 112 scoped_ptr<LocalRtpVideoData> incoming_payload_callback_;
113 scoped_ptr<LocalRtpVideoFeedback> incoming_payload_feedback_; 113 scoped_ptr<LocalRtpVideoFeedback> incoming_payload_feedback_;
114 RtpReceiver rtp_receiver_; 114 RtpReceiver rtp_receiver_;
115 scoped_ptr<Rtcp> rtcp_; 115 scoped_ptr<Rtcp> rtcp_;
116 scoped_ptr<RtpReceiverStatistics> rtp_video_receiver_statistics_; 116 scoped_ptr<RtpReceiverStatistics> rtp_video_receiver_statistics_;
117 base::TimeDelta time_offset_; // Sender-receiver offset estimation. 117 base::TimeDelta time_offset_; // Sender-receiver offset estimation.
118 int time_offset_counter_;
119 transport::TransportEncryptionHandler decryptor_; 118 transport::TransportEncryptionHandler decryptor_;
120 std::list<VideoFrameEncodedCallback> queued_encoded_callbacks_; 119 std::list<VideoFrameEncodedCallback> queued_encoded_callbacks_;
121 bool time_incoming_packet_updated_; 120 bool time_incoming_packet_updated_;
122 base::TimeTicks time_incoming_packet_; 121 base::TimeTicks time_incoming_packet_;
123 uint32 incoming_rtp_timestamp_; 122 uint32 incoming_rtp_timestamp_;
124 base::TimeTicks last_render_time_; 123 base::TimeTicks last_render_time_;
125 124
126 // This mapping allows us to log kVideoAckSent as a frame event. In addition 125 // This mapping allows us to log kVideoAckSent as a frame event. In addition
127 // it allows the event to be transmitted via RTCP. 126 // it allows the event to be transmitted via RTCP.
128 RtpTimestamp frame_id_to_rtp_timestamp_[256]; 127 RtpTimestamp frame_id_to_rtp_timestamp_[256];
129 128
130 base::WeakPtrFactory<VideoReceiver> weak_factory_; 129 base::WeakPtrFactory<VideoReceiver> weak_factory_;
131 130
132 DISALLOW_COPY_AND_ASSIGN(VideoReceiver); 131 DISALLOW_COPY_AND_ASSIGN(VideoReceiver);
133 }; 132 };
134 133
135 } // namespace cast 134 } // namespace cast
136 } // namespace media 135 } // namespace media
137 136
138 #endif // MEDIA_CAST_VIDEO_RECEIVER_VIDEO_RECEIVER_H_ 137 #endif // MEDIA_CAST_VIDEO_RECEIVER_VIDEO_RECEIVER_H_
OLDNEW
« no previous file with comments | « no previous file | trunk/src/media/cast/video_receiver/video_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698