[FFmpeg-cvslog] Merge commit '10065d9324c2e35ce7040b6a2b9ebf6079bcbf42'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Thu Mar 30 11:37:39 2017 +0200| [14764b93e282f1c1a30d093da915df1b692db126] | committer: Hendrik Leppkes

Merge commit '10065d9324c2e35ce7040b6a2b9ebf6079bcbf42'

* commit '10065d9324c2e35ce7040b6a2b9ebf6079bcbf42':
  hwcontext_dxva2: add support for the P8 format

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=14764b93e282f1c1a30d093da915df1b692db126
---

 libavutil/hwcontext_dxva2.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/libavutil/hwcontext_dxva2.c b/libavutil/hwcontext_dxva2.c
index bc53d53..c5265b9 100644
--- a/libavutil/hwcontext_dxva2.c
+++ b/libavutil/hwcontext_dxva2.c
@@ -56,6 +56,10 @@ static const D3DPRESENT_PARAMETERS dxva2_present_params = {
     .Flags            = D3DPRESENTFLAG_VIDEO,
 };
 
+typedef struct DXVA2Mapping {
+    uint32_t palette_dummy[256];
+} DXVA2Mapping;
+
 typedef struct DXVA2FramesContext {
     IDirect3DSurface9 **surfaces_internal;
     int              nb_surfaces_used;
@@ -82,6 +86,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);
@@ -261,12 +266,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;
@@ -287,10 +294,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;
@@ -298,6 +311,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);


======================================================================

diff --cc libavutil/hwcontext_dxva2.c
index bc53d53,600cf0e..c5265b9
--- a/libavutil/hwcontext_dxva2.c
+++ b/libavutil/hwcontext_dxva2.c
@@@ -37,25 -36,14 +37,29 @@@
  #include "imgutils.h"
  #include "pixdesc.h"
  #include "pixfmt.h"
 +#include "compat/w32dlfcn.h"
  
  typedef IDirect3D9* WINAPI pDirect3DCreate9(UINT);
 +typedef HRESULT WINAPI pDirect3DCreate9Ex(UINT, IDirect3D9Ex **);
  typedef HRESULT WINAPI pCreateDeviceManager9(UINT *, IDirect3DDeviceManager9 **);
  
 +#define FF_D3DCREATE_FLAGS (D3DCREATE_SOFTWARE_VERTEXPROCESSING | \
 +                            D3DCREATE_MULTITHREADED | \
 +                            D3DCREATE_FPU_PRESERVE)
 +
 +static const D3DPRESENT_PARAMETERS dxva2_present_params = {
 +    .Windowed         = TRUE,
 +    .BackBufferWidth  = 640,
 +    .BackBufferHeight = 480,
 +    .BackBufferCount  = 0,
 +    .SwapEffect       = D3DSWAPEFFECT_DISCARD,
 +    .Flags            = D3DPRESENTFLAG_VIDEO,
 +};
 +
+ typedef struct DXVA2Mapping {
+     uint32_t palette_dummy[256];
+ } DXVA2Mapping;
+ 
  typedef struct DXVA2FramesContext {
      IDirect3DSurface9 **surfaces_internal;
      int              nb_surfaces_used;