From patchwork Sun Apr 2 08:08:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Lhomme X-Patchwork-Id: 3241 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp2727889vss; Sun, 2 Apr 2017 01:15:19 -0700 (PDT) X-Received: by 10.28.113.204 with SMTP id d73mr5148638wmi.15.1491120918963; Sun, 02 Apr 2017 01:15:18 -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 u10si10484030wma.76.2017.04.02.01.15.18; Sun, 02 Apr 2017 01:15:18 -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 07B3F68828B; Sun, 2 Apr 2017 11:15:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0171168826C for ; Sun, 2 Apr 2017 11:15:08 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id o81so5789259wmb.0 for ; Sun, 02 Apr 2017 01:15:09 -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=1QOJQPI6oO5PLI0qJQJeXeFolI/a30gh2aC0pXXpiAI=; b=Syj0pgqtCkZ5Oynd+WNqPUhi9jFhCZGJ04Dmo5qWhf0AUG+TWUxzM5JPRGeavaiEci /Nklyo1lbOS6kJLXB/J/a/Gt10G/FOcxewAwGDFiVzbmIzHesiPu06Ma+oxgoZN6h67l ITCx5rnEdSBXclqRZFIhx7fQ46MP9HE6uYQhPGhcibpj0OvN8+6LqpiKmdfsf+iq987o Kr6k3jpIvhIzEyt6ZY5XHefg0PltHVQZgkbN1Is7oWlc1dsgo2qum9uK4dWXYlmqUsWR uDgHGztxhh35zWGC8Qv9Atch2gSCvFUoNj7VPSqpanIJInEA7WExIcNCXwF9u1+B4/Nt EFGA== 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=1QOJQPI6oO5PLI0qJQJeXeFolI/a30gh2aC0pXXpiAI=; b=ZLvIlGBELRbKN4psk93IvIIYD3myCaoQgJGdcNhBp6EIfkVUipKAbkbLtF6J13uwwy PDZP9kKaZk5l24oOfBcJr46x9GNDZ1wbAsx0lkfmmp5taDiNQD2nU6MMg4unw/QiMstL REKAkQkX+BCxSTJ/dKD4fzTPAOLLi9MGgqxtUuLeLrInzYyHQg1sS4iYv9qIN9kZeDLD QZxiAOhssmlk+EyWIHy7Fe+al4xvXWIsrPiBh9W7whR5rlX/vQp9gQZoixLMQMeuorkA glIOlgjJt5HxDkSabfvBJrf0sWmnz3F6BDZ9566a7BzpeVHLIoYY36tEzyVg0Ba52QvZ Qg2w== X-Gm-Message-State: AFeK/H3KoeAEo0YupD9AJllNwHRuHDI13N2AfD82scFwF/7hMPK9T1WCQSr1aby0MC/XAA== X-Received: by 10.28.69.68 with SMTP id s65mr5055019wma.13.1491120518186; Sun, 02 Apr 2017 01:08:38 -0700 (PDT) Received: from localhost.localdomain (2a01cb0c000ea900b139156697821910.ipv6.abo.wanadoo.fr. [2a01:cb0c:e:a900:b139:1566:9782:1910]) by smtp.gmail.com with ESMTPSA id u63sm9383015wmu.22.2017.04.02.01.08.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 02 Apr 2017 01:08:37 -0700 (PDT) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Apr 2017 10:08:24 +0200 Message-Id: <20170402080825.2168-2-robux4@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170402080825.2168-1-robux4@gmail.com> References: <20170402080825.2168-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. --- update the previous patch: - rename CEA 861.3 to CTA-861.3 - update with MaxCLL/MaxFALL changes in avutil update the previous patch: - rebased and updated version bump --- libavcodec/avcodec.h | 7 +++++++ libavcodec/avpacket.c | 1 + libavcodec/hevc_sei.c | 15 +++++++++++++++ libavcodec/hevcdec.c | 18 ++++++++++++++++++ libavcodec/hevcdec.h | 5 +++++ libavcodec/utils.c | 1 + libavcodec/version.h | 2 +- 7 files changed, 48 insertions(+), 1 deletion(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index d7804773cb..92549e1ed9 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 CTA-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 e633245a62..4bf830bb8a 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..61426979ae 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2644,6 +2644,24 @@ 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->MaxCLL = s->max_content_light_level; + metadata->MaxFALL = s->max_pic_average_light_level; + + av_log(s->avctx, AV_LOG_DEBUG, "Content Light Level Metadata:\n"); + av_log(s->avctx, AV_LOG_DEBUG, "MaxCLL=%d, MaxFALL=%d\n", + metadata->MaxCLL, metadata->MaxFALL); + } 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 27b0d48af2..00fa1475ed 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 88 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \