Merge branch 'master-fd.o'

4 files changed, 19 insertions, 4 deletions

diff --git a/dummy_drv_video/dummy_drv_video.c b/dummy_drv_video/dummy_drv_video.c
index 1a9d7c1..f617018 100644
--- a/dummy_drv_video/dummy_drv_video.c
+++ b/dummy_drv_video/dummy_drv_video.c
@@ -1163,7 +1163,7 @@ VAStatus dummy_Terminate( VADriverContextP ctx )
     return VA_STATUS_SUCCESS;
 }
 
-VAStatus __vaDriverInit_0_30(  VADriverContextP ctx )
+VAStatus __vaDriverInit_0_31(  VADriverContextP ctx )
 {
     object_base_p obj;
     int result;
diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c
index caf7f62..d26942d 100644
--- a/i965_drv_video/i965_drv_video.c
+++ b/i965_drv_video/i965_drv_video.c
@@ -1312,7 +1312,7 @@ i965_Terminate(VADriverContextP ctx)
 }
 
 VAStatus 
-__vaDriverInit_0_30(  VADriverContextP ctx )
+__vaDriverInit_0_31(  VADriverContextP ctx )
 {
     struct i965_driver_data *i965;
     int result;
diff --git a/src/va.c b/src/va.c
index dbfcd31..9a34534 100644
--- a/src/va.c
+++ b/src/va.c
@@ -39,8 +39,8 @@
 #include "va_dricommon.h"
 
 
-#define DRIVER_INIT_FUNC	"__vaDriverInit_0_30"
-#define DRIVER_INIT_FUNC_SDS	"__vaDriverInit_0_30_sds"
+#define DRIVER_INIT_FUNC	"__vaDriverInit_0_31"
+#define DRIVER_INIT_FUNC_SDS	"__vaDriverInit_0_31_sds"
 
 #define DRIVER_EXTENSION	"_drv_video.so"
 
diff --git a/src/va.h b/src/va.h
index 874049f..083275b 100644
--- a/src/va.h
+++ b/src/va.h
@@ -392,6 +392,21 @@ VAStatus vaCreateSurfaces (
     VASurfaceID *surfaces	/* out */
 );
 
+/* Wrap a CI (camera imaging) frame as a VA surface to share captured video between camear
+ * and VA encode. With frame_id, VA driver need to call CI interfaces to get the information
+ * of the frame, and to determine if the frame can be wrapped as a VA surface
+ *
+ * Application should make sure the frame is idle before the frame is passed into VA stack
+ * and also a vaSyncSurface should be called before application tries to access the frame
+ * from CI stack
+ */
+VAStatus vaCreateSurfaceFromCIFrame (
+    VADisplay dpy,
+    unsigned long frame_id,
+    VASurfaceID *surface	/* out */
+);
+    
+    
 /*
  * vaDestroySurfaces - Destroy resources associated with surfaces. 
  *  Surfaces can only be destroyed after the context associated has been