From patchwork Sun Mar 27 23:25:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 35006 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6d9d:b0:79:214c:b845 with SMTP id gl29csp4097628pzb; Sun, 27 Mar 2022 16:25:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzR39wLZuow7oIRijXCcXBk81L+jYG8/djovmxQFj5VmO2u5c4IDr3HjYrKxn49D1JNh7A0 X-Received: by 2002:a17:906:a08b:b0:6cf:65bc:e7de with SMTP id q11-20020a170906a08b00b006cf65bce7demr24614880ejy.220.1648423540582; Sun, 27 Mar 2022 16:25:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648423540; cv=none; d=google.com; s=arc-20160816; b=B8gSQJJcHjKg4MLcyEC01+nEQ1DOXJmf22h26iHXRmYHo6KvFT9Z0eWZNweLs7q3CX XMAnCY1b/CTrJItCCHKZNKdxsqDuWb/NRlA+7GkPXtjw1aF1rL8lOt0hLY9PoP/ig/Uy n6WKP3w+Xh3UgmvjQsMF/3TQV10x6WnhFFmD7xosIkqL1iawJSOGN4D2lmaSZaf9a/n8 bAx6r0W5DZDpp/QNBI0C3CJHYbzJwAI8dOLfcgqOFsLKS5ldHZE+j4JfiA40YPRR7HRN A/KjvVwcORbaMXThwd5Dv9zlSV+ku4FnDge/s3VXeCP5bUFfB9gP3Xvdc8h2oXN2ObGx cEqQ== 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=4nAl+cB6JywCtWd0VBgNPb2WVDha+a5Lqin4xtwc4uk=; b=utPy4RdRZXVTPOAoVDm55dKPaNsNN7dFVDWU4/WUn4Z6M3mr9U1YlN4s1Yo8E5bvqG B02HVwqO489JPyWNVLkzlOf+F08ccvCz7xJQKNnK6UuS2dbLFUbbTXvAddO+knFIxaT/ 6P4i05l5Ob+4vpSI/nQi9hngGUoGsoHE0imbCgJHpznq1c+As7eXQFMLzgeotz675B3Z ni+NSzsV9MKU+xDHtMwI5DSYxvQ9ICShA6nCoR/vYTamhXIQzhd2FVrC3CSHx6mZ0Vl/ bQ6SP2zxHCI+AizswnMW+Ks6mNgcCJ7qFOBEbzR+tAJwRmoVdkRjGMU5O+rRXRfzYlna IvwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=f+EPEHqv; 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 g24-20020a50d0d8000000b00418c2b5bf4esi11716773edf.560.2022.03.27.16.25.40; Sun, 27 Mar 2022 16:25: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=f+EPEHqv; 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 55BFD68B285; Mon, 28 Mar 2022 02:25:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B556D68A8FD for ; Mon, 28 Mar 2022 02:25:20 +0300 (EEST) Received: by mail-pj1-f46.google.com with SMTP id b8so12399443pjb.4 for ; Sun, 27 Mar 2022 16:25:20 -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=Cimipq3qkCMF97B38lflgU7fpwXfJCYo0peNA001AYQ=; b=f+EPEHqvDuTJDg413GBJzMXUAHLbdbqWS54r3Gzbr4y8r0uFW2AmfV52HWSwmB7xzR vdHO3IOsEVaVIE+vVS1O7/1fv9YqsTLoQptt+BC6XXCqHps7vKVd1/5Q0wFOGk6AdDJg 7lPcRdVOZglzKnquXfbUUC1sX2JRzpOQMkZPZx+T/qAqbW0QNGQzfY0PLuXv5cuJpLz+ DY50KCoE9mxrLmST9rNsKDyxfj+L2RR4zLL2Op6pFmCESrHuk2qmH2hiZQMwBbhoAv4t Jgtis+Odll1ICPVPQZdFOta7jywNObiSBl6lg/8pHNHAcfKvriUTnOBbQzj2WIAKcaZz BaZg== 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=Cimipq3qkCMF97B38lflgU7fpwXfJCYo0peNA001AYQ=; b=xRkep+3PwF46N3vUFglQVqoOtQ7D2p97TOWAMeSpOPjZ3R6etQV7A2o4JzEaFQRmSY DrXK5VwLjiGKh6Yrcqy9uK3dVrKfktQQzI2gA/N4CwmMuG2DXP4Y4eTHSUBjOEyeWUMB 2YtneyhCP26RHCTjKJKG7V5DZvkLYpGsbG/whhY3bGTD0uGPqG3rUcH5QAw4Bh4kQPy0 7hl1k57xnaH5pOVJ95KwtneGITSdUvhPs24QshG8d8CnLOBFKSEuD489L/w0c4g7qDPf h25VsiqYGhUo5jCMxFuKtRZtELEeVpCltT7dF9lOl+bku7fBaQHOL9Vmr+vQCy2kIfAy jenQ== X-Gm-Message-State: AOAM533KwY42JZQjsI6M5nGkOOMN/FQ85iYlY1+ROYbdAOJMr7BjyJtL L0DZY57V3AS15pU1K1uICcOZ+YHaKjMX/g== X-Received: by 2002:a17:902:7615:b0:156:1859:2d00 with SMTP id k21-20020a170902761500b0015618592d00mr731174pll.126.1648423518947; Sun, 27 Mar 2022 16:25:18 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id bh3-20020a056a02020300b00378b62df320sm11000934pgb.73.2022.03.27.16.25.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Mar 2022 16:25:18 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 07:25:11 +0800 Message-Id: <1648423513-21261-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1648423513-21261-1-git-send-email-lance.lmwang@gmail.com> References: <1648423513-21261-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 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: L0x81bM88bHU From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/hevc_sei.c | 19 +++++++++++++++++++ libavcodec/hevc_sei.h | 8 ++++++++ libavcodec/hevcdec.c | 11 +++++++++++ tests/ref/fate/hevc-dv-rpu | 6 ++++++ 4 files changed, 44 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..9be366e 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -36,6 +36,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/stereo3d.h" #include "libavutil/timecode.h" +#include "libavutil/ambient_viewing_env_metadata.h" #include "bswapdsp.h" #include "bytestream.h" @@ -2998,6 +2999,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 +3810,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]