From patchwork Thu Dec 6 19:34:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 11309 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 58D3844CDDA for ; Thu, 6 Dec 2018 21:34:46 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0FB7868A88F; Thu, 6 Dec 2018 21:34:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 91B3668A876 for ; Thu, 6 Dec 2018 21:34:31 +0200 (EET) Received: by mail-wr1-f54.google.com with SMTP id b14so1606712wru.12 for ; Thu, 06 Dec 2018 11:34:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=PKic2IJwgkUj2o/s4MoCnA52em7H5/P8pY6XgySRY3U=; b=rsui6e1jXZOl3UdV1bwx09lDDW5OpaIoRYiCTqtfXRKqLYNcKOJue2S+38qrTdH3Ja l+0RX4XSUh6KOfwLGjDFP2R9vU68fM1zOIiHEb/lc3c/FXCNCU1IK6AXV/0HjomnmIOb //hx0fB7kkK5/9+1pFMtGGDN8l2kYA7B4Xh/TBz4v0XCUWaKVZQfg/9fbVCqz0VfZVuk +KhCS2LX/2ZGIkYzNp9/IhpcpQn8/bT2LyamVUv6y67xb7JPmAPkHjstO/ItLtfvnZ71 POPc+A81yyXa2KIB20ytUah/zDGmM3t//wVnL2To5hmpqCVZilsN5AiTFyxEbpSEwptd e8hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=PKic2IJwgkUj2o/s4MoCnA52em7H5/P8pY6XgySRY3U=; b=ti0jFWx3fHMJ97QzEhxM7tZN04iiDjLzSQTN6eIlnOOgMe4sKYChWO99sMQyeUVxIN PZJj3oOt2AiE3uUFXisfPAeyQbgZxljpUCX6um/7lOaFT7uxjBy5SAvFpTZ6KYlNojA9 ms7JXB2P6xP8GRdmjl7VhUQ5saDUdX69loYeuRbudTnjKlDtRiY+usaSXAZ5enHnR2D5 sFam23+WjwUKMHjEB/Nk5S5B48JOoyhc1ReLvJHHGJg7akzBgL2Fg2ZMstPsggNw13J3 N7sXXOUzU7HoXHZkw0739NUT7+JkBvhS17XeuGoLKpXF8vXRyM5xcldQuev0idbTaXf4 v6ug== X-Gm-Message-State: AA+aEWYVlGToIim5JUruBz3TlnhF74/OB0lfCvPKWQhXdoF/hoKm+6zu K6k24ZWntWKv2K2919HH7PRLClmJ X-Google-Smtp-Source: AFSGD/UrON5+hEFVpLhUCYv0/Edf4rIlq8JAU/KPs8EcGgwz3llAD9KMDWd+qBWkljtsul61vPbJeg== X-Received: by 2002:adf:ef88:: with SMTP id d8mr26346681wro.163.1544124880221; Thu, 06 Dec 2018 11:34:40 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id g201sm1499995wme.43.2018.12.06.11.34.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 11:34:39 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Dec 2018 20:34:22 +0100 Message-Id: <20181206193424.21383-5-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181206193424.21383-1-onemda@gmail.com> References: <20181206193424.21383-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/7] avcodec/dpx: improve decoding of 10 bit gray images 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavcodec/dpx.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index cfe60aaaa1..ed17bf3858 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -51,6 +51,24 @@ static unsigned int read32(const uint8_t **ptr, int is_big) return temp; } +static uint16_t read10in32_gray(const uint8_t **ptr, uint32_t *lbuf, + int *n_datum, int is_big, int shift) +{ + uint16_t temp; + + if (*n_datum) + (*n_datum)--; + else { + *lbuf = read32(ptr, is_big); + *n_datum = 2; + } + + temp = *lbuf >> shift & 0x3FF; + *lbuf = *lbuf >> 10; + + return temp; +} + static uint16_t read10in32(const uint8_t **ptr, uint32_t * lbuf, int * n_datum, int is_big, int shift) { @@ -385,13 +403,17 @@ static int decode_frame(AVCodecContext *avctx, (uint16_t*)ptr[1], (uint16_t*)ptr[2], (uint16_t*)ptr[3]}; - int shift = packing == 1 ? 22 : 20; + int shift = elements > 1 ? packing == 1 ? 22 : 20 : packing == 1 ? 2 : 0; for (y = 0; y < avctx->width; y++) { if (elements >= 3) *dst[2]++ = read10in32(&buf, &rgbBuffer, &n_datum, endian, shift); - *dst[0]++ = read10in32(&buf, &rgbBuffer, - &n_datum, endian, shift); + if (elements == 1) + *dst[0]++ = read10in32_gray(&buf, &rgbBuffer, + &n_datum, endian, shift); + else + *dst[0]++ = read10in32(&buf, &rgbBuffer, + &n_datum, endian, shift); if (elements >= 2) *dst[1]++ = read10in32(&buf, &rgbBuffer, &n_datum, endian, shift);