From patchwork Sun Sep 1 13:20:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 14832 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 CC75E447AE5 for ; Sun, 1 Sep 2019 16:20:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B91B5687F2F; Sun, 1 Sep 2019 16:20:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2D11687F27 for ; Sun, 1 Sep 2019 16:20:42 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id p3so5873650pgb.9 for ; Sun, 01 Sep 2019 06:20:42 -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=dcpVPd3rHB5OauFzyGPcXepCWaMGg3f9KvAqh0LFKHo=; b=SSK55waDgjxpnyLNrTY6uiSiVr87PKXHnxmMH8PG2nH2HTSG1W0ijKkFxgW7AjYIOr zc8YVeAYrg1WCa5EnGSo97a4GZBciq+7Kd69WGfoOC3JLGVZWjaOKuY5cRDuMaUiWaVo pc1zbucbJaFPwvJz2BalYj/+drKYOMerwYOTAoR8TccD9PVW1Yxsr30Whh6tl9ueMYXb y3ibHjulXUkN7GTvC7G4Zh/c/+SSmaco3UQ4lKtYb/cV/2mpAQJJpMszzND63iig+iC1 GESoIi0ckTV+0EdR2CpAMf+OdMppbiUVoc3D1ybEvX3BjXqGNBpRRBPjuB8I9TfxdarT 0DZA== 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=dcpVPd3rHB5OauFzyGPcXepCWaMGg3f9KvAqh0LFKHo=; b=Li+z6SGaky0aOuOKbPhEoXZt9Bd1Cu3ex3lapVig+2vn41PBFif6guiYG52VFCro5o O/U1hXYPrBvYdlEjH3mEVGMA5/X/NO1mVoKtUE3FXofX+cQAqHhV5ddygN9HUDL3O4X0 QapHkKDnWspR4yavMts0q9jeSsaU51uFjqb5K+ODaBdT+gU24DkkWCPQTyi3I6G/nFys 18xVkj+RbS+VoEvLCfFM3U95i4HNxDC/sD5oyJ0GD2wdoc7QnwiOtu8sKuNFPKnSWeZs o164J9JhX1xvgJGt6Yq6YQwmEJ1XeanbKtNRP/Y1cNCIyfDGnkuQTrklIWBmlO2gD0hm 5hlw== X-Gm-Message-State: APjAAAUPVLXnIAdENRiIJY4iV+fHKusOeqy/0Z4GBJYwQZO+oCidZjA2 Ei2km3ZfGVVahGy/ULET0Qo3cYsN X-Google-Smtp-Source: APXvYqz/SYEgD5N0uYIVOiUPBGa4z8T2VIoivKj+fMUtiDo/dJWfQ0PBfmydzIH4GKjImiLmlHXI0g== X-Received: by 2002:a17:90a:37d1:: with SMTP id v75mr8450130pjb.33.1567344040659; Sun, 01 Sep 2019 06:20:40 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id b14sm12587039pfo.15.2019.09.01.06.20.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Sep 2019 06:20:40 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 1 Sep 2019 21:20:22 +0800 Message-Id: <20190901132023.28531-4-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190901132023.28531-1-lance.lmwang@gmail.com> References: <1567007116-9088-1-git-send-email-lance.lmwang@gmail.com> <20190901132023.28531-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 4/5] avcodec/v210enc: make 8bit and 10bit process consistent 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 It's for code factorization in the next patch Signed-off-by: Limin Wang --- libavcodec/v210enc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c index 3e6abbe..d078f0a 100644 --- a/libavcodec/v210enc.c +++ b/libavcodec/v210enc.c @@ -46,7 +46,7 @@ av_cold void ff_v210enc_init(V210EncContext *s) { s->pack_line_8 = v210_planar_pack_8_c; s->pack_line_10 = v210_planar_pack_10_c; - s->sample_factor_8 = 1; + s->sample_factor_8 = 2; s->sample_factor_10 = 1; if (ARCH_X86) @@ -121,18 +121,18 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, if (w < avctx->width - 1) { WRITE_PIXELS(u, y, v, 10); - val = CLIP(*y++, 10); + val = CLIP(*y++, 10) << (10-10); if (w == avctx->width - 2) { AV_WL32(dst, val); dst += 4; } } if (w < avctx->width - 3) { - val |= (CLIP(*u++, 10) << 10) | (CLIP(*y++, 10) << 20); + val |= (CLIP(*u++, 10) << (20-10)) | (CLIP(*y++, 10) << (30-10)); AV_WL32(dst, val); dst += 4; - val = CLIP(*v++, 10) | (CLIP(*y++, 10) << 10); + val = CLIP(*v++, 10) << (10-10) | (CLIP(*y++, 10) << (20-10)); AV_WL32(dst, val); dst += 4; } @@ -148,7 +148,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, const uint8_t *u = pic->data[1]; const uint8_t *v = pic->data[2]; - const int sample_size = 12 * s->sample_factor_8; + const int sample_size = 6 * s->sample_factor_8; const int sample_w = avctx->width / sample_size; for (h = 0; h < avctx->height; h++) { @@ -159,7 +159,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, y += w; u += w >> 1; v += w >> 1; - dst += sample_w * 32 * s->sample_factor_8; + dst += sample_w * 16 * s->sample_factor_8; for (; w < avctx->width - 5; w += 6) { WRITE_PIXELS(u, y, v, 8); @@ -170,18 +170,18 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, if (w < avctx->width - 1) { WRITE_PIXELS(u, y, v, 8); - val = CLIP(*y++, 8) << 2; + val = CLIP(*y++, 8) << (10-8); if (w == avctx->width - 2) { AV_WL32(dst, val); dst += 4; } } if (w < avctx->width - 3) { - val |= (CLIP(*u++, 8) << 12) | (CLIP(*y++, 8) << 22); + val |= (CLIP(*u++, 8) << (20-8)) | (CLIP(*y++, 8) << (30-8)); AV_WL32(dst, val); dst += 4; - val = (CLIP(*v++, 8) << 2) | (CLIP(*y++, 8) << 12); + val = (CLIP(*v++, 8) << (10-8)) | (CLIP(*y++, 8) << (20-8)); AV_WL32(dst, val); dst += 4; }