From patchwork Thu Nov 17 12:09:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 1455 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp723814vsb; Thu, 17 Nov 2016 04:10:10 -0800 (PST) X-Received: by 10.28.29.86 with SMTP id d83mr3563566wmd.75.1479384610640; Thu, 17 Nov 2016 04:10:10 -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 v4si2466083wjk.289.2016.11.17.04.10.10; Thu, 17 Nov 2016 04:10:10 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5AD9E689EFF; Thu, 17 Nov 2016 14:10:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-1.mx.upcmail.net (vie01a-qmta-pe01-1.mx.upcmail.net [62.179.121.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E413B689A8A for ; Thu, 17 Nov 2016 14:09:59 +0200 (EET) Received: from [172.31.218.37] (helo=vie01a-dmta-pe03-1.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1c7LVw-0004F2-Fm for ffmpeg-devel@ffmpeg.org; Thu, 17 Nov 2016 13:10:00 +0100 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1c7LVq-0004Jk-DS for ffmpeg-devel@ffmpeg.org; Thu, 17 Nov 2016 13:09:54 +0100 Received: from [192.168.1.3] ([80.110.110.78]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 909t1u00K1hXwgo0109uvG; Thu, 17 Nov 2016 13:09:54 +0100 X-SourceIP: 80.110.110.78 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Thu, 17 Nov 2016 13:09:53 +0100 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201611171309.53170.cehoyos@ag.or.at> Subject: [FFmpeg-devel] lavc/ffv1: Support YUV4xxP12 and GRAY12. 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 patch adds support for 12bit formats to ffv1. Please comment, Carl Eugen From c7f3f21a1b6d96717a728c0f0c08de76092fdefb Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 17 Nov 2016 13:08:27 +0100 Subject: [PATCH] lavc/ffv1: Support YUV4xxP12 and GRAY12. --- libavcodec/ffv1dec.c | 7 +++++++ libavcodec/ffv1enc.c | 11 +++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 0719e28..a7ddb28 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -625,6 +625,13 @@ static int read_header(FFV1Context *f) case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUVA422P10; break; case 0x11: f->avctx->pix_fmt = AV_PIX_FMT_YUVA420P10; break; } + } else if (f->avctx->bits_per_raw_sample == 12 && !f->transparency) { + f->packed_at_lsb = 1; + switch(16 * f->chroma_h_shift + f->chroma_v_shift) { + case 0x00: f->avctx->pix_fmt = AV_PIX_FMT_YUV444P12; break; + case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUV422P12; break; + case 0x11: f->avctx->pix_fmt = AV_PIX_FMT_YUV420P12; break; + } } else if (f->avctx->bits_per_raw_sample == 16 && !f->transparency){ switch(16 * f->chroma_h_shift + f->chroma_v_shift) { case 0x00: f->avctx->pix_fmt = AV_PIX_FMT_YUV444P16; break; diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index c56623b..d2f0827 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -580,9 +580,15 @@ FF_ENABLE_DEPRECATION_WARNINGS case AV_PIX_FMT_YUVA444P10: case AV_PIX_FMT_YUVA422P10: case AV_PIX_FMT_YUVA420P10: - s->packed_at_lsb = 1; if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample) s->bits_per_raw_sample = 10; + case AV_PIX_FMT_GRAY12: + case AV_PIX_FMT_YUV444P12: + case AV_PIX_FMT_YUV420P12: + case AV_PIX_FMT_YUV422P12: + s->packed_at_lsb = 1; + if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample) + s->bits_per_raw_sample = 12; case AV_PIX_FMT_GRAY16: case AV_PIX_FMT_YUV444P16: case AV_PIX_FMT_YUV422P16: @@ -1293,13 +1299,14 @@ AVCodec ff_ffv1_encoder = { AV_PIX_FMT_YUV410P, AV_PIX_FMT_0RGB32, AV_PIX_FMT_RGB32, AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV444P16, AV_PIX_FMT_YUV444P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, + AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUVA444P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_GRAY16, AV_PIX_FMT_GRAY8, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_YA8, - AV_PIX_FMT_GRAY10, + AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GBRP16, AV_PIX_FMT_RGB48, AV_PIX_FMT_NONE