Skip to content

Commit 29f5d35

Browse files
xhaihaoBin-CI
authored andcommitted
Update submodule and patchset
Update 0014 and 0054 Submodule ffmpeg f6a36c7cf90..c469c3c3b18 Signed-off-by: Haihao Xiang <[email protected]>
1 parent 53a3f44 commit 29f5d35

3 files changed

+20
-20
lines changed

patches/0014-lavu-pixfmt-add-new-pixel-format-0yuv-y410.patch

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 6b54db2a24c388c991cc6c0e9e594c4cd0155b06 Mon Sep 17 00:00:00 2001
1+
From 926b87f71fa9fda2da843fb10976decdc1189e6b Mon Sep 17 00:00:00 2001
22
From: Linjie Fu <[email protected]>
33
Date: Mon, 15 Jun 2020 10:58:19 +0800
4-
Subject: [PATCH 14/73] lavu/pixfmt: add new pixel format 0yuv/y410
4+
Subject: [PATCH 01/59] lavu/pixfmt: add new pixel format 0yuv/y410
55

66
Previously, media driver provided planar format(like 420 8 bit),
77
but for HEVC Range Extension (444 8/10 bit), the decoded image
@@ -25,7 +25,7 @@ Signed-off-by: Linjie Fu <[email protected]>
2525
4 files changed, 39 insertions(+)
2626

