diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | va/va.h | 9 | ||||
| -rw-r--r-- | va/va_enc_h264.h | 3 | ||||
| -rw-r--r-- | va/va_vpp.h | 12 |
4 files changed, 14 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 6617a0e..dd0c611 100644 --- a/configure.ac +++ b/configure.ac @@ -27,8 +27,8 @@ # - reset micro version to zero when minor version is incremented # - reset minor version to zero when major version is incremented m4_define([va_api_major_version], [0]) -m4_define([va_api_minor_version], [39]) -m4_define([va_api_micro_version], [4]) +m4_define([va_api_minor_version], [40]) +m4_define([va_api_micro_version], [0]) m4_define([va_api_version], [va_api_major_version.va_api_minor_version.va_api_micro_version]) @@ -42,7 +42,7 @@ m4_define([va_api_version], # - reset micro version to zero when VA-API major or minor version is changed m4_define([libva_major_version], [m4_eval(va_api_major_version + 1)]) m4_define([libva_minor_version], [m4_eval(va_api_minor_version - 32)]) -m4_define([libva_micro_version], [4]) +m4_define([libva_micro_version], [0]) m4_define([libva_pre_version], [1]) m4_define([libva_version], @@ -2166,6 +2166,7 @@ typedef struct _VAEncPictureParameterBufferMPEG4 * eliminates this copy is to pass null as "data" when calling vaCreateBuffer(), * and then use vaMapBuffer() to map the data store from the server side to the * client address space for access. + * The user must call vaDestroyBuffer() to destroy a buffer. * Note: image buffers are created by the library, not the client. Please see * vaCreateImage on how image buffers are managed. */ @@ -2286,7 +2287,12 @@ VAStatus vaUnmapBuffer ( /** * After this call, the buffer is deleted and this buffer_id is no longer valid - * Only call this if the buffer is not going to be passed to vaRenderBuffer + * + * A buffer can be re-used and sent to the server by another Begin/Render/End + * sequence if vaDestroyBuffer() is not called with this buffer. + * + * Note re-using a shared buffer (e.g. a slice data buffer) between the host and the + * hardware accelerator can result in performance dropping. */ VAStatus vaDestroyBuffer ( VADisplay dpy, @@ -2414,7 +2420,6 @@ VAStatus vaBeginPicture ( /** * Send decode buffers to the server. - * Buffers are automatically destroyed afterwards */ VAStatus vaRenderPicture ( VADisplay dpy, diff --git a/va/va_enc_h264.h b/va/va_enc_h264.h index 604877f..2e7eb8d 100644 --- a/va/va_enc_h264.h +++ b/va/va_enc_h264.h @@ -386,8 +386,7 @@ typedef struct _VAEncPictureParameterBufferH264 { * * If per-macroblock encoder configuration is needed, \c macroblock_info * references a buffer of type #VAEncMacroblockParameterBufferH264. This - * buffer is not passed to vaRenderPicture(). i.e. it is not destroyed - * by subsequent calls to vaRenderPicture() and then can be re-used + * buffer is not passed to vaRenderPicture() and it can be re-used * without re-allocating the whole buffer. */ typedef struct _VAEncSliceParameterBufferH264 { diff --git a/va/va_vpp.h b/va/va_vpp.h index 8ac0923..082f1d5 100644 --- a/va/va_vpp.h +++ b/va/va_vpp.h @@ -371,11 +371,9 @@ typedef struct _VAProcFilterValueRange { /** * \brief Video processing pipeline configuration. * - * This buffer defines a video processing pipeline. As for any buffer - * passed to \c vaRenderPicture(), this is a one-time usage model. - * However, the actual filters to be applied are provided in the - * \c filters field, so they can be re-used in other processing - * pipelines. + * This buffer defines a video processing pipeline. The actual filters to + * be applied are provided in the \c filters field, they can be re-used + * in other processing pipelines. * * The target surface is specified by the \c render_target argument of * \c vaBeginPicture(). The general usage model is described as follows: @@ -491,10 +489,6 @@ typedef struct _VAProcPipelineParameterBuffer { * #VA_STATUS_ERROR_UNSUPPORTED_FILTER is returned if the list * contains an unsupported filter. * - * Note: no filter buffer is destroyed after a call to vaRenderPicture(), - * only this pipeline buffer will be destroyed as per the core API - * specification. This allows for flexibility in re-using the filter for - * other surfaces to be processed. */ VABufferID *filters; /** \brief Actual number of filters. */ |