From patchwork Thu Mar 30 14:31:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Lhomme X-Patchwork-Id: 3193 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp1587847vss; Thu, 30 Mar 2017 07:37:44 -0700 (PDT) X-Received: by 10.28.64.84 with SMTP id n81mr744557wma.47.1490884663962; Thu, 30 Mar 2017 07:37:43 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l18si3751188wra.287.2017.03.30.07.37.42; Thu, 30 Mar 2017 07:37:43 -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 448C4689A14; Thu, 30 Mar 2017 17:37:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1B2A6898CD for ; Thu, 30 Mar 2017 17:37:33 +0300 (EEST) Received: by mail-wr0-f194.google.com with SMTP id p52so12782853wrc.2 for ; Thu, 30 Mar 2017 07:37:33 -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=MaYpwiDDn3z4rG9bK6Huabd9ck5xCV2BoAh5OOrJS2c=; b=ATm1H2UBIHzKJbWMqeSzXGBWo+6MJfFJtzuGSCxojOt3q0VKesoYf2JY91WdE8o98J do2WLLnkPUad9eqhSsIHo9+fZkCI2aqcxzcJsR48tVXZupIDdyUckg5YKxs+io8hE8D8 y1NMxekox2zwcmBY8YzZYt+GYnpkLHZBX3f1rKsRx42VcOA2Mlrnaz8qXUlth/5ElLJb Je8M4rJqzZZX/FF3EAm9ub6vWbMQCroJKZ6KgqMpuMIHZOaHo4MFi+SD9DTNNtJJr2xu ibDT3Z5+Af1JwKz9ESt9ZRX8GMBH3ycR9d1ZsVBGuBEPoZVF3i27m5rTg5zCe5IpQV3z rNrA== 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=MaYpwiDDn3z4rG9bK6Huabd9ck5xCV2BoAh5OOrJS2c=; b=ZFWgt6ykdBuAw8BTjpPquT1cp2u3nQJvOkOnEHioY9fv7boL2pJbHuPrQSoj4mlyX/ SQ14gbiGT+qBUeOsUvV3V3hwKx9PVAjFd9A8SDOztd2kxTrtZzf+tEIpFxL/X2DBTdCY nh4oGcA8+CYmR9+X7pUPYbqkbiKYP5dzcyzp1GGBwd8Yu0ibhMWQO06EjVAL4zOBZlX2 Hw6odAVCuIq0VJJSQ2C12f2lkZhY/cTdCyugCVxJ5WBFUtMpArVqKzB49jr0uVlG3FFZ qHAF5+jCQCNxH4Ba12u8ooXiAuON4BpNnTPoOcsVa3kBnR7mwF2+OyTmKSM0oDDQzXO1 P5iQ== X-Gm-Message-State: AFeK/H3kXHZWz3e/OnWxJDCJofB67KA8KJz5QmuFhLBr+S2jQzpAKw0snBc9DVsNmxro1w== X-Received: by 10.223.157.11 with SMTP id k11mr60556wre.28.1490884327541; Thu, 30 Mar 2017 07:32:07 -0700 (PDT) Received: from localhost.localdomain (2a01cb0c000ea900c43cbe05db2bd7f2.ipv6.abo.wanadoo.fr. [2a01:cb0c:e:a900:c43c:be05:db2b:d7f2]) by smtp.gmail.com with ESMTPSA id 81sm3481967wmj.9.2017.03.30.07.32.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Mar 2017 07:32:06 -0700 (PDT) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Mar 2017 16:31:48 +0200 Message-Id: <20170330143149.3792-2-robux4@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170330143149.3792-1-robux4@gmail.com> References: <20170330143149.3792-1-robux4@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] lavc: Add Content Light Level side metadata found in HEVC 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" These data are necessary when transmitting HDR over HDMI. --- libavcodec/avcodec.h | 7 +++++++ libavcodec/avpacket.c | 1 + libavcodec/hevc_sei.c | 15 +++++++++++++++ libavcodec/hevcdec.c | 22 ++++++++++++++++++++++ libavcodec/hevcdec.h | 5 +++++ libavcodec/utils.c | 1 + libavcodec/version.h | 2 +- 7 files changed, 52 insertions(+), 1 deletion(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 60f7acefbd..af08f7338a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1583,6 +1583,13 @@ enum AVPacketSideDataType { * to the AVSphericalMapping structure. */ AV_PKT_DATA_SPHERICAL, + + /** + * Content light level (based on CEA 861.3). This metadata should be + * associated with a video stream and containts data in the form of the + * AVContentLightMetadata struct. + */ + AV_PKT_DATA_CONTENT_LIGHT_LEVEL, }; #define AV_PKT_DATA_QUALITY_FACTOR AV_PKT_DATA_QUALITY_STATS //DEPRECATED diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 8420d8b258..2c28a26a9a 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -374,6 +374,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type) case AV_PKT_DATA_METADATA_UPDATE: return "Metadata Update"; case AV_PKT_DATA_MPEGTS_STREAM_ID: return "MPEGTS Stream ID"; case AV_PKT_DATA_MASTERING_DISPLAY_METADATA: return "Mastering display metadata"; + case AV_PKT_DATA_CONTENT_LIGHT_LEVEL: return "Content light level metadata"; case AV_PKT_DATA_SPHERICAL: return "Spherical Mapping"; } return NULL; diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index 8fc026cf1e..bb299d5a9f 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -102,6 +102,19 @@ static int decode_nal_sei_mastering_display_info(HEVCContext *s) return 0; } +static int decode_nal_sei_content_light_info(HEVCContext *s) +{ + GetBitContext *gb = &s->HEVClc->gb; + // Max and average light levels + s->max_content_light_level = get_bits_long(gb, 16); + s->max_pic_average_light_level = get_bits_long(gb, 16); + // As this SEI message comes before the first frame that references it, + // initialize the flag to 2 and decrement on IRAP access unit so it + // persists for the coded video sequence (e.g., between two IRAPs) + s-> sei_content_light_present = 2; + return 0; +} + static int decode_nal_sei_frame_packing_arrangement(HEVCContext *s) { GetBitContext *gb = &s->HEVClc->gb; @@ -304,6 +317,8 @@ static int decode_nal_sei_prefix(HEVCContext *s, int type, int size) } case SEI_TYPE_MASTERING_DISPLAY_INFO: return decode_nal_sei_mastering_display_info(s); + case SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO: + return decode_nal_sei_content_light_info(s); case SEI_TYPE_ACTIVE_PARAMETER_SETS: active_parameter_sets(s); av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", type); diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index ef21595c44..4ff269e58f 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2644,6 +2644,28 @@ static int set_side_data(HEVCContext *s) "min_luminance=%f, max_luminance=%f\n", av_q2d(metadata->min_luminance), av_q2d(metadata->max_luminance)); } + // Decrement the mastering display flag when IRAP frame has no_rasl_output_flag=1 + // so the side data persists for the entire coded video sequence. + if (s->sei_content_light_present > 0 && + IS_IRAP(s) && s->no_rasl_output_flag) { + s->sei_content_light_present--; + } + if (s->sei_content_light_present) { + AVContentLightMetadata *metadata = + av_content_light_metadata_create_side_data(out); + if (!metadata) + return AVERROR(ENOMEM); + metadata->max_content_light_level.num = s->max_content_light_level; + metadata->max_pic_avg_light_level.den = 1; + metadata->max_pic_avg_light_level.num = s->max_pic_average_light_level; + metadata->max_pic_avg_light_level.den = 1; + + av_log(s->avctx, AV_LOG_DEBUG, "Content Light Level Metadata:\n"); + av_log(s->avctx, AV_LOG_DEBUG, + "max_content_light_level=%f, max_pic_avg_light_level=%f\n", + av_q2d(metadata->max_content_light_level), + av_q2d(metadata->max_pic_avg_light_level)); + } if (s->a53_caption) { AVFrameSideData* sd = av_frame_new_side_data(out, diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index 0c7881286c..e5879a5c2b 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -596,6 +596,11 @@ typedef struct HEVCContext { uint32_t max_mastering_luminance; uint32_t min_mastering_luminance; + /* content light level */ + int sei_content_light_present; + uint16_t max_content_light_level; + uint16_t max_pic_average_light_level; + } HEVCContext; int ff_hevc_decode_nal_sei(HEVCContext *s); diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 3e8677d0f4..8a47a32663 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -771,6 +771,7 @@ int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) { AV_PKT_DATA_STEREO3D, AV_FRAME_DATA_STEREO3D }, { AV_PKT_DATA_AUDIO_SERVICE_TYPE, AV_FRAME_DATA_AUDIO_SERVICE_TYPE }, { AV_PKT_DATA_MASTERING_DISPLAY_METADATA, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA }, + { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL }, }; if (pkt) { diff --git a/libavcodec/version.h b/libavcodec/version.h index 8dea5cb97b..5dbbc703ab 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 86 -#define LIBAVCODEC_VERSION_MICRO 103 +#define LIBAVCODEC_VERSION_MICRO 104 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \