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

Unified Diff: media/cast/sender/h264_vt_encoder.cc

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: Speculative workaround fix for win8_chromium_ng compile error. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/sender/frame_sender.cc ('k') | media/cast/sender/h264_vt_encoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/sender/h264_vt_encoder.cc
diff --git a/media/cast/sender/h264_vt_encoder.cc b/media/cast/sender/h264_vt_encoder.cc
index c21cfcc6f56d5d856bb231ae1ae43b93395a1d02..33e7366d80a3e534653e8b7cfd94c530fac3f28d 100644
--- a/media/cast/sender/h264_vt_encoder.cc
+++ b/media/cast/sender/h264_vt_encoder.cc
@@ -20,7 +20,7 @@
#include "build/build_config.h"
#include "media/base/mac/corevideo_glue.h"
#include "media/base/mac/video_frame_mac.h"
-#include "media/cast/cast_defines.h"
+#include "media/cast/common/rtp_time.h"
#include "media/cast/constants.h"
#include "media/cast/sender/video_frame_factory.h"
@@ -31,11 +31,11 @@ namespace {
// Container for the associated data of a video frame being processed.
struct InProgressFrameEncode {
- const RtpTimestamp rtp_timestamp;
+ const RtpTimeTicks rtp_timestamp;
const base::TimeTicks reference_time;
const VideoEncoder::FrameEncodedCallback frame_encoded_callback;
- InProgressFrameEncode(RtpTimestamp rtp,
+ InProgressFrameEncode(RtpTimeTicks rtp,
base::TimeTicks r_time,
VideoEncoder::FrameEncodedCallback callback)
: rtp_timestamp(rtp),
@@ -571,7 +571,7 @@ bool H264VideoToolboxEncoder::EncodeVideoFrame(
// Wrap information we'll need after the frame is encoded in a heap object.
// We'll get the pointer back from the VideoToolbox completion callback.
scoped_ptr<InProgressFrameEncode> request(new InProgressFrameEncode(
- TimeDeltaToRtpDelta(video_frame->timestamp(), kVideoFrequency),
+ RtpTimeTicks::FromTimeDelta(video_frame->timestamp(), kVideoFrequency),
reference_time, frame_encoded_callback));
// Build a suitable frame properties dictionary for keyframes.
« no previous file with comments | « media/cast/sender/frame_sender.cc ('k') | media/cast/sender/h264_vt_encoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698