From patchwork Fri May 24 15:23:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 13278 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 8F39B44999F for ; Fri, 24 May 2019 18:30:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73E0668A3D5; Fri, 24 May 2019 18:30:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CE40680AE5 for ; Fri, 24 May 2019 18:29:54 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id 15so9630632wmg.5 for ; Fri, 24 May 2019 08:29:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Jh6UidyYBCT8elLRyDXRCUQKDwrcYUr6vfXMgNmMxxE=; b=M2VJYxJJDMYV75aSPJ0348svucQVRgUsxlxPSR7z4iXoUEIldt074E+e1KsrenLexY omzUnnxrOixzbHCOkVnqxpww+lDhhVbyNakohpQRZXDgnSDl3IF5OWkX2I89ps29CEGK U7/mUIey8WmECXMKbhzoRsFLgDTXfr/RmLBIsfV5o/oR9p9DVVLSrp+b41Zwo/fZagKH cV9SoOzWg6fhT8yiLVCFplbNUGfwdmXrIXUFRIHA/Y83JQPrY418AQbVpTPz97irB6hf NGgZBYcXRDvMh+Snbg6keBfl3gNjWGACXX8oBenlR2VIlvAjB6bHo5fWmmpi28BRtGtN yvfA== 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:mime-version :content-transfer-encoding; bh=Jh6UidyYBCT8elLRyDXRCUQKDwrcYUr6vfXMgNmMxxE=; b=C3JzbR/9Ahid+z0I4gMP8dqc+1OQQ7ODO2QglBX7LRqeM32CjpCOcX6d6hiEDxNi/5 3D5P1UOtIWKU8ojMOWlmXLJUFbHWV4vyZZAPaePyg+ZbHQXLPwU1s8NWRFJ01BaEMgR/ Be+eVdztE39sHncfz6utbQ4C1jr2GVCKVtph8sr5fTtlDVmRx/KLS2Gge4yl9/kS4PJt 8+2UvCdsFfOEvXpvu1MwDlpskhzHcGk7S1aEcKO3WOeRaMEWYzu2oGrQPKRawL3WUqqu boC05ET9UmZSuBdb2olG21lhxmGmHsxlwCgvQW+asn37tIT/ZUATaDxJkK7Fec1JIxjW rIhQ== X-Gm-Message-State: APjAAAV9Y/VBAehO/bEeoPKSMuEbBWQonjRGjFtm9KBPlvwaYexrrzAm KkCikBEGV+kUJrvVTORH4uq8pt62 X-Google-Smtp-Source: APXvYqzeIbkSO1CKAV8agT1csMT2KBqaT/ZjmMi+Ih59Lc6oScCJfzRvYXBgXpaZLRnEvcEGPSF0dQ== X-Received: by 2002:a7b:c301:: with SMTP id k1mr1128383wmj.43.1558711442114; Fri, 24 May 2019 08:24:02 -0700 (PDT) Received: from localhost.localdomain ([82.129.87.116]) by smtp.gmail.com with ESMTPSA id x68sm3915227wmf.13.2019.05.24.08.24.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 May 2019 08:24:01 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 May 2019 16:23:54 +0100 Message-Id: <20190524152354.41425-1-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libx265: Support full range videos 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Derek Buitenhuis --- libavcodec/libx265.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 07bca81aef..f56def53d5 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -133,6 +133,14 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } + + ctx->params->vui.bEnableVideoSignalTypePresentFlag = 1; + + ctx->params->vui.bEnableVideoFullRangeFlag = 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; + if ((avctx->color_primaries <= AVCOL_PRI_SMPTE432 && avctx->color_primaries != AVCOL_PRI_UNSPECIFIED) || (avctx->color_trc <= AVCOL_TRC_ARIB_STD_B67 && @@ -140,7 +148,6 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) (avctx->colorspace <= AVCOL_SPC_ICTCP && avctx->colorspace != AVCOL_SPC_UNSPECIFIED)) { - ctx->params->vui.bEnableVideoSignalTypePresentFlag = 1; ctx->params->vui.bEnableColorDescriptionPresentFlag = 1; // x265 validates the parameters internally @@ -454,8 +461,11 @@ FF_ENABLE_DEPRECATION_WARNINGS static const enum AVPixelFormat x265_csp_eight[] = { 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_GBRP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE @@ -463,8 +473,11 @@ static const enum AVPixelFormat x265_csp_eight[] = { static const enum AVPixelFormat x265_csp_ten[] = { 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_GBRP, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, @@ -477,8 +490,11 @@ static const enum AVPixelFormat x265_csp_ten[] = { static const enum AVPixelFormat x265_csp_twelve[] = { 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_GBRP, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10,