diff options
| author | Aman Gupta <aman@tmm1.net> | 2017-07-06 10:40:40 -0700 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-10-09 18:36:54 +0200 |
| commit | d08e407c9eb9b3fb020efa8f1516a68497389416 (patch) | |
| tree | 631c158bf09a050770dd6e0c4bb5b5a7b78bafde /video | |
| parent | cabb1ca54931d882c6063606c84925071b5ee59d (diff) | |
| download | mpv-d08e407c9eb9b3fb020efa8f1516a68497389416.tar.bz2 mpv-d08e407c9eb9b3fb020efa8f1516a68497389416.tar.xz | |
hwdec: rename mediacodec to mediacodec-copy
Diffstat (limited to 'video')
| -rw-r--r-- | video/decode/hw_mediacodec.c | 24 | ||||
| -rw-r--r-- | video/decode/vd_lavc.c | 11 | ||||
| -rw-r--r-- | video/hwdec.h | 2 |
3 files changed, 27 insertions, 10 deletions
diff --git a/video/decode/hw_mediacodec.c b/video/decode/hw_mediacodec.c new file mode 100644 index 0000000000..9d3ef44f8b --- /dev/null +++ b/video/decode/hw_mediacodec.c @@ -0,0 +1,24 @@ +/* + * 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 "video/decode/lavc.h" + +const struct vd_lavc_hwdec mp_vd_lavc_mediacodec_copy = { + .type = HWDEC_MEDIACODEC_COPY, + .lavc_suffix = "_mediacodec", + .copying = true, +}; diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 67b9cd4e17..ec22b42571 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -129,6 +129,7 @@ const struct m_sub_options vd_lavc_conf = { }, }; +extern const struct vd_lavc_hwdec mp_vd_lavc_mediacodec_copy; extern const struct vd_lavc_hwdec mp_vd_lavc_videotoolbox; extern const struct vd_lavc_hwdec mp_vd_lavc_videotoolbox_copy; extern const struct vd_lavc_hwdec mp_vd_lavc_dxva2; @@ -149,14 +150,6 @@ static const struct vd_lavc_hwdec mp_vd_lavc_rpi_copy = { }; #endif -#if HAVE_ANDROID -static const struct vd_lavc_hwdec mp_vd_lavc_mediacodec = { - .type = HWDEC_MEDIACODEC, - .lavc_suffix = "_mediacodec", - .copying = true, -}; -#endif - #if HAVE_CUDA_HWACCEL static const struct vd_lavc_hwdec mp_vd_lavc_cuda = { .type = HWDEC_CUDA, @@ -268,7 +261,7 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = { &mp_vd_lavc_d3d11va_copy, #endif #if HAVE_ANDROID - &mp_vd_lavc_mediacodec, + &mp_vd_lavc_mediacodec_copy, #endif #if HAVE_CUDA_HWACCEL &mp_vd_lavc_cuda, diff --git a/video/hwdec.h b/video/hwdec.h index 637014d049..379e754ffe 100644 --- a/video/hwdec.h +++ b/video/hwdec.h @@ -22,7 +22,7 @@ enum hwdec_type { HWDEC_D3D11VA_COPY, HWDEC_RPI, HWDEC_RPI_COPY, - HWDEC_MEDIACODEC, + HWDEC_MEDIACODEC_COPY, HWDEC_CUDA, HWDEC_CUDA_COPY, HWDEC_CRYSTALHD, |