summaryrefslogtreecommitdiff
path: root/va
diff options
context:
space:
mode:
authorAustin Yuan <shengquan.yuan@intel.com>2012-04-24 23:00:03 -0700
committerXiang, Haihao <haihao.xiang@intel.com>2013-06-05 09:38:35 +0800
commit63e1d77fb7237469d72a2a773aeec1b3eeb89e98 (patch)
tree1218f2e84847ccadf77307d09978168dd8382550 /va
parentf516e0a846bf39921e33b0712242a3110e38a963 (diff)
tpi: clean the old interface, and use new one
Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>
Diffstat (limited to 'va')
-rw-r--r--va/va_backend_tpi.h93
-rw-r--r--va/va_tpi.c130
-rw-r--r--va/va_tpi.h98
3 files changed, 80 insertions, 241 deletions
diff --git a/va/va_backend_tpi.h b/va/va_backend_tpi.h
index 56998de..141eb75 100644
--- a/va/va_backend_tpi.h
+++ b/va/va_backend_tpi.h
@@ -31,77 +31,38 @@
#include <va/va.h>
#include <va/va_backend.h>
-
-#include <linux/videodev2.h>
+#include <va/va_tpi.h>
struct VADriverVTableTPI
{
- /* device specific */
- VAStatus (*vaCreateSurfaceFromCIFrame) (
- VADriverContextP ctx,
- unsigned long frame_id,
- VASurfaceID *surface /* out */
- );
-
- VAStatus (*vaCreateSurfaceFromV4L2Buf) (
- VADriverContextP ctx,
- int v4l2_fd, /* file descriptor of V4L2 device */
- struct v4l2_format *v4l2_fmt, /* format of V4L2 */
- struct v4l2_buffer *v4l2_buf, /* V4L2 buffer */
- VASurfaceID *surface /* out */
+ VAStatus (*vaCreateSurfacesWithAttribute) (
+ VADisplay dpy,
+ int width,
+ int height,
+ int format,
+ int num_surfaces,
+ VASurfaceID *surfaces, /* out */
+ VASurfaceAttributeTPI *attribute_tpi
);
+
- VAStatus (*vaCreateSurfacesForUserPtr)(
- VADriverContextP ctx,
- int width,
- int height,
- int format,
- int num_surfaces,
- VASurfaceID *surfaces, /* out */
- unsigned size, /* total buffer size need to be allocated */
- unsigned int fourcc, /* expected fourcc */
- unsigned int luma_stride, /* luma stride, could be width aligned with a special value */
- unsigned int chroma_u_stride, /* chroma stride */
- unsigned int chroma_v_stride,
- unsigned int luma_offset, /* could be 0 */
- unsigned int chroma_u_offset, /* UV offset from the beginning of the memory */
- unsigned int chroma_v_offset
- );
-
- VAStatus (*vaCreateSurfaceFromKBuf)(
- VADriverContextP ctx,
- int width,
- int height,
- int format,
- VASurfaceID *surface, /* out */
- unsigned int kbuf_handle, /* kernel buffer handle*/
- unsigned size, /* kernel buffer size */
- unsigned int kBuf_fourcc, /* expected fourcc */
- unsigned int luma_stride, /* luma stride, could be width aligned with a special value */
- unsigned int chroma_u_stride, /* chroma stride */
- unsigned int chroma_v_stride,
- unsigned int luma_offset, /* could be 0 */
- unsigned int chroma_u_offset, /* UV offset from the beginning of the memory */
- unsigned int chroma_v_offset
- );
-
- VAStatus (*vaPutSurfaceBuf) (
- VADriverContextP ctx,
- VASurfaceID surface,
- unsigned char* data,
- int* data_len,
- short srcx,
- short srcy,
- unsigned short srcw,
- unsigned short srch,
- short destx,
- short desty,
- unsigned short destw,
- unsigned short desth,
- VARectangle *cliprects, /* client supplied clip list */
- unsigned int number_cliprects, /* number of clip rects in the clip list */
- unsigned int flags /* de-interlacing flags */
- );
+ VAStatus (*vaPutSurfaceBuf) (
+ VADriverContextP ctx,
+ VASurfaceID surface,
+ unsigned char* data,
+ int* data_len,
+ short srcx,
+ short srcy,
+ unsigned short srcw,
+ unsigned short srch,
+ short destx,
+ short desty,
+ unsigned short destw,
+ unsigned short desth,
+ VARectangle *cliprects, /* client supplied clip list */
+ unsigned int number_cliprects, /* number of clip rects in the clip list */
+ unsigned int flags /* de-interlacing flags */
+ );
};
diff --git a/va/va_tpi.c b/va/va_tpi.c
index e9169fc..21d547d 100644
--- a/va/va_tpi.c
+++ b/va/va_tpi.c
@@ -39,122 +39,18 @@
#define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext)
#define CHECK_DISPLAY(dpy) if( !vaDisplayIsValid(dpy) ) { return VA_STATUS_ERROR_INVALID_DISPLAY; }
-/* 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 */
-)
-{
- VADriverContextP ctx;
- struct VADriverVTableTPI *tpi;
- CHECK_DISPLAY(dpy);
- ctx = CTX(dpy);
-
- tpi = ( struct VADriverVTableTPI *)ctx->vtable_tpi;
- if (tpi && tpi->vaCreateSurfaceFromCIFrame) {
- return tpi->vaCreateSurfaceFromCIFrame( ctx, frame_id, surface );
- } else
- return VA_STATUS_ERROR_UNIMPLEMENTED;
-
-}
-
-/* Wrap a V4L2 buffer as a VA surface, so that V4L2 camera, VA encode
- * can share the data without copy
- * The VA driver should query the camera device from v4l2_fd to see
- * if camera device memory/buffer can be wrapped into a VA surface
- * Buffer information is passed in by v4l2_fmt and v4l2_buf structure,
- * VA driver also needs do further check if the buffer can meet encode
- * hardware requirement, such as dimension, fourcc, stride, etc
- *
- * Application should make sure the buffer is idle before the frame into VA stack
- * and also a vaSyncSurface should be called before application tries to access the frame
- * from V4L2 stack
- */
-VAStatus vaCreateSurfaceFromV4L2Buf(
- VADisplay dpy,
- int v4l2_fd, /* file descriptor of V4L2 device */
- struct v4l2_format *v4l2_fmt, /* format of V4L2 */
- struct v4l2_buffer *v4l2_buf, /* V4L2 buffer */
- VASurfaceID *surface /* out */
-)
-{
- VADriverContextP ctx;
- struct VADriverVTableTPI *tpi;
- CHECK_DISPLAY(dpy);
- ctx = CTX(dpy);
-
- tpi = ( struct VADriverVTableTPI *)ctx->vtable_tpi;
- if (tpi && tpi->vaCreateSurfaceFromV4L2Buf) {
- return tpi->vaCreateSurfaceFromV4L2Buf( ctx, v4l2_fd, v4l2_fmt, v4l2_buf, surface );
- } else
- return VA_STATUS_ERROR_UNIMPLEMENTED;
-}
-
/*
- * The surfaces could be shared and accessed with extern devices
- * which has special requirements, e.g. stride alignment
- * This API is used to force libVA video surfaces are allocated
- * according to these external requirements
- * Special API for V4L2 user pointer support
+ * Create surfaces with special inputs/requirements
*/
-VAStatus vaCreateSurfacesForUserPtr(
- VADisplay dpy,
- int width,
- int height,
- int format,
- int num_surfaces,
- VASurfaceID *surfaces, /* out */
- unsigned size, /* total buffer size need to be allocated */
- unsigned int fourcc, /* expected fourcc */
- unsigned int luma_stride, /* luma stride, could be width aligned with a special value */
- unsigned int chroma_u_stride, /* chroma stride */
- unsigned int chroma_v_stride,
- unsigned int luma_offset, /* could be 0 */
- unsigned int chroma_u_offset, /* UV offset from the beginning of the memory */
- unsigned int chroma_v_offset
-)
-{
- VADriverContextP ctx;
- struct VADriverVTableTPI *tpi;
- CHECK_DISPLAY(dpy);
- ctx = CTX(dpy);
-
- tpi = (struct VADriverVTableTPI *)ctx->vtable_tpi;
- if (tpi && tpi->vaCreateSurfacesForUserPtr) {
- return tpi->vaCreateSurfacesForUserPtr( ctx, width, height, format, num_surfaces,
- surfaces,size, fourcc, luma_stride, chroma_u_stride,
- chroma_v_stride, luma_offset, chroma_u_offset, chroma_v_offset );
- } else
- return VA_STATUS_ERROR_UNIMPLEMENTED;
-}
-
-/*
- * Create surface from the Kernel buffer
- */
-VAStatus vaCreateSurfaceFromKBuf(
- VADisplay dpy,
- int width,
- int height,
- int format,
- VASurfaceID *surface, /* out */
- unsigned int kbuf_handle, /* kernel buffer handle*/
- unsigned size, /* kernel buffer size */
- unsigned int kBuf_fourcc, /* expected fourcc */
- unsigned int luma_stride, /* luma stride, could be width aligned with a special value */
- unsigned int chroma_u_stride, /* chroma stride */
- unsigned int chroma_v_stride,
- unsigned int luma_offset, /* could be 0 */
- unsigned int chroma_u_offset, /* UV offset from the beginning of the memory */
- unsigned int chroma_v_offset
+VAStatus vaCreateSurfacesWithAttribute (
+ VADisplay dpy,
+ int width,
+ int height,
+ int format,
+ int num_surfaces,
+ VASurfaceID *surfaces, /* out */
+ VASurfaceAttributeTPI *attribute_tpi
)
{
VADriverContextP ctx;
@@ -163,10 +59,8 @@ VAStatus vaCreateSurfaceFromKBuf(
ctx = CTX(dpy);
tpi = (struct VADriverVTableTPI *)ctx->vtable_tpi;
- if (tpi && tpi->vaCreateSurfaceFromKBuf) {
- return tpi->vaCreateSurfaceFromKBuf( ctx, width, height, format, surface, kbuf_handle,
- size, kBuf_fourcc, luma_stride, chroma_u_stride,
- chroma_v_stride, luma_offset, chroma_u_offset, chroma_v_offset );
+ if (tpi && tpi->vaCreateSurfacesWithAttribute) {
+ return tpi->vaCreateSurfacesWithAttribute( ctx, width, height, format, num_surfaces, surfaces, attribute_tpi);
} else
return VA_STATUS_ERROR_UNIMPLEMENTED;
}
@@ -198,7 +92,7 @@ VAStatus vaPutSurfaceBuf (
tpi = ( struct VADriverVTableTPI *)ctx->vtable_tpi;
if (tpi && tpi->vaPutSurfaceBuf) {
return tpi->vaPutSurfaceBuf( ctx, surface, data, data_len, srcx, srcy, srcw, srch,
- destx, desty, destw, desth, cliprects, number_cliprects, flags );
+ destx, desty, destw, desth, cliprects, number_cliprects, flags );
} else
return VA_STATUS_ERROR_UNIMPLEMENTED;
}
diff --git a/va/va_tpi.h b/va/va_tpi.h
index 921c8fe..d4a9d06 100644
--- a/va/va_tpi.h
+++ b/va/va_tpi.h
@@ -21,34 +21,51 @@
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+#ifndef _VA_TPI_H_
+#define _VA_TPI_H_
-/* 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
- */
#include <va/va.h>
#ifdef __cplusplus
extern "C" {
#endif
-VAStatus vaCreateSurfaceFromCIFrame (
- VADisplay dpy,
- unsigned long frame_id,
- VASurfaceID *surface /* out */
-);
-VAStatus vaCreateSurfaceFromV4L2Buf(
- VADisplay dpy,
- int v4l2_fd, /* file descriptor of V4L2 device */
- struct v4l2_format *v4l2_fmt, /* format of V4L2 */
- struct v4l2_buffer *v4l2_buf, /* V4L2 buffer */
- VASurfaceID *surface /* out */
-);
+typedef enum {
+ VAExternalMemoryNULL, /* it is not external buffer, but requires the implementation allocates
+ * the surface with the input attribute
+ */
+ VAExternalMemoryV4L2Buffer,
+ VAExternalMemoryCIFrame, /* the memory is from camera frames and buffers points the frame ID list */
+ VAExternalMemoryUserPointer, /* the memory is malloc-ed and buffers points to the buffers */
+ VAExternalMemoryKernelDRMBufffer, /* the memory is from kernel DRM buffers and buffers points the
+ * DRM buffer handle list
+ */
+ VAExternalMemoryAndroidGrallocBuffer, /* the memory is from Android Gralloc memory, and buffers points
+ * the gralloc native_handle_t list
+ */
+} VASurfaceMemoryType;
+
+typedef struct _VASurfaceAttributeTPI {
+ VASurfaceMemoryType type;
+ unsigned int width;
+ unsigned int height;
+ unsigned int size;
+ unsigned int pixel_format; /* buffer format */
+ unsigned int tiling; /* the memory is tiling or not */
+ unsigned int luma_stride; /* luma stride, could be width aligned with a special value */
+ unsigned int chroma_u_stride; /* chroma stride */
+ unsigned int chroma_v_stride;
+ unsigned int luma_offset; /* could be 0 */
+ unsigned int chroma_u_offset; /* U offset from the beginning of the memory */
+ unsigned int chroma_v_offset; /* V offset from the beginning of the memory */
+ unsigned int count; /* buffer count for surface creation */
+ unsigned int *buffers; /* buffer handles or user pointers */
+ unsigned int reserved[4]; /* used to pass additional information, like
+ * Android native window pointer
+ */
+} VASurfaceAttributeTPI;
+
VAStatus vaPutSurfaceBuf (
VADisplay dpy,
@@ -69,51 +86,18 @@ VAStatus vaPutSurfaceBuf (
);
-/*
- * The surfaces could be shared and accessed with extern devices
- * which has special requirements, e.g. stride alignment
- * This API is used to force libVA video surfaces are allocated
- * according to these external requirements
- * Special API for V4L2 user pointer support
- */
-VAStatus vaCreateSurfacesForUserPtr(
+VAStatus vaCreateSurfacesWithAttribute (
VADisplay dpy,
int width,
int height,
int format,
int num_surfaces,
VASurfaceID *surfaces, /* out */
- unsigned size, /* total buffer size need to be allocated */
- unsigned int fourcc, /* expected fourcc */
- unsigned int luma_stride, /* luma stride, could be width aligned with a special value */
- unsigned int chroma_u_stride, /* chroma stride */
- unsigned int chroma_v_stride,
- unsigned int luma_offset, /* could be 0 */
- unsigned int chroma_u_offset, /* UV offset from the beginning of the memory */
- unsigned int chroma_v_offset
+ VASurfaceAttributeTPI *attribute_tpi
);
-/*
- * Create surface from the Kernel buffer
- */
-VAStatus vaCreateSurfaceFromKBuf(
- VADisplay dpy,
- int width,
- int height,
- int format,
- VASurfaceID *surface, /* out */
- unsigned int kbuf_handle, /* kernel buffer handle*/
- unsigned size, /* kernel buffer size */
- unsigned int kBuf_fourcc, /* expected fourcc */
- unsigned int luma_stride, /* luma stride, could be width aligned with a special value */
- unsigned int chroma_u_stride, /* chroma stride */
- unsigned int chroma_v_stride,
- unsigned int luma_offset, /* could be 0 */
- unsigned int chroma_u_offset, /* UV offset from the beginning of the memory */
- unsigned int chroma_v_offset
-);
-
-
#ifdef __cplusplus
}
#endif
+
+#endif