Index: media/cast/sender/h264_vt_encoder_unittest.cc |
diff --git a/media/cast/sender/h264_vt_encoder_unittest.cc b/media/cast/sender/h264_vt_encoder_unittest.cc |
index 19dd3d183041233278073a6a147d193a41d7cc72..732731924ec0dbfe568587ed0adc5a04c89f8a50 100644 |
--- a/media/cast/sender/h264_vt_encoder_unittest.cc |
+++ b/media/cast/sender/h264_vt_encoder_unittest.cc |
@@ -17,7 +17,7 @@ |
#include "media/base/media.h" |
#include "media/base/media_switches.h" |
#include "media/base/media_util.h" |
-#include "media/cast/cast_defines.h" |
+#include "media/cast/common/rtp_time.h" |
#include "media/cast/constants.h" |
#include "media/cast/sender/h264_vt_encoder.h" |
#include "media/cast/sender/video_frame_factory.h" |
@@ -86,7 +86,7 @@ class MetadataRecorder : public base::RefCountedThreadSafe<MetadataRecorder> { |
void PushExpectation(uint32 expected_frame_id, |
uint32 expected_last_referenced_frame_id, |
- uint32 expected_rtp_timestamp, |
+ RtpTimeTicks expected_rtp_timestamp, |
const base::TimeTicks& expected_reference_time) { |
expectations_.push(Expectation{expected_frame_id, |
expected_last_referenced_frame_id, |
@@ -122,7 +122,7 @@ class MetadataRecorder : public base::RefCountedThreadSafe<MetadataRecorder> { |
struct Expectation { |
uint32 expected_frame_id; |
uint32 expected_last_referenced_frame_id; |
- uint32 expected_rtp_timestamp; |
+ RtpTimeTicks expected_rtp_timestamp; |
base::TimeTicks expected_reference_time; |
}; |
std::queue<Expectation> expectations_; |
@@ -287,7 +287,7 @@ TEST_F(H264VideoToolboxEncoderTest, CheckFrameMetadataSequence) { |
&MetadataRecorder::CompareFrameWithExpected, metadata_recorder.get()); |
metadata_recorder->PushExpectation( |
- 0, 0, TimeDeltaToRtpDelta(frame_->timestamp(), kVideoFrequency), |
+ 0, 0, RtpTimeTicks::FromTimeDelta(frame_->timestamp(), kVideoFrequency), |
clock_->NowTicks()); |
EXPECT_TRUE(encoder_->EncodeVideoFrame(frame_, clock_->NowTicks(), cb)); |
message_loop_.RunUntilIdle(); |
@@ -296,7 +296,7 @@ TEST_F(H264VideoToolboxEncoderTest, CheckFrameMetadataSequence) { |
AdvanceClockAndVideoFrameTimestamp(); |
metadata_recorder->PushExpectation( |
frame_id, frame_id - 1, |
- TimeDeltaToRtpDelta(frame_->timestamp(), kVideoFrequency), |
+ RtpTimeTicks::FromTimeDelta(frame_->timestamp(), kVideoFrequency), |
clock_->NowTicks()); |
EXPECT_TRUE(encoder_->EncodeVideoFrame(frame_, clock_->NowTicks(), cb)); |
} |