| Index: media/formats/mp2t/ts_section_psi.cc
|
| diff --git a/media/formats/mp2t/ts_section_psi.cc b/media/formats/mp2t/ts_section_psi.cc
|
| index 64fac9c0761c2ddcefc479245c93a16eae590129..b8c959961e5fe903d89e860d2ef0a4ae1f0903f5 100644
|
| --- a/media/formats/mp2t/ts_section_psi.cc
|
| +++ b/media/formats/mp2t/ts_section_psi.cc
|
| @@ -6,18 +6,17 @@
|
|
|
| #include <algorithm>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/logging.h"
|
| #include "media/base/bit_reader.h"
|
| #include "media/formats/mp2t/mp2t_common.h"
|
|
|
| -static bool IsCrcValid(const uint8* buf, int size) {
|
| - uint32 crc = 0xffffffffu;
|
| - const uint32 kCrcPoly = 0x4c11db7;
|
| +static bool IsCrcValid(const uint8_t* buf, int size) {
|
| + uint32_t crc = 0xffffffffu;
|
| + const uint32_t kCrcPoly = 0x4c11db7;
|
|
|
| for (int k = 0; k < size; k++) {
|
| int nbits = 8;
|
| - uint32 data_msb_aligned = buf[k];
|
| + uint32_t data_msb_aligned = buf[k];
|
| data_msb_aligned <<= (32 - nbits);
|
|
|
| while (nbits > 0) {
|
| @@ -48,7 +47,8 @@ TsSectionPsi::~TsSectionPsi() {
|
| }
|
|
|
| bool TsSectionPsi::Parse(bool payload_unit_start_indicator,
|
| - const uint8* buf, int size) {
|
| + const uint8_t* buf,
|
| + int size) {
|
| // Ignore partial PSI.
|
| if (wait_for_pusi_ && !payload_unit_start_indicator)
|
| return true;
|
| @@ -79,7 +79,7 @@ bool TsSectionPsi::Parse(bool payload_unit_start_indicator,
|
| // Add the data to the parser state.
|
| psi_byte_queue_.Push(buf, size);
|
| int raw_psi_size;
|
| - const uint8* raw_psi;
|
| + const uint8_t* raw_psi;
|
| psi_byte_queue_.Peek(&raw_psi, &raw_psi_size);
|
|
|
| // Check whether we have enough data to start parsing.
|
|
|