From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 742554C791 for ; Tue, 5 Aug 2025 10:13:19 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id E26B568C6C8; Tue, 5 Aug 2025 13:12:54 +0300 (EEST) Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id CBEF8687B78 for ; Tue, 5 Aug 2025 13:12:44 +0300 (EEST) Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-459e4b85895so178245e9.2 for ; Tue, 05 Aug 2025 03:12:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754388764; x=1754993564; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NKT3f/IE0w4kdNU6FPlErMoTqr5rnK1LRoe10KPYHeM=; b=hUefwYrFY0bTpzB2eyAJbN3LC12PejA7JfqY2OL3uPVpMdnv3PQlJYcHoTqq7E0PtY yv1HlkeOl3DjZ2wMuZOo6oQmMh+BsKsnbuPqGjHpN+L1MKzkImvgfStp5oDnV5HThHup YH3L5muMyPcnIyDarx9Xv+Aa1cqzIAoD9CPNYMblpOVOUs2b4Gp9JvnP7xNP2s39HLjx eMk3cS7Pgr2tvNDj/dbFvb3JYFDCN852vV3E51nYO04fCqzQefhhMuKShWHeVdgHVUfb OO2Up5LOVDHcDWULk06ZHVtafHWksUoa3sxBPAhuSrBRA8oWlKfMtmvOyaSkPsD7GLnQ Da8Q== X-Gm-Message-State: AOJu0YyKnzefLT/7cSdUTy8bw8ifQIWhKtDv+gZ26lUqGamRI35Mw7Of /UkBb6oBri7XdB7HImqbBlfdqZWVJc9MighQMH2rJxd7Ue98G7Fmx6ZlZyAIlIKSU5hhSraf/Ts CcyksYJrxiBlrMUOdX5IVZcNEIHT/dWS5HXtY0mkBW1r3dz1Z04Cq2rbkUByytF5x27aY4Nts+u HvemNlboeO8/ijoaVDjUD16bC4Klsvje3AzPxKMw== X-Google-Smtp-Source: AGHT+IEbWH5+qkQ3jjxifkZKP8pqHmyQCRS4uGQOekVE5OmxoHSOkM2sSMSmwsNTVX5xPAYBWMr4CSBxJU4= X-Received: from wmben5.prod.google.com ([2002:a05:600c:8285:b0:459:dc8a:ec9f]) (user=maryla job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4f94:b0:458:bc3f:6a7b with SMTP id 5b1f17b1804b1-4595cffbec0mr78849685e9.18.1754388764180; Tue, 05 Aug 2025 03:12:44 -0700 (PDT) Date: Tue, 5 Aug 2025 12:12:41 +0200 In-Reply-To: <20250805101241.947452-1-maryla@google.com> Mime-Version: 1.0 References: <20250805101241.947452-1-maryla@google.com> X-Mailer: git-send-email 2.50.1.565.gc32cd1483b-goog Message-ID: <20250805101241.947452-3-maryla@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/itut35: rename some provider codes 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: , From: Maryla Ustarroz-Calonge via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Maryla Ustarroz-Calonge Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: In general, a provider code corresponds to a company/organization, and the name should be that of the company, not of a given feature. The feature is signalled in the "provider oriented code". The exception is HDR Vivid, where the code 0x0004 indicates the HDR Vivid feature itself rather than CUVA (China UHD Video Industry Alliance), according to the UHD World Associations 'HDR Video Technology Part 2-1 Application Guide to System Integration' document. ITU_T_T35_PROVIDER_CODE_CUVA -> ITU_T_T35_PROVIDER_CODE_HDR_VIVID ITU_T_T35_PROVIDER_CODE_LCEVC-> ITU_T_T35_PROVIDER_CODE_VNOVA ITU_T_T35_PROVIDER_CODE_SMTPE -> ITU_T_T35_PROVIDER_CODE_SAMSUNG Signed-off-by: Maryla Ustarroz-Calonge --- libavcodec/av1dec.c | 2 +- libavcodec/h2645_sei.c | 6 +++--- libavcodec/itut35.h | 6 +++--- libavcodec/libdav1d.c | 2 +- libavformat/matroskadec.c | 2 +- libavformat/matroskaenc.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 551f79fd7a..be595484d1 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -997,7 +997,7 @@ FF_ENABLE_DEPRECATION_WARNINGS default: // ignore unsupported identifiers break; } - } else if (country_code == ITU_T_T35_COUNTRY_CODE_US && provider_code == ITU_T_T35_PROVIDER_CODE_SMTPE) { + } else if (country_code == ITU_T_T35_COUNTRY_CODE_US && provider_code == ITU_T_T35_PROVIDER_CODE_SAMSUNG) { AVDynamicHDRPlus *hdrplus; int provider_oriented_code = bytestream2_get_be16(&gb); int application_identifier = bytestream2_get_byte(&gb); diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index fe567e1a53..04432b6a8d 100644 --- a/libavcodec/h2645_sei.c +++ b/libavcodec/h2645_sei.c @@ -179,7 +179,7 @@ static int decode_registered_user_data(H2645SEI *h, GetByteContext *gb, user_identifier); break; } - } else if (country_code == ITU_T_T35_COUNTRY_CODE_UK && provider_code == ITU_T_T35_PROVIDER_CODE_LCEVC) { + } else if (country_code == ITU_T_T35_COUNTRY_CODE_UK && provider_code == ITU_T_T35_PROVIDER_CODE_VNOVA) { if (bytestream2_get_bytes_left(gb) < 2) return AVERROR_INVALIDDATA; @@ -187,7 +187,7 @@ static int decode_registered_user_data(H2645SEI *h, GetByteContext *gb, return decode_registered_user_data_lcevc(&h->lcevc, gb); } #if CONFIG_HEVC_SEI - else if (country_code == ITU_T_T35_COUNTRY_CODE_CN && provider_code == ITU_T_T35_PROVIDER_CODE_CUVA) { + else if (country_code == ITU_T_T35_COUNTRY_CODE_CN && provider_code == ITU_T_T35_PROVIDER_CODE_HDR_VIVID) { const uint16_t cuva_provider_oriented_code = 0x0005; uint16_t provider_oriented_code; @@ -201,7 +201,7 @@ static int decode_registered_user_data(H2645SEI *h, GetByteContext *gb, if (provider_oriented_code == cuva_provider_oriented_code) { return decode_registered_user_data_dynamic_hdr_vivid(&h->dynamic_hdr_vivid, gb); } - } else if(country_code == ITU_T_T35_COUNTRY_CODE_US && provider_code == ITU_T_T35_PROVIDER_CODE_SMTPE) { + } else if(country_code == ITU_T_T35_COUNTRY_CODE_US && provider_code == ITU_T_T35_PROVIDER_CODE_SAMSUNG) { // 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 414c76a4fa..b8987d0b01 100644 --- a/libavcodec/itut35.h +++ b/libavcodec/itut35.h @@ -28,16 +28,16 @@ // national body assigns this code nationally. The manufacturer code is always // used in conjunction with a country code. // - CN providers -#define ITU_T_T35_PROVIDER_CODE_CUVA 0x0004 +#define ITU_T_T35_PROVIDER_CODE_HDR_VIVID 0x0004 // - UK providers // V-Nova should be 0x5000 according to UK Register of Manufacturer Codes // https://www.cix.co.uk/~bpechey/H221/h221code.htm // but FFmpeg has been using 0x0050 -#define ITU_T_T35_PROVIDER_CODE_LCEVC 0x0050 +#define ITU_T_T35_PROVIDER_CODE_VNOVA 0x0050 // - US providers #define ITU_T_T35_PROVIDER_CODE_ATSC 0x0031 #define ITU_T_T35_PROVIDER_CODE_DOLBY 0x003B #define ITU_T_T35_PROVIDER_CODE_AOM 0x5890 -#define ITU_T_T35_PROVIDER_CODE_SMTPE 0x003C +#define ITU_T_T35_PROVIDER_CODE_SAMSUNG 0x003C #endif /* AVCODEC_ITUT35_H */ diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 4ade3701bf..a1158a23c4 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -423,7 +423,7 @@ FF_ENABLE_DEPRECATION_WARNINGS default: // ignore unsupported identifiers break; } - } else if (country_code == ITU_T_T35_COUNTRY_CODE_US && provider_code == ITU_T_T35_PROVIDER_CODE_SMTPE) { + } else if (country_code == ITU_T_T35_COUNTRY_CODE_US && provider_code == ITU_T_T35_PROVIDER_CODE_SAMSUNG) { AVDynamicHDRPlus *hdrplus; int provider_oriented_code = bytestream2_get_be16(&gb); int application_identifier = bytestream2_get_byte(&gb); diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 65271aba21..1e0c75c51b 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3931,7 +3931,7 @@ static int matroska_parse_block_additional(MatroskaDemuxContext *matroska, provider_code = bytestream2_get_be16u(&bc); if (country_code != ITU_T_T35_COUNTRY_CODE_US || - provider_code != ITU_T_T35_PROVIDER_CODE_SMTPE) + provider_code != ITU_T_T35_PROVIDER_CODE_SAMSUNG) break; // ignore provider_oriented_code = bytestream2_get_be16u(&bc); diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 408890fa89..8142d9125e 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2869,7 +2869,7 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, size_t payload_size = sizeof(t35_buf) - 6; bytestream_put_byte(&payload, ITU_T_T35_COUNTRY_CODE_US); - bytestream_put_be16(&payload, ITU_T_T35_PROVIDER_CODE_SMTPE); + bytestream_put_be16(&payload, ITU_T_T35_PROVIDER_CODE_SAMSUNG); bytestream_put_be16(&payload, 0x01); // provider_oriented_code bytestream_put_byte(&payload, 0x04); // application_identifier -- 2.50.1.565.gc32cd1483b-goog _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".