From patchwork Tue May 28 03:29:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 13310 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 D377C448923 for ; Tue, 28 May 2019 06:30:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C0D2E680133; Tue, 28 May 2019 06:30:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F6EC680023 for ; Tue, 28 May 2019 06:30:44 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id z3so5449939pgp.8 for ; Mon, 27 May 2019 20:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=loqMyuEwIg8He1AFv7gaL/0Ky0PDuWGBTjscTVb+lrU=; b=J3KbvR7iZKnhsJizMxgoh10ZH5WFG1h0uDrlvOpJOeIq98+een/lH8tJPHdeqACPpd uLmhxSs70bsYLcUR/oHSsw1hCT0D5PyAPpjQ8lkqUlF7ac9DMrQGMXKD57MuadivGQ7/ breNiYph09dHInBLUgtnp5cN4KRqdGQt1hawXfHMr2Y2/eZA51Jp9VgnxJppU4atrst2 UKSKaWtpdxmxfttGC0y4BSfplGAtmj1A5QR3SyskhMDdSZnxfaptwoF8XaFMkoviimYC Jy9PhOALGkjTObiiV1qeT2sLOwPLU+axe0Nxu/D+r+qTvEb5IqpYxdJlcTh3CulGRyKX LG4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=loqMyuEwIg8He1AFv7gaL/0Ky0PDuWGBTjscTVb+lrU=; b=AZsnmXTFprXNoV8V+a0i6LzYj4UYsOf/VIcIKVPeMNbWG6I5rlmoPsGpM/TNgvmTYi RH0I6io3b/QT6+delNSirpwOswkLMolJX7o5fRgvrO5xFhdj56HLtcSIGbvA8N1PXRMS hHn7+OAbkmwFimUBksKFLyQ7Y3TB5ISkjgfKJSMLrzO8+IMho8evz7IbmPcjQX0/xzmb fLmemjfBlzTNBIQN4wBQ1ohZW2shguXNA4OsKnltd6q/9zYck8A+qdCXWDYCM/Y5V7NT /rk0niGhQmaKR3H1fmpHx5EDXoQb+AseoLUFtXg5GSOZPHSB7q9yHfSjqUzzfW2zlqwL X6nw== X-Gm-Message-State: APjAAAUp3Z93LozDHq4zINVrk1oF8kTFdnak25QnLNZlS+grz1pzOSzK Rxjm8VGC0maPsFnqKOM/BX2PT/5TFZA= X-Google-Smtp-Source: APXvYqxEiBKf9L/P6shooTi5IP8ECfZR6+sfTRh+GUapUPSF6+T2iDLRtc6pe1OwdUaZSCbiYWmROA== X-Received: by 2002:a62:2e46:: with SMTP id u67mr141430862pfu.206.1559014242505; Mon, 27 May 2019 20:30:42 -0700 (PDT) Received: from localhost.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id v4sm14095774pff.45.2019.05.27.20.30.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 May 2019 20:30:42 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 May 2019 11:29:53 +0800 Message-Id: <20190528032953.3864-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190528032953.3864-1-lance.lmwang@gmail.com> References: <20190522065954.62328-2-lance.lmwang@gmail.com> <20190528032953.3864-1-lance.lmwang@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] avcodec/nvenc: add more sei support for SDR HLG 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 Cc: Limin Wang , jamrial@gmail.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang The testing command for the atc HLG output with nvenc: ./ffmpeg_g -y -i 4K.mp4 -c:v hevc_nvenc -g 7 -color_primaries bt2020 -colorspace bt2020_ncl -color_trc arib-std-b67 -sei hlg test.ts Signed-off-by: Limin Wang --- libavcodec/nvenc.c | 22 ++++++++++++++++++++++ libavcodec/nvenc.h | 1 + libavcodec/nvenc_hevc.c | 3 +++ 3 files changed, 26 insertions(+) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 30cf4df928..72a7b7f217 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1018,6 +1018,10 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx) vui->colourMatrix = avctx->colorspace; vui->colourPrimaries = avctx->color_primaries; vui->transferCharacteristics = avctx->color_trc; + if (ctx->sei & SEI_ALTER_TRANSFER_CHAR) { + if (IS_10BIT(ctx->data_pix_fmt)) + vui->transferCharacteristics = AVCOL_TRC_BT2020_10; + } vui->videoFullRangeFlag = (avctx->color_range == AVCOL_RANGE_JPEG || ctx->data_pix_fmt == AV_PIX_FMT_YUVJ420P || ctx->data_pix_fmt == AV_PIX_FMT_YUVJ422P || ctx->data_pix_fmt == AV_PIX_FMT_YUVJ444P); @@ -2224,6 +2228,24 @@ int ff_nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) } } + if (ctx->sei & SEI_ALTER_TRANSFER_CHAR) { + if (avctx->codec->id == AV_CODEC_ID_HEVC) { + size_t transfer_sei_size = 1; + + sei_data[sei_count].payloadSize = transfer_sei_size; + sei_data[sei_count].payloadType = HEVC_SEI_TYPE_ALTERNATIVE_TRANSFER_CHARACTERISTICS; + sei_data[sei_count].payload = av_malloc(transfer_sei_size); + if (sei_data[sei_count].payload) { + PutBitContext pb; + init_put_bits(&pb, sei_data[sei_count].payload, sei_data[sei_count].payloadSize); + put_bits(&pb, 8, AVCOL_TRC_ARIB_STD_B67); + flush_put_bits(&pb); + + sei_count ++; + } + } + } + nvenc_codec_specific_pic_params(avctx, &pic_params, sei_data, sei_count); } else { pic_params.encodePicFlags = NV_ENC_PIC_FLAG_EOS; diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index 583c48d090..8be0d341ea 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -55,6 +55,7 @@ typedef void ID3D11Device; #endif enum { + SEI_ALTER_TRANSFER_CHAR = 0x04, SEI_MASTERING_DISPLAY = 0x08, SEI_CONTENT_LIGHT_LEVEL = 0x10, }; diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index 74ebd03d8e..23ba593439 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -134,6 +134,9 @@ static const AVOption options[] = { { "hdr10","Include HDR metadata for mastering display colour volume and content light level information", 0, AV_OPT_TYPE_CONST, { .i64 = SEI_MASTERING_DISPLAY | SEI_CONTENT_LIGHT_LEVEL }, 0, 0, VE, "sei" }, + { "hlg","Include HLG metadata for alternative transfer characteristics", + 0, AV_OPT_TYPE_CONST, { .i64 = SEI_ALTER_TRANSFER_CHAR }, + 0, 0, VE, "sei" }, { "master_display", "SMPTE ST 2086 master display color volume info SEI (HDR), the string format is: \"G(x,y)B(x,y)R(x,y)WP(x,y)L(max,min)\"", OFFSET(master_display), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, VE }, { "max_cll", "content light level info, the string format is: \"cll, fall\"",