From patchwork Sat Jun 16 21:03:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 9426 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp2225961jad; Sat, 16 Jun 2018 14:03:31 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIMLRodVf8MPElmMEM/kSgkUg1lr5jySqwl0elX6H5AFKK2YD5KPz22gfSgN3/3sFUgqZGy X-Received: by 2002:a1c:908b:: with SMTP id s133-v6mr4838760wmd.35.1529183011162; Sat, 16 Jun 2018 14:03:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529183011; cv=none; d=google.com; s=arc-20160816; b=oIh7v3A4qZMYtV/2XJNz3vJp+Smb63G0sQHmzMzEaMC5DqlTXeEsYdl9+7gFBvjL8R x2E0xKI89D1iOO/E/O4WILsUSqbnTYWwGVF2OmDSPGWlAguhugoVJR1z3a2YklhINh+r dbd/F2W+h91OxsWxYo8ouV13DHsIl+ggJ7cXKdYjUhe1e4sN+QAJHNIWQPa35d0dAHWW aYZu432hVXMNYct2ufFY05tNTewMDHC8xlXl9rH9XLG5YDuo6dflwtS8PGJSR4fD/CSO DkQ1gCRsS4ES1Sz3ffu95LKWMYLoJBLZomvPgwXCpZqhYPN/OwM1yYA1TD0Yrn7E98Fd gfxg== 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:references:in-reply-to:mime-version :dkim-signature:delivered-to:arc-authentication-results; bh=lifVKg02tUWqtcl45RQ+7WQuTJfI7ZB1FtwIDsjVhR4=; b=ufELOEOJBtPW65EMdBrvdPfYadvFCunTgQfrefvSWqxkzQrPUhxM6fuLabJtg+m5SH 96rL7boZWo806vyvrPYMXUl1nSqxYnerSvco0OoQNG+dTlY09xVkBStAnoG6OokgxBPQ z/FFGnrsaysm5LBJls01MQ3Ft7/aYlpzko5G7kFzChtNyKlm+8YsBhMA5QqqoqLORNrI iYleM95FnYftHf4iD42Z4Lx1egakZKtn91RbzxbHbxjvixltRD7qO+GAAUD2OZ3mbbyp As39d5sx74lBw2FRxPV8RW7mkaFLiRaWJOufTxZix3+ilZtyQDl37J2va6Gof3yoU8oq yI2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=UjKhprPr; 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=QUARANTINE 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 d4-v6si4078792wro.442.2018.06.16.14.03.30; Sat, 16 Jun 2018 14:03:31 -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.s=20161025 header.b=UjKhprPr; 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=QUARANTINE 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 CD9A168A03A; Sun, 17 Jun 2018 00:02:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f43.google.com (mail-it0-f43.google.com [209.85.214.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 80A53689FFE for ; Sun, 17 Jun 2018 00:02:30 +0300 (EEST) Received: by mail-it0-f43.google.com with SMTP id y127-v6so8156340itd.1 for ; Sat, 16 Jun 2018 14:03:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=y+WEY6EvcVciFqAMeMWuujSZAI5klQYoZ578eWklnjA=; b=UjKhprPrHa0aJdp3myuIWrGgP+pioZ3ixftPDNO7elPjXHyE6dZgt6NF2cp0kmtNuX RQ4LxUcA1Syi5YKuzt//CiIt19WeMsRKZLoGBNJAN+1TTZix+egRoL+ofxBy+ph0P2i7 e2p+zyigAysTMhKe1N0++VXv5jo+Cv2YoU6nc0Y9/sXzsaxXPYjSBYKXKg3QOyvzl0QF IIllrLePH6dmqHtcwym0cXodIQKv26gjLdVODD2Lzekst15D3wVOwoC2o1bxYGx7xcpV s9mPHsWHcHl3IzlPkb9J2WzGfKuiq1UdwxAwkMfElOg14415cLO0YyB7KOUFjDI4bIw/ 4naQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=y+WEY6EvcVciFqAMeMWuujSZAI5klQYoZ578eWklnjA=; b=CUeGgSAS4uKb5d2XeH6zDnjsgJUVojFV8XhSz5yyhnielU1CxXmGeqG2f4cb8R6bwz tdkVeYog4lLtEE4tvSnVQJlnnVsxJO0WnAqpZbOqqC5IeqsInSruX7DqDaItw2CYlwuW JXWuhXKNuY3JePwNknkNqfdrP6EBBTuTA5WeHbc7ETFrMtG00J76xBM0uuDW8+ElgULw uau6FhjrQoWHAPhimeqyRGcFltoWWG4vtmsgLYQI0LFY//IRkC5j5+Mk144nt8ueAYU/ hWJ/yEd6oNJhReQ9SrvomqD5ZDNvwtWHc5+Z3faVI2uY1ZOwImr8SMgbGhXEStF8SdIm xttQ== X-Gm-Message-State: APt69E0LV9a3q6T10tpNDODEKIio5zFUKpNtSsCJLbTSMdbk/T0EVdii 19zbopNv69odec/xvW9RjXTAasAK3TrRLJ+O+VU= X-Received: by 2002:a24:2109:: with SMTP id e9-v6mr2809071ita.39.1529183000880; Sat, 16 Jun 2018 14:03:20 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a02:b09b:0:0:0:0:0 with HTTP; Sat, 16 Jun 2018 14:03:20 -0700 (PDT) In-Reply-To: <6701e9f5-c304-f88d-abe3-67d1653208aa@mediaarea.net> References: <6701e9f5-c304-f88d-abe3-67d1653208aa@mediaarea.net> From: Carl Eugen Hoyos Date: Sat, 16 Jun 2018 23:03:20 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH]lavc/dpx: Support 10-bit packing method b (msbpad) 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" 2018-06-16 21:32 GMT+02:00, Jerome Martinez : > On 16/06/2018 17:49, Carl Eugen Hoyos wrote: >> + *lbuf = (*lbuf << 10) | (*lbuf >> shift); > > Padding bits are 0 in all DPX files I have seen up to now > but in theory padding bits are not defined Of course not, new patch attached. Thank you! Please comment, Carl Eugen From 401bdebba6dc8fa2253c720107a971b3fbf2c312 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 16 Jun 2018 17:47:46 +0200 Subject: [PATCH] lavc/dpx: Support 10-bit packing method b (msbpad). --- libavcodec/dpx.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index 69d594b..0650a20 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -51,7 +51,7 @@ static unsigned int read32(const uint8_t **ptr, int is_big) } static uint16_t read10in32(const uint8_t **ptr, uint32_t * lbuf, - int * n_datum, int is_big) + int * n_datum, int is_big, int shift) { if (*n_datum) (*n_datum)--; @@ -60,7 +60,7 @@ static uint16_t read10in32(const uint8_t **ptr, uint32_t * lbuf, *n_datum = 2; } - *lbuf = (*lbuf << 10) | (*lbuf >> 22); + *lbuf = *lbuf << 10 | *lbuf >> shift & 0x3FFFFF; return *lbuf & 0x3FF; } @@ -221,7 +221,7 @@ static int decode_frame(AVCodecContext *avctx, stride = avctx->width * elements; break; case 10: - if (!packing || packing > 1) { + if (!packing) { av_log(avctx, AV_LOG_ERROR, "Packing to 32bit required\n"); return -1; } @@ -360,17 +360,18 @@ static int decode_frame(AVCodecContext *avctx, (uint16_t*)ptr[1], (uint16_t*)ptr[2], (uint16_t*)ptr[3]}; + int shift = packing == 1 ? 22 : 20; for (y = 0; y < avctx->width; y++) { *dst[2]++ = read10in32(&buf, &rgbBuffer, - &n_datum, endian); + &n_datum, endian, shift); *dst[0]++ = read10in32(&buf, &rgbBuffer, - &n_datum, endian); + &n_datum, endian, shift); *dst[1]++ = read10in32(&buf, &rgbBuffer, - &n_datum, endian); + &n_datum, endian, shift); if (elements == 4) *dst[3]++ = read10in32(&buf, &rgbBuffer, - &n_datum, endian); + &n_datum, endian, shift); } n_datum = 0; for (i = 0; i < elements; i++) -- 1.7.10.4