From patchwork Tue Nov 8 00:21:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Butterworth X-Patchwork-Id: 1330 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1419287vsb; Mon, 7 Nov 2016 16:34:33 -0800 (PST) X-Received: by 10.28.55.203 with SMTP id e194mr11376023wma.97.1478565273638; Mon, 07 Nov 2016 16:34:33 -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 b81si12836215wmc.110.2016.11.07.16.34.33; Mon, 07 Nov 2016 16:34:33 -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 73F14689A76; Tue, 8 Nov 2016 02:34:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0B298689A32 for ; Tue, 8 Nov 2016 02:34:21 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id u144so19386263wmu.0 for ; Mon, 07 Nov 2016 16:34:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=2go6FdMYQlbFz6fH9Znh2XtTOm1hSV2nmLpWyYTqhI8=; b=QELBfIJKhEj3ezaT5XBNneyOhYQKcchXo4bNWbfSTL2xu2sFfnAjqGo8x7GocIJ1ZL 63Q+LI/PA458eszaguDSnL3RG9MFFw4+NCUDnBxM6nPdScyfJaXUp5RmVbvk/xlOcGqd SwCDjm+mSMjqMX6p+dh+7JzGB0w0MrNs07FWayXXe0OdlSKwvn9NtktVEZPgr3PU2FNG f9qTHWEqSBZbMTrDU8hEm6MHNQNuGfqAjoQp9P5H/VehtlAqKTDPEiODwdl15glyBy5I yZo0aXKqpYLPNNg/3KewXqpFk1sg4MvAhYEWmrk18Ukt13H4S+Z/OMSMiwafMicnLrhn LpDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=2go6FdMYQlbFz6fH9Znh2XtTOm1hSV2nmLpWyYTqhI8=; b=jtPVeeCIigdS6eQw/nH3srNxl003bFWB0UvdPCjFct+JrwgZepX5SXRwL+FoUWlgdN 3kf+BpLCi872MqGgIUORIuPUQkw6O+JwFFxQdfYQSqL2vpQMm7ANZF35oXXkszlMH9eH 5JJRtAwmU9nfFxEfeI937JdpSzYnScP7vfD0reWNVnXl0WAmQvzu3kIQaTzgdhwU5X/q FYyQMZgQ0NcUH3bqhsiDNBn+O0aLJAMQH5oCVFLh9NvjN8lF/pkWAWnc2GK7YPrAOf9P +l0ju7qLyMu3hEb8QTAjzT+DKuHmBKyMGaQNd4PFQjArIaQcdNg6iZehLtJalNlusR+Q OocA== X-Gm-Message-State: ABUngvfJ3fnkjz2md6mwEHVfe6aEsB+GwU7jtZNiG1O7gxFphzGmCW9qFMXTZJDimVjBjQ== X-Received: by 10.28.138.137 with SMTP id m131mr5823008wmd.118.1478564542799; Mon, 07 Nov 2016 16:22:22 -0800 (PST) Received: from motbook-pro.Home (bcdf199e.skybroadband.com. [188.223.25.158]) by smtp.gmail.com with ESMTPSA id ba10sm26775590wjb.32.2016.11.07.16.22.21 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 07 Nov 2016 16:22:21 -0800 (PST) From: Tom Butterworth To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Nov 2016 00:21:52 +0000 Message-Id: <20161108002153.66910-1-bangnoise@gmail.com> X-Mailer: git-send-email 2.9.3 (Apple Git-75) Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/hap: pass texture-compression destination as argument, not in context 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 Cc: Tom Butterworth MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This allows a subsequent change to compress directly into the output packet when possible. --- libavcodec/hapenc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/hapenc.c b/libavcodec/hapenc.c index 076923b..7056b62 100644 --- a/libavcodec/hapenc.c +++ b/libavcodec/hapenc.c @@ -52,10 +52,9 @@ enum HapHeaderLength { HAP_HDR_LONG = 8, }; -static void compress_texture(AVCodecContext *avctx, const AVFrame *f) +static void compress_texture(AVCodecContext *avctx, uint8_t *out, const AVFrame *f) { HapContext *ctx = avctx->priv_data; - uint8_t *out = ctx->tex_buf; int i, j; for (j = 0; j < avctx->height; j += 4) { @@ -201,7 +200,7 @@ static int hap_encode(AVCodecContext *avctx, AVPacket *pkt, return ret; /* DXTC compression. */ - compress_texture(avctx, frame); + compress_texture(avctx, ctx->tex_buf, frame); /* Compress (using Snappy) the frame */ final_data_size = hap_compress_frame(avctx, pkt->data + header_length);