tree: Rename the libva hooks

As part of our renaming effort, Rename the libva hooks names to mention
request instead of SunxiCedrus

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>

16 files changed, 317 insertions, 362 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 5d61282..54102b9 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -39,10 +39,10 @@
 #include "utils.h"
 #include "v4l2.h"
 
-VAStatus SunxiCedrusCreateBuffer(VADriverContextP context,
-				 VAContextID context_id, VABufferType type,
-				 unsigned int size, unsigned int count,
-				 void *data, VABufferID *buffer_id)
+VAStatus RequestCreateBuffer(VADriverContextP context, VAContextID context_id,
+			     VABufferType type, unsigned int size,
+			     unsigned int count, void *data,
+			     VABufferID *buffer_id)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -100,8 +100,7 @@ complete:
 	return status;
 }
 
-VAStatus SunxiCedrusDestroyBuffer(VADriverContextP context,
-				  VABufferID buffer_id)
+VAStatus RequestDestroyBuffer(VADriverContextP context, VABufferID buffer_id)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -120,8 +119,8 @@ VAStatus SunxiCedrusDestroyBuffer(VADriverContextP context,
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusMapBuffer(VADriverContextP context, VABufferID buffer_id,
-			      void **data_map)
+VAStatus RequestMapBuffer(VADriverContextP context, VABufferID buffer_id,
+			  void **data_map)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -137,7 +136,7 @@ VAStatus SunxiCedrusMapBuffer(VADriverContextP context, VABufferID buffer_id,
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusUnmapBuffer(VADriverContextP context, VABufferID buffer_id)
+VAStatus RequestUnmapBuffer(VADriverContextP context, VABufferID buffer_id)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -152,9 +151,8 @@ VAStatus SunxiCedrusUnmapBuffer(VADriverContextP context, VABufferID buffer_id)
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusBufferSetNumElements(VADriverContextP context,
-					 VABufferID buffer_id,
-					 unsigned int count)
+VAStatus RequestBufferSetNumElements(VADriverContextP context,
+				     VABufferID buffer_id, unsigned int count)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -172,9 +170,9 @@ VAStatus SunxiCedrusBufferSetNumElements(VADriverContextP context,
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusBufferInfo(VADriverContextP context, VABufferID buffer_id,
-			       VABufferType *type, unsigned int *size,
-			       unsigned int *count)
+VAStatus RequestBufferInfo(VADriverContextP context, VABufferID buffer_id,
+			   VABufferType *type, unsigned int *size,
+			   unsigned int *count)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
diff --git a/src/buffer.h b/src/buffer.h
index ca9aeda..ecb10e4 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -46,22 +46,20 @@ struct object_buffer {
 	unsigned int size;
 };
 
-VAStatus SunxiCedrusCreateBuffer(VADriverContextP context,
-				 VAContextID context_id, VABufferType type,
-				 unsigned int size, unsigned int count,
-				 void *data, VABufferID *buffer_id);
+VAStatus RequestCreateBuffer(VADriverContextP context, VAContextID context_id,
+			     VABufferType type, unsigned int size,
+			     unsigned int count, void *data,
+			     VABufferID *buffer_id);
 void sunxi_cedrus_destroy_buffer(struct cedrus_data *driver_data,
 				 struct object_buffer *obj_buffer);
-VAStatus SunxiCedrusDestroyBuffer(VADriverContextP context,
-				  VABufferID buffer_id);
-VAStatus SunxiCedrusMapBuffer(VADriverContextP context, VABufferID buffer_id,
-			      void **data_map);
-VAStatus SunxiCedrusUnmapBuffer(VADriverContextP context, VABufferID buffer_id);
-VAStatus SunxiCedrusBufferSetNumElements(VADriverContextP context,
-					 VABufferID buffer_id,
-					 unsigned int count);
-VAStatus SunxiCedrusBufferInfo(VADriverContextP context, VABufferID buffer_id,
-			       VABufferType *type, unsigned int *size,
-			       unsigned int *count);
+VAStatus RequestDestroyBuffer(VADriverContextP context, VABufferID buffer_id);
+VAStatus RequestMapBuffer(VADriverContextP context, VABufferID buffer_id,
+			  void **data_map);
+VAStatus RequestUnmapBuffer(VADriverContextP context, VABufferID buffer_id);
+VAStatus RequestBufferSetNumElements(VADriverContextP context,
+				     VABufferID buffer_id, unsigned int count);
+VAStatus RequestBufferInfo(VADriverContextP context, VABufferID buffer_id,
+			   VABufferType *type, unsigned int *size,
+			   unsigned int *count);
 
 #endif
diff --git a/src/config.c b/src/config.c
index a8dad17..c19f553 100644
--- a/src/config.c
+++ b/src/config.c
@@ -36,10 +36,10 @@
 #include "utils.h"
 #include "v4l2.h"
 
-VAStatus SunxiCedrusCreateConfig(VADriverContextP context, VAProfile profile,
-				 VAEntrypoint entrypoint,
-				 VAConfigAttrib *attributes,
-				 int attributes_count, VAConfigID *config_id)
+VAStatus RequestCreateConfig(VADriverContextP context, VAProfile profile,
+			     VAEntrypoint entrypoint,
+			     VAConfigAttrib *attributes, int attributes_count,
+			     VAConfigID *config_id)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -89,8 +89,7 @@ VAStatus SunxiCedrusCreateConfig(VADriverContextP context, VAProfile profile,
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusDestroyConfig(VADriverContextP context,
-				  VAConfigID config_id)
+VAStatus RequestDestroyConfig(VADriverContextP context, VAConfigID config_id)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -106,9 +105,8 @@ VAStatus SunxiCedrusDestroyConfig(VADriverContextP context,
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusQueryConfigProfiles(VADriverContextP context,
-					VAProfile *profiles,
-					int *profiles_count)
+VAStatus RequestQueryConfigProfiles(VADriverContextP context,
+				    VAProfile *profiles, int *profiles_count)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -139,10 +137,10 @@ VAStatus SunxiCedrusQueryConfigProfiles(VADriverContextP context,
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusQueryConfigEntrypoints(VADriverContextP context,
-					   VAProfile profile,
-					   VAEntrypoint *entrypoints,
-					   int *entrypoints_count)
+VAStatus RequestQueryConfigEntrypoints(VADriverContextP context,
+				       VAProfile profile,
+				       VAEntrypoint *entrypoints,
+				       int *entrypoints_count)
 {
 	switch (profile) {
 	case VAProfileMPEG2Simple:
@@ -164,12 +162,11 @@ VAStatus SunxiCedrusQueryConfigEntrypoints(VADriverContextP context,
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusQueryConfigAttributes(VADriverContextP context,
-					  VAConfigID config_id,
-					  VAProfile *profile,
-					  VAEntrypoint *entrypoint,
-					  VAConfigAttrib *attributes,
-					  int *attributes_count)
+VAStatus RequestQueryConfigAttributes(VADriverContextP context,
+				      VAConfigID config_id, VAProfile *profile,
+				      VAEntrypoint *entrypoint,
+				      VAConfigAttrib *attributes,
+				      int *attributes_count)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -197,11 +194,10 @@ VAStatus SunxiCedrusQueryConfigAttributes(VADriverContextP context,
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusGetConfigAttributes(VADriverContextP context,
-					VAProfile profile,
-					VAEntrypoint entrypoint,
-					VAConfigAttrib *attributes,
-					int attributes_count)
+VAStatus RequestGetConfigAttributes(VADriverContextP context, VAProfile profile,
+				    VAEntrypoint entrypoint,
+				    VAConfigAttrib *attributes,
+				    int attributes_count)
 {
 	unsigned int i;
 
@@ -219,23 +215,23 @@ VAStatus SunxiCedrusGetConfigAttributes(VADriverContextP context,
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusQueryDisplayAttributes(VADriverContextP context,
-					   VADisplayAttribute *attributes,
-					   int *attributes_count)
+VAStatus RequestQueryDisplayAttributes(VADriverContextP context,
+				       VADisplayAttribute *attributes,
+				       int *attributes_count)
 {
 	return VA_STATUS_ERROR_UNIMPLEMENTED;
 }
 
-VAStatus SunxiCedrusGetDisplayAttributes(VADriverContextP context,
-					 VADisplayAttribute *attributes,
-					 int attributes_count)
+VAStatus RequestGetDisplayAttributes(VADriverContextP context,
+				     VADisplayAttribute *attributes,
+				     int attributes_count)
 {
 	return VA_STATUS_ERROR_UNIMPLEMENTED;
 }
 
-VAStatus SunxiCedrusSetDisplayAttributes(VADriverContextP context,
-					 VADisplayAttribute *attributes,
-					 int attributes_count)
+VAStatus RequestSetDisplayAttributes(VADriverContextP context,
+				     VADisplayAttribute *attributes,
+				     int attributes_count)
 {
 	return VA_STATUS_ERROR_UNIMPLEMENTED;
 }
diff --git a/src/config.h b/src/config.h
index 68d5bae..00e26bc 100644
--- a/src/config.h
+++ b/src/config.h
@@ -44,38 +44,34 @@ struct object_config {
 	int attributes_count;
 };
 
-VAStatus SunxiCedrusCreateConfig(VADriverContextP context, VAProfile profile,
-				 VAEntrypoint entrypoint,
-				 VAConfigAttrib *attributes,
-				 int attributes_count, VAConfigID *config_id);
-VAStatus SunxiCedrusDestroyConfig(VADriverContextP context,
-				  VAConfigID config_id);
-VAStatus SunxiCedrusQueryConfigProfiles(VADriverContextP context,
-					VAProfile *profiles,
-					int *profiles_count);
-VAStatus SunxiCedrusQueryConfigEntrypoints(VADriverContextP context,
-					   VAProfile profile,
-					   VAEntrypoint *entrypoints,
-					   int *entrypoints_count);
-VAStatus SunxiCedrusQueryConfigAttributes(VADriverContextP context,
-					  VAConfigID config_id,
-					  VAProfile *profile,
-					  VAEntrypoint *entrypoint,
-					  VAConfigAttrib *attributes,
-					  int *attributes_count);
-VAStatus SunxiCedrusGetConfigAttributes(VADriverContextP context,
-					VAProfile profile,
-					VAEntrypoint entrypoint,
-					VAConfigAttrib *attributes,
-					int attributes_count);
-VAStatus SunxiCedrusQueryDisplayAttributes(VADriverContextP context,
-					   VADisplayAttribute *attributes,
-					   int *attributes_count);
-VAStatus SunxiCedrusGetDisplayAttributes(VADriverContextP context,
-					 VADisplayAttribute *attributes,
-					 int attributes_count);
-VAStatus SunxiCedrusSetDisplayAttributes(VADriverContextP context,
-					 VADisplayAttribute *attributes,
-					 int attributes_count);
+VAStatus RequestCreateConfig(VADriverContextP context, VAProfile profile,
+			     VAEntrypoint entrypoint,
+			     VAConfigAttrib *attributes, int attributes_count,
+			     VAConfigID *config_id);
+VAStatus RequestDestroyConfig(VADriverContextP context, VAConfigID config_id);
+VAStatus RequestQueryConfigProfiles(VADriverContextP context,
+				    VAProfile *profiles, int *profiles_count);
+VAStatus RequestQueryConfigEntrypoints(VADriverContextP context,
+				       VAProfile profile,
+				       VAEntrypoint *entrypoints,
+				       int *entrypoints_count);
+VAStatus RequestQueryConfigAttributes(VADriverContextP context,
+				      VAConfigID config_id, VAProfile *profile,
+				      VAEntrypoint *entrypoint,
+				      VAConfigAttrib *attributes,
+				      int *attributes_count);
+VAStatus RequestGetConfigAttributes(VADriverContextP context, VAProfile profile,
+				    VAEntrypoint entrypoint,
+				    VAConfigAttrib *attributes,
+				    int attributes_count);
+VAStatus RequestQueryDisplayAttributes(VADriverContextP context,
+				       VADisplayAttribute *attributes,
+				       int *attributes_count);
+VAStatus RequestGetDisplayAttributes(VADriverContextP context,
+				     VADisplayAttribute *attributes,
+				     int attributes_count);
+VAStatus RequestSetDisplayAttributes(VADriverContextP context,
+				     VADisplayAttribute *attributes,
+				     int attributes_count);
 
 #endif
diff --git a/src/context.c b/src/context.c
index 524c6a7..864f46b 100644
--- a/src/context.c
+++ b/src/context.c
@@ -41,11 +41,10 @@
 #include "utils.h"
 #include "v4l2.h"
 
-VAStatus SunxiCedrusCreateContext(VADriverContextP context,
-				  VAConfigID config_id, int picture_width,
-				  int picture_height, int flags,
-				  VASurfaceID *surfaces_ids, int surfaces_count,
-				  VAContextID *context_id)
+VAStatus RequestCreateContext(VADriverContextP context, VAConfigID config_id,
+			      int picture_width, int picture_height, int flags,
+			      VASurfaceID *surfaces_ids, int surfaces_count,
+			      VAContextID *context_id)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -194,8 +193,7 @@ complete:
 	return status;
 }
 
-VAStatus SunxiCedrusDestroyContext(VADriverContextP context,
-				   VAContextID context_id)
+VAStatus RequestDestroyContext(VADriverContextP context, VAContextID context_id)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
diff --git a/src/context.h b/src/context.h
index 5fcb91c..7879674 100644
--- a/src/context.h
+++ b/src/context.h
@@ -51,12 +51,11 @@ struct object_context {
 	struct h264_dpb dpb;
 };
 
-VAStatus SunxiCedrusCreateContext(VADriverContextP context,
-				  VAConfigID config_id, int picture_width,
-				  int picture_height, int flags,
-				  VASurfaceID *surfaces_ids, int surfaces_count,
-				  VAContextID *context_id);
-VAStatus SunxiCedrusDestroyContext(VADriverContextP context,
-				   VAContextID context_id);
+VAStatus RequestCreateContext(VADriverContextP context, VAConfigID config_id,
+			      int picture_width, int picture_height, int flags,
+			      VASurfaceID *surfaces_ids, int surfaces_count,
+			      VAContextID *context_id);
+VAStatus RequestDestroyContext(VADriverContextP context,
+			       VAContextID context_id);
 
 #endif
diff --git a/src/image.c b/src/image.c
index 7933609..14843e3 100644
--- a/src/image.c
+++ b/src/image.c
@@ -35,8 +35,8 @@
 #include "utils.h"
 #include "v4l2.h"
 
-VAStatus SunxiCedrusCreateImage(VADriverContextP context, VAImageFormat *format,
-				int width, int height, VAImage *image)
+VAStatus RequestCreateImage(VADriverContextP context, VAImageFormat *format,
+			    int width, int height, VAImage *image)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -68,8 +68,8 @@ VAStatus SunxiCedrusCreateImage(VADriverContextP context, VAImageFormat *format,
 	if (image_object == NULL)
 		return VA_STATUS_ERROR_ALLOCATION_FAILED;
 
-	status = SunxiCedrusCreateBuffer(context, 0, VAImageBufferType, size, 1,
-					 NULL, &buffer_id);
+	status = RequestCreateBuffer(context, 0, VAImageBufferType, size, 1,
+				     NULL, &buffer_id);
 	if (status != VA_STATUS_SUCCESS) {
 		object_heap_free(&driver_data->image_heap,
 				 (struct object_base *)image_object);
@@ -97,7 +97,7 @@ VAStatus SunxiCedrusCreateImage(VADriverContextP context, VAImageFormat *format,
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusDestroyImage(VADriverContextP context, VAImageID image_id)
+VAStatus RequestDestroyImage(VADriverContextP context, VAImageID image_id)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -108,7 +108,7 @@ VAStatus SunxiCedrusDestroyImage(VADriverContextP context, VAImageID image_id)
 	if (image_object == NULL)
 		return VA_STATUS_ERROR_INVALID_IMAGE;
 
-	status = SunxiCedrusDestroyBuffer(context, image_object->buffer_id);
+	status = RequestDestroyBuffer(context, image_object->buffer_id);
 	if (status != VA_STATUS_SUCCESS)
 		return status;
 
@@ -118,8 +118,8 @@ VAStatus SunxiCedrusDestroyImage(VADriverContextP context, VAImageID image_id)
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusDeriveImage(VADriverContextP context,
-				VASurfaceID surface_id, VAImage *image)
+VAStatus RequestDeriveImage(VADriverContextP context, VASurfaceID surface_id,
+			    VAImage *image)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -134,7 +134,7 @@ VAStatus SunxiCedrusDeriveImage(VADriverContextP context,
 		return VA_STATUS_ERROR_INVALID_SURFACE;
 
 	if (surface_object->status == VASurfaceRendering) {
-		status = SunxiCedrusSyncSurface(context, surface_id);
+		status = RequestSyncSurface(context, surface_id);
 		if (status != VA_STATUS_SUCCESS)
 			return status;
 	} else if (surface_object->status == VASurfaceReady) {
@@ -143,8 +143,8 @@ VAStatus SunxiCedrusDeriveImage(VADriverContextP context,
 
 	format.fourcc = VA_FOURCC_NV12;
 
-	status = SunxiCedrusCreateImage(context, &format, surface_object->width,
-					surface_object->height, image);
+	status = RequestCreateImage(context, &format, surface_object->width,
+				    surface_object->height, image);
 	if (status != VA_STATUS_SUCCESS)
 		return status;
 
@@ -170,9 +170,8 @@ VAStatus SunxiCedrusDeriveImage(VADriverContextP context,
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusQueryImageFormats(VADriverContextP context,
-				      VAImageFormat *formats,
-				      int *formats_count)
+VAStatus RequestQueryImageFormats(VADriverContextP context,
+				  VAImageFormat *formats, int *formats_count)
 {
 	formats[0].fourcc = VA_FOURCC_NV12;
 	*formats_count = 1;
@@ -180,24 +179,24 @@ VAStatus SunxiCedrusQueryImageFormats(VADriverContextP context,
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusSetImagePalette(VADriverContextP context,
-				    VAImageID image_id, unsigned char *palette)
+VAStatus RequestSetImagePalette(VADriverContextP context, VAImageID image_id,
+				unsigned char *palette)
 {
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusGetImage(VADriverContextP context, VASurfaceID surface_id,
-			     int x, int y, unsigned int width,
-			     unsigned int height, VAImageID image_id)
+VAStatus RequestGetImage(VADriverContextP context, VASurfaceID surface_id,
+			 int x, int y, unsigned int width, unsigned int height,
+			 VAImageID image_id)
 {
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusPutImage(VADriverContextP context, VASurfaceID surface_id,
-			     VAImageID image, int src_x, int src_y,
-			     unsigned int src_width, unsigned int src_height,
-			     int dst_x, int dst_y, unsigned int dst_width,
-			     unsigned int dst_height)
+VAStatus RequestPutImage(VADriverContextP context, VASurfaceID surface_id,
+			 VAImageID image, int src_x, int src_y,
+			 unsigned int src_width, unsigned int src_height,
+			 int dst_x, int dst_y, unsigned int dst_width,
+			 unsigned int dst_height)
 {
 	return VA_STATUS_SUCCESS;
 }
diff --git a/src/image.h b/src/image.h
index 3492202..40dc984 100644
--- a/src/image.h
+++ b/src/image.h
@@ -40,23 +40,22 @@ struct object_image {
 	VABufferID buffer_id;
 };
 
-VAStatus SunxiCedrusCreateImage(VADriverContextP context, VAImageFormat *format,
-				int width, int height, VAImage *image);
-VAStatus SunxiCedrusDestroyImage(VADriverContextP context, VAImageID image_id);
-VAStatus SunxiCedrusDeriveImage(VADriverContextP context,
-				VASurfaceID surface_id, VAImage *image);
-VAStatus SunxiCedrusQueryImageFormats(VADriverContextP context,
-				      VAImageFormat *formats,
-				      int *formats_count);
-VAStatus SunxiCedrusSetImagePalette(VADriverContextP context,
-				    VAImageID image_id, unsigned char *palette);
-VAStatus SunxiCedrusGetImage(VADriverContextP context, VASurfaceID surface_id,
-			     int x, int y, unsigned int width,
-			     unsigned int height, VAImageID image_id);
-VAStatus SunxiCedrusPutImage(VADriverContextP context, VASurfaceID surface_id,
-			     VAImageID image, int src_x, int src_y,
-			     unsigned int src_width, unsigned int src_height,
-			     int dst_x, int dst_y, unsigned int dst_width,
-			     unsigned int dst_height);
+VAStatus RequestCreateImage(VADriverContextP context, VAImageFormat *format,
+			    int width, int height, VAImage *image);
+VAStatus RequestDestroyImage(VADriverContextP context, VAImageID image_id);
+VAStatus RequestDeriveImage(VADriverContextP context, VASurfaceID surface_id,
+			    VAImage *image);
+VAStatus RequestQueryImageFormats(VADriverContextP context,
+				  VAImageFormat *formats, int *formats_count);
+VAStatus RequestSetImagePalette(VADriverContextP context, VAImageID image_id,
+				unsigned char *palette);
+VAStatus RequestGetImage(VADriverContextP context, VASurfaceID surface_id,
+			 int x, int y, unsigned int width, unsigned int height,
+			 VAImageID image_id);
+VAStatus RequestPutImage(VADriverContextP context, VASurfaceID surface_id,
+			 VAImageID image, int src_x, int src_y,
+			 unsigned int src_width, unsigned int src_height,
+			 int dst_x, int dst_y, unsigned int dst_width,
+			 unsigned int dst_height);
 
 #endif
diff --git a/src/picture.c b/src/picture.c
index 2338a8f..a421f90 100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -163,8 +163,8 @@ static VAStatus codec_set_controls(struct cedrus_data *driver_data,
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusBeginPicture(VADriverContextP context,
-				 VAContextID context_id, VASurfaceID surface_id)
+VAStatus RequestBeginPicture(VADriverContextP context, VAContextID context_id,
+			     VASurfaceID surface_id)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -180,7 +180,7 @@ VAStatus SunxiCedrusBeginPicture(VADriverContextP context,
 		return VA_STATUS_ERROR_INVALID_SURFACE;
 
 	if (surface_object->status == VASurfaceRendering)
-		SunxiCedrusSyncSurface(context, surface_id);
+		RequestSyncSurface(context, surface_id);
 
 	surface_object->status = VASurfaceRendering;
 	context_object->render_surface_id = surface_id;
@@ -188,9 +188,8 @@ VAStatus SunxiCedrusBeginPicture(VADriverContextP context,
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusRenderPicture(VADriverContextP context,
-				  VAContextID context_id,
-				  VABufferID *buffers_ids, int buffers_count)
+VAStatus RequestRenderPicture(VADriverContextP context, VAContextID context_id,
+			      VABufferID *buffers_ids, int buffers_count)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -228,7 +227,7 @@ VAStatus SunxiCedrusRenderPicture(VADriverContextP context,
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusEndPicture(VADriverContextP context, VAContextID context_id)
+VAStatus RequestEndPicture(VADriverContextP context, VAContextID context_id)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -282,8 +281,7 @@ VAStatus SunxiCedrusEndPicture(VADriverContextP context, VAContextID context_id)
 
 	surface_object->slices_size = 0;
 
-	status = SunxiCedrusSyncSurface(context,
-					context_object->render_surface_id);
+	status = RequestSyncSurface(context, context_object->render_surface_id);
 	if (status != VA_STATUS_SUCCESS)
 		return status;
 
diff --git a/src/picture.h b/src/picture.h
index ad0f1de..5337c61 100644
--- a/src/picture.h
+++ b/src/picture.h
@@ -30,13 +30,10 @@
 
 #include "object_heap.h"
 
-VAStatus SunxiCedrusBeginPicture(VADriverContextP context,
-				 VAContextID context_id,
-				 VASurfaceID surface_id);
-VAStatus SunxiCedrusRenderPicture(VADriverContextP context,
-				  VAContextID context_id, VABufferID *buffers,
-				  int buffers_count);
-VAStatus SunxiCedrusEndPicture(VADriverContextP context,
-			       VAContextID context_id);
+VAStatus RequestBeginPicture(VADriverContextP context, VAContextID context_id,
+			     VASurfaceID surface_id);
+VAStatus RequestRenderPicture(VADriverContextP context, VAContextID context_id,
+			      VABufferID *buffers, int buffers_count);
+VAStatus RequestEndPicture(VADriverContextP context, VAContextID context_id);
 
 #endif
diff --git a/src/subpicture.c b/src/subpicture.c
index 6a09691..209b64e 100644
--- a/src/subpicture.c
+++ b/src/subpicture.c
@@ -26,76 +26,70 @@
 #include "subpicture.h"
 #include "sunxi_cedrus.h"
 
-VAStatus SunxiCedrusCreateSubpicture(VADriverContextP context,
-				     VAImageID image_id,
-				     VASubpictureID *subpicture_id)
+VAStatus RequestCreateSubpicture(VADriverContextP context, VAImageID image_id,
+				 VASubpictureID *subpicture_id)
 {
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusDestroySubpicture(VADriverContextP context,
-				      VASubpictureID subpicture_id)
+VAStatus RequestDestroySubpicture(VADriverContextP context,
+				  VASubpictureID subpicture_id)
 {
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusQuerySubpictureFormats(VADriverContextP context,
-					   VAImageFormat *formats,
-					   unsigned int *flags,
-					   unsigned int *formats_count)
+VAStatus RequestQuerySubpictureFormats(VADriverContextP context,
+				       VAImageFormat *formats,
+				       unsigned int *flags,
+				       unsigned int *formats_count)
 {
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusSetSubpictureImage(VADriverContextP context,
-				       VASubpictureID subpicture_id,
-				       VAImageID image_id)
+VAStatus RequestSetSubpictureImage(VADriverContextP context,
+				   VASubpictureID subpicture_id,
+				   VAImageID image_id)
 {
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusSetSubpicturePalette(VADriverContextP context,
-					 VASubpictureID subpicture_id,
-					 unsigned char *palette)
+VAStatus RequestSetSubpicturePalette(VADriverContextP context,
+				     VASubpictureID subpicture_id,
+				     unsigned char *palette)
 {
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusSetSubpictureChromakey(VADriverContextP context,
-					   VASubpictureID subpicture_id,
-					   unsigned int chromakey_min,
-					   unsigned int chromakey_max,
-					   unsigned int chromakey_mask)
+VAStatus RequestSetSubpictureChromakey(VADriverContextP context,
+				       VASubpictureID subpicture_id,
+				       unsigned int chromakey_min,
+				       unsigned int chromakey_max,
+				       unsigned int chromakey_mask)
 {
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusSetSubpictureGlobalAlpha(VADriverContextP context,
-					     VASubpictureID subpicture_id,
-					     float global_alpha)
+VAStatus RequestSetSubpictureGlobalAlpha(VADriverContextP context,
+					 VASubpictureID subpicture_id,
+					 float global_alpha)
 {
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusAssociateSubpicture(VADriverContextP context,
-					VASubpictureID subpicture_id,
-					VASurfaceID *surfaces_ids,
-					int surfaces_count,
-					short src_x, short src_y,
-					unsigned short src_width,
-					unsigned short src_height,
-					short dst_x, short dst_y,
-					unsigned short dst_width,
-					unsigned short dst_height,
-					unsigned int flags)
+VAStatus RequestAssociateSubpicture(
+	VADriverContextP context, VASubpictureID subpicture_id,
+	VASurfaceID *surfaces_ids, int surfaces_count, short src_x, short src_y,
+	unsigned short src_width, unsigned short src_height, short dst_x,
+	short dst_y, unsigned short dst_width, unsigned short dst_height,
+	unsigned int flags)
 {
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusDeassociateSubpicture(VADriverContextP context,
-					  VASubpictureID subpicture_id,
-					  VASurfaceID *surfaces_ids,
-					  int surfaces_count)
+VAStatus RequestDeassociateSubpicture(VADriverContextP context,
+				      VASubpictureID subpicture_id,
+				      VASurfaceID *surfaces_ids,
+				      int surfaces_count)
 {
 	return VA_STATUS_SUCCESS;
 }
diff --git a/src/subpicture.h b/src/subpicture.h
index 0c55f30..7a23c36 100644
--- a/src/subpicture.h
+++ b/src/subpicture.h
@@ -28,43 +28,42 @@
 
 #include <va/va_backend.h>
 
-VAStatus SunxiCedrusCreateSubpicture(VADriverContextP context,
-				     VAImageID image_id,
-				     VASubpictureID *subpicture_id);
-VAStatus SunxiCedrusDestroySubpicture(VADriverContextP context,
-				      VASubpictureID subpicture_id);
-VAStatus SunxiCedrusQuerySubpictureFormats(VADriverContextP context,
-					   VAImageFormat *formats,
-					   unsigned int *flags,
-					   unsigned int *formats_count);
-VAStatus SunxiCedrusSetSubpictureImage(VADriverContextP context,
+VAStatus RequestCreateSubpicture(VADriverContextP context, VAImageID image_id,
+				 VASubpictureID *subpicture_id);
+VAStatus RequestDestroySubpicture(VADriverContextP context,
+				  VASubpictureID subpicture_id);
+VAStatus RequestQuerySubpictureFormats(VADriverContextP context,
+				       VAImageFormat *formats,
+				       unsigned int *flags,
+				       unsigned int *formats_count);
+VAStatus RequestSetSubpictureImage(VADriverContextP context,
+				   VASubpictureID subpicture_id,
+				   VAImageID image_id);
+VAStatus RequestSetSubpicturePalette(VADriverContextP context,
+				     VASubpictureID subpicture_id,
+				     unsigned char *palette);
+VAStatus RequestSetSubpictureChromakey(VADriverContextP context,
 				       VASubpictureID subpicture_id,
-				       VAImageID image_id);
-VAStatus SunxiCedrusSetSubpicturePalette(VADriverContextP context,
+				       unsigned int chromakey_min,
+				       unsigned int chromakey_max,
+				       unsigned int chromakey_mask);
+VAStatus RequestSetSubpictureGlobalAlpha(VADriverContextP context,
 					 VASubpictureID subpicture_id,
-					 unsigned char *palette);
-VAStatus SunxiCedrusSetSubpictureChromakey(VADriverContextP context,
-					   VASubpictureID subpicture_id,
-					   unsigned int chromakey_min,
-					   unsigned int chromakey_max,
-					   unsigned int chromakey_mask);
-VAStatus SunxiCedrusSetSubpictureGlobalAlpha(VADriverContextP context,
-					     VASubpictureID subpicture_id,
-					     float global_alpha);
-VAStatus SunxiCedrusAssociateSubpicture(VADriverContextP context,
-					VASubpictureID subpicture_id,
-					VASurfaceID *surfaces_ids,
-					int surfaces_count,
-					short src_x, short src_y,
-					unsigned short src_width,
-					unsigned short src_height,
-					short dst_x, short dst_y,
-					unsigned short dst_width,
-					unsigned short dst_height,
-					unsigned int flags);
-VAStatus SunxiCedrusDeassociateSubpicture(VADriverContextP context,
-					  VASubpictureID subpicture_id,
-					  VASurfaceID *surfaces_ids,
-					  int surfaces_count);
+					 float global_alpha);
+VAStatus RequestAssociateSubpicture(VADriverContextP context,
+				    VASubpictureID subpicture_id,
+				    VASurfaceID *surfaces_ids,
+				    int surfaces_count,
+				    short src_x, short src_y,
+				    unsigned short src_width,
+				    unsigned short src_height,
+				    short dst_x, short dst_y,
+				    unsigned short dst_width,
+				    unsigned short dst_height,
+				    unsigned int flags);
+VAStatus RequestDeassociateSubpicture(VADriverContextP context,
+				      VASubpictureID subpicture_id,
+				      VASurfaceID *surfaces_ids,
+				      int surfaces_count);
 
 #endif
diff --git a/src/sunxi_cedrus.c b/src/sunxi_cedrus.c
index 549967e..9ecaee9 100644
--- a/src/sunxi_cedrus.c
+++ b/src/sunxi_cedrus.c
@@ -77,51 +77,50 @@ VAStatus VA_DRIVER_INIT_FUNC(VADriverContextP context)
 	context->max_display_attributes = SUNXI_CEDRUS_MAX_DISPLAY_ATTRIBUTES;
 	context->str_vendor = SUNXI_CEDRUS_STR_VENDOR;
 
-	vtable->vaTerminate = SunxiCedrusTerminate;
-	vtable->vaQueryConfigEntrypoints = SunxiCedrusQueryConfigEntrypoints;
-	vtable->vaQueryConfigProfiles = SunxiCedrusQueryConfigProfiles;
-	vtable->vaQueryConfigEntrypoints = SunxiCedrusQueryConfigEntrypoints;
-	vtable->vaQueryConfigAttributes = SunxiCedrusQueryConfigAttributes;
-	vtable->vaCreateConfig = SunxiCedrusCreateConfig;
-	vtable->vaDestroyConfig = SunxiCedrusDestroyConfig;
-	vtable->vaGetConfigAttributes = SunxiCedrusGetConfigAttributes;
-	vtable->vaCreateSurfaces = SunxiCedrusCreateSurfaces;
-	vtable->vaDestroySurfaces = SunxiCedrusDestroySurfaces;
-	vtable->vaCreateContext = SunxiCedrusCreateContext;
-	vtable->vaDestroyContext = SunxiCedrusDestroyContext;
-	vtable->vaCreateBuffer = SunxiCedrusCreateBuffer;
-	vtable->vaBufferSetNumElements = SunxiCedrusBufferSetNumElements;
-	vtable->vaMapBuffer = SunxiCedrusMapBuffer;
-	vtable->vaUnmapBuffer = SunxiCedrusUnmapBuffer;
-	vtable->vaDestroyBuffer = SunxiCedrusDestroyBuffer;
-	vtable->vaBeginPicture = SunxiCedrusBeginPicture;
-	vtable->vaRenderPicture = SunxiCedrusRenderPicture;
-	vtable->vaEndPicture = SunxiCedrusEndPicture;
-	vtable->vaSyncSurface = SunxiCedrusSyncSurface;
-	vtable->vaQuerySurfaceStatus = SunxiCedrusQuerySurfaceStatus;
-	vtable->vaPutSurface = SunxiCedrusPutSurface;
-	vtable->vaQueryImageFormats = SunxiCedrusQueryImageFormats;
-	vtable->vaCreateImage = SunxiCedrusCreateImage;
-	vtable->vaDeriveImage = SunxiCedrusDeriveImage;
-	vtable->vaDestroyImage = SunxiCedrusDestroyImage;
-	vtable->vaSetImagePalette = SunxiCedrusSetImagePalette;
-	vtable->vaGetImage = SunxiCedrusGetImage;
-	vtable->vaPutImage = SunxiCedrusPutImage;
-	vtable->vaQuerySubpictureFormats = SunxiCedrusQuerySubpictureFormats;
-	vtable->vaCreateSubpicture = SunxiCedrusCreateSubpicture;
-	vtable->vaDestroySubpicture = SunxiCedrusDestroySubpicture;
-	vtable->vaSetSubpictureImage = SunxiCedrusSetSubpictureImage;
-	vtable->vaSetSubpictureChromakey = SunxiCedrusSetSubpictureChromakey;
-	vtable->vaSetSubpictureGlobalAlpha =
-		SunxiCedrusSetSubpictureGlobalAlpha;
-	vtable->vaAssociateSubpicture = SunxiCedrusAssociateSubpicture;
-	vtable->vaDeassociateSubpicture = SunxiCedrusDeassociateSubpicture;
-	vtable->vaQueryDisplayAttributes = SunxiCedrusQueryDisplayAttributes;
-	vtable->vaGetDisplayAttributes = SunxiCedrusGetDisplayAttributes;
-	vtable->vaSetDisplayAttributes = SunxiCedrusSetDisplayAttributes;
-	vtable->vaLockSurface = SunxiCedrusLockSurface;
-	vtable->vaUnlockSurface = SunxiCedrusUnlockSurface;
-	vtable->vaBufferInfo = SunxiCedrusBufferInfo;
+	vtable->vaTerminate = RequestTerminate;
+	vtable->vaQueryConfigEntrypoints = RequestQueryConfigEntrypoints;
+	vtable->vaQueryConfigProfiles = RequestQueryConfigProfiles;
+	vtable->vaQueryConfigEntrypoints = RequestQueryConfigEntrypoints;
+	vtable->vaQueryConfigAttributes = RequestQueryConfigAttributes;
+	vtable->vaCreateConfig = RequestCreateConfig;
+	vtable->vaDestroyConfig = RequestDestroyConfig;
+	vtable->vaGetConfigAttributes = RequestGetConfigAttributes;
+	vtable->vaCreateSurfaces = RequestCreateSurfaces;
+	vtable->vaDestroySurfaces = RequestDestroySurfaces;
+	vtable->vaCreateContext = RequestCreateContext;
+	vtable->vaDestroyContext = RequestDestroyContext;
+	vtable->vaCreateBuffer = RequestCreateBuffer;
+	vtable->vaBufferSetNumElements = RequestBufferSetNumElements;
+	vtable->vaMapBuffer = RequestMapBuffer;
+	vtable->vaUnmapBuffer = RequestUnmapBuffer;
+	vtable->vaDestroyBuffer = RequestDestroyBuffer;
+	vtable->vaBeginPicture = RequestBeginPicture;
+	vtable->vaRenderPicture = RequestRenderPicture;
+	vtable->vaEndPicture = RequestEndPicture;
+	vtable->vaSyncSurface = RequestSyncSurface;
+	vtable->vaQuerySurfaceStatus = RequestQuerySurfaceStatus;
+	vtable->vaPutSurface = RequestPutSurface;
+	vtable->vaQueryImageFormats = RequestQueryImageFormats;
+	vtable->vaCreateImage = RequestCreateImage;
+	vtable->vaDeriveImage = RequestDeriveImage;
+	vtable->vaDestroyImage = RequestDestroyImage;
+	vtable->vaSetImagePalette = RequestSetImagePalette;
+	vtable->vaGetImage = RequestGetImage;
+	vtable->vaPutImage = RequestPutImage;
+	vtable->vaQuerySubpictureFormats = RequestQuerySubpictureFormats;
+	vtable->vaCreateSubpicture = RequestCreateSubpicture;
+	vtable->vaDestroySubpicture = RequestDestroySubpicture;
+	vtable->vaSetSubpictureImage = RequestSetSubpictureImage;
+	vtable->vaSetSubpictureChromakey = RequestSetSubpictureChromakey;
+	vtable->vaSetSubpictureGlobalAlpha = RequestSetSubpictureGlobalAlpha;
+	vtable->vaAssociateSubpicture = RequestAssociateSubpicture;
+	vtable->vaDeassociateSubpicture = RequestDeassociateSubpicture;
+	vtable->vaQueryDisplayAttributes = RequestQueryDisplayAttributes;
+	vtable->vaGetDisplayAttributes = RequestGetDisplayAttributes;
+	vtable->vaSetDisplayAttributes = RequestSetDisplayAttributes;
+	vtable->vaLockSurface = RequestLockSurface;
+	vtable->vaUnlockSurface = RequestUnlockSurface;
+	vtable->vaBufferInfo = RequestBufferInfo;
 
 	driver_data = malloc(sizeof(*driver_data));
 	memset(driver_data, 0, sizeof(*driver_data));
@@ -182,7 +181,7 @@ complete:
 	return status;
 }
 
-VAStatus SunxiCedrusTerminate(VADriverContextP context)
+VAStatus RequestTerminate(VADriverContextP context)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -201,8 +200,7 @@ VAStatus SunxiCedrusTerminate(VADriverContextP context)
 	image_object = (struct object_image *)
 		object_heap_first(&driver_data->image_heap, &iterator);
 	while (image_object != NULL) {
-		SunxiCedrusDestroyImage(context,
-					(VAImageID)image_object->base.id);
+		RequestDestroyImage(context, (VAImageID)image_object->base.id);
 		image_object = (struct object_image *)
 			object_heap_next(&driver_data->image_heap, &iterator);
 	}
@@ -212,8 +210,8 @@ VAStatus SunxiCedrusTerminate(VADriverContextP context)
 	buffer_object = (struct object_buffer *)
 		object_heap_first(&driver_data->buffer_heap, &iterator);
 	while (buffer_object != NULL) {
-		SunxiCedrusDestroyBuffer(context,
-					 (VABufferID)buffer_object->base.id);
+		RequestDestroyBuffer(context,
+				     (VABufferID)buffer_object->base.id);
 		buffer_object = (struct object_buffer *)
 			object_heap_next(&driver_data->buffer_heap, &iterator);
 	}
@@ -223,9 +221,8 @@ VAStatus SunxiCedrusTerminate(VADriverContextP context)
 	surface_object = (struct object_surface *)
 		object_heap_first(&driver_data->surface_heap, &iterator);
 	while (surface_object != NULL) {
-		SunxiCedrusDestroySurfaces(context,
-					   (VASurfaceID *)&surface_object->base.id,
-					   1);
+		RequestDestroySurfaces(context,
+				      (VASurfaceID *)&surface_object->base.id, 1);
 		surface_object = (struct object_surface *)
 			object_heap_next(&driver_data->surface_heap, &iterator);
 	}
@@ -235,8 +232,8 @@ VAStatus SunxiCedrusTerminate(VADriverContextP context)
 	context_object = (struct object_context *)
 		object_heap_first(&driver_data->context_heap, &iterator);
 	while (context_object != NULL) {
-		SunxiCedrusDestroyContext(context,
-					  (VAContextID)context_object->base.id);
+		RequestDestroyContext(context,
+				      (VAContextID)context_object->base.id);
 		context_object = (struct object_context *)
 			object_heap_next(&driver_data->context_heap, &iterator);
 	}
@@ -246,8 +243,8 @@ VAStatus SunxiCedrusTerminate(VADriverContextP context)
 	config_object = (struct object_config *)
 		object_heap_first(&driver_data->config_heap, &iterator);
 	while (config_object != NULL) {
-		SunxiCedrusDestroyConfig(context,
-					 (VAConfigID)config_object->base.id);
+		RequestDestroyConfig(context,
+				     (VAConfigID)config_object->base.id);
 		config_object = (struct object_config *)
 			object_heap_next(&driver_data->config_heap, &iterator);
 	}
diff --git a/src/sunxi_cedrus.h b/src/sunxi_cedrus.h
index 1905330..fac8dc7 100644
--- a/src/sunxi_cedrus.h
+++ b/src/sunxi_cedrus.h
@@ -56,6 +56,6 @@ struct cedrus_data {
 };
 
 VAStatus VA_DRIVER_INIT_FUNC(VADriverContextP context);
-VAStatus SunxiCedrusTerminate(VADriverContextP context);
+VAStatus RequestTerminate(VADriverContextP context);
 
 #endif
diff --git a/src/surface.c b/src/surface.c
index ed1bfd6..3c20123 100644
--- a/src/surface.c
+++ b/src/surface.c
@@ -42,9 +42,9 @@
 #include "v4l2.h"
 #include "video.h"
 
-VAStatus SunxiCedrusCreateSurfaces(VADriverContextP context, int width,
-				   int height, int format, int surfaces_count,
-				   VASurfaceID *surfaces_ids)
+VAStatus RequestCreateSurfaces(VADriverContextP context, int width, int height,
+			       int format, int surfaces_count,
+			       VASurfaceID *surfaces_ids)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -172,9 +172,8 @@ VAStatus SunxiCedrusCreateSurfaces(VADriverContextP context, int width,
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusDestroySurfaces(VADriverContextP context,
-				    VASurfaceID *surfaces_ids,
-				    int surfaces_count)
+VAStatus RequestDestroySurfaces(VADriverContextP context,
+				VASurfaceID *surfaces_ids, int surfaces_count)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -210,8 +209,7 @@ VAStatus SunxiCedrusDestroySurfaces(VADriverContextP context,
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusSyncSurface(VADriverContextP context,
-				VASurfaceID surface_id)
+VAStatus RequestSyncSurface(VADriverContextP context, VASurfaceID surface_id)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -287,9 +285,9 @@ complete:
 	return status;
 }
 
-VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP context,
-				       VASurfaceID surface_id,
-				       VASurfaceStatus *status)
+VAStatus RequestQuerySurfaceStatus(VADriverContextP context,
+				   VASurfaceID surface_id,
+				   VASurfaceStatus *status)
 {
 	struct cedrus_data *driver_data =
 		(struct cedrus_data *)context->pDriverData;
@@ -304,33 +302,29 @@ VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP context,
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus SunxiCedrusPutSurface(VADriverContextP context, VASurfaceID surface_id,
-			       void *draw, short src_x, short src_y,
-			       unsigned short src_width,
-			       unsigned short src_height, short dst_x,
-			       short dst_y, unsigned short dst_width,
-			       unsigned short dst_height,
-			       VARectangle *cliprects,
-			       unsigned int cliprects_count, unsigned int flags)
+VAStatus RequestPutSurface(VADriverContextP context, VASurfaceID surface_id,
+			   void *draw, short src_x, short src_y,
+			   unsigned short src_width, unsigned short src_height,
+			   short dst_x, short dst_y, unsigned short dst_width,
+			   unsigned short dst_height, VARectangle *cliprects,
+			   unsigned int cliprects_count, unsigned int flags)
 {
 	return VA_STATUS_ERROR_UNIMPLEMENTED;
 }
 
-VAStatus SunxiCedrusLockSurface(VADriverContextP context,
-				VASurfaceID surface_id, unsigned int *fourcc,
-				unsigned int *luma_stride,
-				unsigned int *chroma_u_stride,
-				unsigned int *chroma_v_stride,
-				unsigned int *luma_offset,
-				unsigned int *chroma_u_offset,
-				unsigned int *chroma_v_offset,
-				unsigned int *buffer_name, void **buffer)
+VAStatus RequestLockSurface(VADriverContextP context, VASurfaceID surface_id,
+			    unsigned int *fourcc, unsigned int *luma_stride,
+			    unsigned int *chroma_u_stride,
+			    unsigned int *chroma_v_stride,
+			    unsigned int *luma_offset,
+			    unsigned int *chroma_u_offset,
+			    unsigned int *chroma_v_offset,
+			    unsigned int *buffer_name, void **buffer)
 {
 	return VA_STATUS_ERROR_UNIMPLEMENTED;
 }
 
-VAStatus SunxiCedrusUnlockSurface(VADriverContextP context,
-				  VASurfaceID surface_id)
+VAStatus RequestUnlockSurface(VADriverContextP context, VASurfaceID surface_id)
 {
 	return VA_STATUS_ERROR_UNIMPLEMENTED;
 }
diff --git a/src/surface.h b/src/surface.h
index 58e85a8..efee317 100644
--- a/src/surface.h
+++ b/src/surface.h
@@ -75,36 +75,29 @@ struct object_surface {
 	int request_fd;
 };
 
-VAStatus SunxiCedrusCreateSurfaces(VADriverContextP context, int width,
-				   int height, int format, int surfaces_count,
-				   VASurfaceID *surfaces_ids);
-VAStatus SunxiCedrusDestroySurfaces(VADriverContextP context,
-				    VASurfaceID *surfaces_ids,
-				    int surfaces_count);
-VAStatus SunxiCedrusSyncSurface(VADriverContextP context,
-				VASurfaceID surface_id);
-VAStatus SunxiCedrusQuerySurfaceStatus(VADriverContextP context,
-				       VASurfaceID surface_id,
-				       VASurfaceStatus *status);
-VAStatus SunxiCedrusPutSurface(VADriverContextP context, VASurfaceID surface_id,
-			       void *draw, short src_x, short src_y,
-			       unsigned short src_width,
-			       unsigned short src_height, short dst_x,
-			       short dst_y, unsigned short dst_width,
-			       unsigned short dst_height,
-			       VARectangle *cliprects,
-			       unsigned int cliprects_count,
-			       unsigned int flags);
-VAStatus SunxiCedrusLockSurface(VADriverContextP context,
-				VASurfaceID surface_id, unsigned int *fourcc,
-				unsigned int *luma_stride,
-				unsigned int *chroma_u_stride,
-				unsigned int *chroma_v_stride,
-				unsigned int *luma_offset,
-				unsigned int *chroma_u_offset,
-				unsigned int *chroma_v_offset,
-				unsigned int *buffer_name, void **buffer);
-VAStatus SunxiCedrusUnlockSurface(VADriverContextP context,
-				  VASurfaceID surface_id);
+VAStatus RequestCreateSurfaces(VADriverContextP context, int width, int height,
+			       int format, int surfaces_count,
+			       VASurfaceID *surfaces_ids);
+VAStatus RequestDestroySurfaces(VADriverContextP context,
+				VASurfaceID *surfaces_ids, int surfaces_count);
+VAStatus RequestSyncSurface(VADriverContextP context, VASurfaceID surface_id);
+VAStatus RequestQuerySurfaceStatus(VADriverContextP context,
+				   VASurfaceID surface_id,
+				   VASurfaceStatus *status);
+VAStatus RequestPutSurface(VADriverContextP context, VASurfaceID surface_id,
+			   void *draw, short src_x, short src_y,
+			   unsigned short src_width, unsigned short src_height,
+			   short dst_x, short dst_y, unsigned short dst_width,
+			   unsigned short dst_height, VARectangle *cliprects,
+			   unsigned int cliprects_count, unsigned int flags);
+VAStatus RequestLockSurface(VADriverContextP context, VASurfaceID surface_id,
+			    unsigned int *fourcc, unsigned int *luma_stride,
+			    unsigned int *chroma_u_stride,
+			    unsigned int *chroma_v_stride,
+			    unsigned int *luma_offset,
+			    unsigned int *chroma_u_offset,
+			    unsigned int *chroma_v_offset,
+			    unsigned int *buffer_name, void **buffer);
+VAStatus RequestUnlockSurface(VADriverContextP context, VASurfaceID surface_id);
 
 #endif