From patchwork Fri Nov 11 08:09:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 1385 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1275197vsb; Fri, 11 Nov 2016 00:09:40 -0800 (PST) X-Received: by 10.28.136.80 with SMTP id k77mr32433688wmd.57.1478851780647; Fri, 11 Nov 2016 00:09: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 n124si9771013wmn.102.2016.11.11.00.09.40; Fri, 11 Nov 2016 00:09: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=@gmail.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; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AC454689F24; Fri, 11 Nov 2016 10:09:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f179.google.com (mail-pf0-f179.google.com [209.85.192.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5EBA9689EFF for ; Fri, 11 Nov 2016 10:09:27 +0200 (EET) Received: by mail-pf0-f179.google.com with SMTP id n85so8150154pfi.1 for ; Fri, 11 Nov 2016 00:09:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=to:from:subject:message-id:date:user-agent:mime-version; bh=O6jh2ngu+lxDnaqQyGRV9wMC9cL4uOrIfGh/aF7f6H8=; b=RsHb8OiVXH9MpzXcEGhobFD1xNEM9GxOMJj5++Yh5CX4tEVmNFtqlMC9dDaop0JWu4 UekoFwNqcHFarNTfNWvP25xUHb3zpzhtyUmqTEF6xNoo6AAfwgeWduyKqTe/mQM0hoHa f7gvd+yi9MPFD4KTHfO0+xZI4f0PGNuJRHdsQh+ytPI0k/RIqIw1kpYxP9QxLRpe2WAH NpU6UIzgi5NRzmFvfJ3m+aovZF3VWHs6h9ufxSKo/Qko44VCTTyzF4YdOSi6IxUiTaaY Aubepp3q3zIpFA4O3N2Ki710Xt0LFGzIgstw8ICjd2Jq2FHy0FIQbeHXmHmzxlL21n2M 5rJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version; bh=O6jh2ngu+lxDnaqQyGRV9wMC9cL4uOrIfGh/aF7f6H8=; b=XJ/4M0lco0zISb6ftUFdEbIp4iMeBP+34Ug3md75PeE9w2mBkV61q8yhBtR5Tsqk7d WmNqYAuwPcFeQH52XQvZmkAqyjzm0WMSXEegFZPzPIXdxarXMb/68UnLCMzcMSYUtpJ3 Wtsj59jWvF39unLJf/cbkClQ5WPMVbm8WNnsYkzYpSTjELdEdgMV8s+FLBLhAV0VkJgO sLM9wmFq0wl+Awd9sujf+dX5QGBbxswOxm3r5RZaqk/9Q+FKibdgYuW/CZxFbICwyF8u c1Bp9cY7ecGUJ9KBwqQeHoAe4n+iQqMqA/golN4J6UMsjBMQfUQFQbLh/azFZTxIZwiI cqZg== X-Gm-Message-State: ABUngvdD4nC03stadUp7fN+6vI5U19RJNpB0SAzil071zKK2E+tUfQ0DJ7uqZOoC/g8I5Q== X-Received: by 10.99.226.83 with SMTP id y19mr43029783pgj.147.1478851769245; Fri, 11 Nov 2016 00:09:29 -0800 (PST) Received: from [10.239.204.196] ([192.55.54.43]) by smtp.gmail.com with ESMTPSA id x189sm12697048pfb.37.2016.11.11.00.09.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Nov 2016 00:09:28 -0800 (PST) To: FFmpeg development discussions and patches , jun.zhao@intel.com, Mark Thompson , Yi Wang From: Jun Zhao Message-ID: Date: Fri, 11 Nov 2016 16:09:25 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 Content-Disposition: attachment; filename*0="0001-lavc-vc1dec-add-multi-slice-decoding-support-for-hwa.pa"; filename*1="tch" X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] lavc/vc1dec: add multi-slice decoding support for hwaccel. 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" From 95eebc4d94a2f2db9f03e569b660d94ae083d26c Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Fri, 11 Nov 2016 16:05:57 +0800 Subject: [PATCH] lavc/vc1dec: add multi-slice decoding support for hwaccel. add multi-slice decoding support for hwaccel, now only test with vaapi as backend. Reviewed-by: Jun Zhao Signed-off-by: Wang, Yi A --- libavcodec/vc1dec.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 4f78aa8..1c8f03c 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -953,8 +953,24 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, s->picture_structure = PICT_FRAME; if ((ret = avctx->hwaccel->start_frame(avctx, buf_start, (buf + buf_size) - buf_start)) < 0) goto err; - if ((ret = avctx->hwaccel->decode_slice(avctx, buf_start, (buf + buf_size) - buf_start)) < 0) - goto err; + if (n_slices == 0) { + if ((ret = avctx->hwaccel->decode_slice(avctx, buf_start, (buf + buf_size) - buf_start)) < 0) + goto err; + } else { + int i; + ret = avctx->hwaccel->decode_slice(avctx, s->gb.buffer, s->gb.buffer_end - s->gb.buffer); + if (ret < 0) + goto err; + for (i = 0 ; i < n_slices; i++) { + s->gb = slices[i].gb; + s->mb_y = slices[i].mby_start; + if (get_bits(&s->gb, 1)) + ff_vc1_parse_frame_header_adv(v, &s->gb); + ret = avctx->hwaccel->decode_slice(avctx, s->gb.buffer, s->gb.buffer_end - s->gb.buffer); + if (ret < 0) + goto err; + } + } if ((ret = avctx->hwaccel->end_frame(avctx)) < 0) goto err; }