diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2022-10-25 22:17:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-25 22:17:19 +0000 |
| commit | eae978ff4f7d652177b352dbcc6b67ca8be0a52f (patch) | |
| tree | deda1356c2ef176bd3d05aea8f4deb11ec563ad5 | |
| parent | b8c8f0128c9b4257b18ff2f06e980896d41a667e (diff) | |
| parent | fee037c163d98bda09a4452a70bf7cd31f263d5f (diff) | |
| download | libwebm-eae978ff4f7d652177b352dbcc6b67ca8be0a52f.tar.gz | |
Merge tag 'libwebm-1.0.0.29' into master am: 37e04ec372 am: fee037c163
Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/2269627
Change-Id: Ib4485ce9b331f3b7e13ba093fbbdfb4098907907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | METADATA | 2 | ||||
| -rw-r--r-- | common/vp9_level_stats_tests.cc | 7 | ||||
| -rw-r--r-- | m2ts/webm2pes.cc | 2 | ||||
| -rw-r--r-- | mkvmuxer/mkvmuxerutil.cc | 2 | ||||
| -rw-r--r-- | mkvparser/mkvparser.cc | 4 |
5 files changed, 9 insertions, 8 deletions
@@ -9,7 +9,7 @@ third_party { type: GIT value: "https://chromium.googlesource.com/webm/libwebm" } - version: "ee0bab576c338c9807249b99588e352b7268cb62" + version: "libwebm-1.0.0.29" license_type: NOTICE last_upgrade_date { year: 2022 diff --git a/common/vp9_level_stats_tests.cc b/common/vp9_level_stats_tests.cc index 0dec071..a39cf37 100644 --- a/common/vp9_level_stats_tests.cc +++ b/common/vp9_level_stats_tests.cc @@ -118,7 +118,7 @@ class Vp9LevelStatsTests : public ::testing::Test { }; TEST_F(Vp9LevelStatsTests, VideoOnlyFile) { - CreateAndLoadSegment("test_stereo_left_right.webm"); + ASSERT_NO_FATAL_FAILURE(CreateAndLoadSegment("test_stereo_left_right.webm")); ProcessTheFrames(); EXPECT_EQ(256, parser_.width()); EXPECT_EQ(144, parser_.height()); @@ -141,7 +141,8 @@ TEST_F(Vp9LevelStatsTests, VideoOnlyFile) { } TEST_F(Vp9LevelStatsTests, Muxed) { - CreateAndLoadSegment("bbb_480p_vp9_opus_1second.webm", 4); + ASSERT_NO_FATAL_FAILURE( + CreateAndLoadSegment("bbb_480p_vp9_opus_1second.webm", 4)); ProcessTheFrames(); EXPECT_EQ(854, parser_.width()); EXPECT_EQ(480, parser_.height()); @@ -163,7 +164,7 @@ TEST_F(Vp9LevelStatsTests, Muxed) { } TEST_F(Vp9LevelStatsTests, SetDuration) { - CreateAndLoadSegment("test_stereo_left_right.webm"); + ASSERT_NO_FATAL_FAILURE(CreateAndLoadSegment("test_stereo_left_right.webm")); ProcessTheFrames(); const int64_t kDurationNano = 2080000000; // 2.08 seconds stats_.set_duration(kDurationNano); diff --git a/m2ts/webm2pes.cc b/m2ts/webm2pes.cc index fc4b314..afa8a6b 100644 --- a/m2ts/webm2pes.cc +++ b/m2ts/webm2pes.cc @@ -68,7 +68,7 @@ void PesOptionalHeader::SetPtsBits(std::int64_t pts_90khz) { // Top 8 bits of second PTS chunk. buffer[3] |= (pts3 >> 7) & 0xff; // bottom 7 bits of second PTS chunk. - buffer[4] |= (pts3 << 1); + buffer[4] |= (pts3 << 1) & 0xff; // Marker. buffer[4] |= 1; diff --git a/mkvmuxer/mkvmuxerutil.cc b/mkvmuxer/mkvmuxerutil.cc index bd2f769..300b155 100644 --- a/mkvmuxer/mkvmuxerutil.cc +++ b/mkvmuxer/mkvmuxerutil.cc @@ -607,7 +607,7 @@ uint64 WriteVoidElement(IMkvWriter* writer, uint64 size) { void GetVersion(int32* major, int32* minor, int32* build, int32* revision) { *major = 0; *minor = 3; - *build = 0; + *build = 1; *revision = 0; } diff --git a/mkvparser/mkvparser.cc b/mkvparser/mkvparser.cc index de8884b..5d583dc 100644 --- a/mkvparser/mkvparser.cc +++ b/mkvparser/mkvparser.cc @@ -55,7 +55,7 @@ Type* SafeArrayAlloc(unsigned long long num_elements, void GetVersion(int& major, int& minor, int& build, int& revision) { major = 1; minor = 1; - build = 0; + build = 1; revision = 0; } @@ -298,7 +298,7 @@ long UnserializeInt(IMkvReader* pReader, long long pos, long long size, if (status < 0) return status; - unsigned long long result = first_byte; + unsigned long long result = static_cast<unsigned long long>(first_byte); ++pos; for (long i = 1; i < size; ++i) { |