image: Replace buffer ID with full VAImage structure

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>

src/image.c

@@ -75,8 +75,6 @@ VAStatus RequestCreateImage(VADriverContextP context, VAImageFormat *format,
 		return status;
 	}
 
-	image_object->buffer_id = buffer_id;
-
 	memset(image, 0, sizeof(*image));
 
 	image->format = *format;
@@ -88,6 +86,8 @@ VAStatus RequestCreateImage(VADriverContextP context, VAImageFormat *format,
 	image->num_planes = destination_planes_count;
 	image->data_size = size;
 
+	image_object->image = *image;
+
 	for (i = 0; i < image->num_planes; i++) {
 		image->pitches[i] = destination_bytesperlines[i];
 		image->offsets[i] = i > 0 ? destination_sizes[i - 1] : 0;
@@ -106,7 +106,7 @@ VAStatus RequestDestroyImage(VADriverContextP context, VAImageID image_id)
 	if (image_object == NULL)
 		return VA_STATUS_ERROR_INVALID_IMAGE;
 
-	status = RequestDestroyBuffer(context, image_object->buffer_id);
+	status = RequestDestroyBuffer(context, image_object->image.buf);
 	if (status != VA_STATUS_SUCCESS)
 		return status;
 

src/image.h

@@ -36,7 +36,7 @@
 
 struct object_image {
 	struct object_base base;
-	VABufferID buffer_id;
+	VAImage image;
 };
 
 VAStatus RequestCreateImage(VADriverContextP context, VAImageFormat *format,