From patchwork Mon Mar 28 12:41:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 35014 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp205230pzb; Mon, 28 Mar 2022 05:41:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmNx+O3FLtFoieVpGnTtoRjG8/mZeiCWk5sLYaKCwXJUTx7BIklWRxFzBGopf/isoGg9xm X-Received: by 2002:a17:907:d2a:b0:6e0:963c:97d9 with SMTP id gn42-20020a1709070d2a00b006e0963c97d9mr21638739ejc.736.1648471300764; Mon, 28 Mar 2022 05:41:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648471300; cv=none; d=google.com; s=arc-20160816; b=mAizot0bZU3asT61ZjFcE08DG3vvkPTv+kmQ50R+zdemnEM0jq0ug/7V6KlQxyrrQU fbGZvEcGXKTLgtU+p7WIyKE25iGAUuldPCdGMXSYPuMHzSf8XNcbI7nVbZ8iTnA+FOgS aGiUv0EcHjzMS07FGL5zK5r/Ea3OGvkQBVkeJQCwE8wAepSJPA4fE54/fHaJ9oy8H375 uXEAuAxIY5JlM6t5ixhddoAd1h9U7y2GbxHxcMLUPlZnnMhaAii3Fb8Tyn8izkxs7FFR 2liYxgYca1OQni4uLy6aqjHxhH4jxIXpc+mn8dZ8grI3Qi8WfTN6Q9N6XfCdnBvgVqC5 cqYw== 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:dkim-signature:delivered-to; bh=iyQ0pTbzi+IYDE6A8cTy6PAPRAC7PHZjVAc+JjPgT2w=; b=sdj/avGflVaz+KOZncq+foyV1mJBtcQdAC9ZFW37RWiiJzalQq8NFpZexAzQtn6vE1 K6bLI4k4cW7AM9P2Vpf44isOiOjY0AuxTQEb3x9mdP61fGZQRPjLxYkWunRscygfjvGN MdbRCnpd4w7XRL6bjr4VXwmSaLqadyzUJLjNL/waf9HAFPkbARgNZgozcbfIy0wtor1+ LfxsDG7OVcEq5QBVbZjynybPdJOk56Z8p1nJKGdRAWyzqxtd5vZnJyaDmMXMPn8SgnyO p52HckLRUYDjyjWOhi4HXhbZki1VdjSmBB9ppz+xUmrz2gg69nKhAvTTX8TNm+ldohmr 8egQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nNdpMBnw; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u29-20020a50a41d000000b00418c2b5bf6asi13770363edb.588.2022.03.28.05.41.40; Mon, 28 Mar 2022 05:41:40 -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 header.s=20210112 header.b=nNdpMBnw; 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=QUARANTINE 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 E705E68B1F1; Mon, 28 Mar 2022 15:41:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28A5E68A2F6 for ; Mon, 28 Mar 2022 15:41:19 +0300 (EEST) Received: by mail-pf1-f170.google.com with SMTP id w7so9827789pfu.11 for ; Mon, 28 Mar 2022 05:41:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3M7Ajv6Q+Tp2WWmWp7AXQaobTk/Ud777HqAPKxOXuZA=; b=nNdpMBnw8AvDGAk5MgyP+5LqBD8VvnHbfaHzqyJfTeekvUtU0GC9qJ/kAgO/xsfcff ahaj4yiqxQiIwUeR7wEWLFBlI9IIMzCWv9w9BE8Sy5X0Z7bxa3G8vy84GEytNWuIK77Z +1fGKgCLSheTycdmoLrsvjvMGn106w0m5mZMiyA3F9hn1vgqT3V1BoMVAvc/Om/eL/B2 zxw2QkmkZx7fmXZqkGV0l+sd9UMUc1KlqJr4T+s7Fx2cq68SXVKWuRTjUtzre3cFdKQ+ oT5OpjNDOVAkCJbuF96VucChgUCq+r2QCg8f1Yqf39ryJfvUsOap8fUlgcRtS+1p0vms kYyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3M7Ajv6Q+Tp2WWmWp7AXQaobTk/Ud777HqAPKxOXuZA=; b=V9yW+WV/nol01mcylHoNUOwPafj8/gwUZMKeOZgbS1GIy+weKnPxb7vkl4CkHCvmfr j/HE2t7SB1RUMeMAgf2ibHDT1sWW7Z4sejZrwWxvaq/cdZIqRYxu5KgEadfalYzYLMp9 Un4lnoRP+W1x+j2xMB+LCU0zrqVmuuzUlEEZPHmU8vswJklpkOQxAdAcecm3I9D4RWIA rqLiJzZgSZdzR+yFOnnC+he/Tu9xG1vDSjSKUE08ERXO38iEHIXjXMldvG36Zaao8ShA YL14wcpQuCmQby27QbOMtbhQ4mtb58HDRNv0oFC+COExg/ULtDeOfrgY4lL0hwsop+00 N+kg== X-Gm-Message-State: AOAM533iGGbDL3eXDmEtwCAI+JvrlAxmON49PpdI/HWMsAYCYANDJ+Rf YUefpuMLKjCfQJs6Adqvk49KywBfu3vIYA== X-Received: by 2002:a62:1c8d:0:b0:4fa:8dcb:6da2 with SMTP id c135-20020a621c8d000000b004fa8dcb6da2mr465035pfc.19.1648471277370; Mon, 28 Mar 2022 05:41:17 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id b2-20020a056a000a8200b004f1111c66afsm17895304pfl.148.2022.03.28.05.41.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Mar 2022 05:41:17 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 20:41:09 +0800 Message-Id: <1648471271-22016-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1648471271-22016-1-git-send-email-lance.lmwang@gmail.com> References: <1648423513-21261-1-git-send-email-lance.lmwang@gmail.com> <1648471271-22016-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/4] avcodec: add support for hevc ambient viewing environment SEI message X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rj9rB+VZXBF8 From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/hevc_sei.c | 19 +++++++++++++++++++ libavcodec/hevc_sei.h | 8 ++++++++ libavcodec/hevcdec.c | 10 ++++++++++ tests/ref/fate/hevc-dv-rpu | 6 ++++++ 4 files changed, 43 insertions(+) diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index ec3036f..d94df4e 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -497,6 +497,23 @@ static int decode_film_grain_characteristics(HEVCSEIFilmGrainCharacteristics *h, return 0; } +static int decode_ambient_viewing_env(HEVCSEIAmbientViewingEnvironment *s, GetBitContext *gb, int size) +{ + if (size < 8) + return AVERROR_INVALIDDATA; + + s->ambient_illuminance = get_bits(gb, 32); + s->ambient_light_x = get_bits(gb, 16); + s->ambient_light_y = get_bits(gb, 16); + size -= 8; + + s->present = 1; + + skip_bits_long(gb, 8 * size); + return 0; +} + + static int decode_nal_sei_prefix(GetBitContext *gb, void *logctx, HEVCSEI *s, const HEVCParamSets *ps, int type, int size) { @@ -525,6 +542,8 @@ static int decode_nal_sei_prefix(GetBitContext *gb, void *logctx, HEVCSEI *s, return decode_nal_sei_timecode(&s->timecode, gb); case SEI_TYPE_FILM_GRAIN_CHARACTERISTICS: return decode_film_grain_characteristics(&s->film_grain_characteristics, gb); + case SEI_TYPE_AMBIENT_VIEWING_ENVIRONMENT: + return decode_ambient_viewing_env(&s->ambient_viewing_env, gb, size); default: av_log(logctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", type); skip_bits_long(gb, 8 * size); diff --git a/libavcodec/hevc_sei.h b/libavcodec/hevc_sei.h index f198402..c7623f5 100644 --- a/libavcodec/hevc_sei.h +++ b/libavcodec/hevc_sei.h @@ -134,6 +134,13 @@ typedef struct HEVCSEIFilmGrainCharacteristics { int persistence_flag; } HEVCSEIFilmGrainCharacteristics; +typedef struct HEVCSEIAmbientViewingEnvironment { + int present; + uint32_t ambient_illuminance; + uint16_t ambient_light_x; + uint16_t ambient_light_y; +} HEVCSEIAmbientViewingEnvironment; + typedef struct HEVCSEI { HEVCSEIPictureHash picture_hash; HEVCSEIFramePacking frame_packing; @@ -149,6 +156,7 @@ typedef struct HEVCSEI { HEVCSEIAlternativeTransfer alternative_transfer; HEVCSEITimeCode timecode; HEVCSEIFilmGrainCharacteristics film_grain_characteristics; + HEVCSEIAmbientViewingEnvironment ambient_viewing_env; } HEVCSEI; struct HEVCParamSets; diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 09c07ac..13c6642 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2998,6 +2998,15 @@ static int set_side_data(HEVCContext *s) } } + if (s->sei.ambient_viewing_env.present > 0) { + AVAmbientViewingEnvMetadata *metadata = av_ambient_viewing_env_metadata_create_side_data(out); + if (!metadata) + return AVERROR(ENOMEM); + metadata->ambient_illuminance = s->sei.ambient_viewing_env.ambient_illuminance; + metadata->ambient_light_x = s->sei.ambient_viewing_env.ambient_light_x; + metadata->ambient_light_y = s->sei.ambient_viewing_env.ambient_light_y; + } + return 0; } @@ -3800,6 +3809,7 @@ static int hevc_update_thread_context(AVCodecContext *dst, s->sei.mastering_display = s0->sei.mastering_display; s->sei.content_light = s0->sei.content_light; s->sei.alternative_transfer = s0->sei.alternative_transfer; + s->sei.ambient_viewing_env = s0->sei.ambient_viewing_env; ret = export_stream_params_from_sei(s); if (ret < 0) diff --git a/tests/ref/fate/hevc-dv-rpu b/tests/ref/fate/hevc-dv-rpu index 1980ab1..6879f71 100644 --- a/tests/ref/fate/hevc-dv-rpu +++ b/tests/ref/fate/hevc-dv-rpu @@ -117,6 +117,9 @@ source_min_pq=0 source_max_pq=3079 source_diagonal=42 [/SIDE_DATA] +[SIDE_DATA] +side_data_type=Ambient Viewing Environment +[/SIDE_DATA] [/FRAME] [FRAME] [SIDE_DATA] @@ -234,4 +237,7 @@ source_min_pq=0 source_max_pq=3079 source_diagonal=42 [/SIDE_DATA] +[SIDE_DATA] +side_data_type=Ambient Viewing Environment +[/SIDE_DATA] [/FRAME]