vlc/vlc-2.2 | branch: master | Petri Hintukainen <phint...@gmail.com> | Mon Oct 5 11:58:59 2015 +0300| [dc8baddd4470c7915ee7f83f4b71de086cfc51f9] | committer: Jean-Baptiste Kempf
contrib: update d3d11.idl checksum and patch Maybe it would be better to download specific revision instead of HEAD (?). Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> (cherry picked from commit 9c039ddb541709ac2dc9ac3ac35fc72e0299f21e) Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=dc8baddd4470c7915ee7f83f4b71de086cfc51f9 --- contrib/src/d3d11/SHA512SUMS | 2 +- contrib/src/d3d11/id3d11videodecoder.patch | 144 +--------------------------- 2 files changed, 2 insertions(+), 144 deletions(-) diff --git a/contrib/src/d3d11/SHA512SUMS b/contrib/src/d3d11/SHA512SUMS index 20e4d85..7706843 100644 --- a/contrib/src/d3d11/SHA512SUMS +++ b/contrib/src/d3d11/SHA512SUMS @@ -1,2 +1,2 @@ -257664deade110fb0ad00d4c408b320768d9c470892bfe2b4f756a23fb828b6bd7b28dd670ff5f90edcf7b5eed56a6cc10af030f5d69f4be19ea7e376d1b6e1a d3d11.idl +6b6b845d9a75e4f66cf1225b28c75f8eed93931e94c182c7211e2747c70fbc97eab551dded77327ac0c0b48b037e630cc96d796be5f341a7e3bd9e7fcc30bf96 d3d11.idl 04b208ddf9c91f923d262ae68a5fb0588a3ef1a39ea450eaac9031e021bd5efdc7b30e3fb3e589b07bc88e41f8861caeb56934a2fa6cbf2efb7404f5f3453b70 dxgidebug.idl diff --git a/contrib/src/d3d11/id3d11videodecoder.patch b/contrib/src/d3d11/id3d11videodecoder.patch index 27f29c8..1f193e9 100644 --- a/contrib/src/d3d11/id3d11videodecoder.patch +++ b/contrib/src/d3d11/id3d11videodecoder.patch @@ -1,52 +1,10 @@ diff --git a/d3d11.idl b/d3d11.idl --- a/d3d11.idl +++ b/d3d11.idl -@@ -2125,6 +2125,214 @@ interface ID3D11Device : IUnknown +@@ -2125,6 +2125,72 @@ interface ID3D11Device : IUnknown UINT GetExceptionMode(); } -+typedef enum D3D11_VDOV_DIMENSION -+{ -+ D3D11_VDOV_DIMENSION_UNKNOWN = 0, -+ D3D11_VDOV_DIMENSION_TEXTURE2D -+} D3D11_VDOV_DIMENSION; -+ -+typedef struct D3D11_TEX2D_VDOV -+{ -+ UINT ArraySlice; -+} D3D11_TEX2D_VDOV; -+ -+typedef struct D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC -+{ -+ GUID DecodeProfile; -+ D3D11_VDOV_DIMENSION ViewDimension; -+ -+ union -+ { -+ D3D11_TEX2D_VDOV Texture2D; -+ }; -+} D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC; -+ -+[ -+ object, -+ local, -+ uuid(c2931aea-2a85-4f20-860f-fba1fd256e18) -+] -+interface ID3D11VideoDecoderOutputView : ID3D11View -+{ -+ void GetDesc( -+ [out] D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC *pDesc ); -+} -+ -+[ -+ object, -+ local, -+ uuid(3c9c5b51-995d-48d1-9b8d-fa5caeded65c) -+] -+interface ID3D11VideoDecoder : ID3D11DeviceChild -+{ -+} -+ +typedef enum D3D11_VIDEO_DECODER_BUFFER_TYPE +{ + D3D11_VIDEO_DECODER_BUFFER_PICTURE_PARAMETERS = 0, @@ -113,106 +71,6 @@ diff --git a/d3d11.idl b/d3d11.idl + [in] const D3D11_VIDEO_DECODER_BUFFER_DESC *pBufferDesc); +} + -+typedef struct D3D11_VIDEO_DECODER_DESC -+{ -+ GUID Guid; -+ UINT SampleWidth; -+ UINT SampleHeight; -+ DXGI_FORMAT OutputFormat; -+} D3D11_VIDEO_DECODER_DESC; -+ -+typedef struct D3D11_VIDEO_DECODER_CONFIG -+{ -+ GUID guidConfigBitstreamEncryption; -+ GUID guidConfigMBcontrolEncryption; -+ GUID guidConfigResidDiffEncryption; -+ UINT ConfigBitstreamRaw; -+ UINT ConfigMBcontrolRasterOrder; -+ UINT ConfigResidDiffHost; -+ UINT ConfigSpatialResid8; -+ UINT ConfigResid8Subtraction; -+ UINT ConfigSpatialHost8or9Clipping; -+ UINT ConfigSpatialResidInterleaved; -+ UINT ConfigIntraResidUnsigned; -+ UINT ConfigResidDiffAccelerator; -+ UINT ConfigHostInverseScan; -+ UINT ConfigSpecificIDCT; -+ UINT Config4GroupedCoefs; -+ USHORT ConfigMinRenderTargetBuffCount; -+ USHORT ConfigDecoderSpecific; -+} D3D11_VIDEO_DECODER_CONFIG; -+ -+typedef enum D3D11_AUTHENTICATED_CHANNEL_TYPE -+{ -+ D3D11_AUTHENTICATED_CHANNEL_D3D11 = 1, -+ D3D11_AUTHENTICATED_CHANNEL_DRIVER_SOFTWARE, -+ D3D11_AUTHENTICATED_CHANNEL_DRIVER_HARDWARE -+} D3D11_AUTHENTICATED_CHANNEL_TYPE; -+ -+interface ID3D11VideoProcessorEnumerator; -+interface ID3D11VideoProcessor; -+interface ID3D11VideoProcessorInputView; -+interface ID3D11VideoProcessorOutputView; -+interface ID3D11AuthenticatedChannel; -+interface ID3D11CryptoSession; -+ -+[ -+ object, -+ local, -+ uuid(10ec4d5b-975a-4689-b9e4-d0aac30fe333) -+] -+interface ID3D11VideoDevice : IUnknown -+{ -+ HRESULT CreateVideoDecoder( -+ [in] const D3D11_VIDEO_DECODER_DESC *pVideoDesc, -+ [in] const D3D11_VIDEO_DECODER_CONFIG *pConfig, -+ [out] ID3D11VideoDecoder **ppVideoDecoder); -+ HRESULT CreateVideoProcessor( -+ [in] ID3D11VideoProcessorEnumerator *ppProcEnumerator, -+ [in] UINT RateConversionIndex, -+ [out] ID3D11VideoProcessor **ppVideoProcessor); -+ HRESULT CreateAuthenticatedChannel( -+ [in] D3D11_AUTHENTICATED_CHANNEL_TYPE ChannelType, -+ [out] ID3D11AuthenticatedChannel **ppAuthenticatedChannel); -+ HRESULT CreateCryptoSession( -+ [in] const GUID *pCryptoType, -+ [in] const GUID *pDecoderProfile, -+ [in] const GUID *pKeyExchangeType, -+ [out] ID3D11CryptoSession **ppCryptoSession); -+ HRESULT CreateVideoDecoderOutputView( -+ [in] ID3D11Resource *pResource, -+ [in] const D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC *pDesc, -+ [out] ID3D11VideoDecoderOutputView **ppVideoDecoderOutputView); -+ HRESULT CreateVideoProcessorInputView( -+ [in] ID3D11Resource *pResource, -+ [in] ID3D11VideoProcessorEnumerator *ppProcEnumerator, -+ [in] const void *pInputDesc, /*D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC */ -+ [out] ID3D11VideoProcessorInputView **ppVideoProcInputView); -+ HRESULT CreateVideoProcessorOutputView( -+ [in] ID3D11Resource *pResource, -+ [in] ID3D11VideoProcessorEnumerator *pEnumerator, -+ [in] const void *pOutputDesc, /*D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC */ -+ [out] ID3D11VideoProcessorOutputView **ppVideoProcOutputView); -+ HRESULT CreateVideoProcessorEnumerator( -+ [in] const void *pContentDesc, /*D3D11_VIDEO_PROCESSOR_CONTENT_DESC */ -+ [out] ID3D11VideoProcessorEnumerator **ppProcEnumerator); -+ UINT GetVideoDecoderProfileCount(void); -+ HRESULT GetVideoDecoderProfile( -+ [in] UINT DecoderIndex, -+ [out] GUID *pDecoderProfile); -+ HRESULT CheckVideoDecoderFormat( -+ [in] const GUID *pDecoderProfile, -+ [in] DXGI_FORMAT Format, -+ [out] BOOL *pSupported); -+ HRESULT GetVideoDecoderConfigCount( -+ [in] const D3D11_VIDEO_DECODER_DESC *pDesc, -+ [out] UINT *pCount); -+ HRESULT GetVideoDecoderConfig( -+ [in] const D3D11_VIDEO_DECODER_DESC *pDesc, -+ [in] UINT DecoderIndex, -+ [out] D3D11_VIDEO_DECODER_CONFIG *pConfig); -+} -+ typedef enum D3D11_CREATE_DEVICE_FLAG { D3D11_CREATE_DEVICE_SINGLETHREADED = 0x0001, D3D11_CREATE_DEVICE_DEBUG = 0x0002, _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits