From patchwork Sat Nov 18 01:50:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Zern X-Patchwork-Id: 6159 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1332990jah; Fri, 17 Nov 2017 17:55:40 -0800 (PST) X-Google-Smtp-Source: AGs4zMbmShAAeMyeLhpLd703ML60g4mieIs+tJgq0ZVrBwKGrAVyg5G8IfmdMXb05wcht8+30fZ5 X-Received: by 10.28.126.146 with SMTP id z140mr5970332wmc.126.1510970140875; Fri, 17 Nov 2017 17:55:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510970140; cv=none; d=google.com; s=arc-20160816; b=XmtLOpbk6cY50GzEM0OMacO99E9l5BbU/iOi4Gm2tX+jq4FzSwC3XA42z0GdJN8aYU 95UnUQlEX/KFfNtANpqlFMDCd+sc5wupZLR7C71kWvDrQ5O19osN+a7mYs/Y9deH+yuj aO4YSSV8vLiMN6CxG6fAdZdabg+Bonv0jTjQXklnORaqJRCVL/IR82cki/o+5yO/bnvU AS1Gs3jyeBnfmgr4u5fX//DJYfp1B46nIaJwO283TMhtOgzeO5tJrTH+yFTgbQk5dzER LnuMdfTesLrgb2kcvzcrspmqT50mfUivkQdoG0C2bDIjQqgKFxXuz7bnM2Lo2/rEgzj9 wl0Q== 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=e3C+6aKArO5oResczMtBBbHrlkDB+Sbsm2D4Tj+Byek=; b=pT2nz1GLxIKbYvIODbKsH3XFSd3U83cdOE3FrM6IzAAxp7or0LunRMud/bsznSEvQd NAfpi48LQzvqxZ65811vSye3SLDB6eJYfPD+NqD5LglGowHP+vWMGWEChVzSABAWv0DY c60yoOd3jKWG9yedlXedPOhdzkJitg9Qqf9/HYiKflmiy7KOigM3zFBZUC/TsxqinhZH kFHa63Yf+Mb7Nkucy5Ul4gm/kbUjIgfozLvKAG2axoLOJ8Nel9DYkTAr02yDIBlW9MJz qBSeNFvlgxhOoJVM+Gkzmf09hOHvym2AcQVzeyEzyS0CFiAXKA3jEIuOTHzBWklETAOD 0YOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=ducROng5; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y1si3879991wrg.438.2017.11.17.17.55.40; Fri, 17 Nov 2017 17:55:40 -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; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=ducROng5; 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 7E1F6689E62; Sat, 18 Nov 2017 03:55:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16A92689BE5 for ; Sat, 18 Nov 2017 03:55:17 +0200 (EET) Received: by mail-pf0-f195.google.com with SMTP id u70so3203633pfa.7 for ; Fri, 17 Nov 2017 17:55:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=r4Uu8n2t4a5LvI9pDMn5AYVlTZE0TOK/cVQRLZ3VIC8=; b=ducROng5yIQDEP/FoxaF1UphPjBdJeTq9hZ+6XX61v/rJ7ShFembhjJzhxo+pR3+E1 bSOFV+WSAozBaglHLWE/QpCVrmNz0PvYThqup9vOIWa6s8zDwUUJv4ovIt/Bp0o2ASac ltY5e8opCCblO9Q+4ODc3CmYFWuAgjwG1PqzB8+JHwCa98XaaysuTQChCKuY8oMC8HNW LA4nczBtxqWbGYn3sPRQrS0uaBI7RcUuxfZkr8SLxBq7zZgoe2O3sd8+OXc1wbDyQDSC 2SRRvkiB6LIJ1sN+weB0UXOCWecDI1FT6WUZex/DlIok82qGRs6FKsuaKu6PKqsAVTAN TIKw== 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=r4Uu8n2t4a5LvI9pDMn5AYVlTZE0TOK/cVQRLZ3VIC8=; b=RTOvUGpVu4id9bUcCkOxtJBzEX10EahAzFG3nXd3nqL3A0MytxOHFOiFfhLix+WNt1 O/eQhzd20uPoi6iedZ0cTdNanH64VxEWsg2GpOTLOm6+yfAGph1js6MvPPOD0H5xeFMQ 8gVyiQML8LCi3+Tv7cNUlT3OFWvXdhGfBoTeUZhqLcWa8M3xdhZIXelXURy/9QrK49or dvXpIstrTeWU3gIakj5Oq4dw8b3fi3f0Xl7+JICvRbMAyZKtB+xbVcTBlt9EuQNFztGU ShcgwRiHzZrdx+JZvhXtOyaOYf/vfbAqPOAva47fT6AyiRMubqr4ZDU3JF4QIj8PvV+h aZuQ== X-Gm-Message-State: AJaThX5kQdWIrEMdbI4zJYqpUY5ObDTtUD3zjvi2ui9YSuuCF3EtlTPz 1uzRpPu+9qY6GsOXDaGBLjiFy+o0CyE= X-Received: by 10.84.131.161 with SMTP id d30mr7213837pld.270.1510969812704; Fri, 17 Nov 2017 17:50:12 -0800 (PST) Received: from jzern.mtv.corp.google.com ([172.18.84.226]) by smtp.gmail.com with ESMTPSA id m69sm9684289pfc.27.2017.11.17.17.50.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Nov 2017 17:50:10 -0800 (PST) Received: by jzern.mtv.corp.google.com (Postfix, from userid 105886) id 98A3088BD1; Fri, 17 Nov 2017 17:50:08 -0800 (PST) From: James Zern To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Nov 2017 17:50:07 -0800 Message-Id: <20171118015008.123256-3-jzern@google.com> X-Mailer: git-send-email 2.15.0.448.gf294e3d99a-goog In-Reply-To: <20171118015008.123256-1-jzern@google.com> References: <20171118015008.123256-1-jzern@google.com> Subject: [FFmpeg-devel] [PATCH 3/4] libvpxdec: remove pre-1.4.0 checks 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 Zern --- libavcodec/libvpxdec.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index ad0ea3b02a..2ae29d202a 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -70,7 +70,6 @@ static av_cold int vpx_init(AVCodecContext *avctx, static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img, int has_alpha_channel) { -#if VPX_IMAGE_ABI_VERSION >= 3 static const enum AVColorSpace colorspaces[8] = { AVCOL_SPC_UNSPECIFIED, AVCOL_SPC_BT470BG, AVCOL_SPC_BT709, AVCOL_SPC_SMPTE170M, AVCOL_SPC_SMPTE240M, AVCOL_SPC_BT2020_NCL, AVCOL_SPC_RESERVED, AVCOL_SPC_RGB, @@ -82,7 +81,6 @@ static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img, avctx->color_range = color_ranges[img->range]; #endif avctx->colorspace = colorspaces[img->cs]; -#endif if (avctx->codec_id == AV_CODEC_ID_VP8 && img->fmt != VPX_IMG_FMT_I420) return AVERROR_INVALIDDATA; switch (img->fmt) { @@ -97,22 +95,15 @@ static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img, avctx->profile = FF_PROFILE_VP9_1; avctx->pix_fmt = AV_PIX_FMT_YUV422P; return 0; -#if VPX_IMAGE_ABI_VERSION >= 3 case VPX_IMG_FMT_I440: avctx->profile = FF_PROFILE_VP9_1; avctx->pix_fmt = AV_PIX_FMT_YUV440P; return 0; -#endif case VPX_IMG_FMT_I444: avctx->profile = FF_PROFILE_VP9_1; -#if VPX_IMAGE_ABI_VERSION >= 3 avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? AV_PIX_FMT_GBRP : AV_PIX_FMT_YUV444P; -#else - avctx->pix_fmt = AV_PIX_FMT_YUV444P; -#endif return 0; -#ifdef VPX_IMG_FMT_HIGHBITDEPTH case VPX_IMG_FMT_I42016: avctx->profile = FF_PROFILE_VP9_2; if (img->bit_depth == 10) { @@ -135,7 +126,6 @@ static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img, } else { return AVERROR_INVALIDDATA; } -#if VPX_IMAGE_ABI_VERSION >= 3 case VPX_IMG_FMT_I44016: avctx->profile = FF_PROFILE_VP9_3; if (img->bit_depth == 10) { @@ -147,29 +137,19 @@ static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img, } else { return AVERROR_INVALIDDATA; } -#endif case VPX_IMG_FMT_I44416: avctx->profile = FF_PROFILE_VP9_3; if (img->bit_depth == 10) { -#if VPX_IMAGE_ABI_VERSION >= 3 avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? AV_PIX_FMT_GBRP10 : AV_PIX_FMT_YUV444P10; -#else - avctx->pix_fmt = AV_PIX_FMT_YUV444P10; -#endif return 0; } else if (img->bit_depth == 12) { -#if VPX_IMAGE_ABI_VERSION >= 3 avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? AV_PIX_FMT_GBRP12 : AV_PIX_FMT_YUV444P12; -#else - avctx->pix_fmt = AV_PIX_FMT_YUV444P12; -#endif return 0; } else { return AVERROR_INVALIDDATA; } -#endif #endif default: return AVERROR_INVALIDDATA; @@ -252,13 +232,8 @@ static int vpx_decode(AVCodecContext *avctx, } if ((ret = set_pix_fmt(avctx, img, ctx->has_alpha_channel)) < 0) { -#ifdef VPX_IMG_FMT_HIGHBITDEPTH av_log(avctx, AV_LOG_ERROR, "Unsupported output colorspace (%d) / bit_depth (%d)\n", img->fmt, img->bit_depth); -#else - av_log(avctx, AV_LOG_ERROR, "Unsupported output colorspace (%d) / bit_depth (%d)\n", - img->fmt, 8); -#endif return ret; }