From patchwork Mon Jul 24 18:00:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 4444 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp4523392vsb; Mon, 24 Jul 2017 11:01:23 -0700 (PDT) X-Received: by 10.28.189.133 with SMTP id n127mr4133115wmf.23.1500919283653; Mon, 24 Jul 2017 11:01:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500919283; cv=none; d=google.com; s=arc-20160816; b=Fin8bwIJ9AJjpVL/dXDT/pZx03yxvj0fu7rRN6K5dbQB4wIu+3CGeVmKNbTy2KVXSL ISHf67P4BbNPR1nrGgBg3D7Ccy1GHSsIaR2DXx6WCzfKYluX4ljNWS7mjQV7Q1ne8nru adz2Mbpdu4WlQ75x71RdXm98KuiQ7mb1bmPSTzOB8Lmp3e1+njWB6oEAJBLa3OKtjxai 8wGEaSDTSe5NLehk30vD9RcCfEJRuvgCNhj/rSHWLo5PicCE/CbMLrBxZyX3DLyPQu3a SQ40TAgz7TOfoSUOP7ypxXu0eW5/88O1281uTmVYdwQzg5Y+ENF0I+iL0DHIwGMQdQA0 CEow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=Uhrm1fPFUgqjgKdL93bg8u4PTb4/9zi6m7S6zoZeM+U=; b=X5SAqkTfx4Ms/SPQy644KT72PkHL0bL4asZogQum3mPDtXW3gypwyqomHi2sOMW/Cu WU7IjHvLcjcegYtOtAUb8cR065aajhRIcwFIl19cqiPP1TboY65BUcZvaSBAmIutg2hs lJVzP5QF663vXUaLaQYoJVpJYSHsRiBe2FSbFHl05a1G2gJmNpv8yUI14wN0ifZ5dMVg m+7PATWWgAAsxTuiRWuLyhlQkARPhl3FrYV2yWe9o4TvOpMwEgaw8Fz/z8CoP0oPts+M 6cBfayHAI6pjkwWn0rC+RlvfO8/MoWgEFganUxj6QSXjlthJA2T3vQJE9WK+DTAj5Bg8 3bVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=IngPzCqd; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o128si5915568wmd.102.2017.07.24.11.01.23; Mon, 24 Jul 2017 11:01:23 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=IngPzCqd; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 263C7689AE1; Mon, 24 Jul 2017 21:01:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua0-f173.google.com (mail-ua0-f173.google.com [209.85.217.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E4F068065E for ; Mon, 24 Jul 2017 21:01:04 +0300 (EEST) Received: by mail-ua0-f173.google.com with SMTP id w45so84872368uac.5 for ; Mon, 24 Jul 2017 11:01:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=1KaiavcGU6UZEhulaCSxkarmL8x6w0CnA3OF57+hBGg=; b=IngPzCqdufKhX5KkGQ4odw/UwVfOllIdozpSluDJAlSs9fBY6yRUlkMiJdoSJDGH4o 8/1XYBJVcNJCB40yZKzOtfStrd+iOQ1coavIjj3r8S9vcUvlTyaOaPt4YbiGfCON0VXV BEOVlpcUFggKFwGoHcKgmtXsDqPVOCqKNzqj8flrQCEOCmQd2F2jAqxGZpGYywas4W13 13SDvSeZKpLv8RcednvBsyDfAWEOS+OiBCfEJ6BUUzMiSpS2hdf3K5wzXjpikWZk+mlG ymKRnIMVa253Ov1DTHDH7Lfgzv1XBCK1c4YuRyaTbyN3PMAvxqdiQ6uHSKJ1l6O/9WOJ bQLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=1KaiavcGU6UZEhulaCSxkarmL8x6w0CnA3OF57+hBGg=; b=TCAAFI+oRwh2w+A6xZg70WLjcE+ZLWKgqiJJMZkobakPWjjIoQEBztBdzolkEmlv9g U6WKEIUqVjZaDaSQaIDVFeUi9QH+B8bfD2GHcpht6mqhFv+nAjspqLJ5bXLeFIl3slf0 0ej442xj9qeO7/QRNxZvoY8+vb8vlnR0PbHb8aYaQPkf0iNFATfxyWzLtsbVPWF/UERK EVvhXp2jGFFsGA+rhUJnwTEGOfrh8DnyQcK0brOec99wUz9x5tRF7pF9pq206ubaK3tn kxXQJZq+CywwE+TQfl7EkuzhycC89uSNNJL77G2+iqMV4LyGxnXN6LIaa4b63DloIn7P ofgg== X-Gm-Message-State: AIVw110WqbDrCsIHHaGjaPkxX+Pm2WHZYXH3VsB7CPbjBP+D4PMzrwWU Jcyp7/tYfWOlldE1R5ePu85EhcWVmg== X-Received: by 10.31.180.80 with SMTP id d77mr9449756vkf.110.1500919272632; Mon, 24 Jul 2017 11:01:12 -0700 (PDT) MIME-Version: 1.0 Received: by 10.103.25.2 with HTTP; Mon, 24 Jul 2017 11:00:51 -0700 (PDT) From: Carl Eugen Hoyos Date: Mon, 24 Jul 2017 20:00:51 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [RFC]libswscale: Sanitize isRGBinInt() and isBGRinInt() 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! Attached is a PoC for a code simplification that imo makes a logic in libswscale easier to read and also fixes the Big Endian fate failure. If this approach is preferred, I will try to fix the five affected asm functions. Please comment, Carl Eugen diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c index f7f8188..a974d64 100644 --- a/libswscale/rgb2rgb.c +++ b/libswscale/rgb2rgb.c @@ -133,8 +133,10 @@ void (*yuyvtoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, av_cold void ff_sws_rgb2rgb_init(void) { rgb2rgb_init_c(); +/* if (ARCH_X86) rgb2rgb_init_x86(); +*/ } void rgb32to24(const uint8_t *src, uint8_t *dst, int src_size) @@ -142,16 +144,9 @@ void rgb32to24(const uint8_t *src, uint8_t *dst, int src_size) int i, num_pixels = src_size >> 2; for (i = 0; i < num_pixels; i++) { -#if HAVE_BIGENDIAN - /* RGB32 (= A,B,G,R) -> BGR24 (= B,G,R) */ - dst[3 * i + 0] = src[4 * i + 1]; - dst[3 * i + 1] = src[4 * i + 2]; - dst[3 * i + 2] = src[4 * i + 3]; -#else - dst[3 * i + 0] = src[4 * i + 2]; + dst[3 * i + 0] = src[4 * i + 0]; dst[3 * i + 1] = src[4 * i + 1]; - dst[3 * i + 2] = src[4 * i + 0]; -#endif + dst[3 * i + 2] = src[4 * i + 2]; } } @@ -160,18 +155,10 @@ void rgb24to32(const uint8_t *src, uint8_t *dst, int src_size) int i; for (i = 0; 3 * i < src_size; i++) { -#if HAVE_BIGENDIAN - /* RGB24 (= R, G, B) -> BGR32 (= A, R, G, B) */ - dst[4 * i + 0] = 255; - dst[4 * i + 1] = src[3 * i + 0]; - dst[4 * i + 2] = src[3 * i + 1]; - dst[4 * i + 3] = src[3 * i + 2]; -#else - dst[4 * i + 0] = src[3 * i + 2]; + dst[4 * i + 0] = src[3 * i + 0]; dst[4 * i + 1] = src[3 * i + 1]; - dst[4 * i + 2] = src[3 * i + 0]; + dst[4 * i + 2] = src[3 * i + 2]; dst[4 * i + 3] = 255; -#endif } } @@ -183,17 +170,10 @@ void rgb16tobgr32(const uint8_t *src, uint8_t *dst, int src_size) while (s < end) { register uint16_t bgr = *s++; -#if HAVE_BIGENDIAN - *d++ = 255; *d++ = ((bgr&0x001F)<<3) | ((bgr&0x001F)>> 2); *d++ = ((bgr&0x07E0)>>3) | ((bgr&0x07E0)>> 9); *d++ = ((bgr&0xF800)>>8) | ((bgr&0xF800)>>13); -#else - *d++ = ((bgr&0xF800)>>8) | ((bgr&0xF800)>>13); - *d++ = ((bgr&0x07E0)>>3) | ((bgr&0x07E0)>> 9); - *d++ = ((bgr&0x001F)<<3) | ((bgr&0x001F)>> 2); *d++ = 255; -#endif } } @@ -258,17 +238,10 @@ void rgb15tobgr32(const uint8_t *src, uint8_t *dst, int src_size) while (s < end) { register uint16_t bgr = *s++; -#if HAVE_BIGENDIAN - *d++ = 255; *d++ = ((bgr&0x001F)<<3) | ((bgr&0x001F)>> 2); *d++ = ((bgr&0x03E0)>>2) | ((bgr&0x03E0)>> 7); *d++ = ((bgr&0x7C00)>>7) | ((bgr&0x7C00)>>12); -#else - *d++ = ((bgr&0x7C00)>>7) | ((bgr&0x7C00)>>12); - *d++ = ((bgr&0x03E0)>>2) | ((bgr&0x03E0)>> 7); - *d++ = ((bgr&0x001F)<<3) | ((bgr&0x001F)>> 2); *d++ = 255; -#endif } } diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c index 499d25b..7df454b 100644 --- a/libswscale/rgb2rgb_template.c +++ b/libswscale/rgb2rgb_template.c @@ -36,19 +36,11 @@ static inline void rgb24tobgr32_c(const uint8_t *src, uint8_t *dst, const uint8_t *end = s + src_size; while (s < end) { -#if HAVE_BIGENDIAN - /* RGB24 (= R, G, B) -> RGB32 (= A, B, G, R) */ - *dest++ = 255; *dest++ = s[2]; *dest++ = s[1]; *dest++ = s[0]; - s += 3; -#else - *dest++ = *s++; - *dest++ = *s++; - *dest++ = *s++; *dest++ = 255; -#endif + s += 3; } } @@ -60,19 +52,11 @@ static inline void rgb32tobgr24_c(const uint8_t *src, uint8_t *dst, const uint8_t *end = s + src_size; while (s < end) { -#if HAVE_BIGENDIAN - /* RGB32 (= A, B, G, R) -> RGB24 (= R, G, B) */ - s++; dest[2] = *s++; dest[1] = *s++; dest[0] = *s++; dest += 3; -#else - *dest++ = *s++; - *dest++ = *s++; - *dest++ = *s++; s++; -#endif } } @@ -278,17 +262,10 @@ static inline void rgb15to32_c(const uint8_t *src, uint8_t *dst, int src_size) while (s < end) { register uint16_t bgr = *s++; -#if HAVE_BIGENDIAN - *d++ = 255; *d++ = ((bgr&0x7C00)>>7) | ((bgr&0x7C00)>>12); *d++ = ((bgr&0x03E0)>>2) | ((bgr&0x03E0)>> 7); *d++ = ((bgr&0x001F)<<3) | ((bgr&0x001F)>> 2); -#else - *d++ = ((bgr&0x001F)<<3) | ((bgr&0x001F)>> 2); - *d++ = ((bgr&0x03E0)>>2) | ((bgr&0x03E0)>> 7); - *d++ = ((bgr&0x7C00)>>7) | ((bgr&0x7C00)>>12); *d++ = 255; -#endif } } @@ -300,17 +277,10 @@ static inline void rgb16to32_c(const uint8_t *src, uint8_t *dst, int src_size) while (s < end) { register uint16_t bgr = *s++; -#if HAVE_BIGENDIAN - *d++ = 255; *d++ = ((bgr&0xF800)>>8) | ((bgr&0xF800)>>13); *d++ = ((bgr&0x07E0)>>3) | ((bgr&0x07E0)>> 9); *d++ = ((bgr&0x001F)<<3) | ((bgr&0x001F)>> 2); -#else - *d++ = ((bgr&0x001F)<<3) | ((bgr&0x001F)>> 2); - *d++ = ((bgr&0x07E0)>>3) | ((bgr&0x07E0)>> 9); - *d++ = ((bgr&0xF800)>>8) | ((bgr&0xF800)>>13); *d++ = 255; -#endif } } diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 0f51df9..16c041b 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -698,8 +698,8 @@ static av_always_inline int isRGBinInt(enum AVPixelFormat pix_fmt) { return pix_fmt == AV_PIX_FMT_RGB48BE || pix_fmt == AV_PIX_FMT_RGB48LE || - pix_fmt == AV_PIX_FMT_RGB32 || - pix_fmt == AV_PIX_FMT_RGB32_1 || + pix_fmt == AV_PIX_FMT_RGBA || + pix_fmt == AV_PIX_FMT_ARGB || pix_fmt == AV_PIX_FMT_RGB24 || pix_fmt == AV_PIX_FMT_RGB565BE || pix_fmt == AV_PIX_FMT_RGB565LE || @@ -720,8 +720,8 @@ static av_always_inline int isBGRinInt(enum AVPixelFormat pix_fmt) { return pix_fmt == AV_PIX_FMT_BGR48BE || pix_fmt == AV_PIX_FMT_BGR48LE || - pix_fmt == AV_PIX_FMT_BGR32 || - pix_fmt == AV_PIX_FMT_BGR32_1 || + pix_fmt == AV_PIX_FMT_BGRA || + pix_fmt == AV_PIX_FMT_ABGR || pix_fmt == AV_PIX_FMT_BGR24 || pix_fmt == AV_PIX_FMT_BGR565BE || pix_fmt == AV_PIX_FMT_BGR565LE || diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query index e262a0c..b28cd31 100644 --- a/tests/ref/fate/sws-pixdesc-query +++ b/tests/ref/fate/sws-pixdesc-query @@ -407,8 +407,8 @@ RGBinInt: rgb8 rgb4 rgb4_byte - abgr - bgra + argb + rgba rgb48be rgb48le rgb565be @@ -427,8 +427,8 @@ BGRinInt: bgr8 bgr4 bgr4_byte - argb - rgba + abgr + bgra bgr565be bgr565le bgr555be