From patchwork Sat Dec 9 15:38:07 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: 6631 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp809554jah; Sat, 9 Dec 2017 07:40:54 -0800 (PST) X-Google-Smtp-Source: AGs4zMZMM/mf9MFNLGOy7cLHp0yUKJKc27huCpSmh5ogpOW5E1g9U1mhdrzHDa7ZGNYO4Ceegm/6 X-Received: by 10.223.139.149 with SMTP id o21mr6870426wra.87.1512834054810; Sat, 09 Dec 2017 07:40:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512834054; cv=none; d=google.com; s=arc-20160816; b=T9slxkPDdUWpEZWSj4JKBWEni1ZN5YgRHF9WChI+tCYQu3gpQ3ckHNj084YcjDr31W YQ2HhP2vSLx/J3cF9fjIAmnSEiz+RdG146RRbLNNRZjU0sz0JSxL7sgZIA4Rf1baVGCZ zoZbixsvDsyDX2V01Qb+tK0o1h32W8D2nE5QrPm3w1KFeprqRXzcxZzaSKSDR7PViZCT f0JfQHpV4dQBOHY3I7lIfdLDFNb3kAzfd4yyVlrJ9l5i8D4MH8ZgSDBXuEScG2Re7oLg N3UhEXTXq3bR71EgOi0MtsVEluqNkEwW4J69Pbk6bUoRf0Ql2fE2ccc9EKIJgCVaiOa5 +1hg== 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=UNHiD6rKMVAmpPSexUy5Ko3fUoJ0jxkVujeHgUBI+lYGjsNtgkbk1nEioyx6QhzWsE mKaWz31b7WEuN01WslIVKM32NRDRbqY3OEhjWkDoSmVaVQdPx9cMXPxw+AQwikWj/B9T w+P2+/bwOpR8+w3pe56obdwbC5dhIN9sLZRhe+l1nRpQvkWLRxljjhFDSAE7EYxX8Td3 c5lvuso3kO+typPWidXCHGqdhHVlpXSeXad8uIhp8oydnZaqhA+MAI59PFyHqvNcw562 TluVsPE+QVF+MR/AI9Pgne0uaYqAOlxEC4eZt7JQ3niIOoGrzR+tKAYtjndUSMF+WnQt tj3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ZnqOFr3t; 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 o67si2746807wme.106.2017.12.09.07.40.54; Sat, 09 Dec 2017 07:40:54 -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=ZnqOFr3t; 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 BD87068A504; Sat, 9 Dec 2017 17:39:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4418768A467 for ; Sat, 9 Dec 2017 17:39:09 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id t8so7548691wmc.3 for ; Sat, 09 Dec 2017 07:39:16 -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=ZnqOFr3t8HyAvTy1e4ANuOEdOyVkz63pW5O6Dp+vI/aYkHoIOogS60blIleu2jAE9K yMeF22DdK3C9984EMt3ki3pEuXbzIb+HEyaLg2bJTry3ROMjEKIkI4skcVFpE/ep1yJU p/vQcZeVTfYl7KPo/9NtNRAHDQpe2c57ENhYqxysKgSAzUEeI3lvwpITQejlY2Xxr3Hg 3+VaYNQW1dTVyuso8UASwDc6FCyEfV1LV5IMp4JplocE8gOyMG7aSQF0eGcry8HPu34F PLp4/N2ISyHuiAHtQsVAPXm0XY6aldAch05FCWuW3p5IF/qwIN6yYjlZ80OBhAbdK68D QkEw== 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=VV5QykQAP7UhMAQx/PV13LNbfFnZ4ySMjRAhtRtvuxs0+sVbtBxvHq2EYKZJRhcy9u p4fCbdzGRdIHg119yM4Yjh7B44P2pXuBQggEHGj7RXG41Ebu16hEBCYi7DnYxooNYRRM Hs4EQVgFu6OwenO7+clAbnwRUlVjXi8icy3f35eng2BeX71UJH9ytb9Sf/FEDOsUNj7D wzF8ot8SnjHAVVFpgFWbgw2mYRdkRTidCNqDdmJg4siZxR6NyvwDNsurB2j+I96ePHB+ 4sb8u0nINsgsj6hlh2tay5irDmRrLoAQYz28+AkUkyC3iJpCHxk4FlSHwBhcaS++2s1F NR9A== X-Gm-Message-State: AKGB3mLBJtgH5dLGUwxwDK6MVtObpolbo8bWFv62tt8N01Q9ci2wbpnr 82fDdKKdHJOSvJ4cPi7R7ATcYg== X-Received: by 10.28.249.1 with SMTP id x1mr6157420wmh.161.1512833955418; Sat, 09 Dec 2017 07:39:15 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id 52sm14654536wrv.8.2017.12.09.07.39.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Dec 2017 07:39:14 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Dec 2017 16:38:07 +0100 Message-Id: <20171209153819.19007-15-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171209153819.19007-1-onemda@gmail.com> References: <20171209153819.19007-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 15/27] 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