From patchwork Sun Jan 8 18:11:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 2110 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp6753532vsb; Sun, 8 Jan 2017 10:11:58 -0800 (PST) X-Received: by 10.223.166.167 with SMTP id t36mr9158476wrc.18.1483899118857; Sun, 08 Jan 2017 10:11:58 -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 d8si15526054wjy.93.2017.01.08.10.11.58; Sun, 08 Jan 2017 10:11:58 -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 0A7EF68A52E; Sun, 8 Jan 2017 20:11:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD69D689D47 for ; Sun, 8 Jan 2017 20:11:43 +0200 (EET) Received: by mail-wm0-f52.google.com with SMTP id k184so92602409wme.1 for ; Sun, 08 Jan 2017 10:11:50 -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=o2gRw9Yqf3/N26jHd2VnOs+mGJuXlXTJO3nt7T5xSZg=; b=wVo2grgOBdMuV1YnLlgPuI/cB2ovmvds4ww3HxmxioWx2YGfqjxnq25GQJ3c5L8KYE BRn3tCsv75hoRbA9lpaBGoAzyjtArWBmj+hKaGvnar+TuTFOkuYU2tbCs/c5uPOu8RDJ TgVkp5BE2VsppBqGEDoJrAYJ/7Jo01Em3W4Tf979eoxa1ltPZQRzB9q2nPKBFsE8vmU5 BNpjnetcLL8RhSxDr/XIoqTLQPSmV8rX9BzG/ifa8op1OdFSbZ5kIr6qAOv7McTBhNaE xqis/v2Spxa1am6HNS4uEwAgUWJcanic4JEajf5IqACYP1Xa+cTK0wtiP5bKzIayi/TG BZbQ== 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=o2gRw9Yqf3/N26jHd2VnOs+mGJuXlXTJO3nt7T5xSZg=; b=C1xffpPbYonStIjKmJHgfXwWYY2Iyai6O1Kg/nT58n6i4ydP3EfTAUoLjQQ2yz0IWE 7UeKHqLEoCpMPD4FqX6Lz+ClS2NuSaz0MJdxSx8lQluSDoqAlAJWQKO/GBR3nqDeX5dh XAGLvThQp9PsljUxmrzK53xPB5mS1LZmCBwAW+ZZfMCBapvwpveN5n+a0Yjp8Gwu8uLA Y7LCmTub7U+KoF3fxnVxtddY6VSyqLvm1dlKK/gcvmOadNjfXnitMm+fD9M4rz95FFIf 2HL03skDn3XqYswfJWzKtJm6/uaP3CNqVuzFQdL15LR/BSX6831mKkvDbloR9MiAITKz aZqg== X-Gm-Message-State: AIkVDXLkFUuByG8SDeSj1FjEkxgSu1QAaw63heAv90ZCHRsqiS1Bi96mDYqv/GhSEPTRsw== X-Received: by 10.28.168.12 with SMTP id r12mr2902426wme.16.1483899109870; Sun, 08 Jan 2017 10:11:49 -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 l6sm14611241wmd.5.2017.01.08.10.11.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jan 2017 10:11:49 -0800 (PST) To: FFmpeg development discussions and patches References: <320e2652-f3d9-5509-11ac-fbd84e22db6a@jkqxz.net> From: Mark Thompson Message-ID: <64c488c4-ee16-4878-df66-35b5f4b68241@jkqxz.net> Date: Sun, 8 Jan 2017 18:11:48 +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 07/16] vaapi_mpeg2: 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 102e13c353de43aa0cb1aa1843804d195c2a9164) --- libavcodec/vaapi_mpeg2.c | 170 +++++++++++++++++++++++++++++------------------ 1 file changed, 105 insertions(+), 65 deletions(-) diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c index beaac9a57f..b2417ee830 100644 --- a/libavcodec/vaapi_mpeg2.c +++ b/libavcodec/vaapi_mpeg2.c @@ -22,8 +22,8 @@ #include "mpegutils.h" #include "mpegvideo.h" -#include "vaapi_internal.h" #include "internal.h" +#include "vaapi_decode.h" /** Reconstruct bitstream f_code */ static inline int mpeg2_get_f_code(const MpegEncContext *s) @@ -41,71 +41,100 @@ static inline int mpeg2_get_is_frame_start(const MpegEncContext *s) static int vaapi_mpeg2_start_frame(AVCodecContext *avctx, av_unused const uint8_t *buffer, av_unused uint32_t size) { const MpegEncContext *s = avctx->priv_data; - FFVAContext *vactx = ff_vaapi_get_context(avctx); - VAPictureParameterBufferMPEG2 *pic_param; - VAIQMatrixBufferMPEG2 *iq_matrix; - int i; - - vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG2); - - /* Fill in VAPictureParameterBufferMPEG2 */ - pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferMPEG2)); - if (!pic_param) - return -1; - pic_param->horizontal_size = s->width; - pic_param->vertical_size = s->height; - pic_param->forward_reference_picture = VA_INVALID_ID; - pic_param->backward_reference_picture = VA_INVALID_ID; - pic_param->picture_coding_type = s->pict_type; - pic_param->f_code = mpeg2_get_f_code(s); - pic_param->picture_coding_extension.value = 0; /* reset all bits */ - pic_param->picture_coding_extension.bits.intra_dc_precision = s->intra_dc_precision; - pic_param->picture_coding_extension.bits.picture_structure = s->picture_structure; - pic_param->picture_coding_extension.bits.top_field_first = s->top_field_first; - pic_param->picture_coding_extension.bits.frame_pred_frame_dct = s->frame_pred_frame_dct; - pic_param->picture_coding_extension.bits.concealment_motion_vectors = s->concealment_motion_vectors; - pic_param->picture_coding_extension.bits.q_scale_type = s->q_scale_type; - pic_param->picture_coding_extension.bits.intra_vlc_format = s->intra_vlc_format; - pic_param->picture_coding_extension.bits.alternate_scan = s->alternate_scan; - pic_param->picture_coding_extension.bits.repeat_first_field = s->repeat_first_field; - pic_param->picture_coding_extension.bits.progressive_frame = s->progressive_frame; - pic_param->picture_coding_extension.bits.is_first_field = mpeg2_get_is_frame_start(s); + VAAPIDecodePicture *pic = s->current_picture_ptr->hwaccel_picture_private; + VAPictureParameterBufferMPEG2 pic_param; + VAIQMatrixBufferMPEG2 iq_matrix; + int i, err; + + pic->output_surface = ff_vaapi_get_surface_id(s->current_picture_ptr->f); + + pic_param = (VAPictureParameterBufferMPEG2) { + .horizontal_size = s->width, + .vertical_size = s->height, + .forward_reference_picture = VA_INVALID_ID, + .backward_reference_picture = VA_INVALID_ID, + .picture_coding_type = s->pict_type, + .f_code = mpeg2_get_f_code(s), + .picture_coding_extension.bits = { + .intra_dc_precision = s->intra_dc_precision, + .picture_structure = s->picture_structure, + .top_field_first = s->top_field_first, + .frame_pred_frame_dct = s->frame_pred_frame_dct, + .concealment_motion_vectors = s->concealment_motion_vectors, + .q_scale_type = s->q_scale_type, + .intra_vlc_format = s->intra_vlc_format, + .alternate_scan = s->alternate_scan, + .repeat_first_field = s->repeat_first_field, + .progressive_frame = s->progressive_frame, + .is_first_field = mpeg2_get_is_frame_start(s), + }, + }; switch (s->pict_type) { case 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); // fall-through case AV_PICTURE_TYPE_P: - 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); break; } - /* Fill in VAIQMatrixBufferMPEG2 */ - iq_matrix = ff_vaapi_alloc_iq_matrix(vactx, sizeof(VAIQMatrixBufferMPEG2)); - if (!iq_matrix) - return -1; - iq_matrix->load_intra_quantiser_matrix = 1; - iq_matrix->load_non_intra_quantiser_matrix = 1; - iq_matrix->load_chroma_intra_quantiser_matrix = 1; - iq_matrix->load_chroma_non_intra_quantiser_matrix = 1; + err = ff_vaapi_decode_make_param_buffer(avctx, pic, + VAPictureParameterBufferType, + &pic_param, sizeof(pic_param)); + if (err < 0) + goto fail; + + iq_matrix.load_intra_quantiser_matrix = 1; + iq_matrix.load_non_intra_quantiser_matrix = 1; + iq_matrix.load_chroma_intra_quantiser_matrix = 1; + iq_matrix.load_chroma_non_intra_quantiser_matrix = 1; for (i = 0; i < 64; i++) { int n = s->idsp.idct_permutation[ff_zigzag_direct[i]]; - iq_matrix->intra_quantiser_matrix[i] = s->intra_matrix[n]; - iq_matrix->non_intra_quantiser_matrix[i] = s->inter_matrix[n]; - iq_matrix->chroma_intra_quantiser_matrix[i] = s->chroma_intra_matrix[n]; - iq_matrix->chroma_non_intra_quantiser_matrix[i] = s->chroma_inter_matrix[n]; + iq_matrix.intra_quantiser_matrix[i] = s->intra_matrix[n]; + iq_matrix.non_intra_quantiser_matrix[i] = s->inter_matrix[n]; + iq_matrix.chroma_intra_quantiser_matrix[i] = s->chroma_intra_matrix[n]; + iq_matrix.chroma_non_intra_quantiser_matrix[i] = s->chroma_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_mpeg2_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_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size) { const MpegEncContext *s = avctx->priv_data; - FFVAContext *vactx = ff_vaapi_get_context(avctx); - VASliceParameterBufferMPEG2 *slice_param; + VAAPIDecodePicture *pic = s->current_picture_ptr->hwaccel_picture_private; + VASliceParameterBufferMPEG2 slice_param; GetBitContext gb; uint32_t quantiser_scale_code, intra_slice_flag, macroblock_offset; + int err; /* Determine macroblock_offset */ init_get_bits(&gb, buffer, 8 * size); @@ -120,27 +149,38 @@ static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer } macroblock_offset = get_bits_count(&gb); - /* Fill in VASliceParameterBufferMPEG2 */ - slice_param = (VASliceParameterBufferMPEG2 *)ff_vaapi_alloc_slice(vactx, buffer, size); - if (!slice_param) - return -1; - slice_param->macroblock_offset = macroblock_offset; - slice_param->slice_horizontal_position = s->mb_x; - slice_param->slice_vertical_position = s->mb_y >> (s->picture_structure != PICT_FRAME); - slice_param->quantiser_scale_code = quantiser_scale_code; - slice_param->intra_slice_flag = intra_slice_flag; + slice_param = (VASliceParameterBufferMPEG2) { + .slice_data_size = size, + .slice_data_offset = 0, + .slice_data_flag = VA_SLICE_DATA_FLAG_ALL, + .macroblock_offset = macroblock_offset, + .slice_horizontal_position = s->mb_x, + .slice_vertical_position = s->mb_y >> (s->picture_structure != PICT_FRAME), + .quantiser_scale_code = quantiser_scale_code, + .intra_slice_flag = intra_slice_flag, + }; + + 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; } AVHWAccel ff_mpeg2_vaapi_hwaccel = { - .name = "mpeg2_vaapi", - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_MPEG2VIDEO, - .pix_fmt = AV_PIX_FMT_VAAPI, - .start_frame = vaapi_mpeg2_start_frame, - .end_frame = ff_vaapi_mpeg_end_frame, - .decode_slice = vaapi_mpeg2_decode_slice, - .init = ff_vaapi_context_init, - .uninit = ff_vaapi_context_fini, - .priv_data_size = sizeof(FFVAContext), + .name = "mpeg2_vaapi", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_MPEG2VIDEO, + .pix_fmt = AV_PIX_FMT_VAAPI, + .start_frame = &vaapi_mpeg2_start_frame, + .end_frame = &vaapi_mpeg2_end_frame, + .decode_slice = &vaapi_mpeg2_decode_slice, + .frame_priv_data_size = sizeof(VAAPIDecodePicture), + .init = &ff_vaapi_decode_init, + .uninit = &ff_vaapi_decode_uninit, + .priv_data_size = sizeof(VAAPIDecodeContext), };