Skip to content

Commit

Permalink
firefox: backport HEVC hardware acceleration patches
Browse files Browse the repository at this point in the history
Track patches at AOSC-Tracking/firefox @ aosc/v135.0.1
(HEAD: 9ed99f65b86c6add26bbcbd424e766ab776a7178).
  • Loading branch information
MingcongBai authored and ruaharico committed Feb 24, 2025
1 parent c31ce49 commit d57cdb2
Show file tree
Hide file tree
Showing 23 changed files with 2,510 additions and 465 deletions.
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From 333c637e2ac049dece69f67ce142fb068ba09d2a Mon Sep 17 00:00:00 2001
From: Jiangjin Wang <[email protected]>
Date: Tue, 14 Nov 2023 18:14:20 -0800
Subject: [PATCH 1/9] Enable VA-API support for AMD GPUs
Subject: [PATCH 01/22] Enable VA-API support for AMD GPUs

---
widget/gtk/GfxInfo.cpp | 8 --------
1 file changed, 8 deletions(-)

diff --git a/widget/gtk/GfxInfo.cpp b/widget/gtk/GfxInfo.cpp
index bc26a3b373..d21714c743 100644
index bc26a3b373c9..d21714c74316 100644
--- a/widget/gtk/GfxInfo.cpp
+++ b/widget/gtk/GfxInfo.cpp
@@ -1105,14 +1105,6 @@ const nsTArray<GfxDriverInfo>& GfxInfo::GetGfxDriverInfo() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From a2639bad696e7a4b9580b29155e43478cda02b2a Mon Sep 17 00:00:00 2001
From: WANG Xuerui <[email protected]>
Date: Tue, 3 Sep 2024 15:38:04 +0800
Subject: [PATCH 2/9] update gn_processor.py to support linux on loong64
Subject: [PATCH 02/22] update gn_processor.py to support linux on loong64

Signed-off-by: WANG Xuerui <[email protected]>
---
python/mozbuild/mozbuild/gn_processor.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/python/mozbuild/mozbuild/gn_processor.py b/python/mozbuild/mozbuild/gn_processor.py
index db7f780a1a..3567e1d33a 100644
index db7f780a1a17..3567e1d33a7a 100644
--- a/python/mozbuild/mozbuild/gn_processor.py
+++ b/python/mozbuild/mozbuild/gn_processor.py
@@ -183,6 +183,7 @@ def filter_gn_config(path, gn_result, sandbox_vars, input_vars, gn_target):
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From 1d0b8be14f5abb654c8953bebadd26051b2a0294 Mon Sep 17 00:00:00 2001
From: WANG Xuerui <[email protected]>
Date: Tue, 3 Sep 2024 15:39:18 +0800
Subject: [PATCH 4/9] enable webrtc for loongarch64 in toolkit/moz.configure
Subject: [PATCH 04/22] enable webrtc for loongarch64 in toolkit/moz.configure

Signed-off-by: WANG Xuerui <[email protected]>
---
toolkit/moz.configure | 1 +
1 file changed, 1 insertion(+)

diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index bd6648a89e..109aa81d04 100644
index bd6648a89e71..109aa81d0422 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -1456,6 +1456,7 @@ def webrtc_default(target):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c37ec40fca8d9528901a1ba0bf85f372182c9a43 Mon Sep 17 00:00:00 2001
From: WANG Xuerui <[email protected]>
Date: Tue, 3 Sep 2024 15:47:26 +0800
Subject: [PATCH 5/9] Fix libyuv unified-source and LoongArch SIMD build
Subject: [PATCH 05/22] Fix libyuv unified-source and LoongArch SIMD build

Signed-off-by: WANG Xuerui <[email protected]>
---
Expand All @@ -11,7 +11,7 @@ Signed-off-by: WANG Xuerui <[email protected]>
3 files changed, 32 insertions(+)

