From patchwork Sun Apr 1 19:59:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 8274 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1848903jad; Sun, 1 Apr 2018 12:59:28 -0700 (PDT) X-Google-Smtp-Source: AIpwx49n3GrI9QupwJB5h3ceJWMp21LpXZ51BCEndfu8UCoRZFm+5ie7L2FbgNTyIbIS0Q3Sv3i3 X-Received: by 10.28.111.19 with SMTP id k19mr6899893wmc.147.1522612768470; Sun, 01 Apr 2018 12:59:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522612768; cv=none; d=google.com; s=arc-20160816; b=Y2Hyz60WNP/TdoFh2a3K7HkTQ0p2z4L+nDguTi4AFvooaVeZVtcMj6BvW0o/y0xjyO zFfhNRX8lCLGGiFRc1DW4ba8mlQs24GOUNd0013wv/9VxQ9dIhjIf+fhAzfbnI64Np7Y 6unlJrtjX7dboVIMX1Yb6rPGSFdnckGZPw+GRYVk+rguO0WGKN36GKA07WNphkY02iju +oTUfsO/tBNzRMACYT8ZBy3KJkZZW1exIs/NCc/iLz9nUO66oQzP0pJFKmT7Wht3g3RX 5Zjyjzp6QOf79OhHJmVkSXlf8Vqj6y54CU9ngyZSWV6teklZkbXmoA1xM492Oa3ioBov yk6g== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=JO7y+RB/IfitYxJcfunIkmdbqL0J7nCty7PqfPnj5FI=; b=GaiQR0YDYjYN7Gwhn7KtixXRNIGbNkCN5UefkkOzV82GqoJkNqcxdQqCKRqeCFxsaz fOvZWXiwX3QwJxhDG3rRLeT74vxG6I558ND+YcLsBEMQo1ez6t7Mhmlju/R4uLnlIhce 1nsTD0KE3TArjdO9MumU0El9yYnYEy8r0zVyFjebBicyiaGEBxHqVnKlR/r2QdVl6jyz /oEHjkpNUle4lmcpA8Oa4EXQp31MfYqSyVx72CU6yCRe6JfC64ljcAIhmGaQhPHndwIV d6gzS2svsl4nUnrDFVJcRe40O11kyniNMwjGXfwJd9Q05hD9m6c8Q0YW6AntDtI3R8UW nc0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=alsjdCnd; 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 e9si9656135wra.341.2018.04.01.12.59.27; Sun, 01 Apr 2018 12:59:28 -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=alsjdCnd; 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 CDDD268186B; Sun, 1 Apr 2018 22:59:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 32996680368 for ; Sun, 1 Apr 2018 22:58:59 +0300 (EEST) Received: by mail-qk0-f196.google.com with SMTP id p67so4888589qke.13 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; bh=xuOxnKh78YzFCLIlM5Ti68PDkr9Acfp3MiGPFGzYTMQ=; b=alsjdCndLq0g0dpMu41FmviHJfOUGv5LE3ci2tiAMv/fUVbkRTn5NfI4KFiUVuXK4l DQd9oTOKA7zzgH1QPUCyBiD/XTN5ENbyJB5dHFAN9sj5ImBm4vqUCFDEDNhpHEIupAkp ojkDIP/zw5TadqNv+dn99rGq30PIbZ+AVtgTHJcj9QaUgjhVt9DNJSOJCzA7Bm1aydMn TUo0hb+RF0uWmLVIlBpzJX0nBjKnSTlAcKeRz9mJXmptEJh9i1H9NLEe2OBbeMap8to0 xfy7IlonxXhH8bGCBo67SuVuUDolIYvyhBiUcqhxmhZ67PHiHfq+0prY5C3oKruv0+1c lgFQ== 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; bh=xuOxnKh78YzFCLIlM5Ti68PDkr9Acfp3MiGPFGzYTMQ=; b=sJFEZSy25lheEem5AdwIRheuRRm0+HxL9+HbkVqOJiW/OpYKjkcVq3tuRalltEkucQ GdA+vJ7bbJsiFdHHam0weKbm0awjzrgjdP7IbBHTxaFuZQ70ssdr62+ah/Qafj4yxRH4 wJyOtnMpuxkqJof4h74npVjylpagujrCMro9ucmgDFJDEo3MFnKoCL/qcAJwVWMygLOT c01hx8EqW8DpnWPTczv6i5rlatnGhjZ/OHlgNxp4ly+AR+tAUjmSm9Rn9sbRiDlPGQY8 RTKFaGg6koiTKpm0ChYeaVAaPW7GXxIwxRPR7NZDDShJ+GRVepfoStBYXMDgigVuEfl7 NEFg== X-Gm-Message-State: ALQs6tDtE35zSgbFVLjW7KMd4a+Kvqm0Vg2W1H5IL7DnXPv7KTOdYVmb Z04IzLiF9Kx9abSGa68zkgNqsA== X-Received: by 10.55.215.70 with SMTP id m67mr10096372qki.123.1522612757339; Sun, 01 Apr 2018 12:59:17 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id o59sm10544467qte.36.2018.04.01.12.59.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Apr 2018 12:59:16 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 1 Apr 2018 16:59:03 -0300 Message-Id: <20180401195904.7356-1-jamrial@gmail.com> X-Mailer: git-send-email 2.16.2 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/libaomdec: remove duplicate code 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: James Almer --- libaom generates all files as I4xx16 right now, so the code i'm removing here is unused. And even if it ends up generating I4xx files down the road, it's safe to assume the bit_depth field in aom_image_t will still be populated. libavcodec/libaomdec.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c index 1352b421d9..e0d3a3b7fe 100644 --- a/libavcodec/libaomdec.c +++ b/libavcodec/libaomdec.c @@ -95,18 +95,6 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img) switch (img->fmt) { case AOM_IMG_FMT_I420: - avctx->pix_fmt = AV_PIX_FMT_YUV420P; - avctx->profile = FF_PROFILE_AV1_MAIN; - return 0; - case AOM_IMG_FMT_I422: - avctx->pix_fmt = AV_PIX_FMT_YUV422P; - avctx->profile = FF_PROFILE_AV1_PROFESSIONAL; - return 0; - case AOM_IMG_FMT_I444: - avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? - AV_PIX_FMT_GBRP : AV_PIX_FMT_YUV444P; - avctx->profile = FF_PROFILE_AV1_HIGH; - return 0; case AOM_IMG_FMT_I42016: if (img->bit_depth == 8) { avctx->pix_fmt = AV_PIX_FMT_YUV420P; @@ -123,6 +111,7 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img) } else { return AVERROR_INVALIDDATA; } + case AOM_IMG_FMT_I422: case AOM_IMG_FMT_I42216: if (img->bit_depth == 8) { avctx->pix_fmt = AV_PIX_FMT_YUV422P; @@ -139,6 +128,7 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img) } else { return AVERROR_INVALIDDATA; } + case AOM_IMG_FMT_I444: case AOM_IMG_FMT_I44416: if (img->bit_depth == 8) { avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ?