From patchwork Mon Apr 3 07:29:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Lhomme X-Patchwork-Id: 3260 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp3062129vss; Mon, 3 Apr 2017 00:38:03 -0700 (PDT) X-Received: by 10.28.165.145 with SMTP id o139mr8287009wme.13.1491205083486; Mon, 03 Apr 2017 00:38:03 -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 a37si18821463wrc.296.2017.04.03.00.38.02; Mon, 03 Apr 2017 00:38:03 -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 B02ED680D34; Mon, 3 Apr 2017 10:37:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 081E56809FC for ; Mon, 3 Apr 2017 10:37:52 +0300 (EEST) Received: by mail-wr0-f195.google.com with SMTP id p52so31010283wrc.2 for ; Mon, 03 Apr 2017 00:37:53 -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=Sttw4eUjaC5TyCeCVYCCGMM0Id9lcmYb6BrmtsDoxmQ=; b=GadAz14/aJqSXrkOCbWo2LFY/8wkTemhsSIOXn2Ncnv3B5hQCC3Up5Bk8NOOUwUn++ bghSHwCbDJvYPEUqpnIdfaT61w9R8YD3H/FWRwixwGTHzSaBe9aUBY1hdYT7fYjxIuzJ ZVYiYsacR3QFOG+vtRWDu5ZD+tlYsKvXA/UAbat42LMTeyxTBVAMM1A+U6bJ2QT7a1qi ZDtiaYUiXlZIrSmLRBiNGG2xOp9tKSs35q3pVPoBfNGk/WJjF84OQOtMkWLryycjEq94 YOKG9spq1oJmXO4DaaoOzxarHaky2A7neyht2GkH+KvA95Zb4v9Q4q+ZsTj5uGwVqxwi x15A== 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=Sttw4eUjaC5TyCeCVYCCGMM0Id9lcmYb6BrmtsDoxmQ=; b=FAdUXjHuuD1rg76NGjPm4pkMpbjRRJJugxnz+DpelEtHRKhL+8csdv7PQWTHnR7MEz NY2QiVZvcospGotBAU4dVYFkzKY+LhQC8jCtB9xY+0SFjcZWUQMnLeVyZjMhm2JfV5M+ 65eAlJMtT4Ets3uj7P1PZN23Msszwl2Y67TrSrsfU5M7c3ZyOMwRETvO+EuR8e5T/zm4 L4RD5uQcsZbtDlqjuUWPEFJLAyzutSJblzTYiItjWeC7/bZ+ov/0lfnYCNe3pyFvpxGw RyLE3lr0qq8gAqUx/TeGMQc01fv48TwRSfZ2lwGmXsmQ5W6cz9X1dl/3xgeXawpJ106V Fusw== X-Gm-Message-State: AFeK/H1xag4GKWOTPby4098hkTcqb3f/r9pHkpQ+AmSoR8y95ZNMdLHWcrRjo5cFiIA95g== X-Received: by 10.28.229.78 with SMTP id c75mr8796706wmh.20.1491204606210; Mon, 03 Apr 2017 00:30:06 -0700 (PDT) Received: from localhost.localdomain (2a01cb0c000ea90038820d29b685d41a.ipv6.abo.wanadoo.fr. [2a01:cb0c:e:a900:3882:d29:b685:d41a]) by smtp.gmail.com with ESMTPSA id m14sm2444916wrb.13.2017.04.03.00.30.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Apr 2017 00:30:05 -0700 (PDT) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Apr 2017 09:29:46 +0200 Message-Id: <20170403072947.10208-2-robux4@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170403072947.10208-1-robux4@gmail.com> References: <20170403072947.10208-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 77da9b36b8..f2a2dd990c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 90 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \