[FFmpeg-cvslog] r18136 - in trunk/libavcodec: vaapi.c vaapi.h vaapi_internal.h
gb
subversion
Sun Mar 22 02:32:27 CET 2009
Author: gb
Date: Sun Mar 22 02:32:27 2009
New Revision: 18136
Log:
Add common VA API data structures and helpers.
Added:
trunk/libavcodec/vaapi.c
trunk/libavcodec/vaapi.h
trunk/libavcodec/vaapi_internal.h
Added: trunk/libavcodec/vaapi.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/libavcodec/vaapi.c Sun Mar 22 02:32:27 2009 (r18136)
@@ -0,0 +1,197 @@
+/*
+ * Video Acceleration API (video decoding)
+ * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1
+ *
+ * Copyright (C) 2008-2009 Splitted-Desktop Systems
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "vaapi_internal.h"
+
+/**
+ * \addtogroup VAAPI_Decoding
+ *
+ * @{
+ */
+
+static void destroy_buffers(VADisplay display, VABufferID *buffers, unsigned int n_buffers)
+{
+ unsigned int i;
+ for (i = 0; i < n_buffers; i++) {
+ if (buffers[i]) {
+ vaDestroyBuffer(display, buffers[i]);
+ buffers[i] = 0;
+ }
+ }
+}
+
+static int render_picture(struct vaapi_context *vactx, VASurfaceID surface)
+{
+ VABufferID va_buffers[3];
+ unsigned int n_va_buffers = 0;
+
+ if (vaCreateBuffer(vactx->display, vactx->context_id,
+ VAPictureParameterBufferType,
+ vactx->pic_param_size,
+ 1, &vactx->pic_param,
+ &vactx->pic_param_buf_id) != VA_STATUS_SUCCESS)
+ return -1;
+ va_buffers[n_va_buffers++] = vactx->pic_param_buf_id;
+
+ if (vactx->iq_matrix_present) {
+ if (vaCreateBuffer(vactx->display, vactx->context_id,
+ VAIQMatrixBufferType,
+ vactx->iq_matrix_size,
+ 1, &vactx->iq_matrix,
+ &vactx->iq_matrix_buf_id) != VA_STATUS_SUCCESS)
+ return -1;
+ va_buffers[n_va_buffers++] = vactx->iq_matrix_buf_id;
+ }
+
+ if (vactx->bitplane_buffer) {
+ if (vaCreateBuffer(vactx->display, vactx->context_id,
+ VABitPlaneBufferType,
+ vactx->bitplane_buffer_size,
+ 1, vactx->bitplane_buffer,
+ &vactx->bitplane_buf_id) != VA_STATUS_SUCCESS)
+ return -1;
+ va_buffers[n_va_buffers++] = vactx->bitplane_buf_id;
+ }
+
+ if (vaBeginPicture(vactx->display, vactx->context_id,
+ surface) != VA_STATUS_SUCCESS)
+ return -1;
+
+ if (vaRenderPicture(vactx->display, vactx->context_id,
+ va_buffers, n_va_buffers) != VA_STATUS_SUCCESS)
+ return -1;
+
+ if (vaRenderPicture(vactx->display, vactx->context_id,
+ vactx->slice_buf_ids,
+ vactx->n_slice_buf_ids) != VA_STATUS_SUCCESS)
+ return -1;
+
+ if (vaEndPicture(vactx->display, vactx->context_id) != VA_STATUS_SUCCESS)
+ return -1;
+
+ return 0;
+}
+
+static int commit_slices(struct vaapi_context *vactx)
+{
+ VABufferID *slice_buf_ids;
+ VABufferID slice_param_buf_id, slice_data_buf_id;
+
+ if (vactx->slice_count == 0)
+ return 0;
+
+ slice_buf_ids =
+ av_fast_realloc(vactx->slice_buf_ids,
+ &vactx->slice_buf_ids_alloc,
+ (vactx->n_slice_buf_ids + 2) * sizeof(slice_buf_ids[0]));
+ if (!slice_buf_ids)
+ return -1;
+ vactx->slice_buf_ids = slice_buf_ids;
+
+ slice_param_buf_id = 0;
+ if (vaCreateBuffer(vactx->display, vactx->context_id,
+ VASliceParameterBufferType,
+ vactx->slice_param_size,
+ vactx->slice_count, vactx->slice_params,
+ &slice_param_buf_id) != VA_STATUS_SUCCESS)
+ return -1;
+ vactx->slice_count = 0;
+
+ slice_data_buf_id = 0;
+ if (vaCreateBuffer(vactx->display, vactx->context_id,
+ VASliceDataBufferType,
+ vactx->slice_data_size,
+ 1, (void *)vactx->slice_data,
+ &slice_data_buf_id) != VA_STATUS_SUCCESS)
+ return -1;
+ vactx->slice_data = NULL;
+ vactx->slice_data_size = 0;
+
+ slice_buf_ids[vactx->n_slice_buf_ids++] = slice_param_buf_id;
+ slice_buf_ids[vactx->n_slice_buf_ids++] = slice_data_buf_id;
+ return 0;
+}
+
+VASliceParameterBufferBase *ff_vaapi_alloc_slice(struct vaapi_context *vactx, const uint8_t *buffer, uint32_t size)
+{
+ uint8_t *slice_params;
+ VASliceParameterBufferBase *slice_param;
+
+ if (!vactx->slice_data)
+ vactx->slice_data = buffer;
+ if (vactx->slice_data + vactx->slice_data_size != buffer) {
+ if (commit_slices(vactx) < 0)
+ return NULL;
+ vactx->slice_data = buffer;
+ }
+
+ slice_params =
+ av_fast_realloc(vactx->slice_params,
+ &vactx->slice_params_alloc,
+ (vactx->slice_count + 1) * vactx->slice_param_size);
+ if (!slice_params)
+ return NULL;
+ vactx->slice_params = slice_params;
+
+ slice_param = (VASliceParameterBufferBase *)(slice_params + vactx->slice_count * vactx->slice_param_size);
+ slice_param->slice_data_size = size;
+ slice_param->slice_data_offset = vactx->slice_data_size;
+ slice_param->slice_data_flag = VA_SLICE_DATA_FLAG_ALL;
+
+ vactx->slice_count++;
+ vactx->slice_data_size += size;
+ return slice_param;
+}
+
+int ff_vaapi_common_end_frame(MpegEncContext *s)
+{
+ struct vaapi_context * const vactx = s->avctx->hwaccel_context;
+ int ret = -1;
+
+ dprintf(s->avctx, "ff_vaapi_common_end_frame()\n");
+
+ if (commit_slices(vactx) < 0)
+ goto done;
+ if (vactx->n_slice_buf_ids > 0) {
+ if (render_picture(vactx, ff_vaapi_get_surface(s->current_picture_ptr)) < 0)
+ goto done;
+ ff_draw_horiz_band(s, 0, s->avctx->height);
+ }
+ ret = 0;
+
+done:
+ destroy_buffers(vactx->display, &vactx->pic_param_buf_id, 1);
+ destroy_buffers(vactx->display, &vactx->iq_matrix_buf_id, 1);
+ destroy_buffers(vactx->display, &vactx->bitplane_buf_id, 1);
+ destroy_buffers(vactx->display, vactx->slice_buf_ids, vactx->n_slice_buf_ids);
+ av_freep(&vactx->bitplane_buffer);
+ av_freep(&vactx->slice_buf_ids);
+ av_freep(&vactx->slice_params);
+ vactx->n_slice_buf_ids = 0;
+ vactx->slice_buf_ids_alloc = 0;
+ vactx->slice_count = 0;
+ vactx->slice_params_alloc = 0;
+ return ret;
+}
+
+/* @} */
Added: trunk/libavcodec/vaapi.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/libavcodec/vaapi.h Sun Mar 22 02:32:27 2009 (r18136)
@@ -0,0 +1,232 @@
+/*
+ * Video Acceleration API (shared data between FFmpeg and the video player)
+ * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1
+ *
+ * Copyright (C) 2008-2009 Splitted-Desktop Systems
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VAAPI_H
+#define AVCODEC_VAAPI_H
+
+#include <stdint.h>
+
+/**
+ * \defgroup VAAPI_Decoding VA API Decoding
+ * \ingroup Decoder
+ * @{
+ */
+
+/**
+ * This structure is used to share data between the FFmpeg library and
+ * the client video application.
+ * This shall be zero-allocated and available as
+ * AVCodecContext.hwaccel_context. All user members can be set once
+ * during initialization or through each AVCodecContext.get_buffer()
+ * function call. In any case, they must be valid prior to calling
+ * decoding functions.
+ */
+struct vaapi_context {
+ /**
+ * Window system dependent data
+ *
+ * - encoding: unused
+ * - decoding: Set by user
+ */
+ void *display;
+
+ /**
+ * Configuration ID
+ *
+ * - encoding: unused
+ * - decoding: Set by user
+ */
+ uint32_t config_id;
+
+ /**
+ * Context ID (video decode pipeline)
+ *
+ * - encoding: unused
+ * - decoding: Set by user
+ */
+ uint32_t context_id;
+
+ /**
+ * VAPictureParameterBuffer ID
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ VABufferID pic_param_buf_id;
+
+ /**
+ * VAIQMatrixBuffer ID
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ VABufferID iq_matrix_buf_id;
+
+ /**
+ * VABitPlaneBuffer ID (for VC-1 decoding)
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ VABufferID bitplane_buf_id;
+
+ /**
+ * Slice parameter/data buffer IDs
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ VABufferID *slice_buf_ids;
+
+ /**
+ * Number of effective slice buffer IDs to send to the HW
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ unsigned int n_slice_buf_ids;
+
+ /**
+ * Size of pre-allocated slice_buf_ids
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ unsigned int slice_buf_ids_alloc;
+
+ /**
+ * Picture parameter buffer
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ union {
+ VAPictureParameterBufferMPEG2 mpeg2;
+ VAPictureParameterBufferMPEG4 mpeg4;
+ VAPictureParameterBufferH264 h264;
+ VAPictureParameterBufferVC1 vc1;
+ } pic_param;
+
+ /**
+ * Size of a VAPictureParameterBuffer element
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ unsigned int pic_param_size;
+
+ /**
+ * Inverse quantization matrix buffer
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ union {
+ VAIQMatrixBufferMPEG2 mpeg2;
+ VAIQMatrixBufferMPEG4 mpeg4;
+ VAIQMatrixBufferH264 h264;
+ } iq_matrix;
+
+ /**
+ * Size of a VAIQMatrixBuffer element
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ unsigned int iq_matrix_size;
+
+ /**
+ * Flag: is quantization matrix present?
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ uint8_t iq_matrix_present;
+
+ /**
+ * VC-1 bitplane buffer
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ uint8_t *bitplane_buffer;
+
+ /**
+ * Size of VC-1 bitplane buffer
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ unsigned int bitplane_buffer_size;
+
+ /**
+ * Pointer to VASliceParameterBuffers
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ void *slice_params;
+
+ /**
+ * Size of a VASliceParameterBuffer element
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ unsigned int slice_param_size;
+
+ /**
+ * Size of pre-allocated slice_params
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ unsigned int slice_params_alloc;
+
+ /**
+ * Number of slices currently filled in
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ unsigned int slice_count;
+
+ /**
+ * Pointer to slice data buffer base
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ const uint8_t *slice_data;
+
+ /**
+ * Current size of slice data
+ *
+ * - encoding: unused
+ * - decoding: Set by libavcodec
+ */
+ uint32_t slice_data_size;
+};
+
+/* @} */
+
+#endif /* AVCODEC_VAAPI_H */
Added: trunk/libavcodec/vaapi_internal.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/libavcodec/vaapi_internal.h Sun Mar 22 02:32:27 2009 (r18136)
@@ -0,0 +1,59 @@
+/*
+ * Video Acceleration API (video decoding)
+ * HW decode acceleration for MPEG-2, MPEG-4, H.264 and VC-1
+ *
+ * Copyright (C) 2008-2009 Splitted-Desktop Systems
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_VAAPI_INTERNAL_H
+#define AVCODEC_VAAPI_INTERNAL_H
+
+#include <va/va.h>
+#include "vaapi.h"
+#include "avcodec.h"
+#include "mpegvideo.h"
+
+/**
+ * \addtogroup VAAPI_Decoding
+ *
+ * @{
+ */
+
+/** Extract VASurfaceID from a Picture */
+static inline VASurfaceID ff_vaapi_get_surface(Picture *pic)
+{
+ return (uintptr_t)pic->data[3];
+}
+
+/** Common AVHWAccel.end_frame() implementation */
+int ff_vaapi_common_end_frame(MpegEncContext *s);
+
+/**
+ * Allocate a new slice descriptor for the input slice.
+ *
+ * @param vactx the VA API context
+ * @param buffer the slice data buffer base
+ * @param size the size of the slice in bytes
+ * @return the newly allocated slice parameter
+ */
+VASliceParameterBufferBase *ff_vaapi_alloc_slice(struct vaapi_context *vactx, const uint8_t *buffer, uint32_t size);
+
+/* @} */
+
+#endif /* AVCODEC_VAAPI_INTERNAL_H */
More information about the ffmpeg-cvslog
mailing list