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

Unified Diff: media/formats/mp2t/es_parser_h264.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/mp2t/es_parser_h264.cc
diff --git a/media/formats/mp2t/es_parser_h264.cc b/media/formats/mp2t/es_parser_h264.cc
index 8c5911230f053b4526dd6afc4f3df2b938d5d9ee..793e2aa993a88d64957215ca41262c2da8c0a707 100644
--- a/media/formats/mp2t/es_parser_h264.cc
+++ b/media/formats/mp2t/es_parser_h264.cc
@@ -41,7 +41,7 @@ void EsParserH264::Flush() {
// Simulate an additional AUD to force emitting the last access unit
// which is assumed to be complete at this point.
- uint8 aud[] = { 0x00, 0x00, 0x01, 0x09 };
+ uint8_t aud[] = {0x00, 0x00, 0x01, 0x09};
es_queue_->Push(aud, sizeof(aud));
ParseFromEsQueue();
@@ -57,9 +57,9 @@ void EsParserH264::ResetInternal() {
es_adapter_.Reset();
}
-bool EsParserH264::FindAUD(int64* stream_pos) {
+bool EsParserH264::FindAUD(int64_t* stream_pos) {
while (true) {
- const uint8* es;
+ const uint8_t* es;
int size;
es_queue_->PeekAt(*stream_pos, &es, &size);
@@ -120,10 +120,10 @@ bool EsParserH264::ParseFromEsQueue() {
bool is_key_frame = false;
int pps_id_for_access_unit = -1;
- const uint8* es;
+ const uint8_t* es;
int size;
es_queue_->PeekAt(current_access_unit_pos_, &es, &size);
- int access_unit_size = base::checked_cast<int, int64>(
+ int access_unit_size = base::checked_cast<int, int64_t>(
next_access_unit_pos_ - current_access_unit_pos_);
DCHECK_LE(access_unit_size, size);
h264_parser_->SetStream(es, access_unit_size);
@@ -195,8 +195,10 @@ bool EsParserH264::ParseFromEsQueue() {
return true;
}
-bool EsParserH264::EmitFrame(int64 access_unit_pos, int access_unit_size,
- bool is_key_frame, int pps_id) {
+bool EsParserH264::EmitFrame(int64_t access_unit_pos,
+ int access_unit_size,
+ bool is_key_frame,
+ int pps_id) {
// Get the access unit timing info.
// Note: |current_timing_desc.pts| might be |kNoTimestamp()| at this point
// if:
@@ -236,7 +238,7 @@ bool EsParserH264::EmitFrame(int64 access_unit_pos, int access_unit_size,
DVLOG(LOG_LEVEL_ES) << "Emit frame: stream_pos=" << current_access_unit_pos_
<< " size=" << access_unit_size;
int es_size;
- const uint8* es;
+ const uint8_t* es;
es_queue_->PeekAt(current_access_unit_pos_, &es, &es_size);
CHECK_GE(es_size, access_unit_size);

Powered by Google App Engine
This is Rietveld 408576698