summaryrefslogtreecommitdiffstats
path: root/video/decode
diff options
context:
space:
mode:
authorJan Ekström <jeebjp@gmail.com>2016-02-26 00:46:15 +0200
committerwm4 <wm4@nowhere>2016-03-25 21:35:59 +0100
commit5843392db5691403345074b24c9b3caae468d4c6 (patch)
tree04283e8aa78c181790c9ca058d7bc48cd342c01b /video/decode
parent83b8d3f52c22f991227d824ddffd3b054d773d3a (diff)
downloadmpv-5843392db5691403345074b24c9b3caae468d4c6.tar.bz2
mpv-5843392db5691403345074b24c9b3caae468d4c6.tar.xz
Add a mediacodec decoder hwdec wrapper
Does the same thing as the rpi one - makes fallback possible by pretending that h264_mediacodec is a hwdec.
Diffstat (limited to 'video/decode')
-rw-r--r--video/decode/mediacodec.c68
-rw-r--r--video/decode/vd_lavc.c4
2 files changed, 72 insertions, 0 deletions
diff --git a/video/decode/mediacodec.c b/video/decode/mediacodec.c
new file mode 100644
index 0000000000..37ce1b8a2f
--- /dev/null
+++ b/video/decode/mediacodec.c
@@ -0,0 +1,68 @@
+/*
+ * 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 "lavc.h"
+#include "common/common.h"
+
+static const char *const codecs[][2] = {
+ {"h264", "h264_mediacodec"},
+ {0}
+};
+
+static const char *map_codec(const char *c)
+{
+ for (int n = 0; codecs[n][0]; n++) {
+ if (c && strcmp(codecs[n][0], c) == 0)
+ return codecs[n][1];
+ }
+ return NULL;
+}
+
+static int init_decoder(struct lavc_ctx *ctx, int w, int h)
+{
+ return 0;
+}
+
+static void uninit(struct lavc_ctx *ctx)
+{
+}
+
+static int init(struct lavc_ctx *ctx)
+{
+ return 0;
+}
+
+static int probe(struct vd_lavc_hwdec *hwdec, struct mp_hwdec_info *info,
+ const char *decoder)
+{
+ return map_codec(decoder) ? 0 : HWDEC_ERR_NO_CODEC;
+}
+
+static const char *get_codec(struct lavc_ctx *ctx, const char *codec)
+{
+ return map_codec(codec);
+}
+
+const struct vd_lavc_hwdec mp_vd_lavc_mediacodec = {
+ .type = HWDEC_MEDIACODEC,
+ .image_format = IMGFMT_NV12,
+ .probe = probe,
+ .init = init,
+ .uninit = uninit,
+ .init_decoder = init_decoder,
+ .get_codec = get_codec,
+};
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 167c1e55f2..1cb5bc9897 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -127,6 +127,7 @@ extern const struct vd_lavc_hwdec mp_vd_lavc_vaapi_copy;
extern const struct vd_lavc_hwdec mp_vd_lavc_dxva2;
extern const struct vd_lavc_hwdec mp_vd_lavc_dxva2_copy;
extern const struct vd_lavc_hwdec mp_vd_lavc_rpi;
+extern const struct vd_lavc_hwdec mp_vd_lavc_mediacodec;
static const struct vd_lavc_hwdec *const hwdec_list[] = {
#if HAVE_RPI
@@ -146,6 +147,9 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = {
&mp_vd_lavc_dxva2,
&mp_vd_lavc_dxva2_copy,
#endif
+#if HAVE_ANDROID
+ &mp_vd_lavc_mediacodec,
+#endif
NULL
};