From 10065d9324c2e35ce7040b6a2b9ebf6079bcbf42 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 10 Aug 2016 13:01:55 +0200 Subject: hwcontext_dxva2: add support for the P8 format This format is used internally by the QSV encoder to store the encoded bitstream. Signed-off-by: Maxym Dmytrychenko --- libavutil/hwcontext_dxva2.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'libavutil/hwcontext_dxva2.c') diff --git a/libavutil/hwcontext_dxva2.c b/libavutil/hwcontext_dxva2.c index eb1bc46398..600cf0eec7 100644 --- a/libavutil/hwcontext_dxva2.c +++ b/libavutil/hwcontext_dxva2.c @@ -40,6 +40,10 @@ typedef IDirect3D9* WINAPI pDirect3DCreate9(UINT); typedef HRESULT WINAPI pCreateDeviceManager9(UINT *, IDirect3DDeviceManager9 **); +typedef struct DXVA2Mapping { + uint32_t palette_dummy[256]; +} DXVA2Mapping; + typedef struct DXVA2FramesContext { IDirect3DSurface9 **surfaces_internal; int nb_surfaces_used; @@ -66,6 +70,7 @@ static const struct { } supported_formats[] = { { MKTAG('N', 'V', '1', '2'), AV_PIX_FMT_NV12 }, { MKTAG('P', '0', '1', '0'), AV_PIX_FMT_P010 }, + { D3DFMT_P8, AV_PIX_FMT_PAL8 }, }; DEFINE_GUID(video_decoder_service, 0xfc51a551, 0xd5e7, 0x11d9, 0xaf, 0x55, 0x00, 0x05, 0x4e, 0x43, 0xff, 0x02); @@ -245,12 +250,14 @@ static void dxva2_unmap_frame(AVHWFramesContext *ctx, HWMapDescriptor *hwmap) { IDirect3DSurface9 *surface = (IDirect3DSurface9*)hwmap->source->data[3]; IDirect3DSurface9_UnlockRect(surface); + av_freep(&hwmap->priv); } static int dxva2_map_frame(AVHWFramesContext *ctx, AVFrame *dst, const AVFrame *src, int flags) { IDirect3DSurface9 *surface = (IDirect3DSurface9*)src->data[3]; + DXVA2Mapping *map; D3DSURFACE_DESC surfaceDesc; D3DLOCKED_RECT LockedRect; HRESULT hr; @@ -271,10 +278,16 @@ static int dxva2_map_frame(AVHWFramesContext *ctx, AVFrame *dst, const AVFrame * return AVERROR_UNKNOWN; } + map = av_mallocz(sizeof(*map)); + if (!map) + goto fail; + err = ff_hwframe_map_create(src->hw_frames_ctx, dst, src, - dxva2_unmap_frame, NULL); - if (err < 0) + dxva2_unmap_frame, map); + if (err < 0) { + av_freep(&map); goto fail; + } for (i = 0; i < nb_planes; i++) dst->linesize[i] = LockedRect.Pitch; @@ -282,6 +295,9 @@ static int dxva2_map_frame(AVHWFramesContext *ctx, AVFrame *dst, const AVFrame * av_image_fill_pointers(dst->data, dst->format, surfaceDesc.Height, (uint8_t*)LockedRect.pBits, dst->linesize); + if (dst->format == AV_PIX_FMT_PAL8) + dst->data[1] = (uint8_t*)map->palette_dummy; + return 0; fail: IDirect3DSurface9_UnlockRect(surface); -- cgit v1.2.3