From patchwork Tue Mar 12 18:44:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 47005 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp2058736pzb; Tue, 12 Mar 2024 11:45:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXQjSjVdeQA0xM7Yry+HrEc3/c4A3s/tyRGtHX+xwVOQD4sethJA+K0HBj9LmVPz0+d0qcA1c/uzioAsTwBL9XPd7E8qjTNtJ3qpw== X-Google-Smtp-Source: AGHT+IFEkxAPFqLYVd5WqmCo3vR7RIGBf2SkoXDGZZR3A3Lt7/fNC798FAYl2g3HovEOH6yv4PLW X-Received: by 2002:a17:906:a24f:b0:a45:182e:29ba with SMTP id bi15-20020a170906a24f00b00a45182e29bamr873078ejb.30.1710269151598; Tue, 12 Mar 2024 11:45:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710269151; cv=none; d=google.com; s=arc-20160816; b=BEdMmmyCEh6PveYz8TonRogZF5LwyRDOpwbMm1Q2njcWFC5+j8ygyuJVmEAMpUxDw9 NC+T7H8NX1HHoGFJOg+r8BwIbfltXuE154CHWvrQLjiGdNPjD5TQOHfN3H1kQYJoiT9T DMxjWQ6hJHWk9aptCH3q+lLRn6GT7hlGedrmMPDbPO2GLS9kNkVDIICaFliweFv8iI/H /1ikn8RsLliZuqbNWYBO7brBGXpx5fOjTyfVtecmxi5bf1XtQLVNXBJjtVtpcE93Glrd 1oZnDv8k0Y60f27qj1iYFYh2L4qYw4w4a3ht2ekrYd8f0aSe4ua9QMHXyIGSwl5swO+0 53Qw== 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=iQWxP+ISVgB4T8aAtK7m/MhlqR/q1YE8Y+sbLQqUo9E=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=asxJiox+4tBi/42mgDm27BVH1un5EOMEMiiZc0XglRRSaTUB63mONSla/+V4jCJmI1 eEW2Yqx8Jy9D8cWOuyjrSz3cm3Ch/NOw3S8UJL7kcmAKB1fEiwMyumw6m+Vt5zyg3dNl Lu+8lE764lmsHt9K4skwbZYPKa3spS/O69nqsL4weQlj5w6i4uDkj0UkO5WWLf6njiTT pXKboDQBaEUPhHooYqlN5Vw+Re4KqFTnW+l2GIianbqxpkvRteoFeyHRMFYqV6vTF0Nw Mzlk3TK1NefdNrSqJeSVuWdZNgYjsygkfFFWTu7ZhkxJp2q5hdniL0X68VyBbCofDKkR 9CMQ==; 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=KAAFATuk; 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 du17-20020a17090772d100b00a43ff1d85b2si3668786ejc.414.2024.03.12.11.45.51; Tue, 12 Mar 2024 11:45:51 -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=KAAFATuk; 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 0E8EE68D0D2; Tue, 12 Mar 2024 20:45:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F5F868CF01 for ; Tue, 12 Mar 2024 20:45:35 +0200 (EET) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-6e6a6d486d6so91228b3a.1 for ; Tue, 12 Mar 2024 11:45:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710269133; x=1710873933; 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=eaukaqe47aB9VtUFW912IeUzBWCAvtqfrYYk7CcoJno=; b=KAAFATuk/Qlydqcj6amqh223lxIHl/bUicopC+0t6VpMLuIwLuGXbsrlgBwrVhMD64 nHM848qj8bU0n8RNhtcA/Ed5CBMttndP39M2xb9S8kWuVBbsIiKJ5AjjLJmX4FE9b6Vr 8SBpP6Qazf9aXlYuc+KyfBSCYuLZDHGSWwOfQG8l07T0kF6FRWwQ5Zm/lVYzfSJdCq30 mxZdQpRqH6+RjZZ4P0Jd5oqz9OmhJ7Qrlyn52jrrOvYjrKSyd0idm4x1iW9pYCH7dNux dEMZa+uTNFDfdi/fnljROrLveLXCh+EW7P2o1Xn2Zz2gS9KZvuSf0Vea/Wf2dy+wbFHZ Phlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710269133; x=1710873933; 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=eaukaqe47aB9VtUFW912IeUzBWCAvtqfrYYk7CcoJno=; b=Jvhwx78eX0lN+S2/n2ampYbjoLSeRXGqDYVrlgnE4pN0IrnAp7vxnmHO637ZDajrD8 hKbiqaBOObRz8Kn4yjkqlKp/su66Dv1Kp+yPTb5JsRhevVq2AxhC8qGhanivg60DWkw7 5MyG6/0YLuUBWGJff0GKEbJ8wy3LzDA5IBLfh4IPH7u9/YANHv8qfQy7oeYzxiPICeWO THdxuA5w2++a+jvzBN9O0vvESoCsetOuzScGPhVsDuCIANqqvIdMbWiFfDN7vJ+Y/6UB RH7MoZoXjcS+RejfMPWS4wW2lqPRAteVfQbYgpYbC6UkiymaqQRqR8ihbusV15v41yYh /BhQ== X-Gm-Message-State: AOJu0YxCzwroRsskTyfKV6bYneV1f0p+X2ndEu2QtfNB4hlmfLaJlFlR qMYpNzO1ZsFwD5KFFJvktSy+vbyJckmoJhWwzPcS7NK3W3hBze0zNw87w8ro X-Received: by 2002:a05:6a20:9389:b0:1a0:8897:85f1 with SMTP id x9-20020a056a20938900b001a0889785f1mr538273pzh.6.1710269132949; Tue, 12 Mar 2024 11:45:32 -0700 (PDT) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id y187-20020a62cec4000000b006e4d8687f44sm6734326pfg.102.2024.03.12.11.45.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 11:45:32 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Mar 2024 15:44:33 -0300 Message-ID: <20240312184435.7420-2-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240312184435.7420-1-jamrial@gmail.com> References: <20240312184435.7420-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/h2645_sei: use named constants for ITU-T T.35 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: WvE70/KdX26m Signed-off-by: James Almer --- libavcodec/h2645_sei.c | 10 ++++++---- libavcodec/itut35.h | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index e60606f43f..e8eb15524f 100644 --- a/libavcodec/h2645_sei.c +++ b/libavcodec/h2645_sei.c @@ -40,6 +40,7 @@ #include "get_bits.h" #include "golomb.h" #include "h2645_sei.h" +#include "itut35.h" #define IS_H264(codec_id) (CONFIG_H264_SEI && CONFIG_HEVC_SEI ? codec_id == AV_CODEC_ID_H264 : CONFIG_H264_SEI) #define IS_HEVC(codec_id) (CONFIG_H264_SEI && CONFIG_HEVC_SEI ? codec_id == AV_CODEC_ID_HEVC : CONFIG_HEVC_SEI) @@ -140,7 +141,8 @@ static int decode_registered_user_data(H2645SEI *h, GetByteContext *gb, bytestream2_skipu(gb, 1); // itu_t_t35_country_code_extension_byte } - if (country_code != 0xB5 && country_code != 0x26) { // usa_country_code and cn_country_code + if (country_code != ITU_T_T35_COUNTRY_CODE_US && + 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", country_code); @@ -151,7 +153,7 @@ static int decode_registered_user_data(H2645SEI *h, GetByteContext *gb, provider_code = bytestream2_get_be16u(gb); switch (provider_code) { - case 0x31: { // atsc_provider_code + case ITU_T_T35_PROVIDER_CODE_ATSC: { uint32_t user_identifier; if (bytestream2_get_bytes_left(gb) < 4) @@ -172,7 +174,7 @@ static int decode_registered_user_data(H2645SEI *h, GetByteContext *gb, break; } #if CONFIG_HEVC_SEI - case 0x04: { // cuva_provider_code + case ITU_T_T35_PROVIDER_CODE_CUVA: { const uint16_t cuva_provider_oriented_code = 0x0005; uint16_t provider_oriented_code; @@ -188,7 +190,7 @@ static int decode_registered_user_data(H2645SEI *h, GetByteContext *gb, } break; } - case 0x3C: { // smpte_provider_code + case ITU_T_T35_PROVIDER_CODE_SMTPE: { // A/341 Amendment - 2094-40 const uint16_t smpte2094_40_provider_oriented_code = 0x0001; const uint8_t smpte2094_40_application_identifier = 0x04; diff --git a/libavcodec/itut35.h b/libavcodec/itut35.h index 10063e6a9e..ffa7024981 100644 --- a/libavcodec/itut35.h +++ b/libavcodec/itut35.h @@ -19,9 +19,11 @@ #ifndef AVCODEC_ITUT35_H #define AVCODEC_ITUT35_H +#define ITU_T_T35_COUNTRY_CODE_CN 0x26 #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_SMTPE 0x3C