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

Side by Side Diff: media/cast/receiver/frame_receiver.h

Issue 1515433002: Replace uses of raw uint32's with a type-checked RtpTimeTicks data type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_RECEIVER_FRAME_RECEIVER_H_ 5 #ifndef MEDIA_CAST_RECEIVER_FRAME_RECEIVER_H_
6 #define MEDIA_CAST_RECEIVER_FRAME_RECEIVER_H_ 6 #define MEDIA_CAST_RECEIVER_FRAME_RECEIVER_H_
7 7
8 #include <list> 8 #include <list>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "base/time/time.h" 13 #include "base/time/time.h"
14 #include "media/cast/cast_receiver.h" 14 #include "media/cast/cast_receiver.h"
15 #include "media/cast/common/clock_drift_smoother.h" 15 #include "media/cast/common/clock_drift_smoother.h"
16 #include "media/cast/common/rtp_time.h"
16 #include "media/cast/common/transport_encryption_handler.h" 17 #include "media/cast/common/transport_encryption_handler.h"
17 #include "media/cast/logging/logging_defines.h" 18 #include "media/cast/logging/logging_defines.h"
18 #include "media/cast/net/rtcp/receiver_rtcp_event_subscriber.h" 19 #include "media/cast/net/rtcp/receiver_rtcp_event_subscriber.h"
19 #include "media/cast/net/rtcp/rtcp.h" 20 #include "media/cast/net/rtcp/rtcp.h"
20 #include "media/cast/net/rtp/framer.h" 21 #include "media/cast/net/rtp/framer.h"
21 #include "media/cast/net/rtp/receiver_stats.h" 22 #include "media/cast/net/rtp/receiver_stats.h"
22 #include "media/cast/net/rtp/rtp_defines.h" 23 #include "media/cast/net/rtp/rtp_defines.h"
23 #include "media/cast/net/rtp/rtp_parser.h" 24 #include "media/cast/net/rtp/rtp_parser.h"
24 25
25 namespace media { 26 namespace media {
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 164
164 // Outstanding callbacks to run to deliver on client requests for frames. 165 // Outstanding callbacks to run to deliver on client requests for frames.
165 std::list<ReceiveEncodedFrameCallback> frame_request_queue_; 166 std::list<ReceiveEncodedFrameCallback> frame_request_queue_;
166 167
167 // True while there's an outstanding task to re-invoke 168 // True while there's an outstanding task to re-invoke
168 // EmitAvailableEncodedFrames(). 169 // EmitAvailableEncodedFrames().
169 bool is_waiting_for_consecutive_frame_; 170 bool is_waiting_for_consecutive_frame_;
170 171
171 // This mapping allows us to log FRAME_ACK_SENT as a frame event. In addition 172 // This mapping allows us to log FRAME_ACK_SENT as a frame event. In addition
172 // it allows the event to be transmitted via RTCP. 173 // it allows the event to be transmitted via RTCP.
173 RtpTimestamp frame_id_to_rtp_timestamp_[256]; 174 RtpTimeTicks frame_id_to_rtp_timestamp_[256];
174 175
175 // Lip-sync values used to compute the playout time of each frame from its RTP 176 // Lip-sync values used to compute the playout time of each frame from its RTP
176 // timestamp. These are updated each time the first packet of a frame is 177 // timestamp. These are updated each time the first packet of a frame is
177 // received. 178 // received.
178 RtpTimestamp lip_sync_rtp_timestamp_; 179 RtpTimeTicks lip_sync_rtp_timestamp_;
179 base::TimeTicks lip_sync_reference_time_; 180 base::TimeTicks lip_sync_reference_time_;
180 ClockDriftSmoother lip_sync_drift_; 181 ClockDriftSmoother lip_sync_drift_;
181 182
182 // NOTE: Weak pointers must be invalidated before all other member variables. 183 // NOTE: Weak pointers must be invalidated before all other member variables.
183 base::WeakPtrFactory<FrameReceiver> weak_factory_; 184 base::WeakPtrFactory<FrameReceiver> weak_factory_;
184 185
185 DISALLOW_COPY_AND_ASSIGN(FrameReceiver); 186 DISALLOW_COPY_AND_ASSIGN(FrameReceiver);
186 }; 187 };
187 188
188 } // namespace cast 189 } // namespace cast
189 } // namespace media 190 } // namespace media
190 191
191 #endif // MEDIA_CAST_RECEIVER_FRAME_RECEIVER_H_ 192 #endif // MEDIA_CAST_RECEIVER_FRAME_RECEIVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698