From patchwork Thu Sep 12 00:59:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 51549 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:14c:b0:48e:c0f8:d0de with SMTP id h12csp921313vqi; Thu, 12 Sep 2024 06:24:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVfgeZoaSmqtJoW7DzLCQeSoRacjibvvILq7Q0IZTRc37P5/j8KuPLcbqVlGOjxLFLv6pLkYeUgdXQZc70oDNYv@gmail.com X-Google-Smtp-Source: AGHT+IE89MqgpnEGCdJuX7DUX8Wy5wlpafIOuAGyo/f4+whIz+Qc5vthjl0N8mPfMYEE1VyvpJYl X-Received: by 2002:a17:907:1c29:b0:a8a:926a:d000 with SMTP id a640c23a62f3a-a90294355e9mr135682566b.5.1726147451153; Thu, 12 Sep 2024 06:24:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726147451; cv=none; d=google.com; s=arc-20240605; b=EPSsWdsPCwhu+n8HlQd9WKzwKtQuyewOewAVLzuLjY/XJs8WpGch8O9Szf5SP2m+F4 e48l1DD8hgxS15OTXG8E0E+27HJoxzEQQ/O0vRZCj5YdBfwTS7QcJdmiI7dPgCl7U0ts 4OQve4DZbgL2+ITYb2roF6MmMXDxUbOYLlq3EQnn21zYgemmXuIxniAVV2Zu2qUFsqs1 C5CY9olSD2p8oSvmsYplFdZLgYscjGdQdvkZhXggc262CsiYvGWcogYvJq3EdknIshlg gTZRVn6PEjYhd4C5CpnPKBV8tPmfojwaYUPjaG0m5AHAyG5zp75S++OSQ/FZ86/C0TOx Wekg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=JxlbM003sLdW+0fS/op6HaV8M8ZmeoCLcR7EdOq3A64=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=LS68UzqpXCt8IbJaSKruK9sJAKkaL7FiW55qsE/BHxKd+Wds7Z81BT9ns0SHoC77re s/LyIrlysIcMb88VMSOtsuDr7tlf4kn69XAhCS/NO6lf3n2sI5pZeyKB3KF+Lt9IywB7 PbpS9viHhm3Y/98NxVEp/Atf6UNjvD4LoyN7Nl+LpsVZNsnV5XpdBN7fHhpVxcuL2r9A 3/bNw7lZ89dCT/pD92BTBPDiKx9eSaFC1ZeLHfsNeUoCh4e3SWcduFD6n3lyipxXGrv4 lRNPQQxr3QkbVkuJm7HlqSOkJ+GfokkXZXVbXMnL961naXsLi0pE+NjXq5RFGwGJKZDh 9VPA==; 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=P5KVtbQ4; 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 a640c23a62f3a-a8d25d547c4si905457966b.723.2024.09.12.06.24.09; Thu, 12 Sep 2024 06:24:11 -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=P5KVtbQ4; 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 9CA4F68D3AE; Thu, 12 Sep 2024 03:59:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2962268D3AE for ; Thu, 12 Sep 2024 03:59:38 +0300 (EEST) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-717911ef035so252505b3a.3 for ; Wed, 11 Sep 2024 17:59:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726102775; x=1726707575; 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=6ZbGgFlVAo1BXbR5i+47qKdETSfM4rtNy9SkKSRZ+WU=; b=P5KVtbQ4V2Gg6DKrIxTEGz54J2qLwro6UdhOwE1Fm/uXOlxmTzMYbSWR6vyzx/YEF6 EQD2NUuTeMBHpOTBGPpw8BxuZYuukfn057nS768pE6uY+uvU/x0AAuWX7XT+LacAClo4 l/AoLyFMWfs9JQ2/5AgDFQkKwUadqg4WlSsxHRVxPpxgJINIgHhodYGDy1cSREBSjwkf g1dcm/NQX0VWcGFidEnZl3QmBa/2fBJhpa1NAqTg8blKH9sp2vv8Cv5SbTGGQYg5mQQk /rJzT89B33RPpB9z4qNSlcm1I8Yc3pzwZ7Vl2bfGrBxnwgGuzC+KDAYXyX7Z26TE017C YNsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726102775; x=1726707575; 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=6ZbGgFlVAo1BXbR5i+47qKdETSfM4rtNy9SkKSRZ+WU=; b=iLtELWimdnDmurh97hjc1jBkmUnVCzYYzA8lN8teF0mbE5e5zWBYNhXq+y6L4LM7en gctmqovvfB8uimgxh1SSV6YhxiaKi7PszcCKa0WzkPq+KbTUfahq0prDi3VwXbhARk3O luQ9dOV9CNo3IuucvMGJ40qdahA+eqpKzOlLfTXU978hbQAJKKTHG0H16oHkW7ttcBaU iHuu5bzf96UczzUIErq39s8fLxyaeiPno41wzcl1GHxkoIErp6RWn4phtAQpcwRRsWHH iTh5POCxHVgHCwYVYsXTYTsTo4fPNXveu3to1ioco+iPqSE7RMe5rL7eejfXwwbGAkZ8 59Pw== X-Gm-Message-State: AOJu0Yy//15TOdy4s+kDpCqyuVCOzKwXigHageqraQsxjUGxvI5WG4GY HQhgx0rTdVAkn7i1A2sPbz6rTId03pLuBDN9/Y3KIjAK6wED64eCQjBiTA== X-Received: by 2002:aa7:88c6:0:b0:70d:3354:a190 with SMTP id d2e1a72fcca58-719261f8db2mr1663394b3a.27.1726102775375; Wed, 11 Sep 2024 17:59:35 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71908fc8210sm3557769b3a.36.2024.09.11.17.59.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 17:59:34 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Sep 2024 21:59:16 -0300 Message-ID: <20240912005925.10151-2-jamrial@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240912005925.10151-1-jamrial@gmail.com> References: <20240912005925.10151-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/10 v4] avcodec/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: GX+NTDC9SR/I Signed-off-by: James Almer --- No changes since last version. libavcodec/h2645_sei.c | 34 ++++++++++++++++++++++++++++++++++ libavcodec/h2645_sei.h | 5 +++++ libavcodec/itut35.h | 2 ++ 3 files changed, 41 insertions(+) diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index 7c83747cd0..c46a563308 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,10 @@ 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, @@ -778,6 +804,13 @@ int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, } } + if (sei->lcevc.info) { + HEVCSEILCEVC *lcevc = &sei->lcevc; + ret = ff_frame_new_side_data_from_buf(avctx, frame, AV_FRAME_DATA_LCEVC, &lcevc->info); + if (ret < 0) + return ret; + } + if (sei->film_grain_characteristics.present) { H2645SEIFilmGrainCharacteristics *fgc = &sei->film_grain_characteristics; AVFilmGrainParams *fgp = av_film_grain_params_create_side_data(frame); @@ -875,6 +908,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 */