diff options
| author | wm4 <wm4@nowhere> | 2017-12-01 18:01:15 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-12-01 18:01:15 +0100 |
| commit | 80359c6615658f2784dd834a6978e43022799745 (patch) | |
| tree | d94f5a1772f97f8e4732a68a2e08e3bc16545f74 /video/decode/vd_lavc.c | |
| parent | 9f52a92899db1acf8ae630d5d06c28eb6be652c6 (diff) | |
| download | mpv-80359c6615658f2784dd834a6978e43022799745.tar.bz2 mpv-80359c6615658f2784dd834a6978e43022799745.tar.xz | |
vd_lavc: drop mediacodec direct rendering support temporarily
The libavcodec mediacodec support does not conform to the new hwaccel
APIs yet. It has been agreed uppon that this glue code can be deleted
for now, and support for it will be restored at a later point.
Readding would require that it supports the AVCodecContext.hw_device_ctx
API. The hw_device_ctx would then contain the surface ID.
vo_mediacodec_embed would actually perform the task of creating
vo.hwdec_devs and adding a mp_hwdec_ctx, whose av_device_ref is a
AVHWDeviceContext containing the android surface.
Diffstat (limited to 'video/decode/vd_lavc.c')
| -rw-r--r-- | video/decode/vd_lavc.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 1005c131c6..a422a53819 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -123,9 +123,6 @@ const struct m_sub_options vd_lavc_conf = { }, }; -extern const struct vd_lavc_hwdec mp_vd_lavc_mediacodec; -extern const struct vd_lavc_hwdec mp_vd_lavc_mediacodec_copy; - #if HAVE_RPI static const struct vd_lavc_hwdec mp_vd_lavc_rpi = { .type = HWDEC_RPI, @@ -279,6 +276,14 @@ static const struct vd_lavc_hwdec mp_vd_lavc_dxva2_copy = { }; #endif +#if HAVE_ANDROID +static const struct vd_lavc_hwdec mp_vd_lavc_mediacodec_copy = { + .type = HWDEC_MEDIACODEC_COPY, + .lavc_suffix = "_mediacodec", + .copying = true, +}; +#endif + static const struct vd_lavc_hwdec *const hwdec_list[] = { #if HAVE_D3D_HWACCEL &mp_vd_lavc_d3d11va, @@ -310,7 +315,6 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = { &mp_vd_lavc_vaapi_copy, #endif #if HAVE_ANDROID - &mp_vd_lavc_mediacodec, &mp_vd_lavc_mediacodec_copy, #endif #if HAVE_CUDA_HWACCEL |