2727
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
28-
index e078fd5320..c7307d5377 100644
28+
index f7558ff8b9..489dab8697 100644
2929
--- a/libavutil/pixdesc.c
3030
+++ b/libavutil/pixdesc.c
3131
@@ -224,6 +224,30 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
@@ -60,7 +60,7 @@ index e078fd5320..c7307d5377 100644
6060
.name = "rgb24",
6161
.nb_components = 3,
6262
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
63-
index 9d1fdaf82d..e989740c2e 100644
63+
index 86c9bdefeb..6d5f6d7fbc 100644
6464
--- a/libavutil/pixfmt.h
6565
+++ b/libavutil/pixfmt.h
6666
@@ -350,6 +350,9 @@ enum AVPixelFormat {
@@ -73,7 +73,7 @@ index 9d1fdaf82d..e989740c2e 100644
7373
AV_PIX_FMT_X2RGB10LE, ///< packed RGB 10:10:10, 30bpp, (msb)2X 10R 10G 10B(lsb), little-endian, X=unused/undefined
7474
AV_PIX_FMT_X2RGB10BE, ///< packed RGB 10:10:10, 30bpp, (msb)2X 10R 10G 10B(lsb), big-endian, X=unused/undefined
7575
AV_PIX_FMT_X2BGR10LE, ///< packed BGR 10:10:10, 30bpp, (msb)2X 10B 10G 10R(lsb), little-endian, X=unused/undefined
76-
@@ -458,6 +461,7 @@ enum AVPixelFormat {
76+
@@ -461,6 +464,7 @@ enum AVPixelFormat {
7777
#define AV_PIX_FMT_P016 AV_PIX_FMT_NE(P016BE, P016LE)
7878

7979
#define AV_PIX_FMT_Y210 AV_PIX_FMT_NE(Y210BE, Y210LE)
@@ -82,7 +82,7 @@ index 9d1fdaf82d..e989740c2e 100644
8282
#define AV_PIX_FMT_X2BGR10 AV_PIX_FMT_NE(X2BGR10BE, X2BGR10LE)
8383

8484
diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils
85-
index 4ec66febb8..99c0db7d5d 100644
85+
index 01c9877de5..31e3949d7e 100644
8686
--- a/tests/ref/fate/imgutils
8787
+++ b/tests/ref/fate/imgutils
8888
@@ -234,6 +234,8 @@ nv24 planes: 2, linesizes: 64 128 0 0, plane_sizes: 3072 6144
@@ -95,10 +95,10 @@ index 4ec66febb8..99c0db7d5d 100644
9595
x2rgb10be planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288
9696
x2bgr10le planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288
9797
diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query
98-
index bd0f1fcb82..5aa9d0ee9c 100644
98+
index f79d99e513..5a0114f17b 100644
9999
--- a/tests/ref/fate/sws-pixdesc-query
100100
+++ b/tests/ref/fate/sws-pixdesc-query
101-
@@ -73,6 +73,8 @@ isNBPS:
101+
@@ -75,6 +75,8 @@ isNBPS:
102102
xyz12le
103103
y210be
104104
y210le
@@ -107,15 +107,15 @@ index bd0f1fcb82..5aa9d0ee9c 100644
107107
yuv420p10be
108108
yuv420p10le
109109
yuv420p12be
110-
@@ -161,6 +163,7 @@ isBE:
110+
@@ -164,6 +166,7 @@ isBE:
111111
x2rgb10be
112112
xyz12be
113113
y210be
114114
+ y410be
115115
ya16be
116116
yuv420p10be
117117
yuv420p12be
118-
@@ -220,6 +223,8 @@ isYUV:
118+
@@ -223,6 +226,8 @@ isYUV:
119119
xyz12le
120120
y210be
121121
y210le
@@ -124,16 +124,16 @@ index bd0f1fcb82..5aa9d0ee9c 100644
124124
ya16be
125125
ya16le
126126
ya8
127-
@@ -656,6 +661,8 @@ ALPHA:
128-
rgba64be
129-
rgba64le
127+
@@ -665,6 +670,8 @@ ALPHA:
128+
rgbaf16be
129+
rgbaf16le
130130
vuya
131131
+ y410be
132132
+ y410le
133133
ya16be
134134
ya16le
135135
ya8
136-
@@ -750,6 +757,8 @@ Packed:
136+
@@ -761,6 +768,8 @@ Packed:
137137
xyz12le
138138
y210be
139139
y210le

patches/0054-hwcontext_d3d11va-add-mutiple-supported-DXGI-formats.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 294a0192dda9ed66901e10468c3043b3e6350d29 Mon Sep 17 00:00:00 2001
1+
From 13b2eea7c52fc37dc96952dd0f01255d40dc83ad Mon Sep 17 00:00:00 2001
22
From: Tong Wu <[email protected]>
33
Date: Tue, 12 Oct 2021 16:57:35 +0800
4-
Subject: [PATCH 49/73] hwcontext_d3d11va: add mutiple supported DXGI formats
4+
Subject: [PATCH 35/59] hwcontext_d3d11va: add mutiple supported DXGI formats
55

66
Add support for 0YUV, YUYV422, Y210, Y410, P012, Y212, Y412.
77

@@ -15,13 +15,13 @@ Signed-off-by: Tong Wu <[email protected]>
1515
1 file changed, 7 insertions(+)
1616

1717
diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c
18-
index 27c0c80413..c8e81a773a 100644
18+
index 363ec6a47d..758e9d13d4 100644
1919
--- a/libavutil/hwcontext_d3d11va.c
2020
+++ b/libavutil/hwcontext_d3d11va.c
21-
@@ -88,6 +88,13 @@ static const struct {
22-
{ DXGI_FORMAT_P010, AV_PIX_FMT_P010 },
21+
@@ -89,6 +89,13 @@ static const struct {
2322
{ DXGI_FORMAT_B8G8R8A8_UNORM, AV_PIX_FMT_BGRA },
2423
{ DXGI_FORMAT_R10G10B10A2_UNORM, AV_PIX_FMT_X2BGR10 },
24+
{ DXGI_FORMAT_R16G16B16A16_FLOAT, AV_PIX_FMT_RGBAF16 },
2525
+ { DXGI_FORMAT_AYUV, AV_PIX_FMT_VUYA },
2626
+ { DXGI_FORMAT_YUY2, AV_PIX_FMT_YUYV422 },
2727
+ { DXGI_FORMAT_Y210, AV_PIX_FMT_Y210 },

0 commit comments

Comments
 (0)