Commit 467604c6 authored by Biswapriyo Nath's avatar Biswapriyo Nath Committed by Alexandre Julliard

include: Fix IDirectXVideoDecoderService declaration in dxva2api.idl.

This matches the declaration with official documentation and fixes the following two compiler errors in apitrace project. d3d9trace.cpp:28469:59: error: invalid conversion from 'const DXVA2_ConfigPictureDecode*' to 'DXVA2_ConfigPictureDecode*' [-fpermissive] d3d9trace.cpp:28194:65: error: invalid conversion from 'void*' to 'IUnknown*' [-fpermissive] Signed-off-by: 's avatarBiswapriyo Nath <nathbappai@gmail.com>
parent 84f1f366
...@@ -701,7 +701,7 @@ static HRESULT WINAPI device_manager_decoder_service_GetDecoderRenderTargets(IDi ...@@ -701,7 +701,7 @@ static HRESULT WINAPI device_manager_decoder_service_GetDecoderRenderTargets(IDi
} }
static HRESULT WINAPI device_manager_decoder_service_GetDecoderConfigurations(IDirectXVideoDecoderService *iface, static HRESULT WINAPI device_manager_decoder_service_GetDecoderConfigurations(IDirectXVideoDecoderService *iface,
REFGUID guid, const DXVA2_VideoDesc *video_desc, IUnknown *reserved, UINT *count, DXVA2_ConfigPictureDecode **configs) REFGUID guid, const DXVA2_VideoDesc *video_desc, void *reserved, UINT *count, DXVA2_ConfigPictureDecode **configs)
{ {
FIXME("%p, %s, %p, %p, %p, %p.\n", iface, debugstr_guid(guid), video_desc, reserved, count, configs); FIXME("%p, %s, %p, %p, %p, %p.\n", iface, debugstr_guid(guid), video_desc, reserved, count, configs);
...@@ -709,7 +709,7 @@ static HRESULT WINAPI device_manager_decoder_service_GetDecoderConfigurations(ID ...@@ -709,7 +709,7 @@ static HRESULT WINAPI device_manager_decoder_service_GetDecoderConfigurations(ID
} }
static HRESULT WINAPI device_manager_decoder_service_CreateVideoDecoder(IDirectXVideoDecoderService *iface, static HRESULT WINAPI device_manager_decoder_service_CreateVideoDecoder(IDirectXVideoDecoderService *iface,
REFGUID guid, const DXVA2_VideoDesc *video_desc, DXVA2_ConfigPictureDecode *config, IDirect3DSurface9 **rts, REFGUID guid, const DXVA2_VideoDesc *video_desc, const DXVA2_ConfigPictureDecode *config, IDirect3DSurface9 **rts,
UINT num_surfaces, IDirectXVideoDecoder **decoder) UINT num_surfaces, IDirectXVideoDecoder **decoder)
{ {
FIXME("%p, %s, %p, %p, %p, %u, %p.\n", iface, debugstr_guid(guid), video_desc, config, rts, num_surfaces, FIXME("%p, %s, %p, %p, %p, %u, %p.\n", iface, debugstr_guid(guid), video_desc, config, rts, num_surfaces,
......
...@@ -631,14 +631,14 @@ interface IDirectXVideoDecoderService : IDirectXVideoAccelerationService ...@@ -631,14 +631,14 @@ interface IDirectXVideoDecoderService : IDirectXVideoAccelerationService
HRESULT GetDecoderConfigurations( HRESULT GetDecoderConfigurations(
[in] REFGUID guid, [in] REFGUID guid,
[in] const DXVA2_VideoDesc *pVideoDesc, [in] const DXVA2_VideoDesc *pVideoDesc,
[in] IUnknown *pReserved, [in] void *pReserved,
[out] UINT *pCount, [out] UINT *pCount,
[out] DXVA2_ConfigPictureDecode **ppConfigs); [out] DXVA2_ConfigPictureDecode **ppConfigs);
HRESULT CreateVideoDecoder( HRESULT CreateVideoDecoder(
[in] REFGUID guid, [in] REFGUID guid,
[in] const DXVA2_VideoDesc *pVideoDesc, [in] const DXVA2_VideoDesc *pVideoDesc,
[in] DXVA2_ConfigPictureDecode *pConfig, [in] const DXVA2_ConfigPictureDecode *pConfig,
[in] IDirect3DSurface9 **ppDecoderRenderTargets, [in] IDirect3DSurface9 **ppDecoderRenderTargets,
[in] UINT NumSurfaces, [in] UINT NumSurfaces,
[out] IDirectXVideoDecoder **ppDecode); [out] IDirectXVideoDecoder **ppDecode);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment