vlc | branch: master | Steve Lhomme <[email protected]> | Mon Apr 10 16:07:25 2017 +0200| [0bc587ab75c8df943e16da5606ac6c064c1e89f3] | committer: Jean-Baptiste Kempf
d3d11_fmt: rename inputView to processorInput Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0bc587ab75c8df943e16da5606ac6c064c1e89f3 --- modules/codec/avcodec/d3d11va.c | 8 ++++---- modules/video_chroma/d3d11_fmt.h | 2 +- modules/video_output/win32/direct3d11.c | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c index 9a10c92daa..94f5bc68d2 100644 --- a/modules/codec/avcodec/d3d11va.c +++ b/modules/codec/avcodec/d3d11va.c @@ -284,7 +284,7 @@ static int Extract(vlc_va_t *va, picture_t *output, uint8_t *data) D3D11_VIDEO_PROCESSOR_STREAM stream = { .Enable = TRUE, - .pInputSurface = p_sys_in->inputView, + .pInputSurface = p_sys_in->processorInput, }; HRESULT hr = ID3D11VideoContext_VideoProcessorBlt(sys->d3dvidctx, sys->videoProcessor, @@ -1209,8 +1209,8 @@ static void DestroyPicture(picture_t *picture) { picture_sys_t *p_sys = picture->p_sys; ID3D11Texture2D_Release( p_sys->texture[KNOWN_DXGI_INDEX] ); - if (p_sys->inputView) - ID3D11View_Release( (ID3D11View*) p_sys->inputView ); + if (p_sys->processorInput) + ID3D11VideoProcessorInputView_Release( p_sys->processorInput ); free(p_sys); free(picture); @@ -1245,7 +1245,7 @@ static picture_t *DxAllocPicture(vlc_va_t *va, const video_format_t *fmt, unsign pic_sys->resource[KNOWN_DXGI_INDEX], sys->procEnumerator, &inDesc, - &pic_sys->inputView); + &pic_sys->processorInput); if (FAILED(hr)) { msg_Err(va, "Failed to create the processor input ArraySlice=%d. (hr=0x%lX)", inDesc.Texture2D.ArraySlice, hr); diff --git a/modules/video_chroma/d3d11_fmt.h b/modules/video_chroma/d3d11_fmt.h index 904c465f07..3bf004a119 100644 --- a/modules/video_chroma/d3d11_fmt.h +++ b/modules/video_chroma/d3d11_fmt.h @@ -39,7 +39,7 @@ struct picture_sys_t }; ID3D11DeviceContext *context; unsigned slice_index; - ID3D11VideoProcessorInputView *inputView; /* when used as processor input */ + ID3D11VideoProcessorInputView *processorInput; /* when used as processor input */ ID3D11ShaderResourceView *resourceView[D3D11_MAX_SHADER_VIEW]; DXGI_FORMAT formatTexture; }; diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c index 021bc29494..cf51985ec7 100644 --- a/modules/video_output/win32/direct3d11.c +++ b/modules/video_output/win32/direct3d11.c @@ -902,6 +902,10 @@ static void ReleasePictureResources(picture_sys_t *p_sys) ID3D11VideoDecoderOutputView_Release(p_sys->decoder); p_sys->decoder = NULL; } + if (p_sys->processorInput) { + ID3D11VideoProcessorInputView_Release(p_sys->processorInput); + p_sys->processorInput = NULL; + } } static void DestroyDisplayPoolPicture(picture_t *picture) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
