From patchwork Thu Dec 6 10:56:40 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: 11301 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 56B8444C89D for ; Thu, 6 Dec 2018 12:56:55 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 064E168A7DA; Thu, 6 Dec 2018 12:56:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70DA068A704 for ; Thu, 6 Dec 2018 12:56:40 +0200 (EET) Received: by mail-wm1-f47.google.com with SMTP id n190so539847wmd.0 for ; Thu, 06 Dec 2018 02:56:49 -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=CXMPtrKstHrZlNEq3jtK6oclaDbd/44gV0dh0sCkQ6E=; b=em9S6n0LTlRX4Y89vz1W6himbEkil1pKnr1lQCiwoyoLTZ/+xHGuCv04F6jniiqeaP Dmky3Mt8PVD7guFUaDhGGtxlsknshO0xsN/qE5p/QZQYwjrVczuRJxdCtpt0IL4NPkuy 4Taalthayta81KMDkmpXhaTjP+zc/cAAOY6Ea0mVtHNere12TrNLLjpKvPQNEQAw1g2+ fU8BE6WP8FbBkIfTuVRq9Lq03eqZbsfE5yjVt3Mc6as7hz7gS5R25YpivqhBqOXgi+dc pE0pBwVft/vMvcSLns8iC1KSrfV946CZ/24Z9orA5fxI7CavroeB80Aamgt/kW7RokQV aLlg== 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=CXMPtrKstHrZlNEq3jtK6oclaDbd/44gV0dh0sCkQ6E=; b=WJLBkGaCTfSyAQiMLuGHH6+LOtY4JUu5FcE0ty1HFuOm0G7gWxM15tKYcVQWbL7epV amivJftXAdWBzLY29LEYvqX9YLWKAo16R2RH5No4wKaOOxNp6+BTVfAS9KeaNMrhaGby zikMjKLQ6FvZhsgIT6Mf3GCQk0BHbrpW4MDJTbJ2Xl/sLklx9dG6AUMoOC8qHhHFP7zc 548FYk0m2TyZt93Rc5+endFUsXxjP2mtOzd6Q2YgklZSm1CmdHGvRErtl4YAcoi4aZw8 Pa2akuciNioQPfQIsUXKE4U+TAUIPMr/i43YD/n9Ij9MMjK7Hg1ipsVqq0qcDAav4xrf 74SQ== X-Gm-Message-State: AA+aEWZKJIh+dmHe3qTW25ksVf07w86EBs6WzBPwK7JNb0wvG2mhaJXl jqYcmWnbOTv+Jl0QEMS/nKcVLwY7 X-Google-Smtp-Source: AFSGD/XK3Vh5iwuWdo2lCOvkzYIzd+idTCWgYlFwIVwFE0ebqk9dBbS3CloLHJBMloJYZLe/O1+sWw== X-Received: by 2002:a1c:f0e:: with SMTP id 14mr18719388wmp.37.1544093809022; Thu, 06 Dec 2018 02:56:49 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id k15sm48753wru.8.2018.12.06.02.56.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 02:56:48 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Dec 2018 11:56:40 +0100 Message-Id: <20181206105640.12774-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181206105640.12774-1-onemda@gmail.com> References: <20181206105640.12774-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/dpx: improve decoding support for 10 bit depth 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 | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index 0297287938..84894abda5 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -50,6 +50,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) { @@ -107,6 +125,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *const p = data; uint8_t *ptr[AV_NUM_DATA_POINTERS]; uint32_t header_version, version = 0; + const uint8_t *creator; unsigned int offset; int magic_num, endian; @@ -151,6 +170,9 @@ static int decode_frame(AVCodecContext *avctx, av_log(avctx, AV_LOG_WARNING, "Unknown header format version %s.\n", av_fourcc2str(header_version)); + buf = avpkt->data + 160; + creator = buf; + // Check encryption buf = avpkt->data + 660; ret = read32(&buf, endian); @@ -320,6 +342,7 @@ static int decode_frame(AVCodecContext *avctx, case 51121: avctx->pix_fmt = AV_PIX_FMT_GBRAP12; break; + case 6100: case 6101: avctx->pix_fmt = AV_PIX_FMT_GRAY10; break; @@ -373,13 +396,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); @@ -388,7 +415,8 @@ static int decode_frame(AVCodecContext *avctx, read10in32(&buf, &rgbBuffer, &n_datum, endian, shift); } - n_datum = 0; + if (version != 2 || !memcmp(creator, "GraphicsMagick", 14)) + n_datum = 0; for (i = 0; i < elements; i++) ptr[i] += p->linesize[i]; }