Rebased against c3beca6c8fc8c07ecd992e64f8f8d0dda3a10ac8

2025-09-12 18:50:20 -07:00 · 2018-02-21 11:20:15 +11:00
parent 8b6ef3476f
commit a14e2990e5
42 changed files with 346 additions and 329 deletions
--- a/patches/dxva2-Video_Decoder/0006-dxva2-tests-Add-tests-for-dxva2-decoder.patch
+++ b/patches/dxva2-Video_Decoder/0006-dxva2-tests-Add-tests-for-dxva2-decoder.patch
@@ -1,7 +1,7 @@
-From 0fdcec4ed315b9633390d19258cff7bb209a5fb1 Mon Sep 17 00:00:00 2001
+From 6dff4fbc02c7281a02c26d6ef46df3db9a65b20f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 22 Feb 2015 01:21:18 +0100
-Subject: dxva2/tests: Add tests for dxva2 decoder.
+Subject: [PATCH] dxva2/tests: Add tests for dxva2 decoder.

 ---
 configure.ac                 |   1 +
@@ -12,20 +12,20 @@ Subject: dxva2/tests: Add tests for dxva2 decoder.
 create mode 100644 dlls/dxva2/tests/dxva2.c

 diff --git a/configure.ac b/configure.ac
-index faa7791ecb5..8dae7719327 100644
+index a36ae73..9163f71 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3120,6 +3120,7 @@ WINE_CONFIG_DLL(dxgi,,[implib])
+@@ -3209,6 +3209,7 @@ WINE_CONFIG_DLL(dxgi,,[implib])
 WINE_CONFIG_TEST(dlls/dxgi/tests)
 WINE_CONFIG_LIB(dxguid)
 WINE_CONFIG_DLL(dxva2)
 +WINE_CONFIG_TEST(dlls/dxva2/tests)
 WINE_CONFIG_DLL(esent)
- WINE_CONFIG_DLL(evr,,[clean])
+ WINE_CONFIG_DLL(evr)
 WINE_CONFIG_TEST(dlls/evr/tests)
 diff --git a/dlls/dxva2/tests/Makefile.in b/dlls/dxva2/tests/Makefile.in
 new file mode 100644
-index 00000000000..10d6af55667
+index 0000000..10d6af5
 --- /dev/null
 +++ b/dlls/dxva2/tests/Makefile.in
@@ -0,0 +1,5 @@
@@ -36,7 +36,7 @@ index 00000000000..10d6af55667
 +	dxva2.c
 diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c
 new file mode 100644
-index 00000000000..dcbb990ee5c
+index 0000000..dcbb990
 --- /dev/null
 +++ b/dlls/dxva2/tests/dxva2.c
@@ -0,0 +1,371 @@
@@ -412,5 +412,5 @@ index 00000000000..dcbb990ee5c
 +    test_decoder_service(window);
 +}
 -- 
-2.14.1
+1.9.1

--- a/patches/dxva2-Video_Decoder/0007-dxva2-Initial-implementation-of-MPEG2-decoder-using-.patch
+++ b/patches/dxva2-Video_Decoder/0007-dxva2-Initial-implementation-of-MPEG2-decoder-using-.patch
@@ -1,7 +1,8 @@
-From 1bef4fd44c776f823f87c1b1014d452888c1e8ea Mon Sep 17 00:00:00 2001
+From 94dc68ec5e72106364d20829ab1ab11e98fa7320 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 22 Feb 2015 01:25:20 +0100
-Subject: dxva2: Initial implementation of MPEG2 decoder using vaapi backend.
+Subject: [PATCH] dxva2: Initial implementation of MPEG2 decoder using vaapi
+ backend.

 ---
 configure.ac                |  18 +-
@@ -21,10 +22,10 @@ Subject: dxva2: Initial implementation of MPEG2 decoder using vaapi backend.
 create mode 100644 dlls/dxva2/vaapi.c

 diff --git a/configure.ac b/configure.ac
-index 8dae7719327..9ab6cfafb1d 100644
+index 9163f71..9d5929d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -103,6 +103,8 @@ AC_ARG_WITH(xxf86vm,   AS_HELP_STRING([--without-xxf86vm],[do not use XFree vide
+@@ -106,6 +106,8 @@ AC_ARG_WITH(xxf86vm,   AS_HELP_STRING([--without-xxf86vm],[do not use XFree vide
             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi])
 AC_ARG_WITH(zlib,      AS_HELP_STRING([--without-zlib],[do not use Zlib (data compression)]),
             [if test "x$withval" = "xno"; then ac_cv_header_zlib_h=no; fi])
@@ -33,7 +34,7 @@ index 8dae7719327..9ab6cfafb1d 100644
 
 AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR]))
 AC_ARG_WITH(wine64,    AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build]))
