diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 04:41:07 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 04:41:07 +0000 |
| commit | 2ddc3a5c1a38898c51f8d188c94d3f60d39dbd19 (patch) | |
| tree | 5939537f1b684b149aed3b8fab8ab4711830d566 /mkvmuxer/mkvmuxer.cc | |
| parent | c8d3e0ea6aa71e28b37c3e93d4fec30b59fb2e3e (diff) | |
| parent | b2c0c512f112c0bb018b20a67b3e14755bf08746 (diff) | |
| download | libwebm-2ddc3a5c1a38898c51f8d188c94d3f60d39dbd19.tar.gz | |
Snap for 10453563 from b2c0c512f112c0bb018b20a67b3e14755bf08746 to mainline-adservices-releaseaml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050
Change-Id: Idbca2911bc9b8c95fc86714da93336ff0d19dfaa
Diffstat (limited to 'mkvmuxer/mkvmuxer.cc')
| -rw-r--r-- | mkvmuxer/mkvmuxer.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mkvmuxer/mkvmuxer.cc b/mkvmuxer/mkvmuxer.cc index 499fbe6..faaf016 100644 --- a/mkvmuxer/mkvmuxer.cc +++ b/mkvmuxer/mkvmuxer.cc @@ -607,10 +607,10 @@ bool ContentEncoding::Write(IMkvWriter* writer) const { return true; } -uint64_t ContentEncoding::EncodingSize(uint64_t compresion_size, +uint64_t ContentEncoding::EncodingSize(uint64_t compression_size, uint64_t encryption_size) const { // TODO(fgalligan): Add support for compression settings. - if (compresion_size != 0) + if (compression_size != 0) return 0; uint64_t encoding_size = 0; @@ -774,7 +774,7 @@ bool Track::Write(IMkvWriter* writer) const { return false; // AV1 tracks require a CodecPrivate. See - // https://github.com/Matroska-Org/matroska-specification/blob/av1-mappin/codec/av1.md + // https://github.com/ietf-wg-cellar/matroska-specification/blob/HEAD/codec/av1.md // TODO(tomfinegan): Update the above link to the AV1 Matroska mappings to // point to a stable version once it is finalized, or our own WebM mappings // page on webmproject.org should we decide to release them. @@ -2622,8 +2622,7 @@ bool Cluster::Finalize(bool set_last_frame_duration, uint64_t duration) { uint64_t Cluster::Size() const { const uint64_t element_size = - EbmlMasterElementSize(static_cast<uint64_t>(libwebm::kMkvCluster), - uint64_t{0xFFFFFFFFFFFFFFFFU}) + + EbmlMasterElementSize(libwebm::kMkvCluster, 0xFFFFFFFFFFFFFFFFULL) + payload_size_; return element_size; } @@ -3085,6 +3084,7 @@ Segment::Segment() accurate_cluster_duration_(false), fixed_size_cluster_timecode_(false), estimate_file_duration_(false), + ebml_header_size_(0), payload_pos_(0), size_position_(0), doc_type_version_(kDefaultDocTypeVersion), |