summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-09-25 12:10:08 +0200
committerwm4 <wm4@nowhere>2015-09-25 12:10:43 +0200
commit38b747bb677400ecb2dccbcd5e1e393cff616905 (patch)
tree4de0b65b5d6b0f9cb1d5deb7d3248da1de27e5ac /video
parent993bee38ca5e4d5d7e95b18b168cbfb9a616dba9 (diff)
downloadmpv-38b747bb677400ecb2dccbcd5e1e393cff616905.tar.bz2
mpv-38b747bb677400ecb2dccbcd5e1e393cff616905.tar.xz
vaapi: cosmetics, minor fixes
Printing "Using vaDeriveImage()" every frame is too verbose, so raise the log level. mp_image strides are in int and not unsigned int; fix this. It's not like it actually matters, though. Finish a comment.
Diffstat (limited to 'video')
-rw-r--r--video/vaapi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/video/vaapi.c b/video/vaapi.c
index 7a8210be6a..c2a298f556 100644
--- a/video/vaapi.c
+++ b/video/vaapi.c
@@ -298,7 +298,7 @@ static int va_surface_image_alloc(struct mp_image *img, VAImageFormat *format)
p->image.width == p->w && p->image.height == p->h)
{
p->is_derived = true;
- MP_VERBOSE(p->ctx, "Using vaDeriveImage()\n");
+ MP_TRACE(p->ctx, "Using vaDeriveImage()\n");
} else {
vaDestroyImage(p->display, p->image.image_id);
status = VA_STATUS_ERROR_OPERATION_FAILED;
@@ -359,7 +359,7 @@ bool va_image_map(struct mp_vaapi_ctx *ctx, VAImage *image, struct mp_image *mpi
}
if (image->format.fourcc == VA_FOURCC_YV12) {
- MPSWAP(unsigned int, mpi->stride[1], mpi->stride[2]);
+ MPSWAP(int, mpi->stride[1], mpi->stride[2]);
MPSWAP(uint8_t *, mpi->planes[1], mpi->planes[2]);
}
@@ -375,7 +375,7 @@ bool va_image_unmap(struct mp_vaapi_ctx *ctx, VAImage *image)
}
// va_dst: copy destination, must be IMGFMT_VAAPI
-// sw_src: copy source, must be a software p
+// sw_src: copy source, must be a software pixel format
int va_surface_upload(struct mp_image *va_dst, struct mp_image *sw_src)
{
struct va_surface *p = va_surface_in_mp_image(va_dst);