From patchwork Thu May 3 03:07:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 8758 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1318618jad; Wed, 2 May 2018 20:08:34 -0700 (PDT) X-Google-Smtp-Source: AB8JxZq7Vb7a5k8ubeUZpmM4ziDj7nkJ0gHEoTaWQsRLUTfGRaNJssjr6NCeGj6OCSypihWj3pOo X-Received: by 2002:adf:cd08:: with SMTP id w8-v6mr17788095wrm.187.1525316914163; Wed, 02 May 2018 20:08:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525316914; cv=none; d=google.com; s=arc-20160816; b=nXqFtHglOg6uo2VvQCaJLV4ki+dn8xv37qKL2Y3UYzdWbsbA9rvs7u8zPJyzxydmwk eEcgsBxm51VsHTeLxXAEFWUlUPn56St4erLsqk2ssfPP4lfMP0Ae3WfCcMRymJlz9+Wq kyYIvcpE4F59hpELAMYZaicm0GfOz5m7/eRDkWzUAcf+yJ+5lG7pmBiGCwkj2Rqn5OxX GEnA23IO7FpU73UNarIE0/iGPxmaDmjSzD98Iyyny8xrrN/LAHwdHWtHARo7bJ/yLgOm CskBX4juh/sSaUjClJ0Yn9c3w8ZkNIHQ9t3QYf5WCrEbNum8/IDjiNxy2GkAEa4//ufD oc5A== 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:cc: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:delivered-to:arc-authentication-results; bh=wLwDnzhtYAb+cS0CUo5BJ06CXNfIF7zvaLwubmD2SDE=; b=EShR02co2zmMqzEN2yTM8e1dwSuJLhge8R0MqoHhNRe58ezWcM/TyogB+xZv8ycFu0 gF9uQCiKSbkMOp2ZKEvPDvHzBXUMEUdyp0Z+w76EHDM5sQ+Jbg35A5Z3+/GNHC9iv9EU yEo4Cdw+RVX0ftcyD4kPxxYqAiYr/MJ87XoaKPtqAUFpBmPDGSfRvQKA9G8Wy46yCan2 kz/DJpZI6Cwv7bBXmjmyImyI6LxA2/1V3zB+NKSig78z0sT+WUYZS2lxpIw5oN4ZjJmr o1bBWvYiQjTCqC3mSCVQfXsBgx/j4LAPBs0aVCAPueGxMxoyTYeMcCTKfouoZKctjXt+ LFDg== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p123si2116wmp.102.2018.05.02.20.08.33; Wed, 02 May 2018 20:08: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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7643668A54D; Thu, 3 May 2018 06:07:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD84A68A547 for ; Thu, 3 May 2018 06:07:37 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 May 2018 20:08:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,356,1520924400"; d="scan'208";a="36461703" Received: from xhh-cfl64.sh.intel.com ([10.239.13.24]) by fmsmga007.fm.intel.com with ESMTP; 02 May 2018 20:08:08 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 May 2018 11:07:29 +0800 Message-Id: <20180503030730.8504-3-haihao.xiang@intel.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180503030730.8504-1-haihao.xiang@intel.com> References: <20180503030730.8504-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH 3/4] cbs_h265: read/write content light level information SEI message 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 Cc: Haihao Xiang , Mark Thompson MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Haihao Xiang --- libavcodec/cbs_h2645.c | 1 + libavcodec/cbs_h265.h | 6 ++++++ libavcodec/cbs_h265_syntax_template.c | 17 +++++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index a4cc7eb990..feb01462ae 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -488,6 +488,7 @@ static void cbs_h265_free_sei_payload(H265RawSEIPayload *payload) { switch (payload->payload_type) { case HEVC_SEI_TYPE_MASTERING_DISPLAY_INFO: + case HEVC_SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO: break; default: av_buffer_unref(&payload->payload.other.data_ref); diff --git a/libavcodec/cbs_h265.h b/libavcodec/cbs_h265.h index 36d71e40c1..3f61686ea8 100644 --- a/libavcodec/cbs_h265.h +++ b/libavcodec/cbs_h265.h @@ -533,11 +533,17 @@ typedef struct H265RawSEIMasteringDiplayColourVolume { uint32_t min_display_mastering_luminance; } H265RawSEIMasteringDiplayColourVolume; +typedef struct H265RawSEIContentLightLevelInfo { + uint16_t max_content_light_level; + uint16_t max_pic_average_light_level; +} H265RawSEIContentLightLevelInfo; + typedef struct H265RawSEIPayload { uint32_t payload_type; uint32_t payload_size; union { H265RawSEIMasteringDiplayColourVolume mastering_display; + H265RawSEIContentLightLevelInfo content_light_level; struct { uint8_t *data; size_t data_length; diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c index 387056618f..490978ce51 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -1528,6 +1528,17 @@ static int FUNC(sei_mastering_display)(CodedBitstreamContext *ctx, RWContext *rw return 0; } +static int FUNC(sei_content_light_level)(CodedBitstreamContext *ctx, RWContext *rw, + H265RawSEIContentLightLevelInfo *current) +{ + int err; + + u(16, max_content_light_level, 0, MAX_UINT_BITS(16)); + u(16, max_pic_average_light_level, 0, MAX_UINT_BITS(16)); + + return 0; +} + static int FUNC(sei_payload)(CodedBitstreamContext *ctx, RWContext *rw, H265RawSEIPayload *current) { @@ -1547,6 +1558,12 @@ static int FUNC(sei_payload)(CodedBitstreamContext *ctx, RWContext *rw, break; + case HEVC_SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO: + CHECK(FUNC(sei_content_light_level) + (ctx, rw, ¤t->payload.content_light_level)); + + break; + default: { allocate(current->payload.other.data, current->payload_size);