summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-21 22:12:30 +0100
committerwm4 <wm4@nowhere>2015-01-21 22:12:30 +0100
commitb2149f7fe102f7d00beb2051e179160e47cbcbc6 (patch)
tree4fc5226f63eb71a167bb2cff0848011c0cca26e4
parenta1ed13869c1586897c323ebf65cfd3975092ffad (diff)
downloadmpv-b2149f7fe102f7d00beb2051e179160e47cbcbc6.tar.bz2
mpv-b2149f7fe102f7d00beb2051e179160e47cbcbc6.tar.xz
vaapi: minor simplification
-rw-r--r--video/filter/vf_vavpp.c2
-rw-r--r--video/out/vo_vaapi.c2
-rw-r--r--video/vaapi.c7
-rw-r--r--video/vaapi.h4
4 files changed, 6 insertions, 9 deletions
diff --git a/video/filter/vf_vavpp.c b/video/filter/vf_vavpp.c
index 4b6322cbe2..ec39772865 100644
--- a/video/filter/vf_vavpp.c
+++ b/video/filter/vf_vavpp.c
@@ -284,7 +284,7 @@ static void uninit(struct vf_instance *vf)
static int query_format(struct vf_instance *vf, unsigned int imgfmt)
{
struct vf_priv_s *p = vf->priv;
- if (imgfmt == IMGFMT_VAAPI || va_image_format_from_imgfmt(p->va->image_formats, imgfmt))
+ if (imgfmt == IMGFMT_VAAPI || va_image_format_from_imgfmt(p->va, imgfmt))
return vf_next_query_format(vf, IMGFMT_VAAPI);
return 0;
}
diff --git a/video/out/vo_vaapi.c b/video/out/vo_vaapi.c
index f8edd83b4e..21e604f235 100644
--- a/video/out/vo_vaapi.c
+++ b/video/out/vo_vaapi.c
@@ -177,7 +177,7 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
static int query_format(struct vo *vo, int imgfmt)
{
struct priv *p = vo->priv;
- if (imgfmt == IMGFMT_VAAPI || va_image_format_from_imgfmt(p->va_image_formats, imgfmt))
+ if (imgfmt == IMGFMT_VAAPI || va_image_format_from_imgfmt(p->mpvaapi, imgfmt))
return 1;
return 0;
diff --git a/video/vaapi.c b/video/vaapi.c
index 981b6ee911..e7cd7591a1 100644
--- a/video/vaapi.c
+++ b/video/vaapi.c
@@ -149,9 +149,9 @@ void va_destroy(struct mp_vaapi_ctx *ctx)
}
}
-VAImageFormat *va_image_format_from_imgfmt(const struct va_image_formats *formats,
- int imgfmt)
+VAImageFormat *va_image_format_from_imgfmt(struct mp_vaapi_ctx *ctx, int imgfmt)
{
+ struct va_image_formats *formats = ctx->image_formats;
const int fourcc = va_fourcc_from_imgfmt(imgfmt);
if (!formats || !formats->num || !fourcc)
return NULL;
@@ -299,8 +299,7 @@ int va_surface_alloc_imgfmt(struct mp_image *img, int imgfmt)
if (p->image.image_id != VA_INVALID_ID &&
va_fourcc_to_imgfmt(p->image.format.fourcc) == imgfmt)
return 0;
- VAImageFormat *format =
- va_image_format_from_imgfmt(p->ctx->image_formats, imgfmt);
+ VAImageFormat *format = va_image_format_from_imgfmt(p->ctx, imgfmt);
if (!format)
return -1;
if (va_surface_image_alloc(img, format) < 0)
diff --git a/video/vaapi.h b/video/vaapi.h
index 86a9919e27..8a6ba766e5 100644
--- a/video/vaapi.h
+++ b/video/vaapi.h
@@ -83,8 +83,6 @@ struct mp_vaapi_ctx {
pthread_mutex_t lock;
};
-struct va_image_formats;
-
bool check_va_status(struct mp_log *log, VAStatus status, const char *msg);
#define CHECK_VA_STATUS(ctx, msg) check_va_status((ctx)->log, status, msg)
@@ -99,7 +97,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx);
enum mp_imgfmt va_fourcc_to_imgfmt(uint32_t fourcc);
uint32_t va_fourcc_from_imgfmt(int imgfmt);
-VAImageFormat * va_image_format_from_imgfmt(const struct va_image_formats *formats, int imgfmt);
+VAImageFormat * va_image_format_from_imgfmt(struct mp_vaapi_ctx *ctx, int imgfmt);
bool va_image_map(struct mp_vaapi_ctx *ctx, VAImage *image, struct mp_image *mpi);
bool va_image_unmap(struct mp_vaapi_ctx *ctx, VAImage *image);