From patchwork Sun Jan 8 18:12:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 2112 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp6753618vsb; Sun, 8 Jan 2017 10:12:17 -0800 (PST) X-Received: by 10.28.212.82 with SMTP id l79mr722310wmg.101.1483899137639; Sun, 08 Jan 2017 10:12:17 -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 f194si2032599wmf.66.2017.01.08.10.12.17; Sun, 08 Jan 2017 10:12:17 -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 802F168A541; Sun, 8 Jan 2017 20:12:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 11516689D8F for ; Sun, 8 Jan 2017 20:12:02 +0200 (EET) Received: by mail-wm0-f47.google.com with SMTP id a197so78016336wmd.0 for ; Sun, 08 Jan 2017 10:12:08 -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=7bbQRcVG3qgo2wFAWfKBS8SJvpxSw9ERk0HvGsajlug=; b=nDvgODxj511IKaNGSHmUrsy3uybv7ATM3mptNuv2x6kjm4S7HA+4ZzntJEd1l8PvRu PhHadW/5PO0kPZxxYQe3NuPofHqk15n5Egg1oOfkioRawxx/eZ0J9cZYN7bx2/l3bY6J Njcnxv8kXoWmwFIlWQOTjQve8rkl0MyMlOuxZxx0rCjejpw/LnpOEvYgQBCgBHZQXv31 wGOMRh6GNLUtZJEcA7wH2okp7RBJ5Mz0j/kKT4zdZxTcpIpa+v7YyehzrZHiwUPUeUoc GtqM2wgCDtvmwo8stll1rnPQA/aQibDwjpQHJR1zGcgvn5mSQ64qt9bSaiXvjXdOz0lA pOTA== 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=7bbQRcVG3qgo2wFAWfKBS8SJvpxSw9ERk0HvGsajlug=; b=Fuml5DpNOSLmPD/bYZjzS+i8yW6zBlLcpRSvd2gBUehxpTZ7Pa2rVVLJtFfEkuYgqR DjcqADccKy1KTjy4P6bmYVtUuB/YFAMGV8GFs2rtcIiHj9tSOj7lw+Vuukio+d+4tmDY I8j+WIWg4EQnVVVGltg79Tc6gt53Sv2+nDLd+FUIxjDTz5396Bs0GFqvtR4sjcETrFFW zr+hKmyaceT9gbEv5QuUQ9S1FPvSc1jOs7zB8zuWJpauiXehXnzrhAGU8BiKpECS0X74 A6kWJyCnETK/HXy3PQ9K3R0hAP0DWAzu3rISYTF+vgMer6HCQW/B4/taOzKH+0mMc0Sh PL2g== X-Gm-Message-State: AIkVDXLdzZNzz2v2/35wGFXOxn9CclVlZ6jqFwPFZdNhX2b6q5DtIPrZODrAh3TS275ipw== X-Received: by 10.223.154.43 with SMTP id z40mr8889851wrb.176.1483899128090; Sun, 08 Jan 2017 10:12:08 -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 cs4sm13231948wjd.42.2017.01.08.10.12.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jan 2017 10:12:07 -0800 (PST) To: FFmpeg development discussions and patches References: <320e2652-f3d9-5509-11ac-fbd84e22db6a@jkqxz.net> From: Mark Thompson Message-ID: <61e0318b-539f-076c-f3d9-f743e47648a7@jkqxz.net> Date: Sun, 8 Jan 2017 18:12:06 +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 08/16] vaapi_vc1: 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 520fb77285ff0e7da1449d2b60742865b0b43ae8) --- libavcodec/vaapi_vc1.c | 353 +++++++++++++++++++++++++++++-------------------- 1 file changed, 206 insertions(+), 147 deletions(-) diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c index 17e35e6a3e..a456149e6e 100644 --- a/libavcodec/vaapi_vc1.c +++ b/libavcodec/vaapi_vc1.c @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "vaapi_internal.h" #include "internal.h" +#include "vaapi_decode.h" #include "vc1.h" #include "vc1data.h" @@ -148,143 +148,165 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t { const VC1Context *v = avctx->priv_data; const MpegEncContext *s = &v->s; - FFVAContext *vactx = ff_vaapi_get_context(avctx); - VAPictureParameterBufferVC1 *pic_param; - - vactx->slice_param_size = sizeof(VASliceParameterBufferVC1); - - /* Fill in VAPictureParameterBufferVC1 */ - pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferVC1)); - if (!pic_param) - return -1; - pic_param->forward_reference_picture = VA_INVALID_ID; - pic_param->backward_reference_picture = VA_INVALID_ID; - pic_param->inloop_decoded_picture = VA_INVALID_ID; - pic_param->sequence_fields.value = 0; /* reset all bits */ - pic_param->sequence_fields.bits.pulldown = v->broadcast; - pic_param->sequence_fields.bits.interlace = v->interlace; - pic_param->sequence_fields.bits.tfcntrflag = v->tfcntrflag; - pic_param->sequence_fields.bits.finterpflag = v->finterpflag; - pic_param->sequence_fields.bits.psf = v->psf; - pic_param->sequence_fields.bits.multires = v->multires; - pic_param->sequence_fields.bits.overlap = v->overlap; - pic_param->sequence_fields.bits.syncmarker = v->resync_marker; - pic_param->sequence_fields.bits.rangered = v->rangered; - pic_param->sequence_fields.bits.max_b_frames = s->avctx->max_b_frames; - pic_param->sequence_fields.bits.profile = v->profile; - pic_param->coded_width = s->avctx->coded_width; - pic_param->coded_height = s->avctx->coded_height; - pic_param->entrypoint_fields.value = 0; /* reset all bits */ - pic_param->entrypoint_fields.bits.broken_link = v->broken_link; - pic_param->entrypoint_fields.bits.closed_entry = v->closed_entry; - pic_param->entrypoint_fields.bits.panscan_flag = v->panscanflag; - pic_param->entrypoint_fields.bits.loopfilter = s->loop_filter; - pic_param->conditional_overlap_flag = v->condover; - pic_param->fast_uvmc_flag = v->fastuvmc; - pic_param->range_mapping_fields.value = 0; /* reset all bits */ - pic_param->range_mapping_fields.bits.luma_flag = v->range_mapy_flag; - pic_param->range_mapping_fields.bits.luma = v->range_mapy; - pic_param->range_mapping_fields.bits.chroma_flag = v->range_mapuv_flag; - pic_param->range_mapping_fields.bits.chroma = v->range_mapuv; - pic_param->b_picture_fraction = v->bfraction_lut_index; - pic_param->cbp_table = v->cbpcy_vlc ? v->cbpcy_vlc - ff_vc1_cbpcy_p_vlc : 0; - pic_param->mb_mode_table = 0; /* XXX: interlaced frame */ - pic_param->range_reduction_frame = v->rangeredfrm; - pic_param->rounding_control = v->rnd; - pic_param->post_processing = v->postproc; - pic_param->picture_resolution_index = v->respic; - pic_param->luma_scale = v->lumscale; - pic_param->luma_shift = v->lumshift; - pic_param->picture_fields.value = 0; /* reset all bits */ - pic_param->picture_fields.bits.picture_type = vc1_get_PTYPE(v); - pic_param->picture_fields.bits.frame_coding_mode = v->fcm; - pic_param->picture_fields.bits.top_field_first = v->tff; - pic_param->picture_fields.bits.is_first_field = v->fcm == 0; /* XXX: interlaced frame */ - pic_param->picture_fields.bits.intensity_compensation = v->mv_mode == MV_PMODE_INTENSITY_COMP; - pic_param->raw_coding.value = 0; /* reset all bits */ - pic_param->raw_coding.flags.mv_type_mb = v->mv_type_is_raw; - pic_param->raw_coding.flags.direct_mb = v->dmb_is_raw; - pic_param->raw_coding.flags.skip_mb = v->skip_is_raw; - pic_param->raw_coding.flags.field_tx = 0; /* XXX: interlaced frame */ - pic_param->raw_coding.flags.forward_mb = 0; /* XXX: interlaced frame */ - pic_param->raw_coding.flags.ac_pred = v->acpred_is_raw; - pic_param->raw_coding.flags.overflags = v->overflg_is_raw; - pic_param->bitplane_present.value = 0; /* reset all bits */ - pic_param->bitplane_present.flags.bp_mv_type_mb = vc1_has_MVTYPEMB_bitplane(v); - pic_param->bitplane_present.flags.bp_direct_mb = vc1_has_DIRECTMB_bitplane(v); - pic_param->bitplane_present.flags.bp_skip_mb = vc1_has_SKIPMB_bitplane(v); - pic_param->bitplane_present.flags.bp_field_tx = 0; /* XXX: interlaced frame */ - pic_param->bitplane_present.flags.bp_forward_mb = 0; /* XXX: interlaced frame */ - pic_param->bitplane_present.flags.bp_ac_pred = vc1_has_ACPRED_bitplane(v); - pic_param->bitplane_present.flags.bp_overflags = vc1_has_OVERFLAGS_bitplane(v); - pic_param->reference_fields.value = 0; /* reset all bits */ - pic_param->reference_fields.bits.reference_distance_flag = v->refdist_flag; - pic_param->reference_fields.bits.reference_distance = 0; /* XXX: interlaced frame */ - pic_param->reference_fields.bits.num_reference_pictures = 0; /* XXX: interlaced frame */ - pic_param->reference_fields.bits.reference_field_pic_indicator = 0; /* XXX: interlaced frame */ - pic_param->mv_fields.value = 0; /* reset all bits */ - pic_param->mv_fields.bits.mv_mode = vc1_get_MVMODE(v); - pic_param->mv_fields.bits.mv_mode2 = vc1_get_MVMODE2(v); - pic_param->mv_fields.bits.mv_table = s->mv_table_index; - pic_param->mv_fields.bits.two_mv_block_pattern_table = 0; /* XXX: interlaced frame */ - pic_param->mv_fields.bits.four_mv_switch = 0; /* XXX: interlaced frame */ - pic_param->mv_fields.bits.four_mv_block_pattern_table = 0; /* XXX: interlaced frame */ - pic_param->mv_fields.bits.extended_mv_flag = v->extended_mv; - pic_param->mv_fields.bits.extended_mv_range = v->mvrange; - pic_param->mv_fields.bits.extended_dmv_flag = v->extended_dmv; - pic_param->mv_fields.bits.extended_dmv_range = 0; /* XXX: interlaced frame */ - pic_param->pic_quantizer_fields.value = 0; /* reset all bits */ - pic_param->pic_quantizer_fields.bits.dquant = v->dquant; - pic_param->pic_quantizer_fields.bits.quantizer = v->quantizer_mode; - pic_param->pic_quantizer_fields.bits.half_qp = v->halfpq; - pic_param->pic_quantizer_fields.bits.pic_quantizer_scale = v->pq; - pic_param->pic_quantizer_fields.bits.pic_quantizer_type = v->pquantizer; - pic_param->pic_quantizer_fields.bits.dq_frame = v->dquantfrm; - pic_param->pic_quantizer_fields.bits.dq_profile = v->dqprofile; - pic_param->pic_quantizer_fields.bits.dq_sb_edge = v->dqprofile == DQPROFILE_SINGLE_EDGE ? v->dqsbedge : 0; - pic_param->pic_quantizer_fields.bits.dq_db_edge = v->dqprofile == DQPROFILE_DOUBLE_EDGES ? v->dqsbedge : 0; - pic_param->pic_quantizer_fields.bits.dq_binary_level = v->dqbilevel; - pic_param->pic_quantizer_fields.bits.alt_pic_quantizer = v->altpq; - pic_param->transform_fields.value = 0; /* reset all bits */ - pic_param->transform_fields.bits.variable_sized_transform_flag = v->vstransform; - pic_param->transform_fields.bits.mb_level_transform_type_flag = v->ttmbf; - pic_param->transform_fields.bits.frame_level_transform_type = vc1_get_TTFRM(v); - pic_param->transform_fields.bits.transform_ac_codingset_idx1 = v->c_ac_table_index; - pic_param->transform_fields.bits.transform_ac_codingset_idx2 = v->y_ac_table_index; - pic_param->transform_fields.bits.intra_transform_dc_table = v->s.dc_table_index; + VAAPIDecodePicture *pic = s->current_picture_ptr->hwaccel_picture_private; + VAPictureParameterBufferVC1 pic_param; + int err; + + pic->output_surface = ff_vaapi_get_surface_id(s->current_picture_ptr->f); + + pic_param = (VAPictureParameterBufferVC1) { + .forward_reference_picture = VA_INVALID_ID, + .backward_reference_picture = VA_INVALID_ID, + .inloop_decoded_picture = VA_INVALID_ID, + .sequence_fields.bits = { + .pulldown = v->broadcast, + .interlace = v->interlace, + .tfcntrflag = v->tfcntrflag, + .finterpflag = v->finterpflag, + .psf = v->psf, + .multires = v->multires, + .overlap = v->overlap, + .syncmarker = v->resync_marker, + .rangered = v->rangered, + .max_b_frames = s->avctx->max_b_frames, + .profile = v->profile, + }, + .coded_width = s->avctx->coded_width, + .coded_height = s->avctx->coded_height, + .entrypoint_fields.bits = { + .broken_link = v->broken_link, + .closed_entry = v->closed_entry, + .panscan_flag = v->panscanflag, + .loopfilter = s->loop_filter, + }, + .conditional_overlap_flag = v->condover, + .fast_uvmc_flag = v->fastuvmc, + .range_mapping_fields.bits = { + .luma_flag = v->range_mapy_flag, + .luma = v->range_mapy, + .chroma_flag = v->range_mapuv_flag, + .chroma = v->range_mapuv, + }, + .b_picture_fraction = v->bfraction_lut_index, + .cbp_table = v->cbpcy_vlc ? v->cbpcy_vlc - ff_vc1_cbpcy_p_vlc : 0, + .mb_mode_table = 0, /* XXX: interlaced frame */ + .range_reduction_frame = v->rangeredfrm, + .rounding_control = v->rnd, + .post_processing = v->postproc, + .picture_resolution_index = v->respic, + .luma_scale = v->lumscale, + .luma_shift = v->lumshift, + .picture_fields.bits = { + .picture_type = vc1_get_PTYPE(v), + .frame_coding_mode = v->fcm, + .top_field_first = v->tff, + .is_first_field = v->fcm == 0, /* XXX: interlaced frame */ + .intensity_compensation = v->mv_mode == MV_PMODE_INTENSITY_COMP, + }, + .raw_coding.flags = { + .mv_type_mb = v->mv_type_is_raw, + .direct_mb = v->dmb_is_raw, + .skip_mb = v->skip_is_raw, + .field_tx = 0, /* XXX: interlaced frame */ + .forward_mb = 0, /* XXX: interlaced frame */ + .ac_pred = v->acpred_is_raw, + .overflags = v->overflg_is_raw, + }, + .bitplane_present.flags = { + .bp_mv_type_mb = vc1_has_MVTYPEMB_bitplane(v), + .bp_direct_mb = vc1_has_DIRECTMB_bitplane(v), + .bp_skip_mb = vc1_has_SKIPMB_bitplane(v), + .bp_field_tx = 0, /* XXX: interlaced frame */ + .bp_forward_mb = 0, /* XXX: interlaced frame */ + .bp_ac_pred = vc1_has_ACPRED_bitplane(v), + .bp_overflags = vc1_has_OVERFLAGS_bitplane(v), + }, + .reference_fields.bits = { + .reference_distance_flag = v->refdist_flag, + .reference_distance = 0, /* XXX: interlaced frame */ + .num_reference_pictures = 0, /* XXX: interlaced frame */ + .reference_field_pic_indicator = 0, /* XXX: interlaced frame */ + }, + .mv_fields.bits = { + .mv_mode = vc1_get_MVMODE(v), + .mv_mode2 = vc1_get_MVMODE2(v), + .mv_table = s->mv_table_index, + .two_mv_block_pattern_table = 0, /* XXX: interlaced frame */ + .four_mv_switch = 0, /* XXX: interlaced frame */ + .four_mv_block_pattern_table = 0, /* XXX: interlaced frame */ + .extended_mv_flag = v->extended_mv, + .extended_mv_range = v->mvrange, + .extended_dmv_flag = v->extended_dmv, + .extended_dmv_range = 0, /* XXX: interlaced frame */ + }, + .pic_quantizer_fields.bits = { + .dquant = v->dquant, + .quantizer = v->quantizer_mode, + .half_qp = v->halfpq, + .pic_quantizer_scale = v->pq, + .pic_quantizer_type = v->pquantizer, + .dq_frame = v->dquantfrm, + .dq_profile = v->dqprofile, + .dq_sb_edge = v->dqprofile == DQPROFILE_SINGLE_EDGE ? v->dqsbedge : 0, + .dq_db_edge = v->dqprofile == DQPROFILE_DOUBLE_EDGES ? v->dqsbedge : 0, + .dq_binary_level = v->dqbilevel, + .alt_pic_quantizer = v->altpq, + }, + .transform_fields.bits = { + .variable_sized_transform_flag = v->vstransform, + .mb_level_transform_type_flag = v->ttmbf, + .frame_level_transform_type = vc1_get_TTFRM(v), + .transform_ac_codingset_idx1 = v->c_ac_table_index, + .transform_ac_codingset_idx2 = v->y_ac_table_index, + .intra_transform_dc_table = v->s.dc_table_index, + }, + }; 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; } - if (pic_param->bitplane_present.value) { + err = ff_vaapi_decode_make_param_buffer(avctx, pic, + VAPictureParameterBufferType, + &pic_param, sizeof(pic_param)); + if (err) + goto fail; + + if (pic_param.bitplane_present.value) { uint8_t *bitplane; const uint8_t *ff_bp[3]; int x, y, n; + size_t size = (s->mb_width * s->mb_height + 1) / 2; + + bitplane = av_mallocz(size); + if (!bitplane) { + err = AVERROR(ENOMEM); + goto fail; + } switch (s->pict_type) { case AV_PICTURE_TYPE_P: - ff_bp[0] = pic_param->bitplane_present.flags.bp_direct_mb ? v->direct_mb_plane : NULL; - ff_bp[1] = pic_param->bitplane_present.flags.bp_skip_mb ? s->mbskip_table : NULL; - ff_bp[2] = pic_param->bitplane_present.flags.bp_mv_type_mb ? v->mv_type_mb_plane : NULL; + ff_bp[0] = pic_param.bitplane_present.flags.bp_direct_mb ? v->direct_mb_plane : NULL; + ff_bp[1] = pic_param.bitplane_present.flags.bp_skip_mb ? s->mbskip_table : NULL; + ff_bp[2] = pic_param.bitplane_present.flags.bp_mv_type_mb ? v->mv_type_mb_plane : NULL; break; case AV_PICTURE_TYPE_B: if (!v->bi_type) { - ff_bp[0] = pic_param->bitplane_present.flags.bp_direct_mb ? v->direct_mb_plane : NULL; - ff_bp[1] = pic_param->bitplane_present.flags.bp_skip_mb ? s->mbskip_table : NULL; + ff_bp[0] = pic_param.bitplane_present.flags.bp_direct_mb ? v->direct_mb_plane : NULL; + ff_bp[1] = pic_param.bitplane_present.flags.bp_skip_mb ? s->mbskip_table : NULL; ff_bp[2] = NULL; /* XXX: interlaced frame (FORWARD plane) */ break; } /* fall-through (BI-type) */ case AV_PICTURE_TYPE_I: ff_bp[0] = NULL; /* XXX: interlaced frame (FIELDTX plane) */ - ff_bp[1] = pic_param->bitplane_present.flags.bp_ac_pred ? v->acpred_plane : NULL; - ff_bp[2] = pic_param->bitplane_present.flags.bp_overflags ? v->over_flags_plane : NULL; + ff_bp[1] = pic_param.bitplane_present.flags.bp_ac_pred ? v->acpred_plane : NULL; + ff_bp[2] = pic_param.bitplane_present.flags.bp_overflags ? v->over_flags_plane : NULL; break; default: ff_bp[0] = NULL; @@ -293,26 +315,51 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t break; } - bitplane = ff_vaapi_alloc_bitplane(vactx, (s->mb_width * s->mb_height + 1) / 2); - if (!bitplane) - return -1; - n = 0; for (y = 0; y < s->mb_height; y++) for (x = 0; x < s->mb_width; x++, n++) vc1_pack_bitplanes(bitplane, n, ff_bp, x, y, s->mb_stride); if (n & 1) /* move last nibble to the high order */ bitplane[n/2] <<= 4; + + err = ff_vaapi_decode_make_param_buffer(avctx, pic, + VABitPlaneBufferType, + bitplane, size); + av_free(bitplane); + if (err) + goto fail; } return 0; + +fail: + ff_vaapi_decode_cancel(avctx, pic); + return err; +} + +static int vaapi_vc1_end_frame(AVCodecContext *avctx) +{ + VC1Context *v = avctx->priv_data; + MpegEncContext *s = &v->s; + 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_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size) { const VC1Context *v = avctx->priv_data; const MpegEncContext *s = &v->s; - FFVAContext *vactx = ff_vaapi_get_context(avctx); - VASliceParameterBufferVC1 *slice_param; + VAAPIDecodePicture *pic = s->current_picture_ptr->hwaccel_picture_private; + VASliceParameterBufferVC1 slice_param; + int err; /* Current bit buffer is beyond any marker for VC-1, so skip it */ if (avctx->codec_id == AV_CODEC_ID_VC1 && IS_MARKER(AV_RB32(buffer))) { @@ -320,39 +367,51 @@ static int vaapi_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, size -= 4; } - /* Fill in VASliceParameterBufferVC1 */ - slice_param = (VASliceParameterBufferVC1 *)ff_vaapi_alloc_slice(vactx, buffer, size); - if (!slice_param) - return -1; - slice_param->macroblock_offset = get_bits_count(&s->gb); - slice_param->slice_vertical_position = s->mb_y; + slice_param = (VASliceParameterBufferVC1) { + .slice_data_size = size, + .slice_data_offset = 0, + .slice_data_flag = VA_SLICE_DATA_FLAG_ALL, + .macroblock_offset = get_bits_count(&s->gb), + .slice_vertical_position = s->mb_y, + }; + + 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_WMV3_VAAPI_HWACCEL AVHWAccel ff_wmv3_vaapi_hwaccel = { - .name = "wmv3_vaapi", - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_WMV3, - .pix_fmt = AV_PIX_FMT_VAAPI, - .start_frame = vaapi_vc1_start_frame, - .end_frame = ff_vaapi_mpeg_end_frame, - .decode_slice = vaapi_vc1_decode_slice, - .init = ff_vaapi_context_init, - .uninit = ff_vaapi_context_fini, - .priv_data_size = sizeof(FFVAContext), + .name = "wmv3_vaapi", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_WMV3, + .pix_fmt = AV_PIX_FMT_VAAPI, + .start_frame = &vaapi_vc1_start_frame, + .end_frame = &vaapi_vc1_end_frame, + .decode_slice = &vaapi_vc1_decode_slice, + .frame_priv_data_size = sizeof(VAAPIDecodePicture), + .init = &ff_vaapi_decode_init, + .uninit = &ff_vaapi_decode_uninit, + .priv_data_size = sizeof(VAAPIDecodeContext), }; #endif AVHWAccel ff_vc1_vaapi_hwaccel = { - .name = "vc1_vaapi", - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_VC1, - .pix_fmt = AV_PIX_FMT_VAAPI, - .start_frame = vaapi_vc1_start_frame, - .end_frame = ff_vaapi_mpeg_end_frame, - .decode_slice = vaapi_vc1_decode_slice, - .init = ff_vaapi_context_init, - .uninit = ff_vaapi_context_fini, - .priv_data_size = sizeof(FFVAContext), + .name = "vc1_vaapi", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_VC1, + .pix_fmt = AV_PIX_FMT_VAAPI, + .start_frame = &vaapi_vc1_start_frame, + .end_frame = &vaapi_vc1_end_frame, + .decode_slice = &vaapi_vc1_decode_slice, + .frame_priv_data_size = sizeof(VAAPIDecodePicture), + .init = &ff_vaapi_decode_init, + .uninit = &ff_vaapi_decode_uninit, + .priv_data_size = sizeof(VAAPIDecodeContext), };