From patchwork Thu Jun 21 10:12:23 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: 9455 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp1822542jad; Thu, 21 Jun 2018 03:19:15 -0700 (PDT) X-Google-Smtp-Source: AAOMgpebWz3VHsFLRXpdFKM1tEAywdHSoI1BP2GdQonaf6+uVMhM8cNqx31LUoO4Oesq8G0Xd1w0 X-Received: by 2002:adf:f0cb:: with SMTP id x11-v6mr917362wro.49.1529576355005; Thu, 21 Jun 2018 03:19:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529576354; cv=none; d=google.com; s=arc-20160816; b=eer1NkOfKVGEGndho5o+UjDel9ks3joBdgEQQQ6ZqrLSDMieV9AQALYm4L4w4r/VQu ncjdklDh2840NXMaWWnnoSrIPHnN8moqDV69Xn1nZuV4pVBJryGKmymfDJWwFjLOKo+4 mw9fT5StUEwpE6xaTP91UXg0q5fezFHBnX/TnquPCBGYX2vi89Qm11No57+Hr7TUFV5E SzLMcGoEPKeNOyaxYJU9ISlc28e68QZFMtb3tXup7Vc6u5R38h/dzjOBXMdurDym6Yjd RQx86V3YjV92pRRVmAFHybztpWgqZRF4Aq5ELnUjlteyyo5/q0yYxRNTpw3/p5QqIzzw zBhQ== 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=JXp349It3sl7F9+RFdK3rapnZUHe+J6bc3gdMHq0k/8=; b=eGWs9n9sQj3/AN4mNTlpxm7AhXXEYj15c7f0hIXDLcoOXEoHQaRVp/pIQ+/Pfz5HRR S0V7hLzWgnJf00mvfZ9usRm0tL0QXJhr+JKIeZQazatGUJ7Ld6tMLXWecdTPXmIxMCoX b6ZnDEdJG5ml1yqdWjwumj3TJRTCX+QfvdSAyAWNM4tmEgUFo6mPTPPJ1+rVC6NH9osT jTM9gNn0J1URqVUxw33JlU1cS9WJ1LuAevt6uj6YISW/smsWC3tiGjmZe9Fcf6teOz/o sTyYlOgCvotu7ikx5sQ27X/2baILnYPdDJnfGprAGsE27wevwePiR3YeDGz7E/KTxjhY Cyww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=eroOkU9M; 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 x10-v6si4517757wre.454.2018.06.21.03.19.14; Thu, 21 Jun 2018 03:19:14 -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=eroOkU9M; 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 E953168A6CC; Thu, 21 Jun 2018 13:18:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f173.google.com (mail-io0-f173.google.com [209.85.223.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D7CD68A6AB for ; Thu, 21 Jun 2018 13:18:12 +0300 (EEST) Received: by mail-io0-f173.google.com with SMTP id e15-v6so2511567iog.1 for ; Thu, 21 Jun 2018 03:19:06 -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=aJdtkdUDsiEhKvPZl5YKRHc5k2RjRIX716kcAFNjumE=; b=eroOkU9MkfNFvvs+P1yPg5WMQMwJM0fHzSFlOlLEe9HwBTJgXOsb8AQuW8zJ3okNi4 rFT2rSLgnxpliHE2RuNeXlUjfw3+kI1PZeK3qnuUNSZN3q/dAwyTlWZj5jV/otJDDD6T /MlqqAfcEM/JgXGzgBCtPtkexOAOPrD5mIO9qvFynCgBo3+2xjnAbTxehWNmAgVPCIUi b6nrRZlyzNly28DmbBPRPN/9v3MzWo/bFkExaFnmwqClHNNBIRSLhaEMqrGCgXVGcUWV chIC3NRzrA956yQtU5f4ei4lTRTYglLHui6YUR+8YYE88dMYdJ9QzcctxB3QA6ubhMWq ul0w== 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=aJdtkdUDsiEhKvPZl5YKRHc5k2RjRIX716kcAFNjumE=; b=Jm/Wkyza4ICLm1JFCQprW/8+yaGuBIZumNOTQCzJOsf4Ohy88kED94qdbdSJNMN3+g 3usAK9FxqD3DSZao5KdQSuv10+Eri81CK5BbJcYbUOTeXR4sttJkXcN1LguiQAWQnkEr JntaW4iqQsJOZgKiYdclc1C8XIBrFTHKRjIvHnoL6RONPeio5CC8GP31gdyt81d11maC xKVmYyU4ADNYFcpjEfvX/gK0/N1iR3pFyFqTrTHIx3tcoiYEvpbLHRqKwJvS8GOM4HYg qj1BC3noDI3s+IKKMKAWpNVdRMdfBmXLrkRTHTYW+jjGhRkWLu+UlAmQErZZNPAycBKX 30Aw== X-Gm-Message-State: APt69E0j7YJfknL2CNTov6zGEygmLQShA5igcRHS/0wjRS7vsDtwk+Uf 8ffFSzc/oARYCHLv0puNzijZ/BT61Zp4ClsQfpM= X-Received: by 2002:a6b:520d:: with SMTP id g13-v6mr21184835iob.60.1529575943744; Thu, 21 Jun 2018 03:12:23 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a02:b09b:0:0:0:0:0 with HTTP; Thu, 21 Jun 2018 03:12:23 -0700 (PDT) From: Carl Eugen Hoyos Date: Thu, 21 Jun 2018 12:12:23 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/libopenjpeg: Support GRAY10, GRAY12 and GRAY14 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 allows to create (and read) gray1x samples with libopenjpeg. Please comment, Carl Eugen From 25c4a1ea0afae9fb3561fd928552133ddcf70d05 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 21 Jun 2018 12:05:40 +0200 Subject: [PATCH] lavc/libopenjpeg: Support GRAY10, GRAY12 and GRAY14. --- libavcodec/libopenjpegdec.c | 1 + libavcodec/libopenjpegenc.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index 5e66cd9..344c5ba 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -45,6 +45,7 @@ AV_PIX_FMT_RGB48, AV_PIX_FMT_RGBA64 #define GRAY_PIXEL_FORMATS AV_PIX_FMT_GRAY8, AV_PIX_FMT_YA8, \ + AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, \ AV_PIX_FMT_GRAY16, AV_PIX_FMT_YA16 #define YUV_PIXEL_FORMATS AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUVA420P, \ diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index 7c7d0aa..8627d02 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -191,6 +191,9 @@ static opj_image_t *mj2_create_image(AVCodecContext *avctx, opj_cparameters_t *p case AV_PIX_FMT_YA8: case AV_PIX_FMT_GRAY16: case AV_PIX_FMT_YA16: + case AV_PIX_FMT_GRAY10: + case AV_PIX_FMT_GRAY12: + case AV_PIX_FMT_GRAY14: color_space = OPJ_CLRSPC_GRAY; break; case AV_PIX_FMT_RGB24: @@ -613,6 +616,9 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, cpyresult = libopenjpeg_copy_unpacked8(avctx, frame, image); break; case AV_PIX_FMT_GRAY16: + case AV_PIX_FMT_GRAY14: + case AV_PIX_FMT_GRAY12: + case AV_PIX_FMT_GRAY10: case AV_PIX_FMT_YUV420P9: case AV_PIX_FMT_YUV422P9: case AV_PIX_FMT_YUV444P9: @@ -763,6 +769,7 @@ AVCodec ff_libopenjpeg_encoder = { AV_PIX_FMT_RGBA64, AV_PIX_FMT_GBR24P, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRP16, AV_PIX_FMT_GRAY8, AV_PIX_FMT_YA8, AV_PIX_FMT_GRAY16, AV_PIX_FMT_YA16, + AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUVA444P, -- 1.7.10.4