vlc | branch: master | Steve Lhomme <[email protected]> | Fri Feb 26 09:29:26 2016 +0100| [0f45db8dfd8597bfad0cbd9699a96e3f0281359a] | committer: Jean-Baptiste Kempf
contrib: update d3d11.idl to the latest master it doesn't need patching anymore Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0f45db8dfd8597bfad0cbd9699a96e3f0281359a --- contrib/src/d3d11/SHA512SUMS | 2 +- contrib/src/d3d11/id3d11videodecoder.patch | 79 ---------------------------- contrib/src/d3d11/rules.mak | 5 +- 3 files changed, 3 insertions(+), 83 deletions(-) diff --git a/contrib/src/d3d11/SHA512SUMS b/contrib/src/d3d11/SHA512SUMS index 3b8ca6a..af11020 100644 --- a/contrib/src/d3d11/SHA512SUMS +++ b/contrib/src/d3d11/SHA512SUMS @@ -1,2 +1,2 @@ -a65c289982ed1259ca02077c1a3df92cc003d06ab0f8f8fcb9c47920a4702ad21d734ee39120ed7e4a5a4d7d34b393120a7eedaba00ff9e6095d66fe94bdb31a d3d11.idl +0d97a004acd9d99d685aef6ae3c41b9951b41170d197173838ad2dbad4db309debcc2dd6ab2cfaa849ab9ca9841ae80232739b113b3e72c35ec8a481066acff5 d3d11.idl 04b208ddf9c91f923d262ae68a5fb0588a3ef1a39ea450eaac9031e021bd5efdc7b30e3fb3e589b07bc88e41f8861caeb56934a2fa6cbf2efb7404f5f3453b70 dxgidebug.idl diff --git a/contrib/src/d3d11/id3d11videodecoder.patch b/contrib/src/d3d11/id3d11videodecoder.patch deleted file mode 100644 index 1f193e9..0000000 --- a/contrib/src/d3d11/id3d11videodecoder.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/d3d11.idl b/d3d11.idl ---- a/d3d11.idl -+++ b/d3d11.idl -@@ -2125,6 +2125,72 @@ interface ID3D11Device : IUnknown - UINT GetExceptionMode(); - } - -+typedef enum D3D11_VIDEO_DECODER_BUFFER_TYPE -+{ -+ D3D11_VIDEO_DECODER_BUFFER_PICTURE_PARAMETERS = 0, -+ D3D11_VIDEO_DECODER_BUFFER_MACROBLOCK_CONTROL, -+ D3D11_VIDEO_DECODER_BUFFER_RESIDUAL_DIFFERENCE, -+ D3D11_VIDEO_DECODER_BUFFER_DEBLOCKING_CONTROL, -+ D3D11_VIDEO_DECODER_BUFFER_INVERSE_QUANTIZATION_MATRIX, -+ D3D11_VIDEO_DECODER_BUFFER_SLICE_CONTROL, -+ D3D11_VIDEO_DECODER_BUFFER_BITSTREAM, -+ D3D11_VIDEO_DECODER_BUFFER_MOTION_VECTOR, -+ D3D11_VIDEO_DECODER_BUFFER_FILM_GRAIN -+} D3D11_VIDEO_DECODER_BUFFER_TYPE; -+ -+typedef struct D3D11_ENCRYPTED_BLOCK_INFO -+{ -+ UINT NumEncryptedBytesAtBeginning; -+ UINT NumBytesInSkipPattern; -+ UINT NumBytesInEncryptPattern; -+} D3D11_ENCRYPTED_BLOCK_INFO; -+ -+typedef struct D3D11_VIDEO_DECODER_BUFFER_DESC -+{ -+ D3D11_VIDEO_DECODER_BUFFER_TYPE BufferType; -+ UINT BufferIndex; -+ UINT DataOffset; -+ UINT DataSize; -+ UINT FirstMBaddress; -+ UINT NumMBsInBuffer; -+ UINT Width; -+ UINT Height; -+ UINT Stride; -+ UINT ReservedBits; -+ void *pIV; -+ UINT IVSize; -+ BOOL PartialEncryption; -+ D3D11_ENCRYPTED_BLOCK_INFO EncryptedBlockInfo; -+} D3D11_VIDEO_DECODER_BUFFER_DESC; -+ -+[ -+ object, -+ local, -+ uuid(61f21c45-3c0e-4a74-9cea-67100d9ad5e4) -+] -+interface ID3D11VideoContext : ID3D11DeviceChild -+{ -+ HRESULT GetDecoderBuffer( -+ [in] ID3D11VideoDecoder *pDecoder, -+ [in] D3D11_VIDEO_DECODER_BUFFER_TYPE BufferType, -+ [out] UINT *pBufferSize, -+ [out] void **ppBuffer); -+ HRESULT ReleaseDecoderBuffer( -+ [in] ID3D11VideoDecoder *pDecoder, -+ [in] D3D11_VIDEO_DECODER_BUFFER_TYPE BufferType); -+ HRESULT DecoderBeginFrame( -+ [in] ID3D11VideoDecoder *pDecoder, -+ [in] ID3D11VideoDecoderOutputView *pVideoDecoderOutputView, -+ [in] UINT ContentKeySize, -+ [in] const void *pContentKey); -+ HRESULT DecoderEndFrame( -+ [in] ID3D11VideoDecoder *pDecoder); -+ HRESULT SubmitDecoderBuffers( -+ [in] ID3D11VideoDecoder *pDecoder, -+ [in] UINT NumBuffers, -+ [in] const D3D11_VIDEO_DECODER_BUFFER_DESC *pBufferDesc); -+} -+ - typedef enum D3D11_CREATE_DEVICE_FLAG { - D3D11_CREATE_DEVICE_SINGLETHREADED = 0x0001, - D3D11_CREATE_DEVICE_DEBUG = 0x0002, --- -1.9.5.msysgit.0 - diff --git a/contrib/src/d3d11/rules.mak b/contrib/src/d3d11/rules.mak index 4da11ea..5627013 100644 --- a/contrib/src/d3d11/rules.mak +++ b/contrib/src/d3d11/rules.mak @@ -7,7 +7,7 @@ else IDL_INC_PATH = /`echo $(MSYSTEM) | tr A-Z a-z`/$(BUILD)/include endif -COMMIT_ID := 477108e5706e73421634436c21cb76e1795b3609 +COMMIT_ID := a0cd5afeb60be3be0860e9a203314c10485bb9b8 D3D11_IDL_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/d3d11.idl?format=raw DST_D3D11_H = $(PREFIX)/include/d3d11.h DST_DXGIDEBUG_H = $(PREFIX)/include/dxgidebug.h @@ -19,14 +19,13 @@ endif $(TARBALLS)/d3d11.idl: $(call download,$(D3D11_IDL_URL)) - (cd $(TARBALLS) && patch -fp1) < $(SRC)/d3d11/id3d11videodecoder.patch $(TARBALLS)/dxgidebug.idl: (cd $(TARBALLS) && patch -fp1) < $(SRC)/d3d11/dxgidebug.patch .sum-d3d11: $(TARBALLS)/d3d11.idl $(TARBALLS)/dxgidebug.idl -$(DST_D3D11_H): $(TARBALLS)/d3d11.idl +$(DST_D3D11_H): $(TARBALLS)/d3d11.idl .sum-d3d11 mkdir -p -- "$(PREFIX)/include/" $(WIDL) -DBOOL=WINBOOL -I$(IDL_INC_PATH) -h -o $@ $< _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
