From patchwork Sat Jul 20 12:45:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50659 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:a742:0:b0:482:c625:d099 with SMTP id f2csp1098293vqm; Sat, 20 Jul 2024 05:45:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW575FOFdfIosgQQBTQDLruzTTumFcFNLs/SQybGLaR9xd0mAO55RAmKEVPI599zaAj7Gvv5jXwAef3571T9CVZ4fq0ifeqH8ZSBQ== X-Google-Smtp-Source: AGHT+IHtjCk4Lnrc9YPGkin7SNite/M/nWWrK+jLlE/T8pC+a8NNsVQuGEiQucY3yP66sXw0LQM0 X-Received: by 2002:a05:6512:2304:b0:52c:dd25:9ac6 with SMTP id 2adb3069b0e04-52efb74594fmr1055273e87.29.1721479533050; Sat, 20 Jul 2024 05:45:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721479533; cv=none; d=google.com; s=arc-20160816; b=fQ6Lo6MfG+xKGHjsGKIRUudv0ySQUcGVCZ5EQxrnv3ZZWbjt1TANxFHiaImFIFklq1 uZ4CdEj4d14uTAZEVVHmnIAB5vUsoEHAPEb5q+dtxcgYJ7wyAeuAWWgvOPrm4JJZ1+QX wt75mAK1B05jPQl35bm4Z+anTt5X1L8I2iDApYL54lw1nTnFTtbzsN7pLDXc2mVWBXLy u6eysk777NtFQvG0t+k/RshifgB4dYH7Kk8xXUOt+dvvWgLdl3kD95eTJKnNvKTklToU Y/KE8ijY8eAWd4Hx22ByMUHCBAp2bic/eGTIrpTOfdG2oXvbD3kuuvj7gGK5QL0vHBoE eZSQ== 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=PSdcVONA13wqZNfWUOd9VsKkS2hIjdfP3zQnL0J2iE8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=NWqJKldjeUy1r2omEvsTYwgD9zTNM0ku0w/qsC2wqhibt8q468lywhFjgaDQ9kJZTo dgcHsfH5dkPii2zmL+OAli55zsIXTGD+8FEvrD8ZavnES7Y0lNAmuMtjC0fefDa4tFec Vjlver0ON9gcl0GN/oGGqNjmncDX4APOtBw9oZE1UzA9sJ+h7TsjsOJC5uqXghjVSZQz ZrifIrUM65WM5JYLiuYjT5i3BFv6ubOf0LhEfr1t7q/IYFq8CeHDFnB3WA9uwq9cdCqL 02ZZDLdqznBdKoCtsk59RNrCRMejg4UA3InwIkd3xSWe1OvqvSBbhc70dplr1ivFP7Yu ILpw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=kxW44aE0; 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; dara=fail header.i=@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 2adb3069b0e04-52ef91b5baasi439229e87.456.2024.07.20.05.45.32; Sat, 20 Jul 2024 05:45:33 -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=20230601 header.b=kxW44aE0; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BC0B268D8F7; Sat, 20 Jul 2024 15:45:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B920F68D85E for ; Sat, 20 Jul 2024 15:45:13 +0300 (EEST) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1fd65aaac27so8645995ad.1 for ; Sat, 20 Jul 2024 05:45:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721479511; x=1722084311; darn=ffmpeg.org; 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=qxpj29bElSiDFVWfvDi/CuKpp5dGOT8DgdzY0bzi4ds=; b=kxW44aE0luTpaHs6ZkpWOkvIDqsTMgh9m2DfER5bcu1M7O8AeXfa+Q1qa0N9LE0cOq 5iCJD/jm43t+fqiLTLO/QmYRLwDGghxNjXcFvI6A1TWAVv4wcqsRuuT/6sB9j3cIyqRl tcskKQKnVXBpKzdGCRe9XfHcr9IB/Kj/Y976uGBkidwn11xtjcAd7jC83898dE/UI394 NGL/RCmeMHfgjvktQ3KMYUscBmj7dddxhH5PlFExMogBs1et8ivDOdjZRXV0/V76R6bi 46RUm8GDwQ/Pgka614wjLaOlDKy2gj5BBxq6EAreOQy9Fa+YjtQsp/FJ1w+0QY79V3vP F2ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721479511; x=1722084311; 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=qxpj29bElSiDFVWfvDi/CuKpp5dGOT8DgdzY0bzi4ds=; b=UZX3jqUMZUzAJqkq8IAznPsDz4LTL+xcAiYuk9kanmd2rTtIZ6wpw5W44Bmy1iLe2u r32zzhHWGOM9ElMb6v94kOFMzxViO9/ImQhsIBZ7lBZQbpccgoBzW36sElGU7zuPTDg0 1MFgOQMPt3491NPAuE81SNgUJ8qQZezjz94VPXLT5IUdpubSKKfY/EpdAiYumV7SjwFL pal7hxpNMgR4xotpZPxG/PhNKJApTmhJPfqVA1lDSyoa8fLHX/T7thzIjKyn7mo6p1za mzcy61uxS1qOpmBe1Ep/uS+/ih7ntkK21Z4PTQIlfYZ+n+DWldVcB+Kyj8znBgIsrleo V36A== X-Gm-Message-State: AOJu0YzBlqjlHV2hnCXCv7ptN61P7K5zERcI1Qc9JUklCCaMUI3gCIN5 ltjywc7qAPvnRdNP2Os2LLTunH0aslzOKrYkT4ruJuo6m+YXqXf4rfl0gQ== X-Received: by 2002:a17:902:680a:b0:1fc:4680:820d with SMTP id d9443c01a7336-1fd74d16bfamr31915265ad.9.1721479511473; Sat, 20 Jul 2024 05:45:11 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fd6f25de96sm21359765ad.54.2024.07.20.05.45.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jul 2024 05:45:10 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Jul 2024 09:45:08 -0300 Message-ID: <20240720124510.1689-2-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240720124510.1689-1-jamrial@gmail.com> References: <20240720124510.1689-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] libavcodec/h2645_sei: export raw LCEVC metadata 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: 7qEsNWXqhk0z Signed-off-by: James Almer --- libavcodec/h2645_sei.c | 36 ++++++++++++++++++++++++++++++++++++ libavcodec/h2645_sei.h | 5 +++++ libavcodec/itut35.h | 2 ++ 3 files changed, 43 insertions(+) diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index 7c83747cd0..90e59df781 100644 --- a/libavcodec/h2645_sei.c +++ b/libavcodec/h2645_sei.c @@ -99,6 +99,20 @@ static int decode_registered_user_data_dynamic_hdr_vivid(HEVCSEIDynamicHDRVivid } #endif +static int decode_registered_user_data_lcevc(HEVCSEILCEVC *s, + GetByteContext *gb) +{ + int size = bytestream2_get_bytes_left(gb); + + av_buffer_unref(&s->info); + s->info = av_buffer_alloc(size); + if (!s->info) + return AVERROR(ENOMEM); + + bytestream2_get_bufferu(gb, s->info->data, size); + return 0; +} + static int decode_registered_user_data_afd(H2645SEIAFD *h, GetByteContext *gb) { int flag; @@ -142,6 +156,7 @@ static int decode_registered_user_data(H2645SEI *h, GetByteContext *gb, } if (country_code != ITU_T_T35_COUNTRY_CODE_US && + country_code != ITU_T_T35_COUNTRY_CODE_UK && country_code != ITU_T_T35_COUNTRY_CODE_CN) { av_log(logctx, AV_LOG_VERBOSE, "Unsupported User Data Registered ITU-T T35 SEI message (country_code = %d)\n", @@ -173,6 +188,13 @@ static int decode_registered_user_data(H2645SEI *h, GetByteContext *gb, } break; } + case ITU_T_T35_PROVIDER_CODE_LCEVC: { + if (bytestream2_get_bytes_left(gb) < 2) + return AVERROR_INVALIDDATA; + + bytestream2_skipu(gb, 1); // user_data_type_code + return decode_registered_user_data_lcevc(&h->lcevc, gb); + } #if CONFIG_HEVC_SEI case ITU_T_T35_PROVIDER_CODE_CUVA: { const uint16_t cuva_provider_oriented_code = 0x0005; @@ -501,6 +523,11 @@ int ff_h2645_sei_ctx_replace(H2645SEI *dst, const H2645SEI *src) av_buffer_unref(&dst->unregistered.buf_ref[i]); dst->unregistered.nb_buf_ref = 0; + ret = av_buffer_replace(&dst->lcevc.info, + src->lcevc.info); + if (ret < 0) + return ret; + if (src->unregistered.nb_buf_ref) { ret = av_reallocp_array(&dst->unregistered.buf_ref, src->unregistered.nb_buf_ref, @@ -666,6 +693,14 @@ static int h2645_sei_to_side_data(AVCodecContext *avctx, H2645SEI *sei, } } + if (sei->lcevc.info) { + HEVCSEILCEVC *lcevc = &sei->lcevc; + AVFrameSideData *sd = av_frame_new_side_data_from_buf(frame, AV_FRAME_DATA_LCEVC, lcevc->info); + if (!sd) + av_buffer_unref(&lcevc->info); + lcevc->info = NULL; + } + return 0; } @@ -875,6 +910,7 @@ 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); + av_buffer_unref(&s->lcevc.info); s->ambient_viewing_environment.present = 0; s->mastering_display.present = 0; diff --git a/libavcodec/h2645_sei.h b/libavcodec/h2645_sei.h index 488dbcad7e..598f78b585 100644 --- a/libavcodec/h2645_sei.h +++ b/libavcodec/h2645_sei.h @@ -50,6 +50,10 @@ typedef struct HEVCSEIDynamicHDRVivid { AVBufferRef *info; } HEVCSEIDynamicHDRVivid; +typedef struct HEVCSEILCEVC { + AVBufferRef *info; +} HEVCSEILCEVC; + typedef struct H2645SEIUnregistered { AVBufferRef **buf_ref; unsigned nb_buf_ref; @@ -126,6 +130,7 @@ typedef struct H2645SEI { H2645SEIAFD afd; HEVCSEIDynamicHDRPlus dynamic_hdr_plus; //< HEVC only HEVCSEIDynamicHDRVivid dynamic_hdr_vivid; //< HEVC only + HEVCSEILCEVC lcevc; H2645SEIUnregistered unregistered; H2645SEIFramePacking frame_packing; H2645SEIDisplayOrientation display_orientation; diff --git a/libavcodec/itut35.h b/libavcodec/itut35.h index ffa7024981..a75ef37929 100644 --- a/libavcodec/itut35.h +++ b/libavcodec/itut35.h @@ -20,11 +20,13 @@ #define AVCODEC_ITUT35_H #define ITU_T_T35_COUNTRY_CODE_CN 0x26 +#define ITU_T_T35_COUNTRY_CODE_UK 0xB4 #define ITU_T_T35_COUNTRY_CODE_US 0xB5 #define ITU_T_T35_PROVIDER_CODE_ATSC 0x31 #define ITU_T_T35_PROVIDER_CODE_CUVA 0x04 #define ITU_T_T35_PROVIDER_CODE_DOLBY 0x3B +#define ITU_T_T35_PROVIDER_CODE_LCEVC 0x50 #define ITU_T_T35_PROVIDER_CODE_SMTPE 0x3C #endif /* AVCODEC_ITUT35_H */