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.

2 files changed, 0 insertions, 122 deletions

diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 6df662e23c..c4d4344f47 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -116,7 +116,6 @@ const struct m_sub_options vd_lavc_conf = {
 };
 
 const struct vd_lavc_hwdec mp_vd_lavc_vdpau;
-const struct vd_lavc_hwdec mp_vd_lavc_vda;
 const struct vd_lavc_hwdec mp_vd_lavc_videotoolbox;
 const struct vd_lavc_hwdec mp_vd_lavc_vaapi;
 const struct vd_lavc_hwdec mp_vd_lavc_vaapi_copy;
@@ -133,9 +132,6 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = {
 #if HAVE_VIDEOTOOLBOX_HWACCEL
     &mp_vd_lavc_videotoolbox,
 #endif
-#if HAVE_VDA_HWACCEL
-    &mp_vd_lavc_vda,
-#endif
 #if HAVE_VAAPI_HWACCEL
     &mp_vd_lavc_vaapi,
     &mp_vd_lavc_vaapi_copy,
diff --git a/video/decode/vda.c b/video/decode/vda.c
deleted file mode 100644
index 538d21b753..0000000000
--- a/video/decode/vda.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * This file is part of mpv.
- *
- * Copyright (c) 2013 Stefano Pigozzi <stefano.pigozzi@gmail.com>
- *
- * mpv is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with mpv.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <libavcodec/version.h>
-#include <libavcodec/vda.h>
-
-#include "common/av_common.h"
-#include "common/msg.h"
-#include "video/mp_image.h"
-#include "video/decode/lavc.h"
-#include "config.h"
-
-static int probe(struct vd_lavc_hwdec *hwdec, struct mp_hwdec_info *info,
-                 const char *decoder)
-{
-    hwdec_request_api(info, "videotoolbox");
-    if (!info || !info->hwctx)
-        return HWDEC_ERR_NO_CTX;
-    if (mp_codec_to_av_codec_id(decoder) != AV_CODEC_ID_H264)
-        return HWDEC_ERR_NO_CODEC;
-    return 0;
-}
-
-static int init(struct lavc_ctx *ctx)
-{
-    return 0;
-}
-
-struct vda_error {
-    int  code;
-    char *reason;
-};
-
-static const struct vda_error vda_errors[] = {
-    { AVERROR(ENOSYS),
-        "Hardware doesn't support accelerated decoding for this stream" },
-    { AVERROR(EINVAL),
-        "Invalid configuration provided to VDADecoderCreate" },
-    { AVERROR_INVALIDDATA,
-        "Generic error returned by the decoder layer. The cause can range from"
-        " VDADecoder finding errors in the bitstream to another application"
-        " using VDA at the moment. Only one application can use VDA at a"
-        " givent time." },
-    { 0, NULL },
-};
-
-static void print_vda_error(struct mp_log *log, int lev, char *message,
-                            int error_code)
-{
-    for (int n = 0; vda_errors[n].code < 0; n++)
-        if (vda_errors[n].code == error_code) {
-            mp_msg(log, lev, "%s: %s (%d)\n",
-                   message, vda_errors[n].reason, error_code);
-            return;
-        }
-
-    mp_msg(log, lev, "%s: %d\n", message, error_code);
-}
-
-static int init_decoder(struct lavc_ctx *ctx, int w, int h)
-{
-    av_vda_default_free(ctx->avctx);
-#if HAVE_VDA_DEFAULT_INIT2
-    AVVDAContext *vdactx = av_vda_alloc_context();
-    vdactx->cv_pix_fmt_type = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
-    int err = av_vda_default_init2(ctx->avctx, vdactx);
-#else
-    int err = av_vda_default_init(ctx->avctx);
-#endif
-
-    if (err < 0) {
-        print_vda_error(ctx->log, MSGL_ERR, "failed to init VDA decoder", err);
-        return -1;
-    }
-    return 0;
-}
-
-static void uninit(struct lavc_ctx *ctx)
-{
-    if (ctx->avctx)
-        av_vda_default_free(ctx->avctx);
-}
-
-static struct mp_image *process_image(struct lavc_ctx *ctx, struct mp_image *img)
-{
-    // Same representation. IMGFMT_VDA is only needed to select the libavcodec
-    // hwaccel driver.
-    if (img->imgfmt == IMGFMT_VDA)
-        mp_image_setfmt(img, IMGFMT_VIDEOTOOLBOX);
-
-    return img;
-}
-
-const struct vd_lavc_hwdec mp_vd_lavc_vda = {
-    .type = HWDEC_VDA,
-    .image_format = IMGFMT_VDA,
-    .probe = probe,
-    .init = init,
-    .uninit = uninit,
-    .init_decoder = init_decoder,
-    .process_image = process_image,
-};