[vlc-commits] d3d11va: find the most appropriate decoder format

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Dec 18 11:08:46 2019 +0100| [3218660f1267c7fc4b626cdbc0c35ff9d69a93d7] | committer: Steve Lhomme

d3d11va: find the most appropriate decoder format

- with full bitdepth/chroma subsampling
- with full bitdepth
- with bitdepth 10 if 12/14/16 was requested
- with any bitdepth

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3218660f1267c7fc4b626cdbc0c35ff9d69a93d7
---

 modules/codec/avcodec/d3d11va.c | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c
index 136697d276..cc0385fcbd 100644
--- a/modules/codec/avcodec/d3d11va.c
+++ b/modules/codec/avcodec/d3d11va.c
@@ -247,21 +247,6 @@ static void Close(vlc_va_t *va)
 
 static const struct vlc_va_operations ops = { Get, Close, };
 
-static const d3d_format_t *GetDirectRenderingFormat(vlc_va_t *vd, const directx_va_mode_t *mode)
-{
-    UINT supportFlags = D3D11_FORMAT_SUPPORT_DECODER_OUTPUT | D3D11_FORMAT_SUPPORT_SHADER_LOAD;
-    return FindD3D11Format( vd, &vd->sys->d3d_dev, 0, D3D11_RGB_FORMAT|D3D11_YUV_FORMAT,
-                            mode->bit_depth, mode->log2_chroma_h+1, mode->log2_chroma_w+1,
-                            D3D11_CHROMA_GPU | D3D11_CHROMA_CPU, supportFlags );
-}
-
-static const d3d_format_t *GetDirectDecoderFormat(vlc_va_t *vd, vlc_fourcc_t i_src_chroma)
-{
-    UINT supportFlags = D3D11_FORMAT_SUPPORT_DECODER_OUTPUT;
-    return FindD3D11Format( vd, &vd->sys->d3d_dev, i_src_chroma, D3D11_RGB_FORMAT|D3D11_YUV_FORMAT, 0, 0, 0,
-                            D3D11_CHROMA_GPU | D3D11_CHROMA_CPU, supportFlags );
-}
-
 static int Open(vlc_va_t *va, AVCodecContext *ctx, const AVPixFmtDescriptor *desc,
                 const es_format_t *fmt_in, vlc_decoder_device *dec_device,
                 video_format_t *fmt_out, vlc_video_context **vtcx_out)
@@ -481,19 +466,26 @@ static int DxSetupOutput(vlc_va_t *va, const directx_va_mode_t *mode, const vide
 
     const d3d_format_t *processorInput[4];
     int idx = 0;
-    const d3d_format_t *decoder_format = GetDirectRenderingFormat(va, mode);
+    const d3d_format_t *decoder_format;
+    UINT supportFlags = D3D11_FORMAT_SUPPORT_DECODER_OUTPUT | D3D11_FORMAT_SUPPORT_SHADER_LOAD;
+    decoder_format = FindD3D11Format( va, &va->sys->d3d_dev, 0, D3D11_RGB_FORMAT|D3D11_YUV_FORMAT,
+                                      mode->bit_depth, mode->log2_chroma_h+1, mode->log2_chroma_w+1,
+                                      D3D11_CHROMA_GPU, supportFlags );
+    if (decoder_format == NULL)
+        decoder_format = FindD3D11Format( va, &va->sys->d3d_dev, 0, D3D11_RGB_FORMAT|D3D11_YUV_FORMAT,
+                                        mode->bit_depth, 0, 0, D3D11_CHROMA_GPU, supportFlags );
+    if (decoder_format == NULL && mode->bit_depth > 10)
+        decoder_format = FindD3D11Format( va, &va->sys->d3d_dev, 0, D3D11_RGB_FORMAT|D3D11_YUV_FORMAT,
+                                        10, 0, 0, D3D11_CHROMA_GPU, supportFlags );
     if (decoder_format == NULL)
-        decoder_format = GetDirectDecoderFormat(va, fmt->i_chroma);
+        decoder_format = FindD3D11Format( va, &va->sys->d3d_dev, 0, D3D11_RGB_FORMAT|D3D11_YUV_FORMAT,
+                                        0, 0, 0, D3D11_CHROMA_GPU, supportFlags );
     if (decoder_format != NULL)
     {
         msg_Dbg(va, "favor decoder format %s", decoder_format->name);
         processorInput[idx++] = decoder_format;
     }
 
-    if (mode->bit_depth > 10 && (decoder_format == NULL || decoder_format->formatTexture != DXGI_FORMAT_P016))
-        processorInput[idx++] = D3D11_FindDXGIFormat(DXGI_FORMAT_P016);
-    if (mode->bit_depth > 8 && (decoder_format == NULL || decoder_format->formatTexture != DXGI_FORMAT_P010))
-        processorInput[idx++] = D3D11_FindDXGIFormat(DXGI_FORMAT_P010);
     if (decoder_format == NULL || decoder_format->formatTexture != DXGI_FORMAT_NV12)
         processorInput[idx++] = D3D11_FindDXGIFormat(DXGI_FORMAT_NV12);
     processorInput[idx++] = D3D11_FindDXGIFormat(DXGI_FORMAT_420_OPAQUE);