vlc | branch: master | Steve Lhomme <[email protected]> | Mon May 29 16:34:57 2017 +0200| [a09f2b121692fb6a414528fdf74ac7fc7f2fc3f6] | committer: Jean-Baptiste Kempf
d3d11va: the decoder sets the surface in the picture->context, not picture_sys_t Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a09f2b121692fb6a414528fdf74ac7fc7f2fc3f6 --- modules/codec/avcodec/d3d11va.c | 218 ++++++++++++++++--------- modules/video_chroma/d3d11_fmt.h | 11 +- modules/video_chroma/d3d11_surface.c | 4 +- modules/video_output/win32/d3d11_deinterlace.c | 19 ++- modules/video_output/win32/direct3d11.c | 40 ++++- 5 files changed, 200 insertions(+), 92 deletions(-) diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c index fa64c9dd63..c1d060ad88 100644 --- a/modules/codec/avcodec/d3d11va.c +++ b/modules/codec/avcodec/d3d11va.c @@ -132,6 +132,8 @@ struct vlc_va_sys_t /* avcodec internals */ struct AVD3D11VAContext hw; + + ID3D11ShaderResourceView *resourceView[MAX_SURFACE_COUNT * D3D11_MAX_SHADER_VIEW]; }; /* */ @@ -174,44 +176,11 @@ void SetupAVCodecContext(vlc_va_t *va) static int Extract(vlc_va_t *va, picture_t *output, uint8_t *data) { - picture_sys_t *p_sys_out = output->p_sys; - assert(p_sys_out->texture[KNOWN_DXGI_INDEX] != NULL); - -#if D3D11_DIRECT_DECODE VLC_UNUSED(va); VLC_UNUSED(data); -#else - { - vlc_va_sys_t *sys = va->sys; - ID3D11VideoDecoderOutputView *src = (ID3D11VideoDecoderOutputView*)(uintptr_t)data; - ID3D11Resource *p_texture; - ID3D11VideoDecoderOutputView_GetResource(src, &p_texture); - - if( sys->context_mutex != INVALID_HANDLE_VALUE ) { - WaitForSingleObjectEx( sys->context_mutex, INFINITE, FALSE ); - } - - D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC viewDesc; - ID3D11VideoDecoderOutputView_GetDesc( src, &viewDesc ); - - D3D11_TEXTURE2D_DESC dstDesc; - ID3D11Texture2D_GetDesc( p_sys_out->texture[KNOWN_DXGI_INDEX], &dstDesc); - - /* copy decoder slice to surface */ - D3D11_BOX copyBox = { - .right = dstDesc.Width, .bottom = dstDesc.Height, .back = 1, - }; - ID3D11DeviceContext_CopySubresourceRegion(sys->d3dctx, p_sys_out->resource[KNOWN_DXGI_INDEX], - p_sys_out->slice_index, 0, 0, 0, - p_texture, - viewDesc.Texture2D.ArraySlice, - ©Box); - ID3D11Resource_Release(p_texture); - if( sys->context_mutex != INVALID_HANDLE_VALUE ) { - ReleaseMutex( sys->context_mutex ); - } - } -#endif - + struct va_pic_context *pic_ctx = (struct va_pic_context*)output->context; + if (!va->sys->b_extern_pool) + directx_va_AddRef(pic_ctx->va_surface); + assert(data == (void*)pic_ctx->picsys.decoder); return VLC_SUCCESS; } @@ -233,57 +202,119 @@ static int CheckDevice(vlc_va_t *va) return VLC_SUCCESS; } +static void d3d11_pic_context_destroy(struct picture_context_t *opaque) +{ + struct va_pic_context *pic_ctx = (struct va_pic_context*)opaque; + if (pic_ctx->va_surface) + directx_va_Release(pic_ctx->va_surface); + ReleasePictureSys(&pic_ctx->picsys); + free(pic_ctx); +} + +static struct va_pic_context *CreatePicContext(vlc_va_surface_t *va_surface, + ID3D11VideoDecoderOutputView *decoderSurface, + ID3D11Resource *p_resource, + ID3D11DeviceContext *context, + UINT slice, + ID3D11ShaderResourceView *resourceView[D3D11_MAX_SHADER_VIEW]) +{ + struct va_pic_context *pic_ctx = calloc(1, sizeof(*pic_ctx)); + if (unlikely(pic_ctx==NULL)) + goto done; + pic_ctx->s.destroy = d3d11_pic_context_destroy; + pic_ctx->va_surface = va_surface; + pic_ctx->picsys.context = context; + pic_ctx->picsys.slice_index = slice; + pic_ctx->picsys.decoder = decoderSurface; + for (int i=0;i<D3D11_MAX_SHADER_VIEW; i++) + { + pic_ctx->picsys.resource[i] = p_resource; + pic_ctx->picsys.resourceView[i] = resourceView[i]; + } + pic_ctx->picsys.context = context; +done: + return pic_ctx; +} + static int Get(vlc_va_t *va, picture_t *pic, uint8_t **data) { #if D3D11_DIRECT_DECODE - picture_sys_t *p_sys = pic->p_sys; - if (p_sys == NULL) + if (va->sys->b_extern_pool) { - assert(!va->sys->b_extern_pool); - vlc_va_surface_t *va_surface = directx_va_Get(va, &va->sys->dx_sys); - if (!va_surface) - return VLC_EGENERIC; - *data = va_surface->decoderSurface; - pic->p_sys = va_surface->p_pic->p_sys; - pic->p_sys->va_surface = va_surface; - return VLC_SUCCESS; - } + /* copy the original picture_sys_t in the va_pic_context */ + if (!pic->context) + { + assert(pic->p_sys!=NULL); + if (!pic->p_sys->decoder) + { + HRESULT hr; + D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC viewDesc; + ZeroMemory(&viewDesc, sizeof(viewDesc)); + viewDesc.DecodeProfile = va->sys->dx_sys.input; + viewDesc.ViewDimension = D3D11_VDOV_DIMENSION_TEXTURE2D; + viewDesc.Texture2D.ArraySlice = pic->p_sys->slice_index; + + hr = ID3D11VideoDevice_CreateVideoDecoderOutputView( va->sys->dx_sys.d3ddec, + pic->p_sys->resource[KNOWN_DXGI_INDEX], + &viewDesc, + &pic->p_sys->decoder ); + if (FAILED(hr)) + return VLC_EGENERIC; + } - if (p_sys->decoder == NULL) + pic->context = (picture_context_t*)CreatePicContext( NULL, + pic->p_sys->decoder, + pic->p_sys->resource[KNOWN_DXGI_INDEX], + va->sys->d3dctx, + pic->p_sys->slice_index, + pic->p_sys->resourceView ); + if (pic->context == NULL) + return VLC_EGENERIC; + } + } + else +#endif { - HRESULT hr; + ID3D11ShaderResourceView *resourceView[D3D11_MAX_SHADER_VIEW]; + vlc_va_surface_t *va_surface = directx_va_Get(va, &va->sys->dx_sys); + if (unlikely(va_surface==NULL)) + return VLC_EGENERIC; - directx_sys_t *dx_sys = &va->sys->dx_sys; + ID3D11Resource *p_resource; + ID3D11VideoDecoderOutputView_GetResource(va_surface->decoderSurface, &p_resource); D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC viewDesc; - ZeroMemory(&viewDesc, sizeof(viewDesc)); - viewDesc.DecodeProfile = dx_sys->input; - viewDesc.ViewDimension = D3D11_VDOV_DIMENSION_TEXTURE2D; - viewDesc.Texture2D.ArraySlice = p_sys->slice_index; - - hr = ID3D11VideoDevice_CreateVideoDecoderOutputView( dx_sys->d3ddec, - p_sys->resource[KNOWN_DXGI_INDEX], - &viewDesc, - &p_sys->decoder ); - if (FAILED(hr)) { - msg_Warn(va, "CreateVideoDecoderOutputView %d failed. (hr=0x%0lx)", p_sys->slice_index, hr); - D3D11_TEXTURE2D_DESC texDesc; - ID3D11Texture2D_GetDesc(p_sys->texture[KNOWN_DXGI_INDEX], &texDesc); - assert(texDesc.BindFlags & D3D11_BIND_DECODER); - p_sys->decoder = NULL; + ID3D11VideoDecoderOutputView_GetDesc(va_surface->decoderSurface, &viewDesc); + + for (int i=0; i<D3D11_MAX_SHADER_VIEW; i++) + resourceView[i] = va->sys->resourceView[viewDesc.Texture2D.ArraySlice*D3D11_MAX_SHADER_VIEW + i]; + + struct va_pic_context *pic_ctx = CreatePicContext( va_surface, + va_surface->decoderSurface, + p_resource, + va->sys->d3dctx, + viewDesc.Texture2D.ArraySlice, + resourceView ); + + ID3D11Resource_Release(p_resource); + if (unlikely(pic_ctx==NULL)) + { + directx_va_Release(va_surface); + return VLC_ENOMEM; } + ID3D11VideoDecoderOutputView_AddRef(pic_ctx->picsys.decoder); + ID3D11DeviceContext_AddRef(pic_ctx->picsys.context); + for (int i=0; i<D3D11_MAX_SHADER_VIEW; i++) + { + if (pic_ctx->picsys.resource[i]) + ID3D11Resource_AddRef(pic_ctx->picsys.resource[i]); + if (pic_ctx->picsys.resourceView[i]) + ID3D11ShaderResourceView_AddRef(pic_ctx->picsys.resourceView[i]); + } + + pic->context = &pic_ctx->s; } - if (p_sys->decoder == NULL) - return VLC_EGENERIC; - *data = p_sys->decoder; - return VLC_SUCCESS; -#endif - vlc_va_surface_t *va_surface = directx_va_Get(va, &va->sys->dx_sys); - if (!va_surface) - return VLC_EGENERIC; - *data = va_surface->decoderSurface; - pic->p_sys = va_surface->p_pic->p_sys; - pic->p_sys->va_surface = va_surface; + *data = (uint8_t*)((struct va_pic_context *)pic->context)->picsys.decoder; return VLC_SUCCESS; } @@ -319,8 +350,8 @@ static void ReleasePic(void *opaque, uint8_t *data) { (void)data; picture_t *pic = opaque; - directx_va_Release(pic->p_sys->va_surface); - pic->p_sys->va_surface = NULL; + struct va_pic_context *pic_ctx = (struct va_pic_context*)pic->context; + directx_va_Release(pic_ctx->va_surface); picture_Release(pic); } @@ -735,6 +766,18 @@ static int DxCreateDecoderSurfaces(vlc_va_t *va, int codec_id, const video_forma viewDesc.DecodeProfile = dx_sys->input; viewDesc.ViewDimension = D3D11_VDOV_DIMENSION_TEXTURE2D; + const d3d_format_t *textureFmt = NULL; + for (const d3d_format_t *output_format = GetRenderFormatList(); + output_format->name != NULL; ++output_format) + { + if (output_format->formatTexture == sys->render && + (output_format->fourcc == VLC_CODEC_D3D11_OPAQUE || output_format->fourcc == VLC_CODEC_D3D11_OPAQUE_10B)) + { + textureFmt = output_format; + break; + } + } + if (sys->b_extern_pool) { #if D3D11_DIRECT_DECODE @@ -784,7 +827,10 @@ static int DxCreateDecoderSurfaces(vlc_va_t *va, int codec_id, const video_forma sys->b_extern_pool = false; break; } - sys->dx_sys.hw_surface[surface_idx] = pic->p_sys->decoder; + + AllocateShaderView(VLC_OBJECT(va), dx_sys->d3ddev, textureFmt, pic->p_sys->texture[KNOWN_DXGI_INDEX], pic->p_sys->slice_index, pic->p_sys->resourceView); + + dx_sys->hw_surface[surface_idx] = pic->p_sys->decoder; } if (!sys->b_extern_pool) @@ -849,6 +895,9 @@ static int DxCreateDecoderSurfaces(vlc_va_t *va, int codec_id, const video_forma ID3D11Texture2D_Release(p_texture); return VLC_EGENERIC; } + + if (texDesc.BindFlags & D3D11_BIND_SHADER_RESOURCE) + AllocateShaderView(VLC_OBJECT(va), dx_sys->d3ddev, textureFmt, p_texture, dx_sys->surface_count, &sys->resourceView[dx_sys->surface_count * D3D11_MAX_SHADER_VIEW]); } } msg_Dbg(va, "ID3D11VideoDecoderOutputView succeed with %d surfaces (%dx%d)", @@ -933,6 +982,15 @@ static void DxDestroySurfaces(vlc_va_t *va) ID3D11Resource_Release(p_texture); ID3D11Resource_Release(p_texture); } + for (int i = 0; i < dx_sys->surface_count; i++) + { + ID3D11VideoDecoderOutputView_Release( dx_sys->hw_surface[i] ); + for (int j = 0; j < D3D11_MAX_SHADER_VIEW; j++) + { + if (va->sys->resourceView[i*D3D11_MAX_SHADER_VIEW + j]) + ID3D11ShaderResourceView_Release(va->sys->resourceView[i*D3D11_MAX_SHADER_VIEW + j]); + } + } } static void DestroyPicture(picture_t *picture) diff --git a/modules/video_chroma/d3d11_fmt.h b/modules/video_chroma/d3d11_fmt.h index cf129037e2..6b4de23cd0 100644 --- a/modules/video_chroma/d3d11_fmt.h +++ b/modules/video_chroma/d3d11_fmt.h @@ -23,6 +23,8 @@ #ifndef VLC_VIDEOCHROMA_D3D11_FMT_H_ #define VLC_VIDEOCHROMA_D3D11_FMT_H_ +#include <vlc_picture.h> + #include <d3d11.h> #include <assert.h> @@ -46,7 +48,14 @@ struct picture_sys_t ID3D11ShaderResourceView *resourceView[D3D11_MAX_SHADER_VIEW]; DXGI_FORMAT decoderFormat; DXGI_FORMAT formatTexture; - vlc_va_surface_t *va_surface; +}; + +/* owned by the hardware decoder */ +struct va_pic_context +{ + picture_context_t s; + vlc_va_surface_t *va_surface; + struct picture_sys_t picsys; }; /* index to use for texture/resource that use a known DXGI format diff --git a/modules/video_chroma/d3d11_surface.c b/modules/video_chroma/d3d11_surface.c index 13b628dd24..f626df6f31 100644 --- a/modules/video_chroma/d3d11_surface.c +++ b/modules/video_chroma/d3d11_surface.c @@ -256,7 +256,7 @@ ok: static void D3D11_YUY2(filter_t *p_filter, picture_t *src, picture_t *dst) { filter_sys_t *sys = (filter_sys_t*) p_filter->p_sys; - picture_sys_t *p_sys = src->p_sys; + picture_sys_t *p_sys = &((struct va_pic_context*)src->context)->picsys; D3D11_TEXTURE2D_DESC desc; D3D11_MAPPED_SUBRESOURCE lock; @@ -388,7 +388,7 @@ static void D3D11_YUY2(filter_t *p_filter, picture_t *src, picture_t *dst) static void D3D11_NV12(filter_t *p_filter, picture_t *src, picture_t *dst) { filter_sys_t *sys = (filter_sys_t*) p_filter->p_sys; - picture_sys_t *p_sys = src->p_sys; + picture_sys_t *p_sys = &((struct va_pic_context*)src->context)->picsys; D3D11_TEXTURE2D_DESC desc; D3D11_MAPPED_SUBRESOURCE lock; diff --git a/modules/video_output/win32/d3d11_deinterlace.c b/modules/video_output/win32/d3d11_deinterlace.c index ef0abd34a2..723c4ab8ff 100644 --- a/modules/video_output/win32/d3d11_deinterlace.c +++ b/modules/video_output/win32/d3d11_deinterlace.c @@ -62,24 +62,26 @@ static picture_t *Deinterlace(filter_t *filter, picture_t *src) filter_sys_t *sys = filter->p_sys; HRESULT hr; - if (!src->p_sys->processorInput) + struct va_pic_context *pic_ctx = (struct va_pic_context*)src->context; + picture_sys_t *p_sys = pic_ctx ? &pic_ctx->picsys : src->p_sys; + if (!p_sys->processorInput) { D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC inDesc = { .FourCC = 0, .ViewDimension = D3D11_VPIV_DIMENSION_TEXTURE2D, .Texture2D.MipSlice = 0, - .Texture2D.ArraySlice = src->p_sys->slice_index, + .Texture2D.ArraySlice = p_sys->slice_index, }; hr = ID3D11VideoDevice_CreateVideoProcessorInputView(sys->d3dviddev, - src->p_sys->resource[KNOWN_DXGI_INDEX], + p_sys->resource[KNOWN_DXGI_INDEX], sys->procEnumerator, &inDesc, - &src->p_sys->processorInput); + &p_sys->processorInput); if (FAILED(hr)) { #ifndef NDEBUG - msg_Dbg(filter,"Failed to create processor input for slice %d. (hr=0x%lX)", src->p_sys->slice_index, hr); + msg_Dbg(filter,"Failed to create processor input for slice %d. (hr=0x%lX)", p_sys->slice_index, hr); #endif return src; } @@ -91,7 +93,7 @@ static picture_t *Deinterlace(filter_t *filter, picture_t *src) D3D11_VIDEO_PROCESSOR_STREAM stream = { .Enable = TRUE, - .pInputSurface = src->p_sys->processorInput, + .pInputSurface = p_sys->processorInput, }; D3D11_VIDEO_FRAME_FORMAT frameFormat = src->b_top_field_first ? @@ -143,6 +145,11 @@ static int Open(vlc_object_t *obj) picture_t *dst = filter_NewPicture(filter); if (dst == NULL) return VLC_EGENERIC; + if (!dst->p_sys && !dst->context) + { + msg_Dbg(filter, "D3D11 opaque without a texture"); + return VLC_EGENERIC; + } D3D11_TEXTURE2D_DESC dstDesc; ID3D11Texture2D_GetDesc(dst->p_sys->texture[KNOWN_DXGI_INDEX], &dstDesc); diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c index 187cedbe82..a324f9a79c 100644 --- a/modules/video_output/win32/direct3d11.c +++ b/modules/video_output/win32/direct3d11.c @@ -657,6 +657,9 @@ error: static picture_pool_t *Pool(vout_display_t *vd, unsigned pool_size) { + /* compensate for extra hardware decoding pulling extra pictures from our pool */ + pool_size += 2; + vout_display_sys_t *sys = vd->sys; ID3D11Texture2D *textures[pool_size * D3D11_MAX_SHADER_VIEW]; picture_t **pictures = NULL; @@ -1104,8 +1107,9 @@ static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpic if( sys->context_lock != INVALID_HANDLE_VALUE ) WaitForSingleObjectEx( sys->context_lock, INFINITE, FALSE ); #endif + struct va_pic_context *pic_ctx = (struct va_pic_context*)picture->context; + picture_sys_t *p_sys = pic_ctx ? &pic_ctx->picsys : picture->p_sys; if (!is_d3d11_opaque(picture->format.i_chroma) || sys->legacy_shader) { - picture_sys_t *p_sys = picture->p_sys; D3D11_TEXTURE2D_DESC texDesc; if (!is_d3d11_opaque(picture->format.i_chroma)) Direct3D11UnmapPoolTexture(picture); @@ -1123,6 +1127,33 @@ static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpic p_sys->resource[KNOWN_DXGI_INDEX], p_sys->slice_index, &box); } + else + { + /* copy pixels from the context texture to the picture_sys texture */ + D3D11_TEXTURE2D_DESC texDesc; + ID3D11Texture2D_GetDesc(p_sys->texture[0], &texDesc); + if (texDesc.BindFlags & D3D11_BIND_SHADER_RESOURCE) + { + /* for performance reason we don't want to allocate this during + * display, do it preferrably when creating the texture */ + assert(p_sys->resourceView[0]!=NULL); + } + else + { + D3D11_BOX box = { + .top = picture->format.i_y_offset, + .bottom = picture->format.i_y_offset + texDesc.Height, + .left = picture->format.i_x_offset, + .right = picture->format.i_x_offset + texDesc.Width, + .back = 1, + }; + ID3D11DeviceContext_CopySubresourceRegion(sys->d3dcontext, + p_sys->resource[KNOWN_DXGI_INDEX], + p_sys->slice_index, 0, 0, 0, + pic_ctx->picsys.resource[KNOWN_DXGI_INDEX], + pic_ctx->picsys.slice_index, &box); + } + } if (subpicture) { int subpicture_region_count = 0; @@ -1187,8 +1218,11 @@ static void Display(vout_display_t *vd, picture_t *picture, subpicture_t *subpic /* Render the quad */ if (!is_d3d11_opaque(picture->format.i_chroma) || sys->legacy_shader) DisplayD3DPicture(sys, &sys->picQuad, sys->stagingSys.resourceView); - else - DisplayD3DPicture(sys, &sys->picQuad, picture->p_sys->resourceView); + else { + struct va_pic_context *pic_ctx = (struct va_pic_context*)picture->context; + picture_sys_t *p_sys = pic_ctx ? &pic_ctx->picsys : picture->p_sys; + DisplayD3DPicture(sys, &sys->picQuad, p_sys->resourceView); + } if (subpicture) { // draw the additional vertices _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
