From patchwork Sun Apr 1 19:59:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 8273 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1849001jad; Sun, 1 Apr 2018 12:59:37 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/Djl5Nr0zEyHLg7yr5NHQr/VPZlFwqW9CCp65bcC6jjo+/oTZLe0+XFbCRHvY39vBKLLTD X-Received: by 10.223.201.3 with SMTP id m3mr5071887wrh.137.1522612777357; Sun, 01 Apr 2018 12:59:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522612777; cv=none; d=google.com; s=arc-20160816; b=taxDc9hcADwlh61Sgh3M7Zw8rIolSl/IXvvRiC9FIVCEsyoemGxHSBCFvm9CY4daby bsODfaSLE1DCwatnxY2S223CKbhNNVWRL+/4n25s57wdeGs0FTXe/eMtIeYyJDRtj3R0 BSdUwvmkLLgaKb+IVaj4yVS+ud7bqQ2GfID8hUyS5feXUSkeB9voQ7GPGDSjSAx1R23Y KnPHdPDdGmCkuPt3DhNTorBiX+rvnLSChNcdQOXHs83fS0tG9SufMxXJbwFQyxqL0jJN 0ijBzrC0ET6JHoUnmZKE/TJyBfSN9Ag/k/Pjam0h2p+dyLVyT0JJ5M3pMZ3P1WC9ueM3 +85g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=t+QAIEr8YdjOjEur2qJtTbwD2DmXGma+gf5sEp/Jlr8=; b=pE4okG2fLUfTDCMsR3VPVrUiH/xE2URNQ9pn/QH5Uil2BTPdSgnFsxOhq633xaPmPi m6S6K8kCANpLLfcLWrwIiSq798ywmzCO6QVwlbDe/nj9HJ089zrXZEsQ5tm6uAz3Y41V sDgq1q4ak2cJal4XGits+rsd1lB65chpqTjmNyEo9ny0mYkhoWxECOSfdhiI2h60ohFa XuKlYDKOetr5edDx5/lx2Mi1Bp0j+S9lPzrNbu8IbYnHETyNGOZ+oFrogzkZ+8ofcNi7 PFt9sHBpHl3XRMRlmCdxAntZV3Ee0NltCldTMbzfabJp19LJ9EAKM/09kAE56lnBITni uZlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=fNYPxCQh; 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 b45si10427085wrb.498.2018.04.01.12.59.36; Sun, 01 Apr 2018 12:59:37 -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=fNYPxCQh; 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 7E72468990D; Sun, 1 Apr 2018 22:59:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8850680368 for ; Sun, 1 Apr 2018 22:58:59 +0300 (EEST) Received: by mail-qk0-f193.google.com with SMTP id 132so13395050qkd.5 for ; Sun, 01 Apr 2018 12:59:19 -0700 (PDT) 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=8B56DyI2i2+3758oofjX6yI0b03aK1SdCgaCoBEKD3g=; b=fNYPxCQhyvzBuWqLXg6K9RJ0UHWjqdLks20Kk7SYiT4Q3GdqE/AUvPY5Pw5cKrgfna T+G1gPRB34ABEYInIO0v16L837ZHF63nQQeycry7N0P4+guJzwts+ZrieDPsFhz2sMkq +4Ey6TMt48R0i0hO993v6ScdjcU/TRlUJBwt2RbNoKr0aHjGJQiIJZhzU032lAflBGGl hEh457pnUiuqGuIgXncPnlyLyravESH6mCu9WGvu9J2TMp3xA7lXNQPiC3VDJYQ1hiKU QsmS49l2TcFcH/LrX3ZZ2jWxLcL3jBOmrxWvbRDNa0qm44/p7zD2zDvt5/UeCmM9sNdZ oebQ== 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=8B56DyI2i2+3758oofjX6yI0b03aK1SdCgaCoBEKD3g=; b=Cfj+i71OK4x7YEMiiZPjDaTddkf/RythmTwWPmpRw6YWdL7ri4epxpUCM6bDez2kKJ fZm+Qgi93lnsm89mlXGqbQriYvMknDYmUZ8ce9iCepAn7wayca77ADPY37z4TfsQ4qJW msgvB19NsgpssqPePLUmp2u639oLAvNMV+mI1CsgGqZoMgMly9UceRU5d1At0P2yI+Y8 OJVbjm9oy2UepAn/b3WX8ihTU5sceBtaHiJcV7cOkgzfxW20nWp/99357aWcYNI7W5mF L1Mo4kyoYBLd54F0b4qvjqcTFTWNZ2zxu3prkhYZHsO8sqLa1PnIkddOe9n8W7HcFZpO 73lQ== X-Gm-Message-State: ALQs6tBJpHVx7B/YVra4P8cUuyOHxCZsYTQwofOwKyKv2FWtk1oPfT8R 7HREhfJ21Va3xm2FOEwdnFzW7A== X-Received: by 10.55.220.7 with SMTP id v7mr8317244qki.8.1522612758536; Sun, 01 Apr 2018 12:59:18 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id o59sm10544467qte.36.2018.04.01.12.59.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Apr 2018 12:59:18 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 1 Apr 2018 16:59:04 -0300 Message-Id: <20180401195904.7356-2-jamrial@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180401195904.7356-1-jamrial@gmail.com> References: <20180401195904.7356-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/libaomdec: add support for monochrome files 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" All such files are signaled as I42016, as there's no monochrome value in aom_img_fmt_t. Signed-off-by: James Almer --- libavcodec/libaomdec.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c index e0d3a3b7fe..00d515dbc0 100644 --- a/libavcodec/libaomdec.c +++ b/libavcodec/libaomdec.c @@ -61,9 +61,10 @@ static av_cold int aom_init(AVCodecContext *avctx, static void image_copy_16_to_8(AVFrame *pic, struct aom_image *img) { + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pic->format); int i; - for (i = 0; i < 3; i++) { + for (i = 0; i < desc->nb_components; i++) { int w = img->d_w; int h = img->d_h; int x, y; @@ -97,15 +98,18 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img) case AOM_IMG_FMT_I420: case AOM_IMG_FMT_I42016: if (img->bit_depth == 8) { - avctx->pix_fmt = AV_PIX_FMT_YUV420P; + avctx->pix_fmt = img->monochrome ? + AV_PIX_FMT_GRAY8 : AV_PIX_FMT_YUV420P; avctx->profile = FF_PROFILE_AV1_MAIN; return 0; } else if (img->bit_depth == 10) { - avctx->pix_fmt = AV_PIX_FMT_YUV420P10; + avctx->pix_fmt = img->monochrome ? + AV_PIX_FMT_GRAY10 : AV_PIX_FMT_YUV420P10; avctx->profile = FF_PROFILE_AV1_MAIN; return 0; } else if (img->bit_depth == 12) { - avctx->pix_fmt = AV_PIX_FMT_YUV420P12; + avctx->pix_fmt = img->monochrome ? + AV_PIX_FMT_GRAY12 : AV_PIX_FMT_YUV420P12; avctx->profile = FF_PROFILE_AV1_PROFESSIONAL; return 0; } else {