diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
tree | eff41dc61d9f714852212739e6b3738b82a2af87 /dom/media/MediaInfo.h | |
parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'dom/media/MediaInfo.h')
-rw-r--r-- | dom/media/MediaInfo.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/dom/media/MediaInfo.h b/dom/media/MediaInfo.h index 73704d1593..7ab5df4e0a 100644 --- a/dom/media/MediaInfo.h +++ b/dom/media/MediaInfo.h @@ -109,12 +109,16 @@ struct FlacCodecSpecificData { RefPtr<MediaByteBuffer> mStreamInfoBinaryBlob{new MediaByteBuffer}; }; -struct Mp3CodecSpecificData { +struct Mp3CodecSpecificData final { bool operator==(const Mp3CodecSpecificData& rhs) const { return mEncoderDelayFrames == rhs.mEncoderDelayFrames && mEncoderPaddingFrames == rhs.mEncoderPaddingFrames; } + auto MutTiedFields() { + return std::tie(mEncoderDelayFrames, mEncoderPaddingFrames); + } + // The number of frames that should be skipped from the beginning of the // decoded stream. // See https://bugzilla.mozilla.org/show_bug.cgi?id=1566389 for more info. @@ -558,7 +562,7 @@ class AudioInfo : public TrackInfo { bool operator==(const AudioInfo& rhs) const; - static const uint32_t MAX_RATE = 640000; + static const uint32_t MAX_RATE = 768000; static const uint32_t MAX_CHANNEL_COUNT = 256; bool IsValid() const override { |