From patchwork Fri Mar 31 08:00:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Lhomme X-Patchwork-Id: 3215 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp1924812vss; Fri, 31 Mar 2017 01:00:52 -0700 (PDT) X-Received: by 10.223.151.69 with SMTP id r63mr1567314wrb.6.1490947252818; Fri, 31 Mar 2017 01:00:52 -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 a1si5013735wra.276.2017.03.31.01.00.52; Fri, 31 Mar 2017 01:00:52 -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 19927689A0C; Fri, 31 Mar 2017 11:00:44 +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 BD4BC6899CE for ; Fri, 31 Mar 2017 11:00:35 +0300 (EEST) Received: by mail-wr0-f195.google.com with SMTP id k6so17005489wre.3 for ; Fri, 31 Mar 2017 01:00:36 -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=2lRzAEXQQltqVvNzguL67h45ch1GjCyIKD/xFmghTok=; b=Xwuad5/OC0zxmqzSKEF9x4hyK6pujHr+DQEqsj6feOqwZIvYRVyA4SmRao5MCxJ0tr G2GJIA6QKN9wGOKSxT03c3RF6Mowz3soVCjnrH5BHkmzfDV4GMtVe99OkgGIEAz3zZQR oFiIV5tAKvZsM2Nu0Qz9uVypUbIOvk+XWQSF1HHhTMvD+DZ+KY8fi/u0pIaOY0W9IJ4M URFKfN9Tia71Uqe//KyKVmA3EPDb3qp59G8NSJKIB1hLdo/HZ+BTUvy1oqmyGvwybxc6 iBk8mxUGAcwtoUclavoT7MBLQRFK8S0bxDosrkesgP1C6rjlKfZWNFEWSgzeU3DQMwJr UmOw== 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=2lRzAEXQQltqVvNzguL67h45ch1GjCyIKD/xFmghTok=; b=IJ+XnkFQi352UJZDHTxoL+6bXVTmTHJpcYdYjmLWNmHUSQqjFM+lKjBSFQ/zgemh93 fRPrwW+5/YAZq5U/+wGSB66hbSwASCmL0juQZu5HvHHC1H8n89bMSE9KbYf7cmx4ewBX 9H7s4QlIPZxH/TNHLWdBHGuUdeRjj5rpnVpWpH+AgRKR7IzT5106V5g27RwACx8MW7ie 5QAvNFRvLBaCqNtDuakHSLRwFMV5NwRkMn7AKJoEUCSoi1+GY4L+4zm07sjnIah0SDMY 35Gvp8hXzvCwWbsFyCn2D5uxlVrGK/WI50yJ2R02VJfpogvpueEKSStYcLl79f4y3Ga4 STWw== X-Gm-Message-State: AFeK/H0OFLMU+9VN/bJ2Ab9FEU+aKhygQHnKB8sxi0eguwIZY0OorLOBJANVc3X9RA6OqA== X-Received: by 10.223.133.188 with SMTP id 57mr1482838wrt.191.1490947235281; Fri, 31 Mar 2017 01:00:35 -0700 (PDT) Received: from localhost.localdomain (2a01cb0c000ea9002158cfa09c18f50d.ipv6.abo.wanadoo.fr. [2a01:cb0c:e:a900:2158:cfa0:9c18:f50d]) by smtp.gmail.com with ESMTPSA id v14sm1873222wmv.24.2017.03.31.01.00.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 31 Mar 2017 01:00:34 -0700 (PDT) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Mar 2017 10:00:22 +0200 Message-Id: <20170331080023.10432-2-robux4@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170331080023.10432-1-robux4@gmail.com> References: <20170331080023.10432-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 --- 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 60f7acefbd..6ded74b512 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 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..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 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, \