X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvaapi.c;h=b2dc41d7fe95074f9363e64525708d84efda1e74;hb=436ced244fadcde2c0b925627920e84b25482542;hp=70949b92421664e0cc10ddf3abe094568c467667;hpb=b38d7298bdc31e000c3d533d99c0cae1ef57d1c2;p=ffmpeg diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c index 70949b92421..b2dc41d7fe9 100644 --- a/libavcodec/vaapi.c +++ b/libavcodec/vaapi.c @@ -4,27 +4,28 @@ * * Copyright (C) 2008-2009 Splitted-Desktop Systems * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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, + * Libav 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 + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "h264.h" #include "vaapi_internal.h" /** - * \addtogroup VAAPI_Decoding + * @addtogroup VAAPI_Decoding * * @{ */ @@ -40,36 +41,21 @@ static void destroy_buffers(VADisplay display, VABufferID *buffers, unsigned int } } -static int render_picture(struct vaapi_context *vactx, VASurfaceID surface) +int ff_vaapi_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; + vaUnmapBuffer(vactx->display, vactx->pic_param_buf_id); 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; + if (vactx->iq_matrix_buf_id) { + vaUnmapBuffer(vactx->display, vactx->iq_matrix_buf_id); 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; + if (vactx->bitplane_buf_id) { + vaUnmapBuffer(vactx->display, vactx->bitplane_buf_id); va_buffers[n_va_buffers++] = vactx->bitplane_buf_id; } @@ -92,7 +78,7 @@ static int render_picture(struct vaapi_context *vactx, VASurfaceID surface) return 0; } -static int commit_slices(struct vaapi_context *vactx) +int ff_vaapi_commit_slices(struct vaapi_context *vactx) { VABufferID *slice_buf_ids; VABufferID slice_param_buf_id, slice_data_buf_id; @@ -132,6 +118,33 @@ static int commit_slices(struct vaapi_context *vactx) return 0; } +static void *alloc_buffer(struct vaapi_context *vactx, int type, unsigned int size, uint32_t *buf_id) +{ + void *data = NULL; + + *buf_id = 0; + if (vaCreateBuffer(vactx->display, vactx->context_id, + type, size, 1, NULL, buf_id) == VA_STATUS_SUCCESS) + vaMapBuffer(vactx->display, *buf_id, &data); + + return data; +} + +void *ff_vaapi_alloc_pic_param(struct vaapi_context *vactx, unsigned int size) +{ + return alloc_buffer(vactx, VAPictureParameterBufferType, size, &vactx->pic_param_buf_id); +} + +void *ff_vaapi_alloc_iq_matrix(struct vaapi_context *vactx, unsigned int size) +{ + return alloc_buffer(vactx, VAIQMatrixBufferType, size, &vactx->iq_matrix_buf_id); +} + +uint8_t *ff_vaapi_alloc_bitplane(struct vaapi_context *vactx, uint32_t size) +{ + return alloc_buffer(vactx, VABitPlaneBufferType, size, &vactx->bitplane_buf_id); +} + VASliceParameterBufferBase *ff_vaapi_alloc_slice(struct vaapi_context *vactx, const uint8_t *buffer, uint32_t size) { uint8_t *slice_params; @@ -140,7 +153,7 @@ VASliceParameterBufferBase *ff_vaapi_alloc_slice(struct vaapi_context *vactx, co if (!vactx->slice_data) vactx->slice_data = buffer; if (vactx->slice_data + vactx->slice_data_size != buffer) { - if (commit_slices(vactx) < 0) + if (ff_vaapi_commit_slices(vactx) < 0) return NULL; vactx->slice_data = buffer; } @@ -163,34 +176,43 @@ VASliceParameterBufferBase *ff_vaapi_alloc_slice(struct vaapi_context *vactx, co return slice_param; } -int ff_vaapi_common_end_frame(MpegEncContext *s) +void ff_vaapi_common_end_frame(AVCodecContext *avctx) { - struct vaapi_context * const vactx = s->avctx->hwaccel_context; - int ret = -1; + struct vaapi_context * const vactx = avctx->hwaccel_context; - dprintf(s->avctx, "ff_vaapi_common_end_frame()\n"); + av_dlog(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; +} + +int ff_vaapi_mpeg_end_frame(AVCodecContext *avctx) +{ + struct vaapi_context * const vactx = avctx->hwaccel_context; + MpegEncContext *s = avctx->priv_data; + int ret; + + ret = ff_vaapi_commit_slices(vactx); + if (ret < 0) + goto finish; + + ret = ff_vaapi_render_picture(vactx, + ff_vaapi_get_surface_id(s->current_picture_ptr->f)); + if (ret < 0) + goto finish; + + ff_mpeg_draw_horiz_band(s, 0, s->avctx->height); + +finish: + ff_vaapi_common_end_frame(avctx); return ret; }