From patchwork Tue Jun 13 18:50:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vittorio Giovara X-Patchwork-Id: 3967 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp489682vsw; Tue, 13 Jun 2017 11:56:34 -0700 (PDT) X-Received: by 10.223.165.76 with SMTP id j12mr4106780wrb.147.1497380194694; Tue, 13 Jun 2017 11:56:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497380194; cv=none; d=google.com; s=arc-20160816; b=bHkKPi6YJxD1wWvzbAvR0OWuD7RtrzDB1xc21kG1bTxMkVnXLIJYtTV6nHuIUTunKk qd4+HYV3XJLHCeWCpABW32kV1783Z3/Y4S/0w3DmRRGHQwGG8P6EU9vIEDuFiNKJZ2fx Y4aGhEERRnY27bJ99Wg2X361rvVLBMLyUWnG/EIkGR0AtZnF3nEAH5KukVqBuELZ/jd0 w3eR0l9gVN9781IpwC1uVilKczIfrSyrioKeOA4x3xci9AB+EM1EqH6lJKwc/F1llpOf EwfrujvNy/nt7CyKgZXZXHslPwRJbMSUkqU+3BYwUCaglgzahtcsvc1ElgPQkWBtNUMD gfbA== 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=cPA5pS70mWwU75KGCR5NOIMeXMVtSroargyqcudweUQ=; b=saVtvsYXIJr+zbNEsXsf+RNpuDxPZnHtn1mJ9SUI0po2VB+SeqoqdNJOVSUyk+1Jfb Shdx8ccSAiKO3W7RUhqQkSxtP6XAaaITUfaFesfu1v5GlFZ0PB+/J+FLrAfuUqbb1uos 90WDgrTGPHr/gmNdJfBy5aK8079Z+Twde6v+CEPDEcOZh4N9nnzreQwDtu7AyfIO3QP6 iUEgy6zxU6K8TJfw2hgPbIJllVg9iwDd1qehYsEvaQB2cNafcy29zzAYKU2XY9+JVdZD PqnhZajPu7LyLX+x+nhyY6lQ5ZJxUsY088gBHQldxa2yszT7w+4ig+UYZ5OuF6IBH8Ss INhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; 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 c62si878595wmc.161.2017.06.13.11.56.33; Tue, 13 Jun 2017 11:56:34 -0700 (PDT) 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; 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 728CB68A1BF; Tue, 13 Jun 2017 21:56:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6569868A180 for ; Tue, 13 Jun 2017 21:56:22 +0300 (EEST) Received: by mail-qt0-f195.google.com with SMTP id s33so36972113qtg.3 for ; Tue, 13 Jun 2017 11:56:24 -0700 (PDT) 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=afXmV2smIgvxdtpwZo7NOBRSE0xgmLtv40EFQa+oZZE=; b=bEnwDxJ/HvwkwJtAWr4nenfWXMxGSLjwD4thv1/lZ+Sc7EUGXmMm3sxlbB0gFwN4p8 dDeETtnw8VAV/1VYEFCmEzAB8aWkW1Kq073NEn/BHwPccHLgSXMMxXM2qObwPWsuca6a KfhwO9zLhI6eMRO2uyyk5DRv9WvvwG0l9l1gnOe57wFHIRcY24clB5ZhXaXAvjDNN5hV K7lt2SBxYeYYa2gjFJI73SSYgXPmfQgXOmSTejlQbf+NipccgkMj8VcLN9fx81eE3d7+ iml9x0AmCioCLSRz43pflvI0MImV8kWV/gD4LnI/cAH77YkcSbOvQZ23i0lxBoVtuchk FU4g== 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=afXmV2smIgvxdtpwZo7NOBRSE0xgmLtv40EFQa+oZZE=; b=YNxEAk0YqdtqP/0wdHM4+aNn297iyRN866LVpwJKzyh+3DMdLI23HL8Mc1I9/UIw+I 9kbFK/6yOvJ3p80j8r6/VF3vfJ0vVVM3a7qKvf3naVXrgURGW+r2Vliz8BUO3vK8UgPz VEfjplujCcZ/mNucdpMeqRikFnCpzYl/3iErEfPMnaTI0YNIuioQAXNvZym+DnAw8cfc daw3c2aeSzwOqEgpwKEbqeXyyFiKVHli7+m0QmujyFfAPTxQIUc4iMAPtiAyAJyBdLhv My38FR67vXRozxe/2IBh1zArL8WYDl65cYbfwT8xKvc+eeouvowmmbXMXTL0qDT4ttOb Ifdg== X-Gm-Message-State: AKS2vOyS8Qtaa1qJxxwrq4bgzbam2UOtTUxCyg7y5qm/or7XCEEuDVVA szu4oHvDYYNEiG7u X-Received: by 10.55.189.66 with SMTP id n63mr1580236qkf.89.1497379853896; Tue, 13 Jun 2017 11:50:53 -0700 (PDT) Received: from vimacbookpro.vimeows.com ([8.40.92.161]) by smtp.gmail.com with ESMTPSA id r1sm5207987qkh.43.2017.06.13.11.50.52 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 13 Jun 2017 11:50:52 -0700 (PDT) From: Vittorio Giovara To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Jun 2017 14:50:51 -0400 Message-Id: <20170613185051.31297-1-vittorio.giovara@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH] hevc: Add support for alternative transfer characterics SEI 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" The use of this SEI is for backward compatibility in HLG HDR systems: older devices that cannot interpret the "arib-std-b67" transfer will get the compatible transfer (usually bt709 or bt2020) from the VUI, while newer devices that can interpret HDR will read the SEI and use its value instead. Signed-off-by: Vittorio Giovara --- libavcodec/hevc_sei.c | 9 +++++++++ libavcodec/hevc_sei.h | 7 +++++++ libavcodec/hevcdec.c | 6 ++++++ 3 files changed, 22 insertions(+) diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index f0ad84f2f4..cd55d50212 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -265,6 +265,13 @@ static int decode_nal_sei_active_parameter_sets(HEVCSEIContext *s, GetBitContext return 0; } +static int decode_nal_sei_alternative_transfer(HEVCSEIAlternativeTransfer *s, GetBitContext *gb) +{ + s->present = 1; + s->preferred_transfer_characteristics = get_bits(gb, 8); + return 0; +} + static int decode_nal_sei_prefix(GetBitContext *gb, HEVCSEIContext *s, const HEVCParamSets *ps, int type, int size, void *logctx) { @@ -285,6 +292,8 @@ static int decode_nal_sei_prefix(GetBitContext *gb, HEVCSEIContext *s, const HEV return decode_nal_sei_active_parameter_sets(s, gb, logctx); case HEVC_SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35: return decode_nal_sei_user_data_registered_itu_t_t35(s, gb, size); + case HEVC_SEI_TYPE_ALTERNATIVE_TRANSFER_CHARACTERISTICS: + return decode_nal_sei_alternative_transfer(&s->alternative_transfer, gb); default: av_log(logctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", type); skip_bits_long(gb, 8 * size); diff --git a/libavcodec/hevc_sei.h b/libavcodec/hevc_sei.h index 5645e4f5de..1b522227ec 100644 --- a/libavcodec/hevc_sei.h +++ b/libavcodec/hevc_sei.h @@ -56,6 +56,7 @@ typedef enum { HEVC_SEI_TYPE_REGION_REFRESH_INFO = 134, HEVC_SEI_TYPE_MASTERING_DISPLAY_INFO = 137, HEVC_SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO = 144, + HEVC_SEI_TYPE_ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147, } HEVC_SEI_Type; typedef struct HEVCSEIPictureHash { @@ -100,6 +101,11 @@ typedef struct HEVCSEIContentLight { uint16_t max_pic_average_light_level; } HEVCSEIContentLight; +typedef struct HEVCSEIAlternativeTransfer { + int present; + int preferred_transfer_characteristics; +} HEVCSEIAlternativeTransfer; + typedef struct HEVCSEIContext { HEVCSEIPictureHash picture_hash; HEVCSEIFramePacking frame_packing; @@ -109,6 +115,7 @@ typedef struct HEVCSEIContext { HEVCSEIMasteringDisplay mastering_display; HEVCSEIContentLight content_light; int active_seq_parameter_set_id; + HEVCSEIAlternativeTransfer alternative_transfer; } HEVCSEIContext; struct HEVCParamSets; diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 23a89345a8..167ce550f7 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2684,6 +2684,12 @@ static int set_side_data(HEVCContext *s) s->avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; } + if (s->sei.alternative_transfer.present && + av_color_transfer_name(s->sei.alternative_transfer.preferred_transfer_characteristics) && + s->sei.alternative_transfer.preferred_transfer_characteristics != AVCOL_TRC_UNSPECIFIED) { + s->avctx->color_trc = s->sei.alternative_transfer.preferred_transfer_characteristics; + } + return 0; }