-@@ -1186,6 +1188,20 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
+@@ -1209,6 +1211,20 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
     WINE_WARNING_WITH(opengl,[test -n "$opengl_msg"],[$opengl_msg
 OpenGL and Direct3D won't be supported.])
 
@@ -54,7 +55,7 @@ index 8dae7719327..9ab6cfafb1d 100644
     CPPFLAGS="$ac_save_CPPFLAGS"
 else
     X_CFLAGS=""
-@@ -3119,7 +3135,7 @@ WINE_CONFIG_LIB(dxerr9)
+@@ -3208,7 +3224,7 @@ WINE_CONFIG_LIB(dxerr9)
 WINE_CONFIG_DLL(dxgi,,[implib])
 WINE_CONFIG_TEST(dlls/dxgi/tests)
 WINE_CONFIG_LIB(dxguid)
@@ -62,9 +63,9 @@ index 8dae7719327..9ab6cfafb1d 100644
 +WINE_CONFIG_DLL(dxva2,,[clean])
 WINE_CONFIG_TEST(dlls/dxva2/tests)
 WINE_CONFIG_DLL(esent)
- WINE_CONFIG_DLL(evr,,[clean])
+ WINE_CONFIG_DLL(evr)
 diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in
-index d484cb14bf2..68a7e3c8c0a 100644
+index d484cb1..68a7e3c 100644
 --- a/dlls/dxva2/Makefile.in
 +++ b/dlls/dxva2/Makefile.in
@@ -1,8 +1,14 @@
@@ -87,7 +88,7 @@ index d484cb14bf2..68a7e3c8c0a 100644
 +	videoservices.c
 diff --git a/dlls/dxva2/backend.idl b/dlls/dxva2/backend.idl
 new file mode 100644
-index 00000000000..8d488351ff2
+index 0000000..8d48835
 --- /dev/null
 +++ b/dlls/dxva2/backend.idl
@@ -0,0 +1,96 @@
@@ -188,7 +189,7 @@ index 00000000000..8d488351ff2
 +        [out] IWineVideoDecoder **decoder);
 +}
 diff --git a/dlls/dxva2/dxva2_private.h b/dlls/dxva2/dxva2_private.h
-index f0068b68891..f51863739b0 100644
+index f0068b6..f518637 100644
 --- a/dlls/dxva2/dxva2_private.h
 +++ b/dlls/dxva2/dxva2_private.h
@@ -1,5 +1,5 @@
@@ -323,7 +324,7 @@ index f0068b68891..f51863739b0 100644
 +#endif /* HAVE_VAAPI */
 diff --git a/dlls/dxva2/genericdecoder.c b/dlls/dxva2/genericdecoder.c
 new file mode 100644
-index 00000000000..3903d6b0b46
+index 0000000..3903d6b
 --- /dev/null
 +++ b/dlls/dxva2/genericdecoder.c
@@ -0,0 +1,432 @@
@@ -760,7 +761,7 @@ index 00000000000..3903d6b0b46
 +    return S_OK;
 +}
 diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c
-index 0382b5fb00a..3006f175b7f 100644
+index 0382b5f..3006f17 100644
 --- a/dlls/dxva2/main.c
 +++ b/dlls/dxva2/main.c
@@ -32,6 +32,8 @@
@@ -854,7 +855,7 @@ index 0382b5fb00a..3006f175b7f 100644
 
     return TRUE;
 diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c
-index dcbb990ee5c..c28be4d8e3c 100644
+index dcbb990..c28be4d 100644
 --- a/dlls/dxva2/tests/dxva2.c
 +++ b/dlls/dxva2/tests/dxva2.c
@@ -1,7 +1,7 @@
@@ -935,7 +936,7 @@ index dcbb990ee5c..c28be4d8e3c 100644
     IDirectXVideoDecoderService_Release(service);
 diff --git a/dlls/dxva2/vaapi-mpeg2.c b/dlls/dxva2/vaapi-mpeg2.c
 new file mode 100644
-index 00000000000..7b7f61db755
+index 0000000..7b7f61d
 --- /dev/null
 +++ b/dlls/dxva2/vaapi-mpeg2.c
@@ -0,0 +1,753 @@
@@ -1694,7 +1695,7 @@ index 00000000000..7b7f61db755
 +#endif /* HAVE_VAAPI */
 diff --git a/dlls/dxva2/vaapi.c b/dlls/dxva2/vaapi.c
 new file mode 100644
-index 00000000000..80e63bf38d9
+index 0000000..80e63bf
 --- /dev/null
 +++ b/dlls/dxva2/vaapi.c
@@ -0,0 +1,767 @@
@@ -2466,7 +2467,7 @@ index 00000000000..80e63bf38d9
 +
 +#endif /* HAVE_VAAPI */
 diff --git a/dlls/dxva2/videoservices.c b/dlls/dxva2/videoservices.c
-index 46e431a7f29..84222dce558 100644
+index 46e431a..84222dc 100644
 --- a/dlls/dxva2/videoservices.c
 +++ b/dlls/dxva2/videoservices.c
@@ -1,5 +1,5 @@
@@ -2643,5 +2644,5 @@ index 46e431a7f29..84222dce558 100644
         return E_NOINTERFACE;
     }
 -- 
-2.14.1
+1.9.1