From patchwork Wed Jan 11 18:57:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 39971 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp4979394pzb; Wed, 11 Jan 2023 10:57:48 -0800 (PST) X-Google-Smtp-Source: AMrXdXu+yscc+Y2D2WHjxmHh9aUY/o5t0Ilh2mjPu+/0SvIQ3kChcbQUD50al1GpW2DPj0dBf0uQ X-Received: by 2002:a17:907:c68a:b0:84c:e9c4:5751 with SMTP id ue10-20020a170907c68a00b0084ce9c45751mr3535859ejc.74.1673463468797; Wed, 11 Jan 2023 10:57:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673463468; cv=none; d=google.com; s=arc-20160816; b=ZFuDqbpUHPyU6uW2LPvyAQIpI0+qowdnLuhF/8xBf40nVmt/1q5qUL/ltAyDgeAPhm BL9rKIeCc/rSYA+i0di34mVhpOCb1/uOeRcCfvq1FBUj/Jbqa34EHuxBvrjp738DJRCx xcMKxIFzOuGoesXDuLGNpSxaw+WgEPsgLRyKPSn4xiFgrMgDPhFoXNB7Zi73So+UlG57 cOiQPAegdsU2ldxSMxxYmeOeUr9RFN3+V/+aGYexyJVlKagK1X854Qj0Nap7d7NiI2/3 5PKFKquGmEWGeAKb5cqVAKyw+jqvtLiV1/CRnnAIG66icBMippPgEpNu3duGn0WLkbfZ w3og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=hpUbCI8RLTQwG7j13sYC0xx4HvjiqlQzspMwjtNP5eM=; b=pMBksvGMYdfPIxvD14+SWb6ZRpDEUJ1OCqAFwr/htycX5DUAeXNXFweRpUE5VWFL+E aMLOT99DL9ku/8kW+6ewUcNiDjhbvGU4qamX+839T+4X4UUzf1nJQ0LJ848FzHV6RcXP 1D946QkkCe9hHn1ZZw4OiSvnUbLxSftv14VkwEcnad2xYD+x0F5AxRZu6AO4fmLgtjlP odzjfVRefNh0lFMpufYHSVSdm3bWEwtwroaoZv2Wq/EwGKEqNA4pzKpGrTy8bS5fQ5ZA 9iig1USWSRtJ8ifWMR+OkNR9iijVPiqN40D7OkyGgblYcFgRI5zMC8Q4mg/yIdqKD4EU YQDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Oojo5PT8; 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 he31-20020a1709073d9f00b0084d46a9b47bsi10283691ejc.725.2023.01.11.10.57.48; Wed, 11 Jan 2023 10:57:48 -0800 (PST) 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=Oojo5PT8; 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 DCCF268BD24; Wed, 11 Jan 2023 20:57:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4809868BC64 for ; Wed, 11 Jan 2023 20:57:16 +0200 (EET) Received: by mail-lf1-f48.google.com with SMTP id d30so20062562lfv.8 for ; Wed, 11 Jan 2023 10:57:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PEaRvRxnlWcNYkQHMoT7rJxIqbT+x0EW8mOkhq7T6Yw=; b=Oojo5PT8wv+Z1N3teyyIJ0ArT1wJlptyPoabB7aVPHwHFM5TqjoeXGBuXLeeM+eh01 KOM8SmDvbyEIyRtVC1mfpYLtbpAJN9JTSBlSePuDCL47nFfZvRInhvTUaDBvqhaKIpGl 3LHdIZcXGMY+TkQX3cu+h0QFzaDL5d0V/MtSIza+pdncg7bWj1+aMA9Lz1GTr4+gG39O nfVtpHtOA6RVvAcANIrlY5aPMhbX/ZAvB1zgWQAExgUyMn1xBof9QVFoHHK5A8iVTHFJ iTyukYEexxRAU6hBz9Z6ixqI4r0cAOlJMHJ4VGsb7L8m60+RQlFlsnKWD5bMtAze3vbk N2gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PEaRvRxnlWcNYkQHMoT7rJxIqbT+x0EW8mOkhq7T6Yw=; b=mperEU/yF/wwjGGCu0Ga1HVcNbnEyiN3bGWicP3aMMK/JLYCxu4dTMnN/zYiodsAqE eIXW9pRJYzY1LbHvgu/6C4iCLLjcY3Vudq2VEF5ymWJVL4gxSTgRDV3ubkc8i8vlLs5A X+ZwgMxjfjyDDYpuLQo9xUAbJfoXQ6T6y3jZ7hBjPSHzhHkU7yfmKtp/g/S5x1wxXJnP NN/DcZNNjKMn5/TaOZ+KefmvceugVoOi1Ib4U5vkRBo1sLXiOTzd8Uvxf0C1YgyoK59y jsfJASsUgFtbo118amcsALK1vuFjZydnaSHYjCn2iP3rHAgNWO4IW4uHjFXFBl+SLsDj keaA== X-Gm-Message-State: AFqh2krQEHUL5N64uUHBeDpVkeHavNel9xIDzoD2XQLWYhfODBw2Wsd6 Jf26QwupBvrvKUL0u8/fkob3o70BOrU= X-Received: by 2002:a05:6512:3048:b0:4b5:8421:587a with SMTP id b8-20020a056512304800b004b58421587amr24625439lfb.44.1673463435622; Wed, 11 Jan 2023 10:57:15 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id j5-20020a05651231c500b004b5480edf67sm2842017lfe.36.2023.01.11.10.57.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 10:57:15 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Jan 2023 20:57:07 +0200 Message-Id: <20230111185707.22132-4-jeebjp@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230111185707.22132-1-jeebjp@gmail.com> References: <20230110211949.8195-1-jeebjp@gmail.com> <20230111185707.22132-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/4] avcodec/h2645_sei: add support for Ambient Viewing Environment SEI 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: vuDgxHtbJyh6 Defined by H.274, this SEI message is utilized by iPhones to save the nominal ambient viewing environment for the display of recorded HDR content. The contents of the message are exposed to API users as AVFrame side data containing AVAmbientViewingEnvironment. As the DV RPU test sample is from an iPhone and includes Ambient Viewing Environment SEI messages, its test result gets updated. --- libavcodec/h2645_sei.c | 45 ++++++++++++++++++++++++++++++++++++++ libavcodec/h2645_sei.h | 8 +++++++ tests/ref/fate/hevc-dv-rpu | 12 ++++++++++ 3 files changed, 65 insertions(+) diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index 3ff89e4fdd..6e4a9a1af2 100644 --- a/libavcodec/h2645_sei.c +++ b/libavcodec/h2645_sei.c @@ -25,6 +25,7 @@ #include "config_components.h" +#include "libavutil/ambient_viewing_environment.h" #include "libavutil/display.h" #include "libavutil/film_grain_params.h" #include "libavutil/pixdesc.h" @@ -320,6 +321,31 @@ static int decode_alternative_transfer(H2645SEIAlternativeTransfer *s, return 0; } +static int decode_ambient_viewing_environment(H2645SEIAmbientViewingEnvironment *s, + GetByteContext *gb) +{ + static const uint16_t max_ambient_light_value = 50000; + + if (bytestream2_get_bytes_left(gb) < 8) + return AVERROR_INVALIDDATA; + + s->ambient_illuminance = bytestream2_get_be32u(gb); + if (!s->ambient_illuminance) + return AVERROR_INVALIDDATA; + + s->ambient_light_x = bytestream2_get_be16u(gb); + if (s->ambient_light_x > max_ambient_light_value) + return AVERROR_INVALIDDATA; + + s->ambient_light_y = bytestream2_get_be16u(gb); + if (s->ambient_light_y > max_ambient_light_value) + return AVERROR_INVALIDDATA; + + s->present = 1; + + return 0; +} + static int decode_film_grain_characteristics(H2645SEIFilmGrainCharacteristics *h, enum AVCodecID codec_id, GetBitContext *gb) { @@ -383,6 +409,9 @@ int ff_h2645_sei_message_decode(H2645SEI *h, enum SEIType type, return decode_frame_packing_arrangement(&h->frame_packing, gb, codec_id); case SEI_TYPE_ALTERNATIVE_TRANSFER_CHARACTERISTICS: return decode_alternative_transfer(&h->alternative_transfer, gbyte); + case SEI_TYPE_AMBIENT_VIEWING_ENVIRONMENT: + return decode_ambient_viewing_environment(&h->ambient_viewing_environment, + gbyte); default: return FF_H2645_SEI_MESSAGE_UNHANDLED; } @@ -609,6 +638,20 @@ int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, avctx->properties |= FF_CODEC_PROPERTY_FILM_GRAIN; } + if (sei->ambient_viewing_environment.present) { + H2645SEIAmbientViewingEnvironment *env = + &sei->ambient_viewing_environment; + + AVAmbientViewingEnvironment *dst_env = + av_ambient_viewing_environment_create_side_data(frame); + if (!dst_env) + return AVERROR(ENOMEM); + + dst_env->ambient_illuminance = av_make_q(env->ambient_illuminance, 10000); + dst_env->ambient_light_x = av_make_q(env->ambient_light_x, 50000); + dst_env->ambient_light_y = av_make_q(env->ambient_light_y, 50000); + } + return 0; } @@ -622,4 +665,6 @@ void ff_h2645_sei_reset(H2645SEI *s) av_freep(&s->unregistered.buf_ref); av_buffer_unref(&s->dynamic_hdr_plus.info); av_buffer_unref(&s->dynamic_hdr_vivid.info); + + s->ambient_viewing_environment.present = 0; } diff --git a/libavcodec/h2645_sei.h b/libavcodec/h2645_sei.h index f3ee9af524..e07ae10376 100644 --- a/libavcodec/h2645_sei.h +++ b/libavcodec/h2645_sei.h @@ -76,6 +76,13 @@ typedef struct H2645SEIAlternativeTransfer { int preferred_transfer_characteristics; } H2645SEIAlternativeTransfer; +typedef struct H2645SEIAmbientViewingEnvironment { + int present; + uint32_t ambient_illuminance; + uint16_t ambient_light_x; + uint16_t ambient_light_y; +} H2645SEIAmbientViewingEnvironment; + typedef struct H2645SEIFilmGrainCharacteristics { int present; int model_id; @@ -108,6 +115,7 @@ typedef struct H2645SEI { H2645SEIDisplayOrientation display_orientation; H2645SEIAlternativeTransfer alternative_transfer; H2645SEIFilmGrainCharacteristics film_grain_characteristics; + H2645SEIAmbientViewingEnvironment ambient_viewing_environment; } H2645SEI; enum { diff --git a/tests/ref/fate/hevc-dv-rpu b/tests/ref/fate/hevc-dv-rpu index 1980ab13ea..aaf0223eab 100644 --- a/tests/ref/fate/hevc-dv-rpu +++ b/tests/ref/fate/hevc-dv-rpu @@ -3,6 +3,12 @@ side_data_type=H.26[45] User Data Unregistered SEI message [/SIDE_DATA] [SIDE_DATA] +side_data_type=Ambient viewing environment +ambient_illuminance=3140000/10000 +ambient_light_x=15635/50000 +ambient_light_y=16450/50000 +[/SIDE_DATA] +[SIDE_DATA] side_data_type=Dolby Vision RPU Data [/SIDE_DATA] [SIDE_DATA] @@ -120,6 +126,12 @@ source_diagonal=42 [/FRAME] [FRAME] [SIDE_DATA] +side_data_type=Ambient viewing environment +ambient_illuminance=3140000/10000 +ambient_light_x=15635/50000 +ambient_light_y=16450/50000 +[/SIDE_DATA] +[SIDE_DATA] side_data_type=Dolby Vision RPU Data [/SIDE_DATA] [SIDE_DATA]