From patchwork Tue Mar 19 14:06:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 47218 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:958e:b0:1a3:31a3:7958 with SMTP id iu14csp1687671pzb; Tue, 19 Mar 2024 07:06:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWtUkbV3EPJKTANbw9C1v1UD8MM01P01W+Ky2QKHnZb/PTFXi4MIfUSttkBdTR6fY1PRY1G+/Ro+Imlz7eOg8zjALHtAC5eHOQeGg== X-Google-Smtp-Source: AGHT+IF3DCp4ajM442yZ1XjW13Hc2GmbPQ3t6IZMPg+p5DwZmmdgSYGENZM/HWFm4JyX0YC9f5UE X-Received: by 2002:a17:906:1c8e:b0:a46:61e0:d99 with SMTP id g14-20020a1709061c8e00b00a4661e00d99mr2051597ejh.54.1710857206052; Tue, 19 Mar 2024 07:06:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710857206; cv=none; d=google.com; s=arc-20160816; b=0NY85VTlWXxrfPNwUu778/WLqITfJi6i4VTxPCY7rvbSSWOcNEvOHQVaLWFvkY0n8X BxVve1hK2IUSshhQ4L73QHPfPddCHAQnexU9DQaNOkv5NP+ZnUG0sT194SmGP/tI6riw IeL2bEC08VHudxM1CwsgbBw6pa/eHsirC//fnQWpXT8f4UU00tFCw3mJbF7DzvfTrbOp FTkaEpUEupEEiC+BKOBCnWrMzkMlK/ynz4cQ13ywr/2jrknfLDYoOYM9A7beo7EWp4u6 WvfUir+cyXT6xSWO8PxoZpIrWfagHPtwFfLpIuLNDX+aZgNkFPAmAOhUmvPc0L7I2Kat Y4Fg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=DYZ7jdLbdo7Q2RiMVrENWnYzgkxS4Izd6SRQcEqbsJ0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=qmkp2lRJ59d877ISCVYyVUyRUF9Sgo5bEw8/7cTW64jVJpn62JsvdcqOtz+wDdkj03 Y0JwCpqPlY6a+nuhTAAcMzN9OUC+V//NCFLH8x/aCTP2kxAcXaYoBxQr891fRCPLRRlS aD/AwUzOpRm2xOqAWTEffHv/TZNiKxX6j/4XZ6/xeqPoYzUzaEUyyqyVH3/jJ5Tuq2tZ fSu7/L+zTrIWQ1/THt54+C/WNM37MzuB8mew7AETAh1YNYzlvS7yXlfjhtmdgFBM5FFP OfPIwc3OvdXTUTUGS+fsvALT6NkezbjiXpg0k+7wsSJPm1uJD2W52AAks1nx7WTjweXM I9FA==; 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=WHIf1YGe; 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 d15-20020a17090648cf00b00a46e5820c9fsi397035ejt.300.2024.03.19.07.06.45; Tue, 19 Mar 2024 07:06:46 -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=WHIf1YGe; 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 5689F68D38D; Tue, 19 Mar 2024 16:06:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC1CB68D316 for ; Tue, 19 Mar 2024 16:06:34 +0200 (EET) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1def2a1aafaso26637025ad.3 for ; Tue, 19 Mar 2024 07:06:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710857192; x=1711461992; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=x+hXhcGDEBTw2GP0KB8JyYGhLB9g6aYuCtE3Egmlt/g=; b=WHIf1YGeceaQ1JC44jfSwaze5kQhnHyARrfViwmLMR6oHU6Yuxn0Uoz2FYRFET4xgG MTJB1j+Kgwqh7IIZETXE/5bueSMtT71JEOlodUIifLV95hVBJrAPDgUo6m4N+dnD0lE5 6DWzYcXONu1VsuOXDX1ADnTMU6BKeKyVJh5+OjTy9pVaZlQaEhF/0Ba6KVj+jRAbi9vh v9icmCJZEtmusVNgtVRPpXPQVXQ6KER/Dvfmmp5YWPl750aEPbBnBEyQ/JIcpGSkGq0B 0PcSpCN6Oy+f4i+1g1EZRsjh0JZFupgo/IXh2UPUGVUnS7WQP+xiirEysZEQMf6Ha8E3 +N+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710857192; x=1711461992; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=x+hXhcGDEBTw2GP0KB8JyYGhLB9g6aYuCtE3Egmlt/g=; b=N3jgpyQC48TbqoTuQmfqXdLvfDmQYqdQVyz4afEkH9vNSZ7RzA/yJGK221xe4VtSo1 X5mSsJLgvhffS2RDX3tDVzUaxSRwW5Dxq9VGZBUxCEJc1h04CjrfiAj3fyRqPOeqXu9j JWMMJkjloCqzndiKbVJ7mCrr5OoI0AFNI74c+4wKsw+DlT3L2cAMoiDwRTzRLk5nT7gS ZL2WEIyuWNbsplk0ib4KxaPVKgzhoLRAfwBWCOOsWvgAE1nk1F/VDLSg8d0FIhzfuNmG FCK7itVe/D61WH1f5I4OZNAkVm61OdmeqT3EkZhoe1QzhjDe2kqkTdReOHgXmI4x2RNF onvw== X-Gm-Message-State: AOJu0YwB43abGRLZpXI+9/Tm5EXhYU/G1cbGMsB2eBaH5XpotohqZaCM Et9Mh5OtQMLFcHN9Q60cLftQQv9TNYgS+z9Q83rUvLrCzwXNGKJBpV0KTOMA X-Received: by 2002:a17:903:2312:b0:1de:f555:164e with SMTP id d18-20020a170903231200b001def555164emr13766017plh.61.1710857191803; Tue, 19 Mar 2024 07:06:31 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id b11-20020a170902650b00b001d9aa663282sm10397008plk.266.2024.03.19.07.06.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 07:06:31 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Mar 2024 11:06:34 -0300 Message-ID: <20240319140636.4323-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] 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: roQxDWi8bURl Signed-off-by: James Almer --- libavcodec/h2645_sei.c | 36 ++++++++++++++++++++++++++++++++++++ libavcodec/h2645_sei.h | 5 +++++ libavcodec/itut35.h | 2 ++ libavutil/frame.c | 1 + libavutil/frame.h | 5 +++++ 5 files changed, 49 insertions(+) diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index e8eb15524f..a6e71894ff 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; @@ -483,6 +505,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, @@ -773,6 +800,14 @@ int ff_h2645_sei_to_frame(AVFrame *frame, 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; } @@ -786,6 +821,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 0ebf48011a..70d7c2277c 100644 --- a/libavcodec/h2645_sei.h +++ b/libavcodec/h2645_sei.h @@ -48,6 +48,10 @@ typedef struct HEVCSEIDynamicHDRVivid { AVBufferRef *info; } HEVCSEIDynamicHDRVivid; +typedef struct HEVCSEILCEVC { + AVBufferRef *info; +} HEVCSEILCEVC; + typedef struct H2645SEIUnregistered { AVBufferRef **buf_ref; unsigned nb_buf_ref; @@ -124,6 +128,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 */ diff --git a/libavutil/frame.c b/libavutil/frame.c index 079cf6595b..f872b1c67d 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -822,6 +822,7 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type) case AV_FRAME_DATA_DOVI_RPU_BUFFER: return "Dolby Vision RPU Data"; case AV_FRAME_DATA_DOVI_METADATA: return "Dolby Vision Metadata"; case AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT: return "Ambient viewing environment"; + case AV_FRAME_DATA_LCEVC: return "Raw LCEVC metadata"; } return NULL; } diff --git a/libavutil/frame.h b/libavutil/frame.h index b94687941d..8959922f85 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -224,6 +224,11 @@ enum AVFrameSideDataType { * encoding. */ AV_FRAME_DATA_VIDEO_HINT, + + /** + * Raw LCEVC payload data, as a uint8_t array. + */ + AV_FRAME_DATA_LCEVC, }; enum AVActiveFormatDescription {