From patchwork Sun Jan 29 21:11:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Langdale X-Patchwork-Id: 2361 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1179566vsb; Sun, 29 Jan 2017 13:12:11 -0800 (PST) X-Received: by 10.28.9.148 with SMTP id 142mr10842664wmj.24.1485724331285; Sun, 29 Jan 2017 13:12:11 -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 t15si13921145wra.71.2017.01.29.13.12.10; Sun, 29 Jan 2017 13:12:11 -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=@overt.org; dkim=neutral (body hash did not verify) header.i=@overt.org; 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 2044468A1B7; Sun, 29 Jan 2017 23:12:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-s67.mailgun.info (mail-s67.mailgun.info [184.173.153.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D9C6068A151 for ; Sun, 29 Jan 2017 23:11:58 +0200 (EET) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=overt.org; q=dns/txt; s=k1; t=1485724318; h=Message-Id: Date: Subject: Cc: To: From: Sender; bh=suTq9hVdeNSymM86xFTHr8v4Whu0b/UdIt3ECmSPE3k=; b=o3+uzGrUwTpZI8Cbt6VO20oOiSFiMwWPfaM0fkU1By0EdWfM2pyVDX7YfGDfgNyVBN5tMuD6 z95CUNhq2wZEt0dig3yTX5r5iNi0yRppLo84QNt23VOB61tn4+P+Weh3Z143ltW9JSEez8Im DcgFQcAOrvUfkm/8EIcBUT2b8CA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=overt.org; s=k1; q=dns; h=Sender: From: To: Cc: Subject: Date: Message-Id; b=fR8RDKE7KAVOkxPfzpCeaB6fcFBMlVy7XxCiaA5NtcISR7cC2cJuvrkX8pMMGffhtWVEQ7 ZYmaKABVvAtjt4idydsNB/0ywo64sU9igPpyEwpGTV9nuXdmEG01GpoG70uMHjr3Ny01xJeA R2B0BevfYGs1EzLfl9qpcMfoL2aqw= X-Mailgun-Sending-Ip: 184.173.153.195 X-Mailgun-Sid: WyIyM2Q3MCIsICJmZm1wZWctZGV2ZWxAZmZtcGVnLm9yZyIsICI0YTg5NjEiXQ== Received: from mail.overt.org (155.208.178.107.bc.googleusercontent.com [107.178.208.155]) by mxa.mailgun.org with ESMTP id 588e5a9e.7f367854c420-smtp-out-n01; Sun, 29 Jan 2017 21:11:58 -0000 (UTC) Received: from authenticated-user (mail.overt.org [107.178.208.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.overt.org (Postfix) with ESMTPSA id 27E7660594; Sun, 29 Jan 2017 21:11:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=overt.org; s=mail; t=1485724316; bh=BCzoD/Qqq2Qa3ABbPf7Zf186v/lnxeEtw00mjeCMVHw=; h=From:To:Cc:Subject:Date:From; b=BxJMPhUIOS/uDLfs9/DEiJu4KcGD4xehQT6OBqSWKAmDlcX/fbiG9X1wTPhdSJkN6 nUIagRlBE1vkT04vj/uSrP+KDqVh6QvIaBAWut3otzGYB+W8N6Pn4Gfmb2q05rgIs9 GJk4x7zxAgbstdawlp2sT3sY5wVEnyq8QkGPkARm6+jMeY0RvzTRUrRJo7J01T4aoQ yg85xlQJBYosEXBOOv6CLQezmDQefZHTDqysbnPCG3Fj/x82qrUs0GQQezN0YDItZA r2yBCzcCMc9QVvbqXK4w1jF4mErQdPSc0iiJwGSQSkwuI5xKQJOIvleDE8eYhQGGFR 3fxGQvwbaDBug== From: Philip Langdale To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Jan 2017 13:11:51 -0800 Message-Id: <20170129211151.31424-1-philipl@overt.org> Subject: [FFmpeg-devel] [PATCH] swscale: add P016 input support 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: Philip Langdale MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Philip Langdale --- libswscale/input.c | 32 ++++++++++++++++++++++++++++++++ libswscale/swscale_unscaled.c | 4 +++- libswscale/utils.c | 2 ++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/libswscale/input.c b/libswscale/input.c index 1f4ea18..8b5f348 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -719,6 +719,28 @@ static void p010BEToUV_c(uint8_t *dstU, uint8_t *dstV, } } +static void p016LEToUV_c(uint8_t *dstU, uint8_t *dstV, + const uint8_t *unused0, const uint8_t *src1, const uint8_t *src2, + int width, uint32_t *unused) +{ + int i; + for (i = 0; i < width; i++) { + AV_WN16(dstU + i * 2, AV_RL16(src1 + i * 4 + 0)); + AV_WN16(dstV + i * 2, AV_RL16(src1 + i * 4 + 2)); + } +} + +static void p016BEToUV_c(uint8_t *dstU, uint8_t *dstV, + const uint8_t *unused0, const uint8_t *src1, const uint8_t *src2, + int width, uint32_t *unused) +{ + int i; + for (i = 0; i < width; i++) { + AV_WN16(dstU + i * 2, AV_RB16(src1 + i * 4 + 0)); + AV_WN16(dstV + i * 2, AV_RB16(src1 + i * 4 + 2)); + } +} + #define input_pixel(pos) (isBE(origin) ? AV_RB16(pos) : AV_RL16(pos)) static void bgr24ToY_c(uint8_t *_dst, const uint8_t *src, const uint8_t *unused1, const uint8_t *unused2, @@ -1085,6 +1107,12 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_P010BE: c->chrToYV12 = p010BEToUV_c; break; + case AV_PIX_FMT_P016LE: + c->chrToYV12 = p016LEToUV_c; + break; + case AV_PIX_FMT_P016BE: + c->chrToYV12 = p016BEToUV_c; + break; } if (c->chrSrcHSubSample) { switch (srcFormat) { @@ -1326,6 +1354,8 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_GRAY10LE: case AV_PIX_FMT_GRAY12LE: case AV_PIX_FMT_GRAY16LE: + + case AV_PIX_FMT_P016LE: c->lumToYV12 = bswap16Y_c; break; case AV_PIX_FMT_YUVA444P9LE: @@ -1362,6 +1392,8 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_GRAY10BE: case AV_PIX_FMT_GRAY12BE: case AV_PIX_FMT_GRAY16BE: + + case AV_PIX_FMT_P016BE: c->lumToYV12 = bswap16Y_c; break; case AV_PIX_FMT_YUVA444P9BE: diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index b2bfc40..ba3d688 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1878,8 +1878,10 @@ void ff_get_unscaled_swscale(SwsContext *c) c->chrDstVSubSample == c->chrSrcVSubSample && dstFormat != AV_PIX_FMT_NV12 && dstFormat != AV_PIX_FMT_NV21 && dstFormat != AV_PIX_FMT_P010LE && dstFormat != AV_PIX_FMT_P010BE && + dstFormat != AV_PIX_FMT_P016LE && dstFormat != AV_PIX_FMT_P016BE && srcFormat != AV_PIX_FMT_NV12 && srcFormat != AV_PIX_FMT_NV21 && - srcFormat != AV_PIX_FMT_P010LE && srcFormat != AV_PIX_FMT_P010BE)) + srcFormat != AV_PIX_FMT_P010LE && srcFormat != AV_PIX_FMT_P010BE && + srcFormat != AV_PIX_FMT_P016LE && srcFormat != AV_PIX_FMT_P016BE)) { if (isPacked(c->srcFormat)) c->swscale = packedCopyWrapper; diff --git a/libswscale/utils.c b/libswscale/utils.c index 60a8e55..caae63a 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -252,6 +252,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_AYUV64LE] = { 1, 1}, [AV_PIX_FMT_P010LE] = { 1, 1 }, [AV_PIX_FMT_P010BE] = { 1, 1 }, + [AV_PIX_FMT_P016LE] = { 1, 0 }, + [AV_PIX_FMT_P016BE] = { 1, 0 }, }; int sws_isSupportedInput(enum AVPixelFormat pix_fmt)