From patchwork Tue Apr 5 13:47:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 35211 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp308635pzb; Tue, 5 Apr 2022 06:47:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBw6KaLOC4ellajNShwgVIUSvuyHsGCpAk082tA5rlDA4CJWAZ7Mry07AB3b63xiCCrJMD X-Received: by 2002:a17:907:d2a:b0:6df:8b4b:2b3b with SMTP id gn42-20020a1709070d2a00b006df8b4b2b3bmr3583485ejc.575.1649166457153; Tue, 05 Apr 2022 06:47:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649166457; cv=none; d=google.com; s=arc-20160816; b=kw5IuMCNMvvsPAlOMN4yS5JkTuGu6ypWoVVRLud0hSNn0RAuIv/KSH2geF62c6ZS8N 6PSZCwE1m53sd2vPC16L8x0oIGdXZlbfAWnGyVAcjqnLs7QaVG9wU9IOjsuyDWt/rDpn K66VZVBfkbthFCqCtm+zVDW7pNHkqdCEkY4mm9u1pUGfVPPHbf3NVd1gYY/tPMjsNEmx N+xeiQh0Xfo7zEvfKVFLY848Cu3UNyY8uV0xKB9wLz/WTLuO0fWOdre/SI6f6TeX61zG AlYGvhb+x3Y5/JzM4Bg7A2+J7A261GfyRd7tlnxpHqT0Ufn1sikrsBKfSPUI4S/lQt9q tNiw== 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=SPRKHnOG0iyafNqpKhw436Pv1838Jt5G9u/kWkJU+S8=; b=u56ou6gjAZv7+y9p+uyjXTkzLepnYcMbEesjJT80TYJctqNYN/Z/AMiRMoJsGUFh1u TIEDFN6/ryi2Jp4fEs7+Q9xO4uIR8OTlg23Gp4TiqncCKXryWvYm4jSZ77/iuCEi0m0S lrk7uWbhT8NNGLGSEP7MmWlSYrf8gaEjfV4nJyGzt6OkWdnca7bSXanI+INcYnMlG4yf mdGG/vIedqGjKfNsLqWCCvYa6WADL0HWt04UavOnG+hicHRVrd19s7MzElXa4LKHfFEU I6prw8X2uKnfheBPNjZGQhQgr/V66afzvb+5v7G7mZsPeHutB3isxscYg13vLG5R4MpD +gUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=mJQHfCbe; 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 13-20020a170906310d00b006df76385ddfsi8483158ejx.639.2022.04.05.06.47.36; Tue, 05 Apr 2022 06:47:37 -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=mJQHfCbe; 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 9EA3768B200; Tue, 5 Apr 2022 16:47:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A5E9768B0AD for ; Tue, 5 Apr 2022 16:47:16 +0300 (EEST) Received: by mail-pj1-f51.google.com with SMTP id a16-20020a17090a6d9000b001c7d6c1bb13so2690348pjk.4 for ; Tue, 05 Apr 2022 06:47:16 -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=HLWmbpOCashPQnH8QgSFHANKYOlN7rKWVhbktKTRCqk=; b=mJQHfCbeOzQf2R3LP98eSwOt7zsW5d+FsiS15S4CWOERL+yHl1OekP6dbZxa3umbnr 2gwdifFW0xjkbam7243k23JUJGVk/Zui9YDisituKfN8ns+PKxlhp2NeKrWT79B8YLpU JXdl9+KPs2x5TXdjrLExpKkZPXEfcFNUfEFKnPQsRs/YJfLwAUz4xkK6UL7La/Ojsvh4 +vzD8U0BTTwCWBeaH/PULlnj/3I+n1DUTO7FF30gGO05WQiW+u1gQ6K7GGOLIq4lZ1Xl 9dkLtOo+T0HuuQbliJZZXo51XhxuNuHvoyw4ak7y4UPvhukilKfWkIsLMRcpnli9U5/+ Ta1g== 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=HLWmbpOCashPQnH8QgSFHANKYOlN7rKWVhbktKTRCqk=; b=0H+wRT1xCddieQdfRxbFblhl5WDfUFdYev4m5CBWX/wZNT0QvNE7NJNOJKh3JqIqbB NjBbZhDJOsWrLhzL7jY/XuPw8J7I8FJanZj/ug8wvFjR4c3tCTzpCQKO9aXTkCR/1XA/ JWD4zVfeUt6zJYvlAkc2MB0HClVb50G8MClSQHcMSEeu51iNC5C2uKIAJl6Q/sYsVh+2 xKr8JafjJX9pXkTcBBX4Ol2WA6TNsIKr5kzAscWGLFt0E2rsewYp8m8KvmxcypM8aaD3 I6wNuhyiA1n/nsrxoVdxi32UEb/yRSo5ERTKzox/wwLQBGWkoz5KetKhGyP24OmD1vGz 7B4w== X-Gm-Message-State: AOAM533uRrth3XF7NIUCNQB3XqhqIx3Bw+cUyC4AY5TgkBf2GyxXszZy 96Elf6IVFCNKfZE09kraLKc5dGQ9Ky/fpQ== X-Received: by 2002:a17:90b:17ca:b0:1c7:3010:5901 with SMTP id me10-20020a17090b17ca00b001c730105901mr4385397pjb.22.1649166434885; Tue, 05 Apr 2022 06:47:14 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id c18-20020a056a000ad200b004f0f9696578sm17112705pfl.141.2022.04.05.06.47.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2022 06:47:14 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Apr 2022 21:47:04 +0800 Message-Id: <1649166427-9667-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1649166427-9667-1-git-send-email-lance.lmwang@gmail.com> References: <1648423513-21261-1-git-send-email-lance.lmwang@gmail.com> <1649166427-9667-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 2/5] 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: p7iJh644wD5h 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..8c6daf5 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_long(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..21ed579 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) { + AVAmbientViewingEnv *metadata = av_ambient_viewing_env_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]