diff --git a/media/base/buffer_writer_unittest.cc b/media/base/buffer_writer_unittest.cc index 0aacd83f38..89ce11d194 100644 --- a/media/base/buffer_writer_unittest.cc +++ b/media/base/buffer_writer_unittest.cc @@ -27,8 +27,8 @@ const uint16 kuint16 = 1000; const int16 kint16 = -1000; const uint32 kuint32 = 1000000; const int32 kint32 = -1000000; -const uint64 kuint64 = 10000000000; -const int64 kint64 = -10000000000; +const uint64 kuint64 = 10000000000ULL; +const int64 kint64 = -10000000000LL; const uint8 kuint8Array[] = {10, 1, 100, 5, 3, 60}; } // namespace diff --git a/media/base/muxer_util_unittest.cc b/media/base/muxer_util_unittest.cc index 1d411f4f5b..712398a064 100644 --- a/media/base/muxer_util_unittest.cc +++ b/media/base/muxer_util_unittest.cc @@ -94,7 +94,7 @@ TEST(MuxerUtilTest, GetSegmentNameWithIndexZero) { } TEST(MuxerUtilTest, GetSegmentNameLargeTime) { - const uint64 kSegmentStartTime = 1601599839840; + const uint64 kSegmentStartTime = 1601599839840ULL; const uint32 kSegmentIndex = 8888888; EXPECT_EQ("1601599839840", diff --git a/media/formats/mp2t/ts_section_pes.cc b/media/formats/mp2t/ts_section_pes.cc index 79481731f1..5e198f33aa 100644 --- a/media/formats/mp2t/ts_section_pes.cc +++ b/media/formats/mp2t/ts_section_pes.cc @@ -70,7 +70,7 @@ static bool IsTimestampSectionValid(int64 timestamp_section) { // Verify that all the marker bits are set to one. return ((timestamp_section & 0x1) != 0) && ((timestamp_section & 0x10000) != 0) && - ((timestamp_section & 0x100000000) != 0); + ((timestamp_section & 0x100000000LL) != 0); } static int64 ConvertTimestampSectionToTimestamp(int64 timestamp_section) { diff --git a/media/formats/mp4/box_definitions_unittest.cc b/media/formats/mp4/box_definitions_unittest.cc index f4917d9761..e569466221 100644 --- a/media/formats/mp4/box_definitions_unittest.cc +++ b/media/formats/mp4/box_definitions_unittest.cc @@ -18,7 +18,7 @@ const uint8 kData4[] = {1, 5, 4, 3, 15}; const uint8 kData8[] = {1, 8, 42, 98, 156}; const uint16 kData16[] = {1, 15, 45, 768, 60000}; const uint32 kData32[] = {1, 24, 99, 1234, 9000000}; -const uint64 kData64[] = {1, 9000000, 12345678901234, 56780909090900}; +const uint64 kData64[] = {1, 9000000, 12345678901234ULL, 56780909090900ULL}; const media::mp4::TrackType kSampleDescriptionTrackType = media::mp4::kVideo; // 4-byte FourCC + 4-bytes size. @@ -209,7 +209,7 @@ class BoxDefinitionsTestGeneral : public testing::Test { } void Modify(MovieHeader* mvhd) { - mvhd->duration = 234141324123; + mvhd->duration = 234141324123ULL; mvhd->next_track_id = 3; mvhd->version = 1; } @@ -228,7 +228,7 @@ class BoxDefinitionsTestGeneral : public testing::Test { } void Modify(TrackHeader* tkhd) { - tkhd->modification_time = 345388873443; + tkhd->modification_time = 345388873443ULL; tkhd->volume = 0x0100; tkhd->width = 0; tkhd->height = 0; @@ -251,7 +251,7 @@ class BoxDefinitionsTestGeneral : public testing::Test { void Modify(EditList* elst) { elst->edits.resize(1); elst->edits[0].segment_duration = 0; - elst->edits[0].media_time = 20364563456; + elst->edits[0].media_time = 20364563456LL; elst->version = 1; } @@ -529,7 +529,7 @@ class BoxDefinitionsTestGeneral : public testing::Test { void Modify(Track* trak) { Modify(&trak->media); } void Fill(MovieExtendsHeader* mehd) { - mehd->fragment_duration = 23489038090; + mehd->fragment_duration = 23489038090ULL; mehd->version = 1; } @@ -572,7 +572,7 @@ class BoxDefinitionsTestGeneral : public testing::Test { void Modify(Movie* moov) { moov->tracks.resize(1); } void Fill(TrackFragmentDecodeTime* tfdt) { - tfdt->decode_time = 234029673820; + tfdt->decode_time = 234029673820ULL; tfdt->version = 1; } @@ -709,7 +709,7 @@ class BoxDefinitionsTestGeneral : public testing::Test { } void Modify(SegmentIndex* sidx) { - sidx->earliest_presentation_time = 2348677865434; + sidx->earliest_presentation_time = 2348677865434ULL; sidx->references.resize(3); sidx->references[2] = sidx->references[1]; sidx->references[2].subsegment_duration = 87662;