From patchwork Sun Jan 8 18:12:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 2111 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp6753712vsb; Sun, 8 Jan 2017 10:12:40 -0800 (PST) X-Received: by 10.223.160.238 with SMTP id n43mr11201472wrn.32.1483899160813; Sun, 08 Jan 2017 10:12:40 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v20si320005wrc.50.2017.01.08.10.12.40; Sun, 08 Jan 2017 10:12:40 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E62AA68A54A; Sun, 8 Jan 2017 20:12:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17E3A68A538 for ; Sun, 8 Jan 2017 20:12:26 +0200 (EET) Received: by mail-wm0-f48.google.com with SMTP id k184so92616463wme.1 for ; Sun, 08 Jan 2017 10:12:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=s85bodF6mHQTKfUo0LYYlx0ypLtxq/w8UPdLbv2D8kE=; b=LEgC143WFKshwY+QIjA/4dn16h3zHqoxqiW2HNBKFa82ejMCuVfml+O72CQ13kj0Pq Ypd5ZXLCWGScsk9TkD9gfYNBPALEKQZiUfM4Y8uZpJgNel/gUaRobw8G8YuGvIhk3IgR fLw1meoNj0lHcQXtTJP9Uc3fHp9T2xqLBEYHVrPwbTfBGyMLyqhQziBRF0oT/nWDPhhi zSoTEAoYqx9rkAyh28QOLzSe9FqIS+e0NYuWZvIzTRdSFWNmMt9bgSthIf7d/u3pmDv3 6dAne7M2M/vkooYW3koVyxkhCy+y8JaV6Inp9ZN9roIqSO6L0YzakWxEGopuGtyzB66d gdNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=s85bodF6mHQTKfUo0LYYlx0ypLtxq/w8UPdLbv2D8kE=; b=Zk9XyhQ3YAInGw5p9JRcsI/zUzi43iVQD/VhZbKtwz0dj3zHGwGx9ZqIkWWpoaqnt0 vBkhoNlmyCRjhf5BHG5gF+wUiep1jPF8gFA2B6T6ym8IA219g7ljXXV5ltxUH/jODOEa zczWsinUQu5MbbYWQuhFeCsLLHBKP6VihccXJ3kw5dg5wXBqJcj38RSUV5ZWMAiMFkmr tmkfmdftTtVLT0K0PwsXQvtlJivUiTv913BZuSNKTWsoXhGNEEPK/htnImbHn5dVqzzE kfywUIJr6zVXyjXComZGRqS8IUPwjbuZkLIH3nqc1djBTquErajiUCvIZWFwr5ZUfR/n RHbg== X-Gm-Message-State: AIkVDXKWWvqV7M62vpVuXZbYvqRvq/K3OEWZuov0M7z6Vky/fcQVe6UMno6t3Tn+KWEiDQ== X-Received: by 10.223.139.22 with SMTP id n22mr9042482wra.143.1483899152113; Sun, 08 Jan 2017 10:12:32 -0800 (PST) Received: from [192.168.0.8] (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id m145sm14634764wma.3.2017.01.08.10.12.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jan 2017 10:12:31 -0800 (PST) To: FFmpeg development discussions and patches References: <320e2652-f3d9-5509-11ac-fbd84e22db6a@jkqxz.net> From: Mark Thompson Message-ID: <26c8bf62-ed13-5bc9-311f-d3d96e4a16a8@jkqxz.net> Date: Sun, 8 Jan 2017 18:12:30 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: <320e2652-f3d9-5509-11ac-fbd84e22db6a@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 09/16] vaapi_mpeg4: Convert to use the new VAAPI hwaccel code X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" (cherry picked from commit ccd0316f7cab760a93052206e8150f6b178c1e39) --- libavcodec/vaapi_mpeg4.c | 235 +++++++++++++++++++++++++++++------------------ 1 file changed, 145 insertions(+), 90 deletions(-) diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c index 725f00b0a6..462233ce8c 100644 --- a/libavcodec/vaapi_mpeg4.c +++ b/libavcodec/vaapi_mpeg4.c @@ -20,11 +20,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "vaapi_internal.h" -#include "internal.h" #include "h263.h" +#include "internal.h" #include "mpeg4video.h" #include "mpegvideo.h" +#include "vaapi_decode.h" /** Reconstruct bitstream intra_dc_vlc_thr */ static int mpeg4_get_intra_dc_vlc_thr(Mpeg4DecContext *s) @@ -45,121 +45,176 @@ static int mpeg4_get_intra_dc_vlc_thr(Mpeg4DecContext *s) static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_t *buffer, av_unused uint32_t size) { Mpeg4DecContext *ctx = avctx->priv_data; - MpegEncContext * const s = &ctx->m; - FFVAContext * const vactx = ff_vaapi_get_context(avctx); - VAPictureParameterBufferMPEG4 *pic_param; - VAIQMatrixBufferMPEG4 *iq_matrix; - int i; - - vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG4); - - /* Fill in VAPictureParameterBufferMPEG4 */ - pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferMPEG4)); - if (!pic_param) - return -1; - pic_param->vop_width = s->width; - pic_param->vop_height = s->height; - pic_param->forward_reference_picture = VA_INVALID_ID; - pic_param->backward_reference_picture = VA_INVALID_ID; - pic_param->vol_fields.value = 0; /* reset all bits */ - pic_param->vol_fields.bits.short_video_header = avctx->codec->id == AV_CODEC_ID_H263; - pic_param->vol_fields.bits.chroma_format = CHROMA_420; - pic_param->vol_fields.bits.interlaced = !s->progressive_sequence; - pic_param->vol_fields.bits.obmc_disable = 1; - pic_param->vol_fields.bits.sprite_enable = ctx->vol_sprite_usage; - pic_param->vol_fields.bits.sprite_warping_accuracy = s->sprite_warping_accuracy; - pic_param->vol_fields.bits.quant_type = s->mpeg_quant; - pic_param->vol_fields.bits.quarter_sample = s->quarter_sample; - pic_param->vol_fields.bits.data_partitioned = s->data_partitioning; - pic_param->vol_fields.bits.reversible_vlc = ctx->rvlc; - pic_param->vol_fields.bits.resync_marker_disable = !ctx->resync_marker; - pic_param->no_of_sprite_warping_points = ctx->num_sprite_warping_points; + MpegEncContext *s = &ctx->m; + VAAPIDecodePicture *pic = s->current_picture_ptr->hwaccel_picture_private; + VAPictureParameterBufferMPEG4 pic_param; + int i, err; + + pic->output_surface = ff_vaapi_get_surface_id(s->current_picture_ptr->f); + + pic_param = (VAPictureParameterBufferMPEG4) { + .vop_width = s->width, + .vop_height = s->height, + .forward_reference_picture = VA_INVALID_ID, + .backward_reference_picture = VA_INVALID_ID, + .vol_fields.bits = { + .short_video_header = avctx->codec->id == AV_CODEC_ID_H263, + .chroma_format = CHROMA_420, + .interlaced = !s->progressive_sequence, + .obmc_disable = 1, + .sprite_enable = ctx->vol_sprite_usage, + .sprite_warping_accuracy = s->sprite_warping_accuracy, + .quant_type = s->mpeg_quant, + .quarter_sample = s->quarter_sample, + .data_partitioned = s->data_partitioning, + .reversible_vlc = ctx->rvlc, + .resync_marker_disable = !ctx->resync_marker, + }, + .no_of_sprite_warping_points = ctx->num_sprite_warping_points, + .quant_precision = s->quant_precision, + .vop_fields.bits = { + .vop_coding_type = s->pict_type - AV_PICTURE_TYPE_I, + .backward_reference_vop_coding_type = + s->pict_type == AV_PICTURE_TYPE_B ? s->next_picture.f->pict_type - AV_PICTURE_TYPE_I : 0, + .vop_rounding_type = s->no_rounding, + .intra_dc_vlc_thr = mpeg4_get_intra_dc_vlc_thr(ctx), + .top_field_first = s->top_field_first, + .alternate_vertical_scan_flag = s->alternate_scan, + }, + .vop_fcode_forward = s->f_code, + .vop_fcode_backward = s->b_code, + .vop_time_increment_resolution = avctx->framerate.num, + .num_macroblocks_in_gob = s->mb_width * H263_GOB_HEIGHT(s->height), + .num_gobs_in_vop = + (s->mb_width * s->mb_height) / (s->mb_width * H263_GOB_HEIGHT(s->height)), + .TRB = s->pb_time, + .TRD = s->pp_time, + }; + for (i = 0; i < ctx->num_sprite_warping_points && i < 3; i++) { - pic_param->sprite_trajectory_du[i] = ctx->sprite_traj[i][0]; - pic_param->sprite_trajectory_dv[i] = ctx->sprite_traj[i][1]; + pic_param.sprite_trajectory_du[i] = ctx->sprite_traj[i][0]; + pic_param.sprite_trajectory_dv[i] = ctx->sprite_traj[i][1]; } - pic_param->quant_precision = s->quant_precision; - pic_param->vop_fields.value = 0; /* reset all bits */ - pic_param->vop_fields.bits.vop_coding_type = s->pict_type - AV_PICTURE_TYPE_I; - pic_param->vop_fields.bits.backward_reference_vop_coding_type = s->pict_type == AV_PICTURE_TYPE_B ? s->next_picture.f->pict_type - AV_PICTURE_TYPE_I : 0; - pic_param->vop_fields.bits.vop_rounding_type = s->no_rounding; - pic_param->vop_fields.bits.intra_dc_vlc_thr = mpeg4_get_intra_dc_vlc_thr(ctx); - pic_param->vop_fields.bits.top_field_first = s->top_field_first; - pic_param->vop_fields.bits.alternate_vertical_scan_flag = s->alternate_scan; - pic_param->vop_fcode_forward = s->f_code; - pic_param->vop_fcode_backward = s->b_code; - pic_param->vop_time_increment_resolution = avctx->framerate.num; - pic_param->num_macroblocks_in_gob = s->mb_width * H263_GOB_HEIGHT(s->height); - pic_param->num_gobs_in_vop = (s->mb_width * s->mb_height) / pic_param->num_macroblocks_in_gob; - pic_param->TRB = s->pb_time; - pic_param->TRD = s->pp_time; if (s->pict_type == AV_PICTURE_TYPE_B) - pic_param->backward_reference_picture = ff_vaapi_get_surface_id(s->next_picture.f); + pic_param.backward_reference_picture = ff_vaapi_get_surface_id(s->next_picture.f); if (s->pict_type != AV_PICTURE_TYPE_I) - pic_param->forward_reference_picture = ff_vaapi_get_surface_id(s->last_picture.f); + pic_param.forward_reference_picture = ff_vaapi_get_surface_id(s->last_picture.f); + + err = ff_vaapi_decode_make_param_buffer(avctx, pic, + VAPictureParameterBufferType, + &pic_param, sizeof(pic_param)); + if (err < 0) + goto fail; - /* Fill in VAIQMatrixBufferMPEG4 */ /* Only the first inverse quantisation method uses the weighting matrices */ - if (pic_param->vol_fields.bits.quant_type) { - iq_matrix = ff_vaapi_alloc_iq_matrix(vactx, sizeof(VAIQMatrixBufferMPEG4)); - if (!iq_matrix) - return -1; - iq_matrix->load_intra_quant_mat = 1; - iq_matrix->load_non_intra_quant_mat = 1; + if (pic_param.vol_fields.bits.quant_type) { + VAIQMatrixBufferMPEG4 iq_matrix; + + iq_matrix.load_intra_quant_mat = 1; + iq_matrix.load_non_intra_quant_mat = 1; for (i = 0; i < 64; i++) { int n = s->idsp.idct_permutation[ff_zigzag_direct[i]]; - iq_matrix->intra_quant_mat[i] = s->intra_matrix[n]; - iq_matrix->non_intra_quant_mat[i] = s->inter_matrix[n]; + iq_matrix.intra_quant_mat[i] = s->intra_matrix[n]; + iq_matrix.non_intra_quant_mat[i] = s->inter_matrix[n]; } + + err = ff_vaapi_decode_make_param_buffer(avctx, pic, + VAIQMatrixBufferType, + &iq_matrix, sizeof(iq_matrix)); + if (err < 0) + goto fail; } return 0; + +fail: + ff_vaapi_decode_cancel(avctx, pic); + return err; +} + +static int vaapi_mpeg4_end_frame(AVCodecContext *avctx) +{ + MpegEncContext *s = avctx->priv_data; + VAAPIDecodePicture *pic = s->current_picture_ptr->hwaccel_picture_private; + int ret; + + ret = ff_vaapi_decode_issue(avctx, pic); + if (ret < 0) + goto fail; + + ff_mpeg_draw_horiz_band(s, 0, s->avctx->height); + +fail: + return ret; } static int vaapi_mpeg4_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size) { - MpegEncContext * const s = avctx->priv_data; - FFVAContext * const vactx = ff_vaapi_get_context(avctx); - VASliceParameterBufferMPEG4 *slice_param; - - /* Fill in VASliceParameterBufferMPEG4 */ - slice_param = (VASliceParameterBufferMPEG4 *)ff_vaapi_alloc_slice(vactx, buffer, size); - if (!slice_param) - return -1; - slice_param->macroblock_offset = get_bits_count(&s->gb) % 8; - slice_param->macroblock_number = 0; - slice_param->quant_scale = s->qscale; + MpegEncContext *s = avctx->priv_data; + VAAPIDecodePicture *pic = s->current_picture_ptr->hwaccel_picture_private; + VASliceParameterBufferMPEG4 slice_param; + int err; + + /* video_plane_with_short_video_header() contains all GOBs + * in-order, and this is what VA API (Intel backend) expects: only + * a single slice param. So fake macroblock_number for Libav so + * that we don't call vaapi_mpeg4_decode_slice() again + */ + if (avctx->codec->id == AV_CODEC_ID_H263) + size = s->gb.buffer_end - buffer; + + slice_param = (VASliceParameterBufferMPEG4) { + .slice_data_size = size, + .slice_data_offset = 0, + .slice_data_flag = VA_SLICE_DATA_FLAG_ALL, + .macroblock_offset = get_bits_count(&s->gb) % 8, + .macroblock_number = s->mb_y * s->mb_width + s->mb_x, + .quant_scale = s->qscale, + }; + + if (avctx->codec->id == AV_CODEC_ID_H263) + s->mb_y = s->mb_height; + + err = ff_vaapi_decode_make_slice_buffer(avctx, pic, + &slice_param, sizeof(slice_param), + buffer, size); + if (err < 0) { + ff_vaapi_decode_cancel(avctx, pic); + return err; + } return 0; } #if CONFIG_MPEG4_VAAPI_HWACCEL AVHWAccel ff_mpeg4_vaapi_hwaccel = { - .name = "mpeg4_vaapi", - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_MPEG4, - .pix_fmt = AV_PIX_FMT_VAAPI, - .start_frame = vaapi_mpeg4_start_frame, - .end_frame = ff_vaapi_mpeg_end_frame, - .decode_slice = vaapi_mpeg4_decode_slice, - .init = ff_vaapi_context_init, - .uninit = ff_vaapi_context_fini, - .priv_data_size = sizeof(FFVAContext), + .name = "mpeg4_vaapi", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_MPEG4, + .pix_fmt = AV_PIX_FMT_VAAPI, + .start_frame = &vaapi_mpeg4_start_frame, + .end_frame = &vaapi_mpeg4_end_frame, + .decode_slice = &vaapi_mpeg4_decode_slice, + .frame_priv_data_size = sizeof(VAAPIDecodePicture), + .init = &ff_vaapi_decode_init, + .uninit = &ff_vaapi_decode_uninit, + .priv_data_size = sizeof(VAAPIDecodeContext), }; #endif #if CONFIG_H263_VAAPI_HWACCEL AVHWAccel ff_h263_vaapi_hwaccel = { - .name = "h263_vaapi", - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_H263, - .pix_fmt = AV_PIX_FMT_VAAPI, - .start_frame = vaapi_mpeg4_start_frame, - .end_frame = ff_vaapi_mpeg_end_frame, - .decode_slice = vaapi_mpeg4_decode_slice, - .init = ff_vaapi_context_init, - .uninit = ff_vaapi_context_fini, - .priv_data_size = sizeof(FFVAContext), + .name = "h263_vaapi", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_H263, + .pix_fmt = AV_PIX_FMT_VAAPI, + .start_frame = &vaapi_mpeg4_start_frame, + .end_frame = &vaapi_mpeg4_end_frame, + .decode_slice = &vaapi_mpeg4_decode_slice, + .frame_priv_data_size = sizeof(VAAPIDecodePicture), + .init = &ff_vaapi_decode_init, + .uninit = &ff_vaapi_decode_uninit, + .priv_data_size = sizeof(VAAPIDecodeContext), }; #endif