diff options
author | wm4 <wm4@nowhere> | 2013-11-23 21:26:31 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-11-23 21:26:31 +0100 |
commit | 4fa2babacc290b94bed0938658447205c0545e27 (patch) | |
tree | 1d5cae1fe22e9e12b3fdb442279a565782953a55 /video/decode | |
parent | 9f4820f6ec1721dc73335cb64b5a5e63170bf379 (diff) | |
download | mpv-4fa2babacc290b94bed0938658447205c0545e27.tar.bz2 mpv-4fa2babacc290b94bed0938658447205c0545e27.tar.xz |
video: move struct mp_hwdec_info into its own header file
This means most code accessing this struct must now include hwdec.h
instead of dec_video.h. I just put it into dec_video.h at first because
I thought a separate file would be a waste, but it's more proper to do
it this way, as there are too many files which include dec_video.h only
to get the mp_hwdec_info definition.
Diffstat (limited to 'video/decode')
-rw-r--r-- | video/decode/dec_video.h | 14 | ||||
-rw-r--r-- | video/decode/lavc.h | 1 | ||||
-rw-r--r-- | video/decode/vaapi.c | 2 | ||||
-rw-r--r-- | video/decode/vdpau.c | 2 | ||||
-rw-r--r-- | video/decode/vdpau_old.c | 2 |
5 files changed, 4 insertions, 17 deletions
diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h index 959d50caaf..2564f45f97 100644 --- a/video/decode/dec_video.h +++ b/video/decode/dec_video.h @@ -42,18 +42,4 @@ void video_reinit_vo(struct sh_video *sh_video); int get_current_video_decoder_lag(sh_video_t *sh_video); int vd_control(struct sh_video *sh_video, int cmd, void *arg); -// Used to communicate hardware decoder API handles from VO to video decoder. -// The VO can set the context pointer for supported APIs. -struct mp_hwdec_info { - struct mp_vdpau_ctx *vdpau_ctx; - struct mp_vaapi_ctx *vaapi_ctx; - // Can be used to lazily load a requested API. - // api_name is e.g. "vdpau" (like the fields above, without "_ctx") - // Can be NULL, is idempotent, caller checks _ctx fields for success/access. - void (*load_api)(struct mp_hwdec_info *info, const char *api_name); - void *load_api_ctx; -}; - -void hwdec_request_api(struct mp_hwdec_info *info, const char *api_name); - #endif /* MPLAYER_DEC_VIDEO_H */ diff --git a/video/decode/lavc.h b/video/decode/lavc.h index 9e2533cbd5..0b0cf0a32a 100644 --- a/video/decode/lavc.h +++ b/video/decode/lavc.h @@ -9,6 +9,7 @@ #include "demux/stheader.h" #include "video/mp_image.h" +#include "video/hwdec.h" // keep in sync with --hwdec option enum hwdec_type { diff --git a/video/decode/vaapi.c b/video/decode/vaapi.c index 4603a3c5e1..a27e3cde93 100644 --- a/video/decode/vaapi.c +++ b/video/decode/vaapi.c @@ -33,7 +33,7 @@ #include "video/fmt-conversion.h" #include "video/vaapi.h" #include "video/mp_image_pool.h" -#include "video/decode/dec_video.h" +#include "video/hwdec.h" #include "video/filter/vf.h" /* diff --git a/video/decode/vdpau.c b/video/decode/vdpau.c index 02f71085d1..02eab84a0c 100644 --- a/video/decode/vdpau.c +++ b/video/decode/vdpau.c @@ -27,7 +27,7 @@ #include "mpvcore/av_common.h" #include "video/fmt-conversion.h" #include "video/vdpau.h" -#include "video/decode/dec_video.h" +#include "video/hwdec.h" struct priv { struct mp_vdpau_ctx *mpvdp; diff --git a/video/decode/vdpau_old.c b/video/decode/vdpau_old.c index 9a15609e14..1ef6c7857a 100644 --- a/video/decode/vdpau_old.c +++ b/video/decode/vdpau_old.c @@ -30,7 +30,7 @@ #include "lavc.h" #include "video/fmt-conversion.h" #include "video/vdpau.h" -#include "video/decode/dec_video.h" +#include "video/hwdec.h" struct priv { struct mp_vdpau_ctx *mpvdp; |