From patchwork Fri Jun 19 01:52:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 20490 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:80ca:0:0:0:0:0 with SMTP id c10csp106055ybm; Thu, 18 Jun 2020 18:53:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3tqD+2dFHjqeLwxXFtfznVF4bVnepaAQAqjoBDpQ6inGgi1ja+8yiPW1iSPLXAfIR7vdT X-Received: by 2002:a1c:2045:: with SMTP id g66mr1109772wmg.53.1592531638797; Thu, 18 Jun 2020 18:53:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592531638; cv=none; d=google.com; s=arc-20160816; b=nZzMqjRzazyD2VVE5hlnfyOO6jImpGHXWNg9pFj/09U5LaXBm+OVP0oo1etLPpH83e uswCUDJy0KUj84l9bPxlfxrYHtPYQzQvq6k6MZ1sjFy5qmqAsNXYBpx9ylUcF+/Hk33l 8iO2jsj/McZCAe9VhCrI6GMY3j/gkHUV3CZIfoweC2lWHANe2YtxDoLF4mjiSfDN7N+5 gSoITSIN+GrmI4vXyPuXOHOY1h+aeW15q6YpKGc+tN0JPj/+bomRUbk/yhzQcHhuS7aj ftsDo7rHM9G5fAivtlTY+al74DRId1k6YPJqeOSfH3NQCGsW4fi3QWJCYeFXpZ+Izrf6 Xk6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:ironport-sdr:ironport-sdr:delivered-to; bh=T1OpoffR1uh0TIlfhnSxIgyWfGWi50FcpUwa6YiWr5M=; b=izQZdffCg4h0NzmceGY9mFoF+WIaFBH6WPfeVpjg5PelTjhlUQNUmE7WfXy8kGQEPP Koqz7icjU7kUvPrSGZVmApih6B34qNFAVENELiA+iy0D7f8XAYBnQ/C6Ziitgwm4mwy6 rLb2EE0+z+lxhMowOHdBCkZ4NP7LhvThMHqqSjyY1XB0A0Cgo2dMscbDckX6hXo4erNS lVHf1ME8SsH/UWGYq8Gg7EsKLH7jy28ubgEiU/tCQprqq2ZQHKUKs0dInr5o9j+QsLxf 5IwyqMO9QiHBX61h44m37iAcBHvkOf4ip3DHbI2fK7lKIVmkOr9MoWHOdzKzhdQJfvpS IoGA== ARC-Authentication-Results: i=1; mx.google.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 sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m10si4925514wrb.404.2020.06.18.18.53.58; Thu, 18 Jun 2020 18:53:58 -0700 (PDT) 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; 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 sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2E7BF68B5CC; Fri, 19 Jun 2020 04:53:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53A0468B545 for ; Fri, 19 Jun 2020 04:53:28 +0300 (EEST) IronPort-SDR: XL/8Ot+Oc/kZml1ZtdTu+y1HAtcHRt6knQXV1qP4znzUyA3/HNkh3xbpAVggzs83MNBdP26q3Q kTdIb+TJsAJA== X-IronPort-AV: E=McAfee;i="6000,8403,9656"; a="204278650" X-IronPort-AV: E=Sophos;i="5.75,253,1589266800"; d="scan'208";a="204278650" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2020 18:53:24 -0700 IronPort-SDR: 5PF503baFjCjRo40j/SDD8XG7Rm0YQAY/4KMda3f6T8DrZEjx2O2w1zIJTqDEzR2+KQKPyojec +VkDD4qZHGMA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,253,1589266800"; d="scan'208";a="317989399" Received: from f.sh.intel.com ([10.239.159.122]) by FMSMGA003.fm.intel.com with ESMTP; 18 Jun 2020 18:53:23 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Jun 2020 09:52:42 +0800 Message-Id: <20200619015248.21873-3-fei.w.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200619015248.21873-1-fei.w.wang@intel.com> References: <20200619015248.21873-1-fei.w.wang@intel.com> Subject: [FFmpeg-devel] [PATCH v1 3/9] swscale: Add swscale input support for P012 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: Fei Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Ov6wHus8s2vw Content-Length: 4693 Signed-off-by: Fei Wang --- libswscale/input.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++ libswscale/utils.c | 1 + 2 files changed, 53 insertions(+) diff --git a/libswscale/input.c b/libswscale/input.c index 0bd1aa7bc9..b0a7d21e60 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -739,6 +739,46 @@ static void p010BEToUV_c(uint8_t *dstU, uint8_t *dstV, } } +static void p012LEToY_c(uint8_t *dst, const uint8_t *src, const uint8_t *unused1, + const uint8_t *unused2, int width, uint32_t *unused) +{ + int i; + for (i = 0; i < width; i++) { + AV_WN16(dst + i * 2, AV_RL16(src + i * 2) >> 4); + } +} + +static void p012BEToY_c(uint8_t *dst, const uint8_t *src, const uint8_t *unused1, + const uint8_t *unused2, int width, uint32_t *unused) +{ + int i; + for (i = 0; i < width; i++) { + AV_WN16(dst + i * 2, AV_RB16(src + i * 2) >> 4); + } +} + +static void p012LEToUV_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) >> 4); + AV_WN16(dstV + i * 2, AV_RL16(src1 + i * 4 + 2) >> 4); + } +} + +static void p012BEToUV_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) >> 4); + AV_WN16(dstV + i * 2, AV_RB16(src1 + i * 4 + 2) >> 4); + } +} + 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) @@ -1249,6 +1289,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_P012LE: + c->chrToYV12 = p012LEToUV_c; + break; + case AV_PIX_FMT_P012BE: + c->chrToYV12 = p012BEToUV_c; + break; case AV_PIX_FMT_P016LE: c->chrToYV12 = p016LEToUV_c; break; @@ -1692,6 +1738,12 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) case AV_PIX_FMT_P010BE: c->lumToYV12 = p010BEToY_c; break; + case AV_PIX_FMT_P012LE: + c->lumToYV12 = p012LEToY_c; + break; + case AV_PIX_FMT_P012BE: + c->lumToYV12 = p012BEToY_c; + break; case AV_PIX_FMT_GRAYF32LE: #if HAVE_BIGENDIAN c->lumToYV12 = grayf32ToY16_bswap_c; diff --git a/libswscale/utils.c b/libswscale/utils.c index dcd1dbaa76..dd2e3f6a75 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -272,6 +272,7 @@ static const FormatEntry format_entries[] = { [AV_PIX_FMT_NV42] = { 1, 1 }, [AV_PIX_FMT_Y210LE] = { 1, 0 }, [AV_PIX_FMT_X2RGB10LE] = { 1, 1 }, + [AV_PIX_FMT_P012LE] = { 1, 0 }, }; int sws_isSupportedInput(enum AVPixelFormat pix_fmt)