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

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

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more 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
Index: media/cast/sender/external_video_encoder_unittest.cc
diff --git a/media/cast/sender/external_video_encoder_unittest.cc b/media/cast/sender/external_video_encoder_unittest.cc
index 78359f3408cab4ba89ddde0d974667b5b73c6b84..1004ba525be3a6c7a3ed99f485feaba50002c05b 100644
--- a/media/cast/sender/external_video_encoder_unittest.cc
+++ b/media/cast/sender/external_video_encoder_unittest.cc
@@ -13,7 +13,7 @@ namespace cast {
namespace {
-scoped_refptr<VideoFrame> CreateFrame(const uint8* y_plane_data,
+scoped_refptr<VideoFrame> CreateFrame(const uint8_t* y_plane_data,
const gfx::Size& size) {
scoped_refptr<VideoFrame> result = VideoFrame::CreateFrame(PIXEL_FORMAT_I420,
size,
@@ -35,7 +35,8 @@ TEST(QuantizerEstimator, EstimatesForTrivialFrames) {
QuantizerEstimator qe;
const gfx::Size frame_size(320, 180);
- const scoped_ptr<uint8[]> black_frame_data(new uint8[frame_size.GetArea()]);
+ const scoped_ptr<uint8_t[]> black_frame_data(
+ new uint8_t[frame_size.GetArea()]);
memset(black_frame_data.get(), 0, frame_size.GetArea());
const scoped_refptr<VideoFrame> black_frame =
CreateFrame(black_frame_data.get(), frame_size);
@@ -48,8 +49,8 @@ TEST(QuantizerEstimator, EstimatesForTrivialFrames) {
for (int i = 0; i < 3; ++i)
EXPECT_EQ(4.0, qe.EstimateForDeltaFrame(*black_frame));
- const scoped_ptr<uint8[]> checkerboard_frame_data(
- new uint8[frame_size.GetArea()]);
+ const scoped_ptr<uint8_t[]> checkerboard_frame_data(
+ new uint8_t[frame_size.GetArea()]);
for (int i = 0, end = frame_size.GetArea(); i < end; ++i)
checkerboard_frame_data.get()[i] = (((i % 2) == 0) ? 0 : 255);
const scoped_refptr<VideoFrame> checkerboard_frame =
@@ -65,11 +66,11 @@ TEST(QuantizerEstimator, EstimatesForTrivialFrames) {
// results in high quantizer estimates.
for (int i = 0; i < 3; ++i) {
int rand_seed = 0xdeadbeef + i;
- const scoped_ptr<uint8[]> random_frame_data(
- new uint8[frame_size.GetArea()]);
+ const scoped_ptr<uint8_t[]> random_frame_data(
+ new uint8_t[frame_size.GetArea()]);
for (int j = 0, end = frame_size.GetArea(); j < end; ++j) {
rand_seed = (1103515245 * rand_seed + 12345) % (1 << 31);
- random_frame_data.get()[j] = static_cast<uint8>(rand_seed & 0xff);
+ random_frame_data.get()[j] = static_cast<uint8_t>(rand_seed & 0xff);
}
const scoped_refptr<VideoFrame> random_frame =
CreateFrame(random_frame_data.get(), frame_size);

Powered by Google App Engine
This is Rietveld 408576698