diff options
author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-04-11 17:42:55 +0200 |
---|---|---|
committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-04-11 17:42:55 +0200 |
commit | 0803f4ad21c195519209bae8d18840dd810191f8 (patch) | |
tree | f9a869011ba90c106cf5c05c3e346912a669f63a /video | |
parent | 9d2980dab752280468620df49cabe7f4843f0551 (diff) | |
parent | b968d779afb9114694976792e903b0591a71a816 (diff) | |
download | mpv-0803f4ad21c195519209bae8d18840dd810191f8.tar.bz2 mpv-0803f4ad21c195519209bae8d18840dd810191f8.tar.xz |
Merge branch 'master' into release/current
Diffstat (limited to 'video')
60 files changed, 3083 insertions, 1459 deletions
diff --git a/video/csputils.c b/video/csputils.c index e446d8e724..69d3b80944 100644 --- a/video/csputils.c +++ b/video/csputils.c @@ -64,6 +64,7 @@ const struct m_opt_choice_alternatives mp_csp_prim_names[] = { {"adobe", MP_CSP_PRIM_ADOBE}, {"prophoto", MP_CSP_PRIM_PRO_PHOTO}, {"cie1931", MP_CSP_PRIM_CIE_1931}, + {"dci-p3", MP_CSP_PRIM_DCI_P3}, {0} }; @@ -403,6 +404,14 @@ struct mp_csp_primaries mp_get_csp_primaries(enum mp_csp_prim spc) .blue = {0.1666, 0.0089}, .white = e }; + // From SMPTE RP 431-2 + case MP_CSP_PRIM_DCI_P3: + return (struct mp_csp_primaries) { + .red = {0.680, 0.320}, + .green = {0.265, 0.690}, + .blue = {0.150, 0.060}, + .white = d65 + }; default: return (struct mp_csp_primaries) {{0}}; } diff --git a/video/csputils.h b/video/csputils.h index d5990d242f..1d8d3b1d14 100644 --- a/video/csputils.h +++ b/video/csputils.h @@ -63,6 +63,7 @@ enum mp_csp_prim { MP_CSP_PRIM_ADOBE, MP_CSP_PRIM_PRO_PHOTO, MP_CSP_PRIM_CIE_1931, + MP_CSP_PRIM_DCI_P3, MP_CSP_PRIM_COUNT }; diff --git a/video/d3d11va.c b/video/d3d11va.c new file mode 100644 index 0000000000..a9be571e9c --- /dev/null +++ b/video/d3d11va.c @@ -0,0 +1,86 @@ +/* + * This file is part of mpv. + * + * mpv is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * mpv is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "mp_image.h" +#include "d3d11va.h" + +struct d3d11va_surface { + HMODULE d3d11_dll; + ID3D11Texture2D *texture; + ID3D11VideoDecoderOutputView *surface; +}; + +ID3D11VideoDecoderOutputView *d3d11_surface_in_mp_image(struct mp_image *mpi) +{ + return mpi && mpi->imgfmt == IMGFMT_D3D11VA ? + (ID3D11VideoDecoderOutputView *)mpi->planes[3] : NULL; +} + +ID3D11Texture2D *d3d11_texture_in_mp_image(struct mp_image *mpi) +{ + if (!mpi || mpi->imgfmt != IMGFMT_D3D11VA) + return NULL; + struct d3d11va_surface *surface = (void *)mpi->planes[0]; + return surface->texture; +} + +static void d3d11va_release_img(void *arg) +{ + struct d3d11va_surface *surface = arg; + if (surface->surface) + ID3D11VideoDecoderOutputView_Release(surface->surface); + + if (surface->texture) + ID3D11Texture2D_Release(surface->texture); + + if (surface->d3d11_dll) + FreeLibrary(surface->d3d11_dll); + + talloc_free(surface); +} + +struct mp_image *d3d11va_new_ref(ID3D11VideoDecoderOutputView *view, + int w, int h) +{ + if (!view) + return NULL; + struct d3d11va_surface *surface = talloc_zero(NULL, struct d3d11va_surface); + + surface->d3d11_dll = LoadLibrary(L"d3d11.dll"); + if (!surface->d3d11_dll) + goto fail; + + surface->surface = view; + ID3D11VideoDecoderOutputView_AddRef(surface->surface); + ID3D11VideoDecoderOutputView_GetResource( + surface->surface, (ID3D11Resource **)&surface->texture); + + struct mp_image *mpi = mp_image_new_custom_ref( + &(struct mp_image){0}, surface, d3d11va_release_img); + if (!mpi) + abort(); + + mp_image_setfmt(mpi, IMGFMT_D3D11VA); + mp_image_set_size(mpi, w, h); + mpi->planes[0] = (void *)surface; + mpi->planes[3] = (void *)surface->surface; + + return mpi; +fail: + d3d11va_release_img(surface); + return NULL; +} diff --git a/video/d3d11va.h b/video/d3d11va.h new file mode 100644 index 0000000000..db2f295241 --- /dev/null +++ b/video/d3d11va.h @@ -0,0 +1,30 @@ +/* + * This file is part of mpv. + * + * mpv is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * mpv is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef MPV_D3D11_H +#define MPV_D3D11_H + +#include <d3d11.h> + +struct mp_image; + +ID3D11VideoDecoderOutputView *d3d11_surface_in_mp_image(struct mp_image *mpi); +ID3D11Texture2D *d3d11_texture_in_mp_image(struct mp_image *mpi); +struct mp_image *d3d11va_new_ref(ID3D11VideoDecoderOutputView *view, + int w, int h); + +#endif diff --git a/video/decode/d3d.c b/video/decode/d3d.c new file mode 100644 index 0000000000..35d1af9243 --- /dev/null +++ b/video/decode/d3d.c @@ -0,0 +1,241 @@ +/* + * This file is part of mpv. + * + * mpv is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * mpv is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <libavcodec/avcodec.h> + +#include "lavc.h" +#include "common/common.h" +#include "common/av_common.h" +#include "video/fmt-conversion.h" +#include "video/mp_image.h" +#include "osdep/windows_utils.h" + +#include "d3d.h" + +// define all the GUIDs used directly here, to avoid problems with inconsistent +// dxva2api.h versions in mingw-w64 and different MSVC version +#include <initguid.h> +DEFINE_GUID(DXVA2_ModeMPEG2_VLD, 0xee27417f, 0x5e28, 0x4e65, 0xbe, 0xea, 0x1d, 0x26, 0xb5, 0x08, 0xad, 0xc9); +DEFINE_GUID(DXVA2_ModeMPEG2and1_VLD, 0x86695f12, 0x340e, 0x4f04, 0x9f, 0xd3, 0x92, 0x53, 0xdd, 0x32, 0x74, 0x60); + +DEFINE_GUID(DXVA2_ModeH264_E, 0x1b81be68, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5); +DEFINE_GUID(DXVA2_ModeH264_F, 0x1b81be69, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5); +DEFINE_GUID(DXVA_ModeH264_VLD_WithFMOASO_NoFGT, 0xd5f04ff9, 0x3418, 0x45d8, 0x95, 0x61, 0x32, 0xa7, 0x6a, 0xae, 0x2d, 0xdd); +DEFINE_GUID(DXVA_Intel_H264_NoFGT_ClearVideo, 0x604F8E68, 0x4951, 0x4c54, 0x88, 0xFE, 0xAB, 0xD2, 0x5C, 0x15, 0xB3, 0xD6); +DEFINE_GUID(DXVA_ModeH264_VLD_NoFGT_Flash, 0x4245F676, 0x2BBC, 0x4166, 0xa0, 0xBB, 0x54, 0xE7, 0xB8, 0x49, 0xC3, 0x80); + +DEFINE_GUID(DXVA2_ModeVC1_D, 0x1b81beA3, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5); +DEFINE_GUID(DXVA2_ModeVC1_D2010, 0x1b81beA4, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5); // August 2010 update + +DEFINE_GUID(DXVA2_ModeHEVC_VLD_Main, 0x5b11d51b, 0x2f4c, 0x4452, 0xbc, 0xc3, 0x09, 0xf2, 0xa1, 0x16, 0x0c, 0xc0); +DEFINE_GUID(DXVA2_ModeHEVC_VLD_Main10, 0x107af0e0, 0xef1a, 0x4d19, 0xab, 0xa8, 0x67, 0xa1, 0x63, 0x07, 0x3d, 0x13); + +DEFINE_GUID(DXVA2_ModeVP9_VLD_Profile0, 0x463707f8, 0xa1d0, 0x4585, 0x87, 0x6d, 0x83, 0xaa, 0x6d, 0x60, 0xb8, 0x9e); + +DEFINE_GUID(DXVA2_NoEncrypt, 0x1b81beD0, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5); + +static const int PROF_MPEG2_SIMPLE[] = {FF_PROFILE_MPEG2_SIMPLE, 0}; +static const int PROF_MPEG2_MAIN[] = {FF_PROFILE_MPEG2_SIMPLE, + FF_PROFILE_MPEG2_MAIN, 0}; +static const int PROF_H264_HIGH[] = {FF_PROFILE_H264_CONSTRAINED_BASELINE, + FF_PROFILE_H264_MAIN, + FF_PROFILE_H264_HIGH, 0}; +static const int PROF_HEVC_MAIN[] = {FF_PROFILE_HEVC_MAIN, 0}; +static const int PROF_HEVC_MAIN10[] = {FF_PROFILE_HEVC_MAIN, + FF_PROFILE_HEVC_MAIN_10, 0}; + +struct d3dva_mode { + const GUID *guid; + const char *name; + enum AVCodecID codec; + const int *profiles; // NULL or ends with 0 +}; + +#define MODE2(id) &MP_CONCAT(DXVA2_Mode, id), # id +#define MODE(id) &MP_CONCAT(DXVA_, id), # id +// Prefered modes must come first +static const struct d3dva_mode d3dva_modes[] = { + // MPEG-1/2 + {MODE2(MPEG2_VLD), AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_SIMPLE}, + {MODE2(MPEG2and1_VLD), AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_MAIN}, + {MODE2(MPEG2and1_VLD), AV_CODEC_ID_MPEG1VIDEO}, + + // H.264 + {MODE2(H264_F), AV_CODEC_ID_H264, PROF_H264_HIGH}, + {MODE (Intel_H264_NoFGT_ClearVideo), AV_CODEC_ID_H264, PROF_H264_HIGH}, + {MODE2(H264_E), AV_CODEC_ID_H264, PROF_H264_HIGH}, + {MODE (ModeH264_VLD_WithFMOASO_NoFGT), AV_CODEC_ID_H264, PROF_H264_HIGH}, + {MODE (ModeH264_VLD_NoFGT_Flash), AV_CODEC_ID_H264, PROF_H264_HIGH}, + + // VC-1 / WMV3 + {MODE2(VC1_D), AV_CODEC_ID_VC1}, + {MODE2(VC1_D), AV_CODEC_ID_WMV3}, + {MODE2(VC1_D2010), AV_CODEC_ID_VC1}, + {MODE2(VC1_D2010), AV_CODEC_ID_WMV3}, + + // HEVC + {MODE2(HEVC_VLD_Main), AV_CODEC_ID_HEVC, PROF_HEVC_MAIN}, + {MODE2(HEVC_VLD_Main10), AV_CODEC_ID_HEVC, PROF_HEVC_MAIN10}, + + // VP9 + {MODE2(VP9_VLD_Profile0), AV_CODEC_ID_VP9}, +}; +#undef MODE +#undef MODE2 + +int d3d_probe_codec(const char *codec) +{ + enum AVCodecID codecid = mp_codec_to_av_codec_id(codec); + for (int i = 0; i < MP_ARRAY_SIZE(d3dva_modes); i++) { + const struct d3dva_mode *mode = &d3dva_modes[i]; + if (mode->codec == codecid) + return 0; + } + return HWDEC_ERR_NO_CODEC; +} + +static bool profile_compatible(const struct d3dva_mode *mode, int profile) +{ + if (!mode->profiles) + return true; + + for (int i = 0; mode->profiles[i]; i++){ + if(mode->profiles[i] == profile) + return true; + } + return false; +} + +static bool mode_supported(const struct d3dva_mode *mode, + const GUID *device_modes, UINT n_modes) +{ + for (int i = 0; i < n_modes; i++) { + if (IsEqualGUID(mode->guid, &device_modes[i])) + return true; + } + return false; +} + +struct d3d_decoder_fmt d3d_select_decoder_mode( + struct lavc_ctx *s, const GUID *device_guids, UINT n_guids, + DWORD (*get_dxfmt_cb)(struct lavc_ctx *s, const GUID *guid, int depth)) +{ + struct d3d_decoder_fmt fmt = { + .guid = &GUID_NULL, + .mpfmt_decoded = IMGFMT_NONE, + .dxfmt_decoded = 0, + }; + + // this has the right bit-depth, but is unfortunately not the native format + int sw_img_fmt = pixfmt2imgfmt(s->avctx->sw_pix_fmt); + if (sw_img_fmt == IMGFMT_NONE) + return fmt; + + int depth = IMGFMT_RGB_DEPTH(sw_img_fmt); + int p010 = mp_imgfmt_find(1, 1, 2, 10, MP_IMGFLAG_YUV_NV); + int mpfmt_decoded = depth <= 8 ? IMGFMT_NV12 : p010; + + for (int i = 0; i < MP_ARRAY_SIZE(d3dva_modes); i++) { + const struct d3dva_mode *mode = &d3dva_modes[i]; + if (mode->codec == s->avctx->codec_id && + profile_compatible(mode, s->avctx->profile) && + mode_supported(mode, device_guids, n_guids)) { + + DWORD dxfmt_decoded = get_dxfmt_cb(s, mode->guid, depth); + if (dxfmt_decoded) { + fmt.guid = mode->guid; + fmt.mpfmt_decoded = mpfmt_decoded; + fmt.dxfmt_decoded = dxfmt_decoded; + return fmt; + } + } + } + return fmt; +} + +char *d3d_decoder_guid_to_desc_buf(char *buf, size_t buf_size, + const GUID *mode_guid) +{ + const char *name = "<unknown>"; + for (int i = 0; i < MP_ARRAY_SIZE(d3dva_modes); i++) { + const struct d3dva_mode *mode = &d3dva_modes[i]; + if (IsEqualGUID(mode->guid, mode_guid)) { + name = mode->name; + break; + } + } + snprintf(buf, buf_size, "%s %s", mp_GUID_to_str(mode_guid), name); + return buf; +} + +void d3d_surface_align(struct lavc_ctx *s, int *w, int *h) +{ + int alignment = 16; + switch (s->avctx->codec_id) { + // decoding MPEG-2 requires additional alignment on some Intel GPUs, but it + // causes issues for H.264 on certain AMD GPUs..... + case AV_CODEC_ID_MPEG2VIDEO: + alignment = 32; + break; + // the HEVC DXVA2 spec asks for 128 pixel aligned surfaces to ensure + // all coding features have enough room to work with + case AV_CODEC_ID_HEVC: + alignment = 128; + break; + } + *w = FFALIGN(*w, alignment); + *h = FFALIGN(*h, alignment); +} + +unsigned d3d_decoder_config_score(struct lavc_ctx *s, + GUID *guidConfigBitstreamEncryption, + UINT ConfigBitstreamRaw) +{ + unsigned score = 0; + if (ConfigBitstreamRaw == 1) { + score = 1; + } else if (s->avctx->codec_id == AV_CODEC_ID_H264 + && ConfigBitstreamRaw == 2) { + score = 2; + } else { + return 0; + } + + if (IsEqualGUID(guidConfigBitstreamEncryption, &DXVA2_NoEncrypt)) + score += 16; + + return score; +} + +BOOL is_clearvideo(const GUID *mode_guid) +{ + return IsEqualGUID(mode_guid, &DXVA_Intel_H264_NoFGT_ClearVideo); +} + +void copy_nv12(struct mp_image *dest, uint8_t *src_bits, + unsigned src_pitch, unsigned surf_height) +{ + struct mp_image buf = {0}; + mp_image_setfmt(&buf, dest->imgfmt); + mp_image_set_size(&buf, dest->w, dest->h); + + buf.planes[0] = src_bits; + buf.stride[0] = src_pitch; + buf.planes[1] = src_bits + src_pitch * surf_height; + buf.stride[1] = src_pitch; + mp_image_copy_gpu(dest, &buf); +} diff --git a/video/decode/d3d.h b/video/decode/d3d.h new file mode 100644 index 0000000000..bbd6bdfd2a --- /dev/null +++ b/video/decode/d3d.h @@ -0,0 +1,50 @@ +/* + * This file is part of mpv. + * + * mpv is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * mpv is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef MPV_DECODE_D3D_H +#define MPV_DECODE_D3D_H + +#include <windows.h> +#include <inttypes.h> + +struct mp_image; +struct lavc_ctx; + +struct d3d_decoder_fmt { + const GUID *guid; + int mpfmt_decoded; + DWORD dxfmt_decoded; // D3DFORMAT or DXGI_FORMAT +}; + +int d3d_probe_codec(const char *codec); +struct d3d_decoder_fmt d3d_select_decoder_mode( + struct lavc_ctx *s, const GUID *device_guids, UINT n_guids, + DWORD (*get_dxfmt_cb)(struct lavc_ctx *s, const GUID *guid, int depth)); + +char *d3d_decoder_guid_to_desc_buf(char *buf, size_t buf_size, + const GUID *mode_guid); +#define d3d_decoder_guid_to_desc(guid) d3d_decoder_guid_to_desc_buf((char[256]){0}, 256, (guid)) + +void d3d_surface_align(struct lavc_ctx *s, int *w, int *h); +unsigned d3d_decoder_config_score(struct lavc_ctx *s, + GUID *guidConfigBitstreamEncryption, + UINT ConfigBitstreamRaw); +BOOL is_clearvideo(const GUID *mode_guid); +void copy_nv12(struct mp_image *dest, uint8_t *src_bits, + unsigned src_pitch, unsigned surf_height); + +#endif diff --git a/video/decode/d3d11va.c b/video/decode/d3d11va.c new file mode 100644 index 0000000000..622a28981d --- /dev/null +++ b/video/decode/d3d11va.c @@ -0,0 +1,499 @@ +/* + * This file is part of mpv. + * + * mpv is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * mpv is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <libavcodec/d3d11va.h> + +#include "lavc.h" +#include "common/common.h" +#include "common/av_common.h" +#include "osdep/windows_utils.h" +#include "video/fmt-conversion.h" +#include "video/mp_image_pool.h" +#include "video/hwdec.h" + +#include "video/d3d11va.h" +#include "d3d.h" + +#define ADDITIONAL_SURFACES (4 + HWDEC_DELAY_QUEUE_COUNT) + +struct d3d11va_decoder { + ID3D11VideoDecoder *decoder; + struct mp_image_pool *pool; + ID3D11Texture2D *staging; + int mpfmt_decoded; +}; + +struct priv { + struct mp_log *log; + + HMODULE d3d11_dll; + ID3D11Device *device; + ID3D11DeviceContext *device_ctx; + ID3D11VideoDevice *video_dev; + ID3D11VideoContext *video_ctx; + + struct d3d11va_decoder *decoder; + struct mp_image_pool *sw_pool; +}; + +static struct mp_image *d3d11va_allocate_image(struct lavc_ctx *s, int w, int h) +{ + struct priv *p = s->hwdec_priv; + struct mp_image *img = mp_image_pool_get_no_alloc(p->decoder->pool, + IMGFMT_D3D11VA, w, h); + if (!img) + MP_ERR(p, "Failed to get free D3D11VA surface\n"); + return img; +} + +static struct mp_image *d3d11va_retrieve_image(struct lavc_ctx *s, + struct mp_image *img) +{ + HRESULT hr; + struct priv *p = s->hwdec_priv; + ID3D11Texture2D *staging = p->decoder->staging; + ID3D11Texture2D *texture = d3d11_texture_in_mp_image(img); + ID3D11VideoDecoderOutputView *surface = d3d11_surface_in_mp_image(img); + + if (!texture || !surface) { + MP_ERR(p, "Failed to get Direct3D texture and surface from mp_image\n"); + return i |