From patchwork Thu May 10 05:47:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 8902 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp662213jad; Wed, 9 May 2018 22:48:34 -0700 (PDT) X-Google-Smtp-Source: AB8JxZq3NNY4eLQQ5Jr8DP+SyPPeAPLS9bzj3E6fcO2EQFRyrGKlfgUHeeMqdwe0cl9BIWGAO1Z3 X-Received: by 2002:adf:e843:: with SMTP id d3-v6mr53221wrn.146.1525931314902; Wed, 09 May 2018 22:48:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525931314; cv=none; d=google.com; s=arc-20160816; b=S67n2NKQ0VlpG+NFe/uhGAe77yVrIk9VGphl5jmdstpCeQ+bM99gms/F/ilIwwHaB0 jb8F9ScTz6DuAsrN1cN8MpDABkM0vbRodu86KyvAtwopUBtYd6BaxkOg4tddQnhh1QFQ QPYnxpA6IxSGReN6FqiQ3yOjNeHdCPTpucNdQ99iHlO/chIHZ6+JG01F0gaQM/0FTMiw pBl9y25BEon/7TwZxvc2kjL1ZysynrXnRkfkV6McvM9UOjl9lpRdQ4PJAOTU4tKs1JS9 PIoaLOUsZSxWZ2t6dmBi3ltuJhsVhcjlK0px5mPGjb/IJtztRMf350hGDGdCnDFGwjcd RnAw== 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=8yYB43Esm3skJ77XXzYebpq57x7kyCtmC936yNQ6zIY=; b=R0M8JtZ+m6TJGOZQvZYYVtdi1JzDzh2fMGlitvaW1u2OAhWok9m1jVJVxEjEqcVf8i DkjFVOa4YGZrNU5xWIjWoxr3vxClRq61PAbUlkbMnRSP1zIScRvVTQjQeSZLYGw0I7qU X/s/kYgqBQp0tNFOt8FPMZlFvW4tKStJXn4K1xj0BiyyfxE+cyA1wqcc7CETC0tiYgLw 2qLQJNo7k428vPbwsNv0tMbrqYRC/gICc1GbYPcFldHKGnJ7BIrmNuCqXD3fEFMTup+P pQqq3zlAHqG97tTRaoi3KWfZ4dPjORJY/IXl1IiWIkzmZNW7XfyIbtAWUTQsCitcf5qT gaFQ== 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 45-v6si21033wrk.398.2018.05.09.22.48.34; Wed, 09 May 2018 22:48: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 2309E68A855; Thu, 10 May 2018 08:47:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75E4068A815 for ; Thu, 10 May 2018 08:47:37 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 May 2018 22:48:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,384,1520924400"; d="scan'208";a="227284027" Received: from xhh-cfl64.sh.intel.com ([10.239.13.24]) by fmsmga005.fm.intel.com with ESMTP; 09 May 2018 22:48:09 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 May 2018 13:47:46 +0800 Message-Id: <20180510054747.7967-3-haihao.xiang@intel.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180510054747.7967-1-haihao.xiang@intel.com> References: <20180510054747.7967-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v3 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 dd13d8ab5f..54f7e93755 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 b5715aed03..46d28dd2ec 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 593b6afd10..9b39201e39 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -1526,6 +1526,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) { @@ -1545,6 +1556,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: { #ifdef READ