From patchwork Mon Jul 31 11:50:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 4531 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.85 with SMTP id 82csp2311789vsb; Mon, 31 Jul 2017 04:50:39 -0700 (PDT) X-Received: by 10.223.142.139 with SMTP id q11mr12262600wrb.184.1501501838917; Mon, 31 Jul 2017 04:50:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501501838; cv=none; d=google.com; s=arc-20160816; b=G9jx6Xpm9w0Rr/pvNki+GxaFHDHvxpNFp4+t4/vBkO7OiTIjvugUGXgavIY2VeNfQs K7JjmX6MWWn4biZi9T9XYMoI7ByJVXZn6Pe6BWo0wSsfckgk1B0Rzfm7d7jLU7UOrd0H koxr5lp2EUEmbPRviB5dmexUf+vx/wxG2Aq9+0OQHV6wXqv09iBj1/IYU7xa8brhAkFb duCau9/ZmSzW0rnT3bNhPcA4b/oGUUdEVwL5GH17s5Rd0Rt765Z+tC6057rQiYxG7kEt rltlkWT3Xk0olE/4ZnUgGVJ33LirPUf67jvm7HUvHkz7ZFT1m+qRs+HhAYZ29z+BOSDD ObIg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=Stn3nA4yifdEIOn4ufZ3BkUY/h1ObZDjRnwZUCvuJYA=; b=AYu2TE9IVVjBnllnM7fq2K3k/uBVx9s0NNA9jWrpjO3TU0bz3COocueI3Plhtm2+hu HKsp8JmYVyHiq2NYhu7ZtWrkOGnmFmL/xwrQ2lxOVcF7T134SdbTkvKmb03dsMBxiKi6 5p4LsIJJVJLBLIJ2Pros7LK4QdP/eSx/YbynrFtB6fAyJ+CCeL4xKNZ6KOvmcr0lfxz2 NS0OH9CdOG5V9Z4YOEm2zy8qrBHFqR4YN++mUB3mySvNW8OgcyPHtLZxdO/VnHofBG0E WF8E+nr9IIP8ggz5S945c3PPAI45htBY6YJCpMtUz62ueMYGLBVjSYptv6ZHKpWW9NJo vcow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.com header.b=Y/1aPBjp; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u21si7588644wrb.258.2017.07.31.04.50.38; Mon, 31 Jul 2017 04:50:38 -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=@ob-encoder-com.20150623.gappssmtp.com header.b=Y/1aPBjp; 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 63063689BC3; Mon, 31 Jul 2017 14:50:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6ABCF68831C for ; Mon, 31 Jul 2017 14:50:19 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id d40so6259915wma.3 for ; Mon, 31 Jul 2017 04:50:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ob-encoder-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=prDy5gTeWmkRmuy0STkKAJAAbQNQCMHKFzbXugHWFMM=; b=Y/1aPBjpThEqvuj5G2xzXUnLjVQ2ELSKKmZ1Sq816GzAI1AY1nlZAbPhqnjwBdz4iH A8KD9E6EliWO/9sLY2AAvR3nRr0P2xjjcg+9gO3zc8tUwYB7yXCGZPzAFkQ/7Ni1ClgF asolZGarb5A1ph7Trubxu+5Ew814eyeXEd640u8z8iOesmEJ2qLynb7gFM0NF6jMRS1a vocH/HWrGzBAEEKro6wc67pwgK+VW8um7ZZcDDjl/iALB7woOL5YCah4iQi73sftqfCC vD5B78kBLUYJHiLMUjKgS92cxjKz36jK2wrfDrPN/O7p2iCEcvDUAjgyqol/lt1Ezd11 Kwaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=prDy5gTeWmkRmuy0STkKAJAAbQNQCMHKFzbXugHWFMM=; b=B9i6T7b4YhQJFNSXx+5pO5M5SdIs9RmheuiaTrJPj8/cf9lPeCIBYkUYXhwaDYPKVD IEbAo5NyKcIB/I1rJyuh407miWd+gEiVFiHQ7WQdzBfck2t3BM5qZeNjRrJ+PlAX5UnH bIoBntkcD93chUsXyup64hyMyMk70LDIrvdfy+OMcjNxaDHkQX6n5Xj0zXp79DdgAE7l yaHSAkpeLqmITh9wCQolAyEkJSKcBV05IS9M3pN5YkNUBYBCpBAJwJXgl332DU7XcOxm xfLSzDgsrmc3VUnqU0XIbQZ1adUXiW9xkToSDdWSdj3oZuNQflBmxdFQ35ODSrB1DxQy 8Tgw== X-Gm-Message-State: AIVw1118pE3vc98yT3RRGugsHEyIpOjiXawyL8SiQYE5b1mXSNkKFovU gxyn8J2Vwp7YnicFFA0= X-Received: by 10.80.213.17 with SMTP id u17mr14298975edi.105.1501501821408; Mon, 31 Jul 2017 04:50:21 -0700 (PDT) Received: from Highwind.systemlords.lan (d51A44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id m53sm14830400edc.29.2017.07.31.04.50.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Jul 2017 04:50:20 -0700 (PDT) From: James Darnley To: FFmpeg development discussions and patches Date: Mon, 31 Jul 2017 13:50:15 +0200 Message-Id: <20170731115016.6854-2-jdarnley@obe.tv> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170731115016.6854-1-jdarnley@obe.tv> References: <20170731115016.6854-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/vc2enc: assign some slice struct members init 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" --- libavcodec/vc2enc.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index 7e0cb03eff..5dec88c81b 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -700,9 +700,6 @@ static int calc_slice_sizes(VC2EncContext *s) for (slice_y = 0; slice_y < s->num_y; slice_y++) { for (slice_x = 0; slice_x < s->num_x; slice_x++) { SliceArgs *args = &enc_args[s->num_x*slice_y + slice_x]; - args->ctx = s; - args->x = slice_x; - args->y = slice_y; args->bits_ceil = s->slice_max_bytes << 3; args->bits_floor = s->slice_min_bytes << 3; memset(args->cache, 0, s->q_ceil*sizeof(*args->cache)); @@ -1201,6 +1198,17 @@ static av_cold int vc2_encode_init(AVCodecContext *avctx) s->slice_args = av_calloc(s->num_x*s->num_y, sizeof(SliceArgs)); if (!s->slice_args) goto alloc_fail; + else { + int x, y; + for (y = 0; y < s->num_y; y++) { + for (x = 0; x < s->num_x; x++) { + SliceArgs *args = &s->slice_args[s->num_x * y + x]; + args->ctx = s; + args->x = x; + args->y = y; + } + } + } /* Lookup tables */ s->coef_lut_len = av_malloc(COEF_LUT_TAB*(s->q_ceil+1)*sizeof(*s->coef_lut_len));