From patchwork Mon Dec 18 12:19:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 6856 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp206863jad; Mon, 18 Dec 2017 04:27:28 -0800 (PST) X-Google-Smtp-Source: ACJfBotnF6GgydphCwkToasy5NI4NPoHFNQfDBfv8F1EqxPbY61JrshPWWCFz3D+gYazlWvM3kfJ X-Received: by 10.223.131.129 with SMTP id 1mr17898825wre.205.1513600048486; Mon, 18 Dec 2017 04:27:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513600048; cv=none; d=google.com; s=arc-20160816; b=U2ehDAbrSc5j1Zgs7a+zwzKsaa9BMSr6L/U8CFNaXouDAT8DbW3GmGtui7aLUXiuFi JJXHH5BSATyzSWEGMIq9MJlKZncKU20dgv7Gnkt/PiDU9Ne83Rej0dTs0bQ01PEIjO/H zTlO34FzQIFOOo8KXMw309I357TZonuuizg7fPATgAWs+GhfKaK6LOlOC860/i3cnx+k ocWZTMSRhyrNkVvxFqkUR34FDFI2p9xIitaPcKP8BX/Ahx/qSqgXsc1zhHZ1cL/Yfp6i orO/ikJhyOGzVDjJKSgykn/KqmoCH5fFoe8Da1plciQJrNo7gNUMJZkJs+bqmRHQMHa1 KHvQ== 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=9/Wo+fPWpguC88/jjUa81fhADhzS2hEAaEofY5R28x8=; b=fKJeP5SmS3xfVJ9t2UIJ7qmrkgJ1rQzwM2rBe/ckxQDrdt1D4ywGbTYLGR5sq/Dcob m26RtN08GbUEOItJkzjoU/6Tqy2spLsLgm8hR6TtarjsmcbCv4LtB4/zuUm6H55vdP3Z ma9RdBijseQ5pb1zpvMSuBnoA+zOtbCOWmXf8ZBEiSWbr1Ttel4ZrLomcaTtxoETJ2Zs /KMdM69JmpMaP8SZS3rfvHTg3jGxUXDBC8BxsNPeo75Ds+tPOt5zN3zxLbS2CIALqjwl EYSgTMf6/OKiJwD5ZkGXuSLJKXC7aS0ThL4UfqNQ4zI3yy9ezP/k268mkfmhv4PSYeaa l1GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nzfnmdUK; 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 f9si9061515wrc.486.2017.12.18.04.27.26; Mon, 18 Dec 2017 04:27:28 -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=nzfnmdUK; 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 C0925689D23; Mon, 18 Dec 2017 14:27:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f193.google.com (mail-io0-f193.google.com [209.85.223.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB20F6805FD for ; Mon, 18 Dec 2017 14:27:07 +0200 (EET) Received: by mail-io0-f193.google.com with SMTP id 14so3116269iou.2 for ; Mon, 18 Dec 2017 04:27:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=I7cWeGCfb1bMkeCsR/6JOR7w15StiYUt37J64P5+WjE=; b=nzfnmdUKt97NiwbpdjIXVRwm/wsG5Hj981nDc9cBGWHzsM62+cKQkbW/4SbanLZHt0 4sSumVJwwdhnvFOBOGhfVbxKHOfNtOG6HlUJKNIpQUlIPv+M0WB4I8zVB5mbgdZd6xxZ qYlRvG0rScdMGzUMLpRkj3Cg6JiJRCp0tbdi8P08Rht5BnuzLaZS55UGbP3KCJcok3wG DZyWnQw5LSEESJp+woDrGw6TWWdXUxyzq9MtudzmIxxBGTvBeI/UqVRitarmXf5F1kE6 kqVzWw3S4DzL/svEi4w1Dp2FZbq0tKFN1RmGRWW0w9RU5ICwCzaT0++knUkD0wW9yB+W GHYA== 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=I7cWeGCfb1bMkeCsR/6JOR7w15StiYUt37J64P5+WjE=; b=RYWw2p3qEDTyhnN/jaT48DODt9ZhMAA4AdZ37b9uVMlrD52hU9wOdP7NF3CWBT04Mz GwM3iskyx6PGyA+02SAXvqy2e4YI/PGPlHujI+EO9/avq9p1kUu+n1MKWX7oi2a8+dQ0 WplTBdxhu0O5dCNHaHbRCU5Loi3Jfpt2xiznXdyxJN0D1yHX94ngI81YVMu+EpLIgzZz DyFm5JOngJN/Cc3zkmtVz1Ol7qCN5LyaywGSaOcT9KKh66T19Cd0lmTTafAOc6rpMOWl fFPXqreNaOswMu9kcsekiHV98KV4VrJYSS7oTMV4yFFYi+ki7aFgcVJ9kOQyaBybE3nV h0ww== X-Gm-Message-State: AKGB3mLl4N/5lVxJPFcsrmVVkaxiidfXuxnjxVzJlW1mTj60CF8eJcxc 9hd0n8Bu0IKc5WhyOWzcfVtLSr79 X-Received: by 10.107.81.2 with SMTP id f2mr20559266iob.282.1513599551099; Mon, 18 Dec 2017 04:19:11 -0800 (PST) Received: from Rodgers-MacBook-Pro.local.net (c-73-75-100-12.hsd1.il.comcast.net. [73.75.100.12]) by smtp.gmail.com with ESMTPSA id r67sm751006iod.58.2017.12.18.04.19.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Dec 2017 04:19:09 -0800 (PST) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Dec 2017 06:19:01 -0600 Message-Id: <20171218121901.40820-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.15.1 Subject: [FFmpeg-devel] [PATCH] lavc/libx265: support all color parameters that x265 does 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" --- libavcodec/libx265.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 25ccb02fcb..14710f8de0 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -115,11 +115,11 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) ctx->params->sourceHeight = avctx->height; ctx->params->bEnablePsnr = !!(avctx->flags & AV_CODEC_FLAG_PSNR); - if ((avctx->color_primaries <= AVCOL_PRI_BT2020 && + if ((avctx->color_primaries <= AVCOL_PRI_SMPTE432 && avctx->color_primaries != AVCOL_PRI_UNSPECIFIED) || - (avctx->color_trc <= AVCOL_TRC_BT2020_12 && + (avctx->color_trc <= AVCOL_TRC_ARIB_STD_B67 && avctx->color_trc != AVCOL_TRC_UNSPECIFIED) || - (avctx->colorspace <= AVCOL_SPC_BT2020_CL && + (avctx->colorspace <= AVCOL_SPC_ICTCP && avctx->colorspace != AVCOL_SPC_UNSPECIFIED)) { ctx->params->vui.bEnableVideoSignalTypePresentFlag = 1;