[vlc-commits] direct3d: fix some logs
Steve Lhomme
git at videolan.org
Tue Jun 13 14:59:55 CEST 2017
vlc | branch: master | Steve Lhomme <robux4 at videolabs.io> | Mon May 29 09:29:14 2017 +0200| [4d2a522cc5997233730b2a234608b13ee710af08] | committer: Jean-Baptiste Kempf
direct3d: fix some logs
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4d2a522cc5997233730b2a234608b13ee710af08
---
modules/codec/avcodec/d3d11va.c | 4 ++--
modules/codec/avcodec/directx_va.c | 4 ++--
modules/video_output/win32/d3d11_deinterlace.c | 2 +-
modules/video_output/win32/direct3d11.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c
index 1da216ae27..89cfd4dfb1 100644
--- a/modules/codec/avcodec/d3d11va.c
+++ b/modules/codec/avcodec/d3d11va.c
@@ -427,7 +427,7 @@ static int Open(vlc_va_t *va, AVCodecContext *ctx, enum PixelFormat pix_fmt,
ID3D11VideoContext *d3dvidctx = NULL;
HRESULT hr = ID3D11DeviceContext_QueryInterface(p_sys->context, &IID_ID3D11VideoContext, (void **)&d3dvidctx);
if (FAILED(hr)) {
- msg_Err(va, "Could not Query ID3D11VideoDevice Interface from the picture. (hr=0x%lX)", hr);
+ msg_Err(va, "Could not Query ID3D11VideoContext Interface from the picture. (hr=0x%lX)", hr);
} else {
ID3D11DeviceContext_GetDevice( p_sys->context, &dx_sys->d3ddev );
HANDLE context_lock = INVALID_HANDLE_VALUE;
@@ -527,7 +527,7 @@ static int D3dCreateDevice(vlc_va_t *va)
ID3D11VideoContext *d3dvidctx = NULL;
hr = ID3D11DeviceContext_QueryInterface(d3dctx, &IID_ID3D11VideoContext, (void **)&d3dvidctx);
if (FAILED(hr)) {
- msg_Err(va, "Could not Query ID3D11VideoDevice Interface. (hr=0x%lX)", hr);
+ msg_Err(va, "Could not Query ID3D11VideoContext Interface. (hr=0x%lX)", hr);
return VLC_EGENERIC;
}
va->sys->d3dvidctx = d3dvidctx;
diff --git a/modules/codec/avcodec/directx_va.c b/modules/codec/avcodec/directx_va.c
index 2a4c3e4868..41df52bcc5 100644
--- a/modules/codec/avcodec/directx_va.c
+++ b/modules/codec/avcodec/directx_va.c
@@ -477,12 +477,12 @@ int directx_va_Open(vlc_va_t *va, directx_sys_t *dx_sys,
msg_Dbg(va, "CreateDevice succeed");
if (dx_sys->pf_create_device_manager(va)) {
- msg_Err(va, "D3dCreateDeviceManager failed");
+ msg_Err(va, "CreateDeviceManager failed");
goto error;
}
if (dx_sys->pf_create_video_service(va)) {
- msg_Err(va, "DxCreateVideoService failed");
+ msg_Err(va, "CreateVideoService failed");
goto error;
}
diff --git a/modules/video_output/win32/d3d11_deinterlace.c b/modules/video_output/win32/d3d11_deinterlace.c
index 54173d8300..ef0abd34a2 100644
--- a/modules/video_output/win32/d3d11_deinterlace.c
+++ b/modules/video_output/win32/d3d11_deinterlace.c
@@ -162,7 +162,7 @@ static int Open(vlc_object_t *obj)
hr = ID3D11DeviceContext_QueryInterface(dst->p_sys->context, &IID_ID3D11VideoContext, (void **)&sys->d3dvidctx);
if (FAILED(hr)) {
- msg_Err(filter, "Could not Query ID3D11VideoDevice Interface from the picture. (hr=0x%lX)", hr);
+ msg_Err(filter, "Could not Query ID3D11VideoContext Interface from the picture. (hr=0x%lX)", hr);
goto error;
}
diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index e9fcb83dca..7b734170a0 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -849,7 +849,7 @@ error:
pool_cfg.picture_count = 0;
sys->sys.pool = picture_pool_NewExtended( &pool_cfg );
} else {
- msg_Dbg(vd, "ID3D11VideoDecoderOutputView succeed with %d surfaces (%dx%d) context 0x%p",
+ msg_Dbg(vd, "D3D11 pool succeed with %d surfaces (%dx%d) context 0x%p",
picture_count, surface_fmt.i_width, surface_fmt.i_height, sys->d3dcontext);
}
return sys->sys.pool;
More information about the vlc-commits
mailing list