From patchwork Tue Sep 17 03:42:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15113 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 E251C448C8A for ; Tue, 17 Sep 2019 06:42:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CBB946881BF; Tue, 17 Sep 2019 06:42:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A0F96881BC for ; Tue, 17 Sep 2019 06:42:40 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id x127so1281109pfb.7 for ; Mon, 16 Sep 2019 20:42:40 -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=98dWKomR8PpZmF6SdTTdkqc6X9RjKj5l5Udwj1VdTdI=; b=ouDUHvZi8qEXzaD/t8CBCx+YG8pOiMIzFk1gNWz1+CS69dVZ+qdUkLk3ld6XSaxrT1 xufrIATQGA4KlnLTXhetC3slI6LAm5yzdn1py5tIGb4paWxXHkgqXJAbnFbLBzOYlqI1 hGERpBbliRgeHMbVQQe1TYQDHFmK8qUOdq8clczjVxeywNP/oW0ltJCyIlTbBMsfGPgL VUjMWuIS87ar/6Dm24Qwiwf86L+yOT3ODyJ//CkGHaqZ721ChZMZglISDo8TC6dOtgmY xbXRaTZDTHnDZiClcZOo4l1OjE8+0MfkKlQH267SfVLkWZWqLJfpr4c57Lt14Q8nq1O2 2iPA== 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=98dWKomR8PpZmF6SdTTdkqc6X9RjKj5l5Udwj1VdTdI=; b=eXS9kcgkgRm/NF9NWXfsNprYOLW+sHdKVE2IdYss3gBWXmuERnIgTfZqwLm83do5TQ ZPSbBnmmUd5JjwSyAu7FP/iJn7rMNRzHQU0BNlElEx+WPBEuV3k0qQSLcqYcdu1UzAx7 qOq4/N3htdbm8gVA1/T1GJtxhundE4/okk2fT8bmmswGQwmuYkJzVIPkMpZ4DHf1FjLR gWRK0HBemitaUDDAQpuB6YV2S8InlWmW+T+uuGMsSeXCyx66K1Qipg1lzMv46qkn9XEw 6pppJiICRmsc4lRmy0QViLnwIuhHAyPL0tkP4IrISwnE5Lpxbbk2Ah598sU4HzX9lyO5 9xEg== X-Gm-Message-State: APjAAAVSoAotfeQFxGeZU/PoYC4HjZcFOM9qCeMgH0mvmPgK/iRgjO4A QoVZVeSY5akMe3pXOLiW0Jgeg9dm X-Google-Smtp-Source: APXvYqxn8BFc0qTexVCjY/dE6vffBNPvKUeShDwb/CHErq+w/Zgsl8aOvLaiiEMPcn0d58ATYnC/lQ== X-Received: by 2002:a63:4c5c:: with SMTP id m28mr1468095pgl.333.1568691758401; Mon, 16 Sep 2019 20:42:38 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id o42sm765973pjo.32.2019.09.16.20.42.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Sep 2019 20:42:37 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Sep 2019 11:42:27 +0800 Message-Id: <20190917034228.31993-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190917034228.31993-1-lance.lmwang@gmail.com> References: <20190901132023.28531-1-lance.lmwang@gmail.com> <20190917034228.31993-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 2/3] 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 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 1b840b2c22..f545e43c6c 100644 --- a/libavcodec/v210enc.c +++ b/libavcodec/v210enc.c @@ -75,7 +75,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) @@ -150,18 +150,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; } @@ -177,7 +177,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++) { @@ -188,7 +188,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); @@ -199,18 +199,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; }