From patchwork Sun Dec 10 13:14:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 6675 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1678190jah; Sun, 10 Dec 2017 05:18:15 -0800 (PST) X-Google-Smtp-Source: AGs4zMbx2q2CoR+YMXa0ovtpgcNNAl1/zrY0IcoJrdZ7V9597b10BlIVtemkx/TvbXyx3OeMef/M X-Received: by 10.28.164.66 with SMTP id n63mr7694065wme.7.1512911895925; Sun, 10 Dec 2017 05:18:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512911895; cv=none; d=google.com; s=arc-20160816; b=IqkjEZSxbn2g2Nw1o21Y8v6IUy07zIIsxfL2nc7IsXxtZq8ozwUg6InOEKsV0LKDVz yYZXFWdw8XQlFmgWbo9DU3uwu9v6YdxyLLIxOu/4E1c7xvUYemwV4eFs5o5Z6BHEgzLz XIftK7F6E6alcofYrPsb1AsHTexkEeVA/tRKLuAx9mSn32RTmrgC+HOyepa03wXVbQ7d /ipU6UZmAoB2eEE1ov3HUuWhZz4ywjpKf8dGQXGrLwaTIgaZdfHgk9WIRuIHma+OArf6 eNBnuFU6nxTQoeEpI+UYE63U1oBbsBMB1JIjDgquCn9aUP5b1v5mXs5BE9AePvW2gHCL ZuAA== 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=7bQXc0RbF2X57wXe6rC1NR1mjAzWgalOVZstc2ZsvFI=; b=ho2vf88v/Qp4hSgbEGp3uwESiS0VsKQg0CICJQ9RR4pR20v+yiajYE25g93JAhFqJt Wcti2p8/EpXzStpc4htRKsddwin/kdLvE57e+I6+LVCtb015z311RpVrVhokTPAiBQiK pp2CVSBoLT6y2GspCw2Msvl1NOW2pC0mHXgNqM6NRkbB7JIMAlVldv+VZCCWzo9rhlIj ZPCPx2FJ82kBjCY1cSfMkVfEulRqQ6HK9OPadh/29c7v+OgaLQkJwAEzCwvHsp3f53Bm ffWKPA/czHASztNrEQiT0EJoqkgA0J8uXtZ9jxPxYVsiEwB5hUXQIJ+XUrR8BAMiXVZR MI5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=BQbC/F74; 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=NONE 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 r79si9230324wrb.379.2017.12.10.05.18.15; Sun, 10 Dec 2017 05:18:15 -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=@gmail.com header.s=20161025 header.b=BQbC/F74; 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=NONE 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 E493468A69E; Sun, 10 Dec 2017 15:15:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF1DD68A68A for ; Sun, 10 Dec 2017 15:15:35 +0200 (EET) Received: by mail-wr0-f195.google.com with SMTP id k61so14897274wrc.4 for ; Sun, 10 Dec 2017 05:15:43 -0800 (PST) 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=M0FcKsE6pFSKJzhDSWvETXoShW6LtCTX0FofWZtLwoU=; b=BQbC/F749b7vITfXkwJuGTSRl5JE/mhfjchK7kqE18imjbMlCLb7QQ5wv7fmIQgFHL oUePM86iBoxWGUtbtTqN4m+CAB/doUbFI+JB/bBpA2RDQlbgkQnbV1Xx3HOEJru2R5tb nE7ZJn9c0ar8cPQ5fy55VJ/C1RB9SFSfne7OBD3HZ1Gx7WwYa0ByrBzA3Tr61xlieLak IZqLwF6xsfweyRajIWSwNUjk43QMXN2tksgRXNJj3b6RADr+7CInsEiwjCR96xkQUy7R snzZ2sKUfff7fuOuUYgqXxbJyM0mQGYK8bK6Yg9skcSb/1tdd3VEosZn5cNe1HJiUPz4 kC9A== 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=M0FcKsE6pFSKJzhDSWvETXoShW6LtCTX0FofWZtLwoU=; b=VtrMYigW6KStRakgJCE+iWWfrbEAF1onALgaYjkfp3SmA7Pafx6UqyA/e99kc77eP5 k1zSCxqwKt/DusWvm4iy/sW9cVVBw73Oef038M83uSqUdui8KnKIo7jeRAmvnBtwxsXl lo5dkxrjXH1v3OXTsgsoRcEwYdlJQM4nA58oqZfxRVjGZSEd7SKHkCynWftS7EsDygQS 79qoniPQQ7sCgHthL+nq4dZcELMp3exrkEwzYaogh087bFt2777szuA7s2l1Keok/T1O g7Yai/SZO7IthmKbqKOnPj7ETlusS78ls46qJb0wF5dPMX1rfp2n70yOECsroGj0oyw4 W9aQ== X-Gm-Message-State: AJaThX7H6xQU3tOdJOktQgwzo880GlETHIZOjmBg1jpF58+fpjCyGcKl r/qQcYt9jUTnLIu4ZE5tJXMTHw== X-Received: by 10.223.139.196 with SMTP id w4mr30312093wra.51.1512911742585; Sun, 10 Dec 2017 05:15:42 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id g78sm1129877wmc.30.2017.12.10.05.15.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Dec 2017 05:15:42 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Dec 2017 14:14:27 +0100 Message-Id: <20171210131436.15791-20-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171210131436.15791-1-onemda@gmail.com> References: <20171210131436.15791-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 20/29] avcodec/libx264: do not use YUVJ pixel formats 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: Paul B Mahol --- libavcodec/libx264.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 9c67c91f33..7a7f21c3d0 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -152,7 +152,6 @@ static int avfmt2_num_planes(int avfmt) { switch (avfmt) { case AV_PIX_FMT_YUV420P: - case AV_PIX_FMT_YUVJ420P: case AV_PIX_FMT_YUV420P9: case AV_PIX_FMT_YUV420P10: case AV_PIX_FMT_YUV444P: @@ -414,14 +413,11 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt) { switch (pix_fmt) { case AV_PIX_FMT_YUV420P: - case AV_PIX_FMT_YUVJ420P: case AV_PIX_FMT_YUV420P9: case AV_PIX_FMT_YUV420P10: return X264_CSP_I420; case AV_PIX_FMT_YUV422P: - case AV_PIX_FMT_YUVJ422P: case AV_PIX_FMT_YUV422P10: return X264_CSP_I422; case AV_PIX_FMT_YUV444P: - case AV_PIX_FMT_YUVJ444P: case AV_PIX_FMT_YUV444P9: case AV_PIX_FMT_YUV444P10: return X264_CSP_I444; #if CONFIG_LIBX264RGB_ENCODER @@ -743,10 +739,7 @@ FF_ENABLE_DEPRECATION_WARNINGS x4->params.i_slice_count = avctx->slices; - x4->params.vui.b_fullrange = avctx->pix_fmt == AV_PIX_FMT_YUVJ420P || - avctx->pix_fmt == AV_PIX_FMT_YUVJ422P || - avctx->pix_fmt == AV_PIX_FMT_YUVJ444P || - avctx->color_range == AVCOL_RANGE_JPEG; + x4->params.vui.b_fullrange = avctx->color_range == AVCOL_RANGE_JPEG; if (avctx->colorspace != AVCOL_SPC_UNSPECIFIED) x4->params.vui.i_colmatrix = avctx->colorspace; @@ -838,11 +831,8 @@ FF_ENABLE_DEPRECATION_WARNINGS static const enum AVPixelFormat pix_fmts_8bit[] = { AV_PIX_FMT_YUV420P, - AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUV422P, - AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUV444P, - AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NV12, AV_PIX_FMT_NV16, #ifdef X264_CSP_NV21