diff options
| author | Avi Drissman <avi@chromium.org> | 2015-12-18 20:11:31 -0500 |
|---|---|---|
| committer | Avi Drissman <avi@chromium.org> | 2015-12-19 01:13:36 +0000 |
| commit | 97785eaf0f3b8f017a38fe738ade818754492483 (patch) | |
| tree | 6663166eaeaefbc78833bf48e89e6544e5d8d1cd /media/cast/sender/h264_vt_encoder_unittest.cc | |
| parent | a388b145dee01a807b80517d57c7229e34e23883 (diff) | |
| download | chromium_src-97785eaf0f3b8f017a38fe738ade818754492483.zip chromium_src-97785eaf0f3b8f017a38fe738ade818754492483.tar.gz chromium_src-97785eaf0f3b8f017a38fe738ade818754492483.tar.bz2 | |
Switch to standard integer types in media/.
BUG=138542
TBR=dalecurtis@chromium.org
Review URL: https://codereview.chromium.org/1534273002 .
Cr-Commit-Position: refs/heads/master@{#366242}
Diffstat (limited to 'media/cast/sender/h264_vt_encoder_unittest.cc')
| -rw-r--r-- | media/cast/sender/h264_vt_encoder_unittest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/media/cast/sender/h264_vt_encoder_unittest.cc b/media/cast/sender/h264_vt_encoder_unittest.cc index 19dd3d1..fac070d 100644 --- a/media/cast/sender/h264_vt_encoder_unittest.cc +++ b/media/cast/sender/h264_vt_encoder_unittest.cc @@ -84,9 +84,9 @@ class MetadataRecorder : public base::RefCountedThreadSafe<MetadataRecorder> { int count_frames_delivered() const { return count_frames_delivered_; } - void PushExpectation(uint32 expected_frame_id, - uint32 expected_last_referenced_frame_id, - uint32 expected_rtp_timestamp, + void PushExpectation(uint32_t expected_frame_id, + uint32_t expected_last_referenced_frame_id, + uint32_t expected_rtp_timestamp, const base::TimeTicks& expected_reference_time) { expectations_.push(Expectation{expected_frame_id, expected_last_referenced_frame_id, @@ -120,9 +120,9 @@ class MetadataRecorder : public base::RefCountedThreadSafe<MetadataRecorder> { int count_frames_delivered_; struct Expectation { - uint32 expected_frame_id; - uint32 expected_last_referenced_frame_id; - uint32 expected_rtp_timestamp; + uint32_t expected_frame_id; + uint32_t expected_last_referenced_frame_id; + uint32_t expected_rtp_timestamp; base::TimeTicks expected_reference_time; }; std::queue<Expectation> expectations_; @@ -292,7 +292,7 @@ TEST_F(H264VideoToolboxEncoderTest, CheckFrameMetadataSequence) { EXPECT_TRUE(encoder_->EncodeVideoFrame(frame_, clock_->NowTicks(), cb)); message_loop_.RunUntilIdle(); - for (uint32 frame_id = 1; frame_id < 10; ++frame_id) { + for (uint32_t frame_id = 1; frame_id < 10; ++frame_id) { AdvanceClockAndVideoFrameTimestamp(); metadata_recorder->PushExpectation( frame_id, frame_id - 1, @@ -317,7 +317,7 @@ TEST_F(H264VideoToolboxEncoderTest, CheckFramesAreDecodable) { VideoEncoder::FrameEncodedCallback cb = base::Bind(&EndToEndFrameChecker::EncodeDone, checker.get()); - for (uint32 frame_id = 0; frame_id < 6; ++frame_id) { + for (uint32_t frame_id = 0; frame_id < 6; ++frame_id) { checker->PushExpectation(frame_); EXPECT_TRUE(encoder_->EncodeVideoFrame(frame_, clock_->NowTicks(), cb)); AdvanceClockAndVideoFrameTimestamp(); |