diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-21 11:44:51 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-21 11:44:51 +0000 |
| commit | 9e3c08db40b8916968b9f30096c7be3f00ce9647 (patch) | |
| tree | a68f146d7fa01f0134297619fbe7e33db084e0aa /third_party/libwebrtc/moz-patch-stack/0095.patch | |
| parent | Initial commit. (diff) | |
| download | thunderbird-9e3c08db40b8916968b9f30096c7be3f00ce9647.tar.xz thunderbird-9e3c08db40b8916968b9f30096c7be3f00ce9647.zip | |
Adding upstream version 1:115.7.0.upstream/1%115.7.0upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'third_party/libwebrtc/moz-patch-stack/0095.patch')
| -rw-r--r-- | third_party/libwebrtc/moz-patch-stack/0095.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/third_party/libwebrtc/moz-patch-stack/0095.patch b/third_party/libwebrtc/moz-patch-stack/0095.patch new file mode 100644 index 0000000000..560b9137ab --- /dev/null +++ b/third_party/libwebrtc/moz-patch-stack/0095.patch @@ -0,0 +1,69 @@ +From: Andreas Pehrson <apehrson@mozilla.com> +Date: Wed, 10 May 2023 07:06:00 +0000 +Subject: Bug 1810949 - cherry-pick upstream libwebrtc commit ba41b40461. + r=webrtc-reviewers,mjf +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream commit: https://webrtc.googlesource.com/src/+/ba41b40461df191624c61f0c98ae76e69fe1d46b + webrtc_libyuv: Add support for more video types for consistency + + Bug: webrtc:14830 + Change-Id: I0998fb04a03745131f9f5cca878b0cdb46f3b62b + Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/291529 + Reviewed-by: Erik Språng <sprang@webrtc.org> + Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> + Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> + Cr-Commit-Position: refs/heads/main@{#39940} + +Differential Revision: https://phabricator.services.mozilla.com/D177229 +Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/b6eaef560895caa06e11cce40083eb87fd8724a8 +--- + common_video/libyuv/include/webrtc_libyuv.h | 3 ++- + common_video/libyuv/webrtc_libyuv.cc | 4 ++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/common_video/libyuv/include/webrtc_libyuv.h b/common_video/libyuv/include/webrtc_libyuv.h +index 6d9071bcd5..253a33294d 100644 +--- a/common_video/libyuv/include/webrtc_libyuv.h ++++ b/common_video/libyuv/include/webrtc_libyuv.h +@@ -32,8 +32,9 @@ enum class VideoType { + kI420, + kIYUV, + kRGB24, +- kABGR, ++ kBGR24, + kARGB, ++ kABGR, + kARGB4444, + kRGB565, + kARGB1555, +diff --git a/common_video/libyuv/webrtc_libyuv.cc b/common_video/libyuv/webrtc_libyuv.cc +index d07d739119..8c68162624 100644 +--- a/common_video/libyuv/webrtc_libyuv.cc ++++ b/common_video/libyuv/webrtc_libyuv.cc +@@ -39,9 +39,11 @@ size_t CalcBufferSize(VideoType type, int width, int height) { + case VideoType::kUYVY: + return width * height * 2; + case VideoType::kRGB24: ++ case VideoType::kBGR24: + return width * height * 3; + case VideoType::kBGRA: + case VideoType::kARGB: ++ case VideoType::kABGR: + return width * height * 4; + case VideoType::kMJPEG: + case VideoType::kUnknown: +@@ -92,6 +94,8 @@ int ConvertVideoType(VideoType video_type) { + return libyuv::FOURCC_YV12; + case VideoType::kRGB24: + return libyuv::FOURCC_24BG; ++ case VideoType::kBGR24: ++ return libyuv::FOURCC_RAW; + case VideoType::kABGR: + return libyuv::FOURCC_ABGR; + case VideoType::kRGB565: +-- +2.34.1 + |