From patchwork Wed Nov 30 21:47:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 1615 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp600726vsa; Wed, 30 Nov 2016 13:47:50 -0800 (PST) X-Received: by 10.194.148.134 with SMTP id ts6mr30221780wjb.220.1480542470253; Wed, 30 Nov 2016 13:47:50 -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 a6si8944285wmc.134.2016.11.30.13.47.49; Wed, 30 Nov 2016 13:47:50 -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=@gmail.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 dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 847E2689F22; Wed, 30 Nov 2016 23:47:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wj0-f175.google.com (mail-wj0-f175.google.com [209.85.210.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F490689229 for ; Wed, 30 Nov 2016 23:47:35 +0200 (EET) Received: by mail-wj0-f175.google.com with SMTP id qp4so187993042wjc.3 for ; Wed, 30 Nov 2016 13:47:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to; bh=cv9XnDxQ7a7VLJSnqc1x2T0GJbX/xWwpC3WwI5gLLC8=; b=YgWcGPSvG6C6AJH/Sfi62xdec4SwV+OCFUfD6tleN+DEH+YFhena7WpAU66R9ggp1H E6k0XjyEBeaYMlNwYaW6TlBRbbCX4ExKLnFO2LFTpyplbiuRTfgrwfz8zk4gxQDLdpvW hFxmsIbG1mH3K7Pob9sIZi2DnJwZ2TGOZskvvv/c0SHI/tN9yspV/7ncXrWHYRFVwXG+ 3odIEyi0V6Siy/pxzMpoWJbUvIln9mYcBQFPaZLiw6uE8Dx0ULNgT4wJXAfMlKbeyHxt hnzGSvEwuWFWVdtHiqOOnFkwT0/hg7gIi22e6JXwIHP0Sf1meWT4cXjPUlssDAggdfnM wsQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=cv9XnDxQ7a7VLJSnqc1x2T0GJbX/xWwpC3WwI5gLLC8=; b=Cxth7DhOt9AVu4KhJzTvl9blUNcc9ApZCcQFmftvpj4mvLq5KE6kFf6A7jRSa6MXUZ oGm4zf7cE7k9UI9JmOs4VPmI6QzLQQf4rd6hw/nh36RCYofC8Qng2K3xtG993BqkCVZH I/PNmOU0wBIX3SmbvBAtdPKhb/fBxUrDbViTOGyKkmpCWgOHSnUOG/0EBp9me5bbEfUY 2ppwG6GWFzemizwwrcjpyTXgzNoz+THO8zbZPCaWP7b2+/PhyRVD+UB4+nqCLqthY2CO rNHzkHaWYz06Gb0ItH68zSRiUuyvoPOZbO3FIjSwUS2AyvELN4d04bMhH2QCUfJ1/w37 RV0Q== X-Gm-Message-State: AKaTC01pEPNR18MwGLkR27L+umz6P7Hilma7UPCfulYlUIc2GRBqNuNLHWdZnW1X7uzlZAyqs8vUTyknBbV9pA== X-Received: by 10.194.108.10 with SMTP id hg10mr36245076wjb.58.1480542461398; Wed, 30 Nov 2016 13:47:41 -0800 (PST) MIME-Version: 1.0 Received: by 10.28.48.12 with HTTP; Wed, 30 Nov 2016 13:47:40 -0800 (PST) From: Paul B Mahol Date: Wed, 30 Nov 2016 22:47:40 +0100 Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] swscale: add gbr(a)p16 output 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi, patch attached, needs fate update. From 1a734f3da2f5da690f5261fb41bd60012790a1a3 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Wed, 30 Nov 2016 22:45:08 +0100 Subject: [PATCH] swscale: add gbr(a)p16 output support Signed-off-by: Paul B Mahol --- libswscale/output.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++-- libswscale/utils.c | 8 +++--- 2 files changed, 82 insertions(+), 6 deletions(-) diff --git a/libswscale/output.c b/libswscale/output.c index b0d33b1..ea6b457 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -2022,6 +2022,78 @@ yuv2gbrp_full_X_c(SwsContext *c, const int16_t *lumFilter, } static void +yuv2gbrp16_full_X_c(SwsContext *c, const int16_t *lumFilter, + const int32_t **lumSrc, int lumFilterSize, + const int16_t *chrFilter, const int32_t **chrUSrc, + const int32_t **chrVSrc, int chrFilterSize, + const int16_t **alpSrc, uint8_t **dest, + int dstW, int y) +{ + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(c->dstFormat); + int i; + int hasAlpha = (desc->flags & AV_PIX_FMT_FLAG_ALPHA) && alpSrc; + uint16_t **dest16 = (uint16_t**)dest; + int A = 0; // init to silence warning + + for (i = 0; i < dstW; i++) { + int j; + int Y = -0x40000000; + int U = -(128 << 23); + int V = -(128 << 23); + int R, G, B; + + for (j = 0; j < lumFilterSize; j++) + Y += lumSrc[j][i] * (unsigned)lumFilter[j]; + + for (j = 0; j < chrFilterSize; j++) { + U += chrUSrc[j][i] * (unsigned)chrFilter[j]; + V += chrVSrc[j][i] * (unsigned)chrFilter[j]; + } + + Y >>= 14; + Y += 0x10000; + U >>= 14; + V >>= 14; + + if (hasAlpha) { + A = 1 << 18; + + for (j = 0; j < lumFilterSize; j++) + A += alpSrc[j][i] * lumFilter[j]; + + if (A & 0xF8000000) + A = av_clip_uintp2(A, 27); + } + + Y -= c->yuv2rgb_y_offset; + Y *= c->yuv2rgb_y_coeff; + Y += 1 << 13; + R = V * c->yuv2rgb_v2r_coeff; + G = V * c->yuv2rgb_v2g_coeff + U * c->yuv2rgb_u2g_coeff; + B = U * c->yuv2rgb_u2b_coeff; + + R = av_clip_uintp2(Y + R, 30); + G = av_clip_uintp2(Y + G, 30); + B = av_clip_uintp2(Y + B, 30); + + dest16[0][i] = G >> 14; + dest16[1][i] = B >> 14; + dest16[2][i] = R >> 14; + if (hasAlpha) + dest16[3][i] = A >> 11; + } + if ((!isBE(c->dstFormat)) != (!HAVE_BIGENDIAN)) { + for (i = 0; i < dstW; i++) { + dest16[0][i] = av_bswap16(dest16[0][i]); + dest16[1][i] = av_bswap16(dest16[1][i]); + dest16[2][i] = av_bswap16(dest16[2][i]); + if (hasAlpha) + dest16[3][i] = av_bswap16(dest16[3][i]); + } + } +} + +static void yuv2ya8_1_c(SwsContext *c, const int16_t *buf0, const int16_t *ubuf[2], const int16_t *vbuf[2], const int16_t *abuf0, uint8_t *dest, int dstW, @@ -2402,8 +2474,6 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, case AV_PIX_FMT_GBRP12LE: case AV_PIX_FMT_GBRP14BE: case AV_PIX_FMT_GBRP14LE: - case AV_PIX_FMT_GBRP16BE: - case AV_PIX_FMT_GBRP16LE: case AV_PIX_FMT_GBRAP: case AV_PIX_FMT_GBRAP10BE: case AV_PIX_FMT_GBRAP10LE: @@ -2411,6 +2481,12 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, case AV_PIX_FMT_GBRAP12LE: *yuv2anyX = yuv2gbrp_full_X_c; break; + case AV_PIX_FMT_GBRP16BE: + case AV_PIX_FMT_GBRP16LE: + case AV_PIX_FMT_GBRAP16BE: + case AV_PIX_FMT_GBRAP16LE: + *yuv2anyX = yuv2gbrp16_full_X_c; + break; } if (!*yuv2packedX && !*yuv2anyX) goto YUV_PACKED; diff --git a/libswscale/utils.c b/libswscale/utils.c index 15cc56d..60a8e55 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -230,11 +230,11 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_GBRAP12BE] = { 1, 1 }, [AV_PIX_FMT_GBRP14LE] = { 1, 1 }, [AV_PIX_FMT_GBRP14BE] = { 1, 1 }, - [AV_PIX_FMT_GBRP16LE] = { 1, 0 }, - [AV_PIX_FMT_GBRP16BE] = { 1, 0 }, + [AV_PIX_FMT_GBRP16LE] = { 1, 1 }, + [AV_PIX_FMT_GBRP16BE] = { 1, 1 }, [AV_PIX_FMT_GBRAP] = { 1, 1 }, - [AV_PIX_FMT_GBRAP16LE] = { 1, 0 }, - [AV_PIX_FMT_GBRAP16BE] = { 1, 0 }, + [AV_PIX_FMT_GBRAP16LE] = { 1, 1 }, + [AV_PIX_FMT_GBRAP16BE] = { 1, 1 }, [AV_PIX_FMT_BAYER_BGGR8] = { 1, 0 }, [AV_PIX_FMT_BAYER_RGGB8] = { 1, 0 }, [AV_PIX_FMT_BAYER_GBRG8] = { 1, 0 }, -- 2.5.0