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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/formats/webm/webm_content_encodings_client_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
« media/cdm/stub/stub_cdm.h ('K') | « media/formats/webm/webm_content_encodings_client.cc ('k') | media/formats/webm/webm_crypto_helpers.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/webm/webm_content_encodings_client_unittest.cc
diff --git a/media/formats/webm/webm_content_encodings_client_unittest.cc b/media/formats/webm/webm_content_encodings_client_unittest.cc
index d31ad278b9e821c4af210c8fd21fe918563c4f8e..657e2c4a911fa41bd1d74c5d72d2ef8e5436801a 100644
--- a/media/formats/webm/webm_content_encodings_client_unittest.cc
+++ b/media/formats/webm/webm_content_encodings_client_unittest.cc
@@ -53,7 +53,7 @@ class WebMContentEncodingsClientTest : public testing::Test {
client_(media_log_),
parser_(kWebMIdContentEncodings, &client_) {}
- void ParseAndExpectToFail(const uint8* buf, int size) {
+ void ParseAndExpectToFail(const uint8_t* buf, int size) {
int result = parser_.Parse(buf, size);
EXPECT_EQ(-1, result);
}
@@ -65,8 +65,8 @@ class WebMContentEncodingsClientTest : public testing::Test {
};
TEST_F(WebMContentEncodingsClientTest, EmptyContentEncodings) {
- const uint8 kContentEncodings[] = {
- 0x6D, 0x80, 0x80, // ContentEncodings (size = 0)
+ const uint8_t kContentEncodings[] = {
+ 0x6D, 0x80, 0x80, // ContentEncodings (size = 0)
};
int size = sizeof(kContentEncodings);
EXPECT_MEDIA_LOG(MissingContentEncoding());
@@ -74,25 +74,25 @@ TEST_F(WebMContentEncodingsClientTest, EmptyContentEncodings) {
}
TEST_F(WebMContentEncodingsClientTest, EmptyContentEncoding) {
- const uint8 kContentEncodings[] = {
- 0x6D, 0x80, 0x83, // ContentEncodings (size = 3)
- 0x63, 0x40, 0x80, // ContentEncoding (size = 0)
+ const uint8_t kContentEncodings[] = {
+ 0x6D, 0x80, 0x83, // ContentEncodings (size = 3)
+ 0x63, 0x40, 0x80, // ContentEncoding (size = 0)
};
int size = sizeof(kContentEncodings);
ParseAndExpectToFail(kContentEncodings, size);
}
TEST_F(WebMContentEncodingsClientTest, SingleContentEncoding) {
- const uint8 kContentEncodings[] = {
- 0x6D, 0x80, 0xA1, // ContentEncodings (size = 33)
- 0x62, 0x40, 0x9e, // ContentEncoding (size = 30)
- 0x50, 0x31, 0x81, 0x00, // ContentEncodingOrder (size = 1)
- 0x50, 0x32, 0x81, 0x01, // ContentEncodingScope (size = 1)
- 0x50, 0x33, 0x81, 0x01, // ContentEncodingType (size = 1)
- 0x50, 0x35, 0x8F, // ContentEncryption (size = 15)
- 0x47, 0xE1, 0x81, 0x05, // ContentEncAlgo (size = 1)
- 0x47, 0xE2, 0x88, // ContentEncKeyID (size = 8)
- 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+ const uint8_t kContentEncodings[] = {
+ 0x6D, 0x80, 0xA1, // ContentEncodings (size = 33)
+ 0x62, 0x40, 0x9e, // ContentEncoding (size = 30)
+ 0x50, 0x31, 0x81, 0x00, // ContentEncodingOrder (size = 1)
+ 0x50, 0x32, 0x81, 0x01, // ContentEncodingScope (size = 1)
+ 0x50, 0x33, 0x81, 0x01, // ContentEncodingType (size = 1)
+ 0x50, 0x35, 0x8F, // ContentEncryption (size = 15)
+ 0x47, 0xE1, 0x81, 0x05, // ContentEncAlgo (size = 1)
+ 0x47, 0xE2, 0x88, // ContentEncKeyID (size = 8)
+ 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
};
int size = sizeof(kContentEncodings);
@@ -112,24 +112,24 @@ TEST_F(WebMContentEncodingsClientTest, SingleContentEncoding) {
}
TEST_F(WebMContentEncodingsClientTest, MultipleContentEncoding) {
- const uint8 kContentEncodings[] = {
- 0x6D, 0x80, 0xC2, // ContentEncodings (size = 66)
- 0x62, 0x40, 0x9e, // ContentEncoding (size = 30)
- 0x50, 0x31, 0x81, 0x00, // ContentEncodingOrder (size = 1)
- 0x50, 0x32, 0x81, 0x03, // ContentEncodingScope (size = 1)
- 0x50, 0x33, 0x81, 0x01, // ContentEncodingType (size = 1)
- 0x50, 0x35, 0x8F, // ContentEncryption (size = 15)
- 0x47, 0xE1, 0x81, 0x05, // ContentEncAlgo (size = 1)
- 0x47, 0xE2, 0x88, // ContentEncKeyID (size = 8)
- 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
- 0x62, 0x40, 0x9e, // ContentEncoding (size = 30)
- 0x50, 0x31, 0x81, 0x01, // ContentEncodingOrder (size = 1)
- 0x50, 0x32, 0x81, 0x03, // ContentEncodingScope (size = 1)
- 0x50, 0x33, 0x81, 0x01, // ContentEncodingType (size = 1)
- 0x50, 0x35, 0x8F, // ContentEncryption (size = 15)
- 0x47, 0xE1, 0x81, 0x01, // ContentEncAlgo (size = 1)
- 0x47, 0xE2, 0x88, // ContentEncKeyID (size = 8)
- 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB,
+ const uint8_t kContentEncodings[] = {
+ 0x6D, 0x80, 0xC2, // ContentEncodings (size = 66)
+ 0x62, 0x40, 0x9e, // ContentEncoding (size = 30)
+ 0x50, 0x31, 0x81, 0x00, // ContentEncodingOrder (size = 1)
+ 0x50, 0x32, 0x81, 0x03, // ContentEncodingScope (size = 1)
+ 0x50, 0x33, 0x81, 0x01, // ContentEncodingType (size = 1)
+ 0x50, 0x35, 0x8F, // ContentEncryption (size = 15)
+ 0x47, 0xE1, 0x81, 0x05, // ContentEncAlgo (size = 1)
+ 0x47, 0xE2, 0x88, // ContentEncKeyID (size = 8)
+ 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+ 0x62, 0x40, 0x9e, // ContentEncoding (size = 30)
+ 0x50, 0x31, 0x81, 0x01, // ContentEncodingOrder (size = 1)
+ 0x50, 0x32, 0x81, 0x03, // ContentEncodingScope (size = 1)
+ 0x50, 0x33, 0x81, 0x01, // ContentEncodingType (size = 1)
+ 0x50, 0x35, 0x8F, // ContentEncryption (size = 15)
+ 0x47, 0xE1, 0x81, 0x01, // ContentEncAlgo (size = 1)
+ 0x47, 0xE2, 0x88, // ContentEncKeyID (size = 8)
+ 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB,
};
int size = sizeof(kContentEncodings);
@@ -152,14 +152,14 @@ TEST_F(WebMContentEncodingsClientTest, MultipleContentEncoding) {
}
TEST_F(WebMContentEncodingsClientTest, DefaultValues) {
- const uint8 kContentEncodings[] = {
- 0x6D, 0x80, 0x8A, // ContentEncodings (size = 10)
- 0x62, 0x40, 0x87, // ContentEncoding (size = 7)
- // ContentEncodingOrder missing
- // ContentEncodingScope missing
- 0x50, 0x33, 0x81, 0x01, // ContentEncodingType (size = 1)
- 0x50, 0x35, 0x80, // ContentEncryption (size = 0)
- // ContentEncAlgo missing
+ const uint8_t kContentEncodings[] = {
+ 0x6D, 0x80, 0x8A, // ContentEncodings (size = 10)
+ 0x62, 0x40, 0x87, // ContentEncoding (size = 7)
+ // ContentEncodingOrder missing
+ // ContentEncodingScope missing
+ 0x50, 0x33, 0x81, 0x01, // ContentEncodingType (size = 1)
+ 0x50, 0x35, 0x80, // ContentEncryption (size = 0)
+ // ContentEncAlgo missing
};
int size = sizeof(kContentEncodings);
@@ -179,16 +179,16 @@ TEST_F(WebMContentEncodingsClientTest, DefaultValues) {
}
TEST_F(WebMContentEncodingsClientTest, ContentEncodingsClientReuse) {
- const uint8 kContentEncodings[] = {
- 0x6D, 0x80, 0xA1, // ContentEncodings (size = 33)
- 0x62, 0x40, 0x9e, // ContentEncoding (size = 30)
- 0x50, 0x31, 0x81, 0x00, // ContentEncodingOrder (size = 1)
- 0x50, 0x32, 0x81, 0x01, // ContentEncodingScope (size = 1)
- 0x50, 0x33, 0x81, 0x01, // ContentEncodingType (size = 1)
- 0x50, 0x35, 0x8F, // ContentEncryption (size = 15)
- 0x47, 0xE1, 0x81, 0x05, // ContentEncAlgo (size = 1)
- 0x47, 0xE2, 0x88, // ContentEncKeyID (size = 8)
- 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+ const uint8_t kContentEncodings[] = {
+ 0x6D, 0x80, 0xA1, // ContentEncodings (size = 33)
+ 0x62, 0x40, 0x9e, // ContentEncoding (size = 30)
+ 0x50, 0x31, 0x81, 0x00, // ContentEncodingOrder (size = 1)
+ 0x50, 0x32, 0x81, 0x01, // ContentEncodingScope (size = 1)
+ 0x50, 0x33, 0x81, 0x01, // ContentEncodingType (size = 1)
+ 0x50, 0x35, 0x8F, // ContentEncryption (size = 15)
+ 0x47, 0xE1, 0x81, 0x05, // ContentEncAlgo (size = 1)
+ 0x47, 0xE2, 0x88, // ContentEncKeyID (size = 8)
+ 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
};
int size = sizeof(kContentEncodings);
@@ -214,12 +214,12 @@ TEST_F(WebMContentEncodingsClientTest, ContentEncodingsClientReuse) {
}
TEST_F(WebMContentEncodingsClientTest, InvalidContentEncodingOrder) {
- const uint8 kContentEncodings[] = {
- 0x6D, 0x80, 0x8E, // ContentEncodings (size = 14)
- 0x62, 0x40, 0x8B, // ContentEncoding (size = 11)
- 0x50, 0x31, 0x81, 0xEE, // ContentEncodingOrder (size = 1), invalid
- 0x50, 0x33, 0x81, 0x01, // ContentEncodingType (size = 1)
- 0x50, 0x35, 0x80, // ContentEncryption (size = 0)
+ const uint8_t kContentEncodings[] = {
+ 0x6D, 0x80, 0x8E, // ContentEncodings (size = 14)
+ 0x62, 0x40, 0x8B, // ContentEncoding (size = 11)
+ 0x50, 0x31, 0x81, 0xEE, // ContentEncodingOrder (size = 1), invalid
+ 0x50, 0x33, 0x81, 0x01, // ContentEncodingType (size = 1)
+ 0x50, 0x35, 0x80, // ContentEncryption (size = 0)
};
int size = sizeof(kContentEncodings);
EXPECT_MEDIA_LOG(UnexpectedContentEncodingOrder());
@@ -227,12 +227,12 @@ TEST_F(WebMContentEncodingsClientTest, InvalidContentEncodingOrder) {
}
TEST_F(WebMContentEncodingsClientTest, InvalidContentEncodingScope) {
- const uint8 kContentEncodings[] = {
- 0x6D, 0x80, 0x8E, // ContentEncodings (size = 14)
- 0x62, 0x40, 0x8B, // ContentEncoding (size = 11)
- 0x50, 0x32, 0x81, 0xEE, // ContentEncodingScope (size = 1), invalid
- 0x50, 0x33, 0x81, 0x01, // ContentEncodingType (size = 1)
- 0x50, 0x35, 0x80, // ContentEncryption (size = 0)
+ const uint8_t kContentEncodings[] = {
+ 0x6D, 0x80, 0x8E, // ContentEncodings (size = 14)
+ 0x62, 0x40, 0x8B, // ContentEncoding (size = 11)
+ 0x50, 0x32, 0x81, 0xEE, // ContentEncodingScope (size = 1), invalid
+ 0x50, 0x33, 0x81, 0x01, // ContentEncodingType (size = 1)
+ 0x50, 0x35, 0x80, // ContentEncryption (size = 0)
};
int size = sizeof(kContentEncodings);
EXPECT_MEDIA_LOG(UnexpectedContentEncodingScope());
@@ -240,11 +240,11 @@ TEST_F(WebMContentEncodingsClientTest, InvalidContentEncodingScope) {
}
TEST_F(WebMContentEncodingsClientTest, InvalidContentEncodingType) {
- const uint8 kContentEncodings[] = {
- 0x6D, 0x80, 0x8E, // ContentEncodings (size = 14)
- 0x62, 0x40, 0x8B, // ContentEncoding (size = 11)
- 0x50, 0x33, 0x81, 0x00, // ContentEncodingType (size = 1), invalid
- 0x50, 0x35, 0x80, // ContentEncryption (size = 0)
+ const uint8_t kContentEncodings[] = {
+ 0x6D, 0x80, 0x8E, // ContentEncodings (size = 14)
+ 0x62, 0x40, 0x8B, // ContentEncoding (size = 11)
+ 0x50, 0x33, 0x81, 0x00, // ContentEncodingType (size = 1), invalid
+ 0x50, 0x35, 0x80, // ContentEncryption (size = 0)
};
int size = sizeof(kContentEncodings);
EXPECT_MEDIA_LOG(ContentCompressionNotSupported());
@@ -253,11 +253,11 @@ TEST_F(WebMContentEncodingsClientTest, InvalidContentEncodingType) {
// ContentEncodingType is encryption but no ContentEncryption present.
TEST_F(WebMContentEncodingsClientTest, MissingContentEncryption) {
- const uint8 kContentEncodings[] = {
- 0x6D, 0x80, 0x87, // ContentEncodings (size = 7)
- 0x62, 0x40, 0x84, // ContentEncoding (size = 4)
- 0x50, 0x33, 0x81, 0x01, // ContentEncodingType (size = 1)
- // ContentEncryption missing
+ const uint8_t kContentEncodings[] = {
+ 0x6D, 0x80, 0x87, // ContentEncodings (size = 7)
+ 0x62, 0x40, 0x84, // ContentEncoding (size = 4)
+ 0x50, 0x33, 0x81, 0x01, // ContentEncodingType (size = 1)
+ // ContentEncryption missing
};
int size = sizeof(kContentEncodings);
EXPECT_MEDIA_LOG(MissingContentEncryption());
@@ -265,14 +265,14 @@ TEST_F(WebMContentEncodingsClientTest, MissingContentEncryption) {
}
TEST_F(WebMContentEncodingsClientTest, InvalidContentEncAlgo) {
- const uint8 kContentEncodings[] = {
- 0x6D, 0x80, 0x99, // ContentEncodings (size = 25)
- 0x62, 0x40, 0x96, // ContentEncoding (size = 22)
- 0x50, 0x33, 0x81, 0x01, // ContentEncodingType (size = 1)
- 0x50, 0x35, 0x8F, // ContentEncryption (size = 15)
- 0x47, 0xE1, 0x81, 0xEE, // ContentEncAlgo (size = 1), invalid
- 0x47, 0xE2, 0x88, // ContentEncKeyID (size = 8)
- 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+ const uint8_t kContentEncodings[] = {
+ 0x6D, 0x80, 0x99, // ContentEncodings (size = 25)
+ 0x62, 0x40, 0x96, // ContentEncoding (size = 22)
+ 0x50, 0x33, 0x81, 0x01, // ContentEncodingType (size = 1)
+ 0x50, 0x35, 0x8F, // ContentEncryption (size = 15)
+ 0x47, 0xE1, 0x81, 0xEE, // ContentEncAlgo (size = 1), invalid
+ 0x47, 0xE2, 0x88, // ContentEncKeyID (size = 8)
+ 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
};
int size = sizeof(kContentEncodings);
EXPECT_MEDIA_LOG(UnexpectedContentEncAlgo(0xEE));
« media/cdm/stub/stub_cdm.h ('K') | « media/formats/webm/webm_content_encodings_client.cc ('k') | media/formats/webm/webm_crypto_helpers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698