diff --git a/media/libyuv/libyuv/libyuv.gypi b/media/libyuv/libyuv/libyuv.gypi
index 1fd1be71e3..fbe35fc42e 100644
index 1fd1be71e341..fbe35fc42e6d 100644
--- a/media/libyuv/libyuv/libyuv.gypi
+++ b/media/libyuv/libyuv/libyuv.gypi
@@ -80,11 +80,14 @@
Expand All @@ -38,7 +38,7 @@ index 1fd1be71e3..fbe35fc42e 100644
'source/scale_rgb.cc',
'source/scale_uv.cc',
diff --git a/media/libyuv/libyuv/source/row_lasx.cc b/media/libyuv/libyuv/source/row_lasx.cc
index 6d49aa5e8b..52fbde9c85 100644
index 6d49aa5e8b39..52fbde9c854b 100644
--- a/media/libyuv/libyuv/source/row_lasx.cc
+++ b/media/libyuv/libyuv/source/row_lasx.cc
@@ -2000,11 +2000,13 @@ void NV21ToARGBRow_LASX(const uint8_t* src_y,
Expand Down Expand Up @@ -82,7 +82,7 @@ index 6d49aa5e8b..52fbde9c85 100644
} // extern "C"
} // namespace libyuv
diff --git a/media/libyuv/libyuv/source/row_lsx.cc b/media/libyuv/libyuv/source/row_lsx.cc
index fa088c9e78..c32c718c78 100644
index fa088c9e78a9..c32c718c78fe 100644
--- a/media/libyuv/libyuv/source/row_lsx.cc
+++ b/media/libyuv/libyuv/source/row_lsx.cc
@@ -2769,11 +2769,13 @@ void HalfFloatRow_LSX(const uint16_t* src,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From cd29c00506458935ba600a0e753650f57bd3e700 Mon Sep 17 00:00:00 2001
From: WANG Xuerui <[email protected]>
Date: Wed, 4 Sep 2024 16:45:05 +0800
Subject: [PATCH 6/9] Fix missing loongarch subdir in libpng moz.yaml
Subject: [PATCH 06/22] Fix missing loongarch subdir in libpng moz.yaml

Signed-off-by: WANG Xuerui <[email protected]>
---
media/libpng/moz.yaml | 1 +
1 file changed, 1 insertion(+)

diff --git a/media/libpng/moz.yaml b/media/libpng/moz.yaml
index 4827c47286..f7de4c6454 100644
index 4827c47286c2..f7de4c645480 100644
--- a/media/libpng/moz.yaml
+++ b/media/libpng/moz.yaml
@@ -37,6 +37,7 @@ vendoring:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 9fab931b2219f3e85a7c98be1eb6145398fec2f3 Mon Sep 17 00:00:00 2001
From: WANG Xuerui <[email protected]>
Date: Wed, 4 Sep 2024 16:50:54 +0800
Subject: [PATCH 7/9] Vendor missing loongarch files of libpng
Subject: [PATCH 07/22] Vendor missing loongarch files of libpng

Signed-off-by: WANG Xuerui <[email protected]>
---
Expand All @@ -13,7 +13,7 @@ Signed-off-by: WANG Xuerui <[email protected]>

diff --git a/media/libpng/loongarch/filter_lsx_intrinsics.c b/media/libpng/loongarch/filter_lsx_intrinsics.c
new file mode 100644
index 0000000000..af6cc763a0
index 000000000000..af6cc763a078
--- /dev/null
+++ b/media/libpng/loongarch/filter_lsx_intrinsics.c
@@ -0,0 +1,412 @@
Expand Down Expand Up @@ -431,7 +431,7 @@ index 0000000000..af6cc763a0
+#endif /* PNG_READ_SUPPORTED */
diff --git a/media/libpng/loongarch/loongarch_lsx_init.c b/media/libpng/loongarch/loongarch_lsx_init.c
new file mode 100644
index 0000000000..2c80fe81b6
index 000000000000..2c80fe81b687
--- /dev/null
+++ b/media/libpng/loongarch/loongarch_lsx_init.c
@@ -0,0 +1,65 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d71c3da12a6150a3a449202a6ba1dc60be8458c2 Mon Sep 17 00:00:00 2001
From: WANG Xuerui <[email protected]>
Date: Wed, 4 Sep 2024 16:51:22 +0800
Subject: [PATCH 8/9] Enable LoongArch LSX optimization for libpng
Subject: [PATCH 08/22] Enable LoongArch LSX optimization for libpng

Signed-off-by: WANG Xuerui <[email protected]>
---
Expand All @@ -10,7 +10,7 @@ Signed-off-by: WANG Xuerui <[email protected]>
2 files changed, 14 insertions(+)

diff --git a/media/libpng/moz.build b/media/libpng/moz.build
index 6fa28a814a..a316a06237 100644
index 6fa28a814a75..a316a0623772 100644
--- a/media/libpng/moz.build
+++ b/media/libpng/moz.build
@@ -50,6 +50,13 @@ if CONFIG['INTEL_ARCHITECTURE']:
Expand All @@ -28,7 +28,7 @@ index 6fa28a814a..a316a06237 100644
DEFINES['MOZ_PNG_USE_MIPS_MSA'] = True
UNIFIED_SOURCES += [
diff --git a/media/libpng/pnglibconf.h b/media/libpng/pnglibconf.h
index 1cbb828436..8ef91386ff 100644
index 1cbb828436de..8ef91386ffe4 100644
--- a/media/libpng/pnglibconf.h
+++ b/media/libpng/pnglibconf.h
@@ -54,6 +54,13 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From ca9cf02649e1738e9c06f407a6dd787d8aa7f72c Mon Sep 17 00:00:00 2001
From: Xuan Chen <[email protected]>
Date: Tue, 14 Jan 2025 21:41:32 +0000
Subject: [PATCH 9/9] Bug 1938855 - [MIPS] Replace BytecodeOffset with
Subject: [PATCH 09/22] Bug 1938855 - [MIPS] Replace BytecodeOffset with
TrapSiteDesc. r=rhunt

Differential Revision: https://phabricator.services.mozilla.com/D232815
Expand All @@ -15,7 +15,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D232815
6 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/js/src/jit/mips-shared/CodeGenerator-mips-shared.cpp b/js/src/jit/mips-shared/CodeGenerator-mips-shared.cpp
index 7a4047efb4..d36678a5e6 100644
index 7a4047efb4ed..d36678a5e65e 100644
--- a/js/src/jit/mips-shared/CodeGenerator-mips-shared.cpp
+++ b/js/src/jit/mips-shared/CodeGenerator-mips-shared.cpp
@@ -440,7 +440,7 @@ void CodeGenerator::visitDivI(LDivI* ins) {
Expand Down Expand Up @@ -94,7 +94,7 @@ index 7a4047efb4..d36678a5e6 100644
}

diff --git a/js/src/jit/mips-shared/LIR-mips-shared.h b/js/src/jit/mips-shared/LIR-mips-shared.h
index a302be061e..9ca426b00c 100644
index a302be061e36..9ca426b00c66 100644
--- a/js/src/jit/mips-shared/LIR-mips-shared.h
+++ b/js/src/jit/mips-shared/LIR-mips-shared.h
@@ -192,12 +192,12 @@ class LUDivOrMod : public LBinaryMath<0> {
Expand All @@ -114,7 +114,7 @@ index a302be061e..9ca426b00c 100644
};

diff --git a/js/src/jit/mips32/CodeGenerator-mips32.cpp b/js/src/jit/mips32/CodeGenerator-mips32.cpp
index 9efe8828fa..3fe833ee1b 100644
index 9efe8828fae4..3fe833ee1b3b 100644
--- a/js/src/jit/mips32/CodeGenerator-mips32.cpp
+++ b/js/src/jit/mips32/CodeGenerator-mips32.cpp
@@ -81,7 +81,7 @@ void CodeGenerator::visitDivOrModI64(LDivOrModI64* lir) {
Expand Down Expand Up @@ -219,7 +219,7 @@ index 9efe8828fa..3fe833ee1b 100644
}
}
diff --git a/js/src/jit/mips32/LIR-mips32.h b/js/src/jit/mips32/LIR-mips32.h
index da68ad7464..12ba54ed6e 100644
index da68ad746449..12ba54ed6ef9 100644
--- a/js/src/jit/mips32/LIR-mips32.h
+++ b/js/src/jit/mips32/LIR-mips32.h
@@ -88,12 +88,12 @@ class LDivOrModI64
Expand Down Expand Up @@ -255,7 +255,7 @@ index da68ad7464..12ba54ed6e 100644
};

diff --git a/js/src/jit/mips64/CodeGenerator-mips64.cpp b/js/src/jit/mips64/CodeGenerator-mips64.cpp
index b1afee8181..03363e6fc2 100644
index b1afee818128..03363e6fc25e 100644
--- a/js/src/jit/mips64/CodeGenerator-mips64.cpp
+++ b/js/src/jit/mips64/CodeGenerator-mips64.cpp
@@ -139,7 +139,7 @@ void CodeGenerator::visitDivOrModI64(LDivOrModI64* lir) {
Expand Down Expand Up @@ -286,7 +286,7 @@ index b1afee8181..03363e6fc2 100644
}

diff --git a/js/src/jit/mips64/LIR-mips64.h b/js/src/jit/mips64/LIR-mips64.h
index 4d8228418c..176c526106 100644
index 4d8228418ce6..176c52610693 100644
--- a/js/src/jit/mips64/LIR-mips64.h
+++ b/js/src/jit/mips64/LIR-mips64.h
@@ -72,12 +72,12 @@ class LDivOrModI64 : public LBinaryMath<1> {
Expand Down
Loading

0 comments on commit d57cdb2

Please sign in to comment.