diff options
| author | wm4 <wm4@nowhere> | 2015-09-28 21:55:23 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-09-28 22:03:14 +0200 |
| commit | 1dd7b7bddc694b1c018b74bccaebcc98d9144ee4 (patch) | |
| tree | 8b8613ab7157e8885f9b093266eabab830cf6dcf /video/out/opengl | |
| parent | 15ef9f9ee6e4aa70b07afd9a2fafff34606d0142 (diff) | |
| download | mpv-1dd7b7bddc694b1c018b74bccaebcc98d9144ee4.tar.bz2 mpv-1dd7b7bddc694b1c018b74bccaebcc98d9144ee4.tar.xz | |
video: remove VDA support
VideoToolbox is preferred. Now that FFmpeg released 2.8, there's no
reason to support VDA anymore. In fact, we had a bug that made VDA not
useable with older FFmpeg versions in some newer mpv releases.
VideoToolbox is supported even on slightly older OSX versions, and if
not, you still can run mpv without hw decoding.
Diffstat (limited to 'video/out/opengl')
| -rw-r--r-- | video/out/opengl/hwdec.c | 3 | ||||
| -rw-r--r-- | video/out/opengl/hwdec.h | 2 | ||||
| -rw-r--r-- | video/out/opengl/hwdec_vda.c | 7 |
3 files changed, 2 insertions, 10 deletions
diff --git a/video/out/opengl/hwdec.c b/video/out/opengl/hwdec.c index 7665d0c056..6eefbc4744 100644 --- a/video/out/opengl/hwdec.c +++ b/video/out/opengl/hwdec.c @@ -31,7 +31,6 @@ extern const struct gl_hwdec_driver gl_hwdec_vaegl; extern const struct gl_hwdec_driver gl_hwdec_vaglx; -extern const struct gl_hwdec_driver gl_hwdec_vda; extern const struct gl_hwdec_driver gl_hwdec_videotoolbox; extern const struct gl_hwdec_driver gl_hwdec_vdpau; extern const struct gl_hwdec_driver gl_hwdec_dxva2; @@ -46,7 +45,7 @@ static const struct gl_hwdec_driver *const mpgl_hwdec_drivers[] = { #if HAVE_VDPAU_GL_X11 &gl_hwdec_vdpau, #endif -#if HAVE_VIDEOTOOLBOX_VDA_GL +#if HAVE_VIDEOTOOLBOX_GL &gl_hwdec_videotoolbox, #endif #if HAVE_DXVA2_HWACCEL diff --git a/video/out/opengl/hwdec.h b/video/out/opengl/hwdec.h index c48ec8b164..7d6f300db7 100644 --- a/video/out/opengl/hwdec.h +++ b/video/out/opengl/hwdec.h @@ -21,7 +21,7 @@ struct gl_hwdec { // IMGFMT_RGB0 indicates that the video texture is RGB. int converted_imgfmt; // Normally this is GL_TEXTURE_2D, but the hwdec driver can set it to - // GL_TEXTURE_RECTANGLE. This is needed because VDA is shit. + // GL_TEXTURE_RECTANGLE. This is needed because VideoToolbox is shit. GLenum gl_texture_target; }; diff --git a/video/out/opengl/hwdec_vda.c b/video/out/opengl/hwdec_vda.c index e921df2f80..19d93e74d6 100644 --- a/video/out/opengl/hwdec_vda.c +++ b/video/out/opengl/hwdec_vda.c @@ -17,8 +17,6 @@ * with mpv. If not, see <http://www.gnu.org/licenses/>. */ -// Note: handles both VDA and VideoToolbox - #include <assert.h> #include <IOSurface/IOSurface.h> @@ -160,12 +158,7 @@ static int create_common(struct gl_hwdec *hw, struct vda_format *format) static int create(struct gl_hwdec *hw) { - // For videotoolbox, we always request NV12. -#if HAVE_VDA_DEFAULT_INIT2 struct vda_format *f = vda_get_gl_format_from_imgfmt(IMGFMT_NV12); -#else - struct vda_format *f = vda_get_gl_format_from_imgfmt(IMGFMT_UYVY); -#endif if (create_common(hw, f)) return -1; |