Skip to content

Commit

Permalink
Update submodule and patchset
Browse files Browse the repository at this point in the history 
Update 0014 and 0054

Submodule ffmpeg f6a36c7cf90..c469c3c3b18

Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
  • Loading branch information
@xhaihao @Bin-CI
xhaihao authored and Bin-CI committed Aug 15, 2022
1 parent 53a3f44 commit 29f5d35
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion ffmpeg
Submodule ffmpeg updated 25 files
+32 −0 compat/windows/mswindres
+4 −2 configure
+3 −0 fftools/Makefile
+127 −146 fftools/ffmpeg.c
+10 −0 fftools/ffmpeg.h
+57 −0 fftools/ffmpeg_demux.c
+13 −5 fftools/ffmpeg_mux.c
+9 −0 fftools/fftools.manifest
+2 −0 fftools/fftoolsres.rc
+1 −1 libavcodec/Makefile
+1 −1 libavdevice/Makefile
+1 −1 libavfilter/Makefile
+1 −1 libavfilter/version.h
+22 −3 libavfilter/vsrc_ddagrab.c
+1 −1 libavformat/Makefile
+1 −1 libavutil/Makefile
+1 −0 libavutil/hwcontext_d3d11va.c
+28 −0 libavutil/pixdesc.c
+5 −0 libavutil/pixfmt.h
+1 −1 libavutil/version.h
+1 −1 libpostproc/Makefile
+1 −1 libswresample/Makefile
+1 −1 libswscale/Makefile
+2 −0 tests/ref/fate/imgutils
+13 −0 tests/ref/fate/sws-pixdesc-query
28 changes: 14 additions & 14 deletions patches/0014-lavu-pixfmt-add-new-pixel-format-0yuv-y410.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 6b54db2a24c388c991cc6c0e9e594c4cd0155b06 Mon Sep 17 00:00:00 2001
From 926b87f71fa9fda2da843fb10976decdc1189e6b Mon Sep 17 00:00:00 2001
From: Linjie Fu <linjie.fu@intel.com>
Date: Mon, 15 Jun 2020 10:58:19 +0800
Subject: [PATCH 14/73] lavu/pixfmt: add new pixel format 0yuv/y410
Subject: [PATCH 01/59] lavu/pixfmt: add new pixel format 0yuv/y410

Previously, media driver provided planar format(like 420 8 bit),
but for HEVC Range Extension (444 8/10 bit), the decoded image
Expand All @@ -25,7 +25,7 @@ Signed-off-by: Linjie Fu <linjie.fu@intel.com>
4 files changed, 39 insertions(+)

diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index e078fd5320..c7307d5377 100644
index f7558ff8b9..489dab8697 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -224,6 +224,30 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
Expand Down Expand Up @@ -60,7 +60,7 @@ index e078fd5320..c7307d5377 100644
.name = "rgb24",
.nb_components = 3,
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 9d1fdaf82d..e989740c2e 100644
index 86c9bdefeb..6d5f6d7fbc 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -350,6 +350,9 @@ enum AVPixelFormat {
Expand All @@ -73,7 +73,7 @@ index 9d1fdaf82d..e989740c2e 100644
AV_PIX_FMT_X2RGB10LE, ///< packed RGB 10:10:10, 30bpp, (msb)2X 10R 10G 10B(lsb), little-endian, X=unused/undefined
AV_PIX_FMT_X2RGB10BE, ///< packed RGB 10:10:10, 30bpp, (msb)2X 10R 10G 10B(lsb), big-endian, X=unused/undefined
AV_PIX_FMT_X2BGR10LE, ///< packed BGR 10:10:10, 30bpp, (msb)2X 10B 10G 10R(lsb), little-endian, X=unused/undefined
@@ -458,6 +461,7 @@ enum AVPixelFormat {
@@ -461,6 +464,7 @@ enum AVPixelFormat {
#define AV_PIX_FMT_P016 AV_PIX_FMT_NE(P016BE, P016LE)

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

diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils
index 4ec66febb8..99c0db7d5d 100644
index 01c9877de5..31e3949d7e 100644
--- a/tests/ref/fate/imgutils
+++ b/tests/ref/fate/imgutils
@@ -234,6 +234,8 @@ nv24 planes: 2, linesizes: 64 128 0 0, plane_sizes: 3072 6144
Expand All @@ -95,10 +95,10 @@ index 4ec66febb8..99c0db7d5d 100644
x2rgb10be planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288
x2bgr10le planes: 1, linesizes: 256 0 0 0, plane_sizes: 12288 0 0 0, plane_offsets: 0 0 0, total_size: 12288
diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query
index bd0f1fcb82..5aa9d0ee9c 100644
index f79d99e513..5a0114f17b 100644
--- a/tests/ref/fate/sws-pixdesc-query
+++ b/tests/ref/fate/sws-pixdesc-query
@@ -73,6 +73,8 @@ isNBPS:
@@ -75,6 +75,8 @@ isNBPS:
xyz12le
y210be
y210le
Expand All @@ -107,15 +107,15 @@ index bd0f1fcb82..5aa9d0ee9c 100644
yuv420p10be
yuv420p10le
yuv420p12be
@@ -161,6 +163,7 @@ isBE:
@@ -164,6 +166,7 @@ isBE:
x2rgb10be
xyz12be
y210be
+ y410be
ya16be
yuv420p10be
yuv420p12be
@@ -220,6 +223,8 @@ isYUV:
@@ -223,6 +226,8 @@ isYUV:
xyz12le
y210be
y210le
Expand All @@ -124,16 +124,16 @@ index bd0f1fcb82..5aa9d0ee9c 100644
ya16be
ya16le
ya8
@@ -656,6 +661,8 @@ ALPHA:
rgba64be
rgba64le
@@ -665,6 +670,8 @@ ALPHA:
rgbaf16be
rgbaf16le
vuya
+ y410be
+ y410le
ya16be
ya16le
ya8
@@ -750,6 +757,8 @@ Packed:
@@ -761,6 +768,8 @@ Packed:
xyz12le
y210be
y210le
Expand Down
10 changes: 5 additions & 5 deletions patches/0054-hwcontext_d3d11va-add-mutiple-supported-DXGI-formats.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 294a0192dda9ed66901e10468c3043b3e6350d29 Mon Sep 17 00:00:00 2001
From 13b2eea7c52fc37dc96952dd0f01255d40dc83ad Mon Sep 17 00:00:00 2001
From: Tong Wu <tong1.wu@intel.com>
Date: Tue, 12 Oct 2021 16:57:35 +0800
Subject: [PATCH 49/73] hwcontext_d3d11va: add mutiple supported DXGI formats
Subject: [PATCH 35/59] hwcontext_d3d11va: add mutiple supported DXGI formats

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

Expand All @@ -15,13 +15,13 @@ Signed-off-by: Tong Wu <tong1.wu@intel.com>
1 file changed, 7 insertions(+)

diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c
index 27c0c80413..c8e81a773a 100644
index 363ec6a47d..758e9d13d4 100644
--- a/libavutil/hwcontext_d3d11va.c
+++ b/libavutil/hwcontext_d3d11va.c
@@ -88,6 +88,13 @@ static const struct {
{ DXGI_FORMAT_P010, AV_PIX_FMT_P010 },
@@ -89,6 +89,13 @@ static const struct {
{ DXGI_FORMAT_B8G8R8A8_UNORM, AV_PIX_FMT_BGRA },
{ DXGI_FORMAT_R10G10B10A2_UNORM, AV_PIX_FMT_X2BGR10 },
{ DXGI_FORMAT_R16G16B16A16_FLOAT, AV_PIX_FMT_RGBAF16 },
+ { DXGI_FORMAT_AYUV, AV_PIX_FMT_VUYA },
+ { DXGI_FORMAT_YUY2, AV_PIX_FMT_YUYV422 },
+ { DXGI_FORMAT_Y210, AV_PIX_FMT_Y210 },
Expand Down

0 comments on commit 29f5d35

Please sign in to comment.