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

Unified Diff: media/formats/common/stream_parser_test_base.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/formats/common/stream_parser_test_base.cc
diff --git a/media/formats/common/stream_parser_test_base.cc b/media/formats/common/stream_parser_test_base.cc
index b6555b9524702312695ce8bc2e9489ac9eea6be5..29ca747f63f55662566734f1de4ac52d3174b276 100644
--- a/media/formats/common/stream_parser_test_base.cc
+++ b/media/formats/common/stream_parser_test_base.cc
@@ -52,17 +52,18 @@ std::string StreamParserTestBase::ParseFile(const std::string& filename,
return results_stream_.str();
}
-std::string StreamParserTestBase::ParseData(const uint8* data, size_t length) {
+std::string StreamParserTestBase::ParseData(const uint8_t* data,
+ size_t length) {
results_stream_.clear();
EXPECT_TRUE(AppendDataInPieces(data, length, length));
return results_stream_.str();
}
-bool StreamParserTestBase::AppendDataInPieces(const uint8* data,
+bool StreamParserTestBase::AppendDataInPieces(const uint8_t* data,
size_t length,
size_t piece_size) {
- const uint8* start = data;
- const uint8* end = data + length;
+ const uint8_t* start = data;
+ const uint8_t* end = data + length;
while (start < end) {
size_t append_size = std::min(piece_size, static_cast<size_t>(end - start));
if (!parser_->Parse(start, append_size))
@@ -109,7 +110,7 @@ bool StreamParserTestBase::OnNewBuffers(
}
void StreamParserTestBase::OnKeyNeeded(EmeInitDataType type,
- const std::vector<uint8>& init_data) {
+ const std::vector<uint8_t>& init_data) {
DVLOG(1) << __FUNCTION__ << "(" << static_cast<int>(type) << ", "
<< init_data.size() << ")";
}

Powered by Google App Engine
This is Rietveld 408576698