From patchwork Mon Jun 26 17:34:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 4126 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp1076519vsb; Mon, 26 Jun 2017 10:34:56 -0700 (PDT) X-Received: by 10.28.156.17 with SMTP id f17mr454879wme.17.1498498496715; Mon, 26 Jun 2017 10:34:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498498496; cv=none; d=google.com; s=arc-20160816; b=0o4qXw2RhA8gEA+/f0zno8hgtSbTDZjiqzPHuLoUoayv6vx2Ns/fM0EntpfnDS9SI8 xXE8+mfREXiz1uEODokTXcSZr3yX8rxTSUDO9aIB632PSlW6k66vzMcNzet/N/dA+HeK zvZaRKUE95r0G5QDdvb0oOxRddvR6fTiXXMFFzhZvRQqAEyufEVy+brQq4ecVMuenKbO KOKFC2H/2BOmRxsKPme82OtIw4RtDygB/bhtQLh6MPpfmXu3scSKoEMXVbfKXp9x0pVW e831u/wWkw1+R/fLIqNqfdyLPmJ5d0Il0E3Gc1OS+KlOcwAPn22xS0qpuiyuWLrdXYud gJJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=gKLBA19urzEhffOUJ3U+9oyDIw+pW2Jjb7oQu/rU+hc=; b=f18TvnZgSxMD9lqB/BRWUNcDV6t9N782NXgS9jQdgE/KeeHSwoOE11dL5RTmHRI2ku 4oRaytRcUhhatr90Y3Y5P3Yb3rY1jHXu0nixbwgy4tShqak1xM6aCtQw1OM4yCGKNFY6 lAmiM9Kk4XuriZ8raZQPDuY7fIzaelOTYmNddd+km+iO2Ab+aYPxEB1sEy11XEXlY67H qvAPIBuQwtjSPtwIqkYbxYnhvi713W+oiB1M2KdBz2WNsD246HJsRNg4Bl2qmF50R/nj PfZ29lzz2kDGQQkCiEM4ejFQfAwkps3wJHsSLkfLhL2NOnvenMxdeCFObGXZbdqtpgZu zPpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=qQQywqHy; 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 sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t124si273924wma.189.2017.06.26.10.34.54; Mon, 26 Jun 2017 10:34:56 -0700 (PDT) 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 header.b=qQQywqHy; 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 sp=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 A842A68A23A; Mon, 26 Jun 2017 20:34:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D1F968A1A1 for ; Mon, 26 Jun 2017 20:34:42 +0300 (EEST) Received: by mail-wr0-f195.google.com with SMTP id z45so30000702wrb.2 for ; Mon, 26 Jun 2017 10:34:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=iGuTJqnyZGKEQdclVn+QV6LHwIJU/Uum+5G2TA5aq04=; b=qQQywqHys3j8LvEv4fla4HqdPu3Z89D9XPElnRvA5frpfdShq2lti7RIpcG/FNxsr8 hrATnEo2cgI77rtmffAPyb+Ers8FHcMsSzp2kOYQwtIN0rjTb0Cohw3BUguceTMUgKYH 71Ru33qV8H6TZx7k8rsJR/SaNXFuyK1dRqL4ZPcRF1vRECxdwFDtKsrA7V8rAIlicoGO MX8GXfKc2Qm+yp/Q5QocA5guJuCKcIZMom4pbmMS0AOxROORdeulq8PEfnjLoJKrhn+h FpyMlsVJkrxdL+DYMIqna/s9nh/cfaE+Z5S7yp7vIkmmFEt2Od33AYeVG7kDBTCrLD2t zDmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=iGuTJqnyZGKEQdclVn+QV6LHwIJU/Uum+5G2TA5aq04=; b=Ya12B2IwKSvgFnrIB1ugq9YHh736m8eK3CpqL/4UruGOYdwxGwmTH9+MGydU1HIsEh UgBZ5K7oDx64llAhsvFDvSokAVZf8X50z5DZOuaNc/a8eA/gSqwRbl/hTGOVt8Pa7Jxf Dj0EWHBiNHBKQXbDhxGYH/6b55DZzZTPxNWc4wzdGyZchIpmbzW/VI+ztdfA+Txsp+JQ W4Ss9DL++nOLJM8lZRoLcXRA2tVnajPp7jNoi0s4jYd3Cj5uIE/AF50tzaC/b5X6JZe4 2jaKHPGV8kpmL2LCRIqWA4kIP+BH0JdBxJm0xe0pdLkcPXE+4PgwluT7attnBFbj8cs7 quvQ== X-Gm-Message-State: AKS2vOzOi9RLKm+3fw0x4nRYRo2O+/rJKam4vfb0APebsOs0CQPeKpqJ DXsn/fLtFWsltKaO X-Received: by 10.223.164.23 with SMTP id d23mr15276394wra.58.1498498483506; Mon, 26 Jun 2017 10:34:43 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id f73sm264729wmi.3.2017.06.26.10.34.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jun 2017 10:34:42 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Jun 2017 19:34:32 +0200 Message-Id: <20170626173432.17248-1-onemda@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] avcodec/proresdec_lgpl: make use of BlockDSP 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavcodec/proresdec_lgpl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/proresdec_lgpl.c b/libavcodec/proresdec_lgpl.c index bc5bdb5..e91abaf 100644 --- a/libavcodec/proresdec_lgpl.c +++ b/libavcodec/proresdec_lgpl.c @@ -34,6 +34,7 @@ #include "libavutil/intmath.h" #include "avcodec.h" +#include "blockdsp.h" #include "idctdsp.h" #include "internal.h" #include "proresdata.h" @@ -52,6 +53,7 @@ typedef struct ProresThreadData { } ProresThreadData; typedef struct ProresContext { + BlockDSPContext bdsp; ProresDSPContext dsp; AVFrame *frame; ScanTable scantable; @@ -86,6 +88,7 @@ static av_cold int decode_init(AVCodecContext *avctx) ctx->slice_data = NULL; avctx->bits_per_raw_sample = PRORES_BITS_PER_SAMPLE; + ff_blockdsp_init(&ctx->bdsp, avctx); ff_proresdsp_init(&ctx->dsp, avctx); ctx->scantable_type = -1; // set scantable type to uninitialized @@ -431,11 +434,12 @@ static int decode_slice_plane(ProresContext *ctx, ProresThreadData *td, { GetBitContext gb; int16_t *block_ptr; - int mb_num, blocks_per_slice, ret; + int i, mb_num, blocks_per_slice, ret; blocks_per_slice = mbs_per_slice * blocks_per_mb; - memset(td->blocks, 0, 8 * 4 * 64 * sizeof(*td->blocks)); + for (i = 0; i < blocks_per_slice; i++) + ctx->bdsp.clear_block(td->blocks + (i << 6)); init_get_bits(&gb, buf, data_size << 3);