From patchwork Tue Sep 17 03:42:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15112 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9CF3E448C8A for ; Tue, 17 Sep 2019 06:42:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73E97688174; Tue, 17 Sep 2019 06:42:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C8BA687F0D for ; Tue, 17 Sep 2019 06:42:37 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id q12so1274305pff.9 for ; Mon, 16 Sep 2019 20:42:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dn+HVbGO2RGlduxM9pp0UzbQpdjvzLLvDD7Ph/GdOlA=; b=gI33etB2g3HFVDDKBvBgtJsUYFe6h3BjS6zN5NM2QbZPztbQT/iTQZ/YfBmUPyUkEb fhZeqrO5lrZNC7LU0Fxn0hmDN4zIPVzcvvZuaxJkTHgYSSxLVDVeM0isTZ0CCrXgtSKV ovWGiAhIkRutHqA7vA4C6kqjAH5ZMGS4HuVxhHIgCPoJjYaTr63kseXHH4Aps1kYHUPm Ncz5meZxiYNvPa8zGtVZCdI4Zrc29fuaJIep1XUeE1ezqo2j/kUpt/vCeB1Tp+bu6Q7X kuJa34bE50yCgeh8aZzq7kSRryO+m2iQVpk4X9+X3MmidCsaT4v7wFTocGgxfudlhJty HCnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dn+HVbGO2RGlduxM9pp0UzbQpdjvzLLvDD7Ph/GdOlA=; b=l6NP4UBR4hzl0xo05s3TUgjhEVe39l0OaoKefWn4hAzhf446oUguXM/Y31H3pUpZW8 5YvulKrAjrFIe4uhTYwBthSMYYXf1QgdECS58QO/YAFXqu9FVKf9nfdvIAasr4Tjh34z jJyl8AnmiEj2ciE48LDop7oCcUXgD0DkWDm0imJFcEQ3PRxAu7ObdeWQm7HcQ5e+CLdD XoRe/t+8qsO+wXOu4qtNCPFkcmCuF5YYWCvTj2izJU/bBqBz2/5r8AtU69mQRFEHHS4r 9mMm2Qvb7ANyogecusRX+GjhTb+xgRrzEVje6z/dbJVAlPS1lqco/Judshb8yQtIVMNm Mwzw== X-Gm-Message-State: APjAAAWtHUliRtVt90VdMBhA45MDNkleiZCAo+OWUBnYol6ydM8wsR41 zaMAMvt4pe/YzNW0zdz3fPz/6E2c X-Google-Smtp-Source: APXvYqwkiaCpTXhs06QSWjEhrKpRU7No/OjqP/2Lf1v0ArIT7ZDN1GLh3VEDIbCV2khoF5ppl964KA== X-Received: by 2002:a65:6799:: with SMTP id e25mr165025pgr.271.1568691755327; Mon, 16 Sep 2019 20:42:35 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id o42sm765973pjo.32.2019.09.16.20.42.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Sep 2019 20:42:34 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Sep 2019 11:42:26 +0800 Message-Id: <20190917034228.31993-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190901132023.28531-1-lance.lmwang@gmail.com> References: <20190901132023.28531-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 1/3] avcodec/v210enc: add depth parameter for WRITE_PIXELS and CLIP 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/v210enc.c | 83 +++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 47 deletions(-) diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c index b024806d0b..1b840b2c22 100644 --- a/libavcodec/v210enc.c +++ b/libavcodec/v210enc.c @@ -26,25 +26,14 @@ #include "internal.h" #include "v210enc.h" -#define CLIP(v) av_clip(v, 4, 1019) -#define CLIP8(v) av_clip(v, 1, 254) - -#define WRITE_PIXELS(a, b, c) \ - do { \ - val = CLIP(*a++); \ - val |= (CLIP(*b++) << 10) | \ - (CLIP(*c++) << 20); \ - AV_WL32(dst, val); \ - dst += 4; \ - } while (0) - -#define WRITE_PIXELS8(a, b, c) \ - do { \ - val = (CLIP8(*a++) << 2); \ - val |= (CLIP8(*b++) << 12) | \ - (CLIP8(*c++) << 22); \ - AV_WL32(dst, val); \ - dst += 4; \ +#define CLIP(v, depth) av_clip(v, 1 << (depth-8), ((1 << depth)-(1 << (depth-8)) -1)) +#define WRITE_PIXELS(a, b, c, depth) \ + do { \ + val = CLIP(*a++, depth) << (10-depth); \ + val |= (CLIP(*b++, depth) << (20-depth)) | \ + (CLIP(*c++, depth) << (30-depth)); \ + AV_WL32(dst, val); \ + dst += 4; \ } while (0) static void v210_planar_pack_8_c(const uint8_t *y, const uint8_t *u, @@ -56,14 +45,14 @@ static void v210_planar_pack_8_c(const uint8_t *y, const uint8_t *u, /* unroll this to match the assembly */ for (i = 0; i < width - 11; i += 12) { - WRITE_PIXELS8(u, y, v); - WRITE_PIXELS8(y, u, y); - WRITE_PIXELS8(v, y, u); - WRITE_PIXELS8(y, v, y); - WRITE_PIXELS8(u, y, v); - WRITE_PIXELS8(y, u, y); - WRITE_PIXELS8(v, y, u); - WRITE_PIXELS8(y, v, y); + WRITE_PIXELS(u, y, v, 8); + WRITE_PIXELS(y, u, y, 8); + WRITE_PIXELS(v, y, u, 8); + WRITE_PIXELS(y, v, y, 8); + WRITE_PIXELS(u, y, v, 8); + WRITE_PIXELS(y, u, y, 8); + WRITE_PIXELS(v, y, u, 8); + WRITE_PIXELS(y, v, y, 8); } } @@ -75,10 +64,10 @@ static void v210_planar_pack_10_c(const uint16_t *y, const uint16_t *u, int i; for (i = 0; i < width - 5; i += 6) { - WRITE_PIXELS(u, y, v); - WRITE_PIXELS(y, u, y); - WRITE_PIXELS(v, y, u); - WRITE_PIXELS(y, v, y); + WRITE_PIXELS(u, y, v, 10); + WRITE_PIXELS(y, u, y, 10); + WRITE_PIXELS(v, y, u, 10); + WRITE_PIXELS(y, v, y, 10); } } @@ -153,26 +142,26 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, dst += sample_w * 16 * s->sample_factor_10; for (; w < avctx->width - 5; w += 6) { - WRITE_PIXELS(u, y, v); - WRITE_PIXELS(y, u, y); - WRITE_PIXELS(v, y, u); - WRITE_PIXELS(y, v, y); + WRITE_PIXELS(u, y, v, 10); + WRITE_PIXELS(y, u, y, 10); + WRITE_PIXELS(v, y, u, 10); + WRITE_PIXELS(y, v, y, 10); } if (w < avctx->width - 1) { - WRITE_PIXELS(u, y, v); + WRITE_PIXELS(u, y, v, 10); - val = CLIP(*y++); + val = CLIP(*y++, 10); if (w == avctx->width - 2) { AV_WL32(dst, val); dst += 4; } } if (w < avctx->width - 3) { - val |= (CLIP(*u++) << 10) | (CLIP(*y++) << 20); + val |= (CLIP(*u++, 10) << 10) | (CLIP(*y++, 10) << 20); AV_WL32(dst, val); dst += 4; - val = CLIP(*v++) | (CLIP(*y++) << 10); + val = CLIP(*v++, 10) | (CLIP(*y++, 10) << 10); AV_WL32(dst, val); dst += 4; } @@ -202,26 +191,26 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, dst += sample_w * 32 * s->sample_factor_8; for (; w < avctx->width - 5; w += 6) { - WRITE_PIXELS8(u, y, v); - WRITE_PIXELS8(y, u, y); - WRITE_PIXELS8(v, y, u); - WRITE_PIXELS8(y, v, y); + WRITE_PIXELS(u, y, v, 8); + WRITE_PIXELS(y, u, y, 8); + WRITE_PIXELS(v, y, u, 8); + WRITE_PIXELS(y, v, y, 8); } if (w < avctx->width - 1) { - WRITE_PIXELS8(u, y, v); + WRITE_PIXELS(u, y, v, 8); - val = CLIP8(*y++) << 2; + val = CLIP(*y++, 8) << 2; if (w == avctx->width - 2) { AV_WL32(dst, val); dst += 4; } } if (w < avctx->width - 3) { - val |= (CLIP8(*u++) << 12) | (CLIP8(*y++) << 22); + val |= (CLIP(*u++, 8) << 12) | (CLIP(*y++, 8) << 22); AV_WL32(dst, val); dst += 4; - val = (CLIP8(*v++) << 2) | (CLIP8(*y++) << 12); + val = (CLIP(*v++, 8) << 2) | (CLIP(*y++, 8) << 12); AV_WL32(dst, val); dst += 4; }