--- Begin Message ---
From: Maryla <mar...@google.com>
ITU-T T.35 provider codes are attributed by national bodies and it's
possible to have collisions across countries. This is why the country code
must always be checked as well.
In the code this could be done by having an outer switch on the country code,
then an inner switch on the provider code, but this would add an extra level of
indentation and is not necessary as long as the codes used don't collide.
Rename some of the constants to match the corresponding organization.
Add a constant for AOM.
Write all constants with 4 hex digits to make it clear that they are 2-byte ids.
The code for V-Nova should be 0x5000 instead of 0x0050 according to the
UK Register of Manufacturer Codes
https://www.cix.co.uk/~bpechey/H221/h221code.htm
but I have been unable to find any reference for what code should be used for
LCEVC, and the author of the original change has not replied to my emails.
Signed-off-by: Maryla Ustarroz-Calonge <mar...@google.com>
---
libavcodec/av1dec.c | 5 ++++-
libavcodec/h2645_sei.c | 27 +++++++++++++++++++++------
libavcodec/itut35.h | 21 ++++++++++++++++-----
libavcodec/libdav1d.c | 5 ++++-
libavformat/matroskadec.c | 2 +-
libavformat/matroskaenc.c | 2 +-
6 files changed, 47 insertions(+), 15 deletions(-)
diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c
index 8ff1bf394c..8618b9f015 100644
--- a/libavcodec/av1dec.c
+++ b/libavcodec/av1dec.c
@@ -972,6 +972,9 @@ static int export_itut_t35(AVCodecContext *avctx, AVFrame
*frame,
provider_code = bytestream2_get_be16(&gb);
switch (provider_code) {
case ITU_T_T35_PROVIDER_CODE_ATSC: {
+ if (itut_t35->itu_t_t35_country_code != ITU_T_T35_COUNTRY_CODE_US)
+ break;
+
uint32_t user_identifier = bytestream2_get_be32(&gb);
switch (user_identifier) {
case MKBETAG('G', 'A', '9', '4'): { // closed captions
@@ -999,7 +1002,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
}
break;
}
- case ITU_T_T35_PROVIDER_CODE_SMTPE: {
+ case 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 d17c4fb5f9..c1fb37042d 100644
--- a/libavcodec/h2645_sei.c
+++ b/libavcodec/h2645_sei.c
@@ -172,6 +172,9 @@ static int decode_registered_user_data(H2645SEI *h,
GetByteContext *gb,
switch (provider_code) {
case ITU_T_T35_PROVIDER_CODE_ATSC: {
+ if (country_code != ITU_T_T35_COUNTRY_CODE_US)
+ goto unsupported_provider_code;
+
uint32_t user_identifier;
if (bytestream2_get_bytes_left(gb) < 4)
@@ -191,7 +194,10 @@ static int decode_registered_user_data(H2645SEI *h,
GetByteContext *gb,
}
break;
}
- case ITU_T_T35_PROVIDER_CODE_LCEVC: {
+ case ITU_T_T35_PROVIDER_CODE_VNOVA: {
+ if (country_code != ITU_T_T35_COUNTRY_CODE_UK)
+ goto unsupported_provider_code;
+
if (bytestream2_get_bytes_left(gb) < 2)
return AVERROR_INVALIDDATA;
@@ -199,7 +205,10 @@ static int decode_registered_user_data(H2645SEI *h,
GetByteContext *gb,
return decode_registered_user_data_lcevc(&h->lcevc, gb);
}
#if CONFIG_HEVC_SEI
- case ITU_T_T35_PROVIDER_CODE_CUVA: {
+ case ITU_T_T35_PROVIDER_CODE_HDR_VIVID: {
+ if (country_code != ITU_T_T35_COUNTRY_CODE_CN)
+ goto unsupported_provider_code;
+
const uint16_t cuva_provider_oriented_code = 0x0005;
uint16_t provider_oriented_code;
@@ -215,7 +224,10 @@ static int decode_registered_user_data(H2645SEI *h,
GetByteContext *gb,
}
break;
}
- case ITU_T_T35_PROVIDER_CODE_SMTPE: {
+ case ITU_T_T35_PROVIDER_CODE_SAMSUNG: {
+ if (country_code != ITU_T_T35_COUNTRY_CODE_US)
+ goto unsupported_provider_code;
+
// A/341 Amendment - 2094-40
const uint16_t smpte2094_40_provider_oriented_code = 0x0001;
const uint8_t smpte2094_40_application_identifier = 0x04;
@@ -236,7 +248,10 @@ static int decode_registered_user_data(H2645SEI *h,
GetByteContext *gb,
}
break;
}
- case 0x5890: { // aom_provider_code
+ case ITU_T_T35_PROVIDER_CODE_AOM: {
+ if (country_code != ITU_T_T35_COUNTRY_CODE_US)
+ goto unsupported_provider_code;
+
const uint16_t aom_grain_provider_oriented_code = 0x0001;
uint16_t provider_oriented_code;
@@ -258,8 +273,8 @@ static int decode_registered_user_data(H2645SEI *h,
GetByteContext *gb,
#endif
default:
av_log(logctx, AV_LOG_VERBOSE,
- "Unsupported User Data Registered ITU-T T35 SEI message
(provider_code = %d)\n",
- provider_code);
+ "Unsupported User Data Registered ITU-T T35 SEI message
(country_code = %d, provider_code = %d)\n",
+ country_code, provider_code);
break;
}
diff --git a/libavcodec/itut35.h b/libavcodec/itut35.h
index a75ef37929..b8987d0b01 100644
--- a/libavcodec/itut35.h
+++ b/libavcodec/itut35.h
@@ -23,10 +23,21 @@
#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
+// The Terminal Provider Code (or "Manufacturer Code") identifies the
+// manufacturer within a country. An Assignment Authority appointed by the
+// 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_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_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_SAMSUNG 0x003C
#endif /* AVCODEC_ITUT35_H */
diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c
index f4cbc927b5..4678c29ac8 100644
--- a/libavcodec/libdav1d.c
+++ b/libavcodec/libdav1d.c
@@ -522,6 +522,9 @@ static int libdav1d_receive_frame(AVCodecContext *c,
AVFrame *frame)
provider_code = bytestream2_get_be16(&gb);
switch (provider_code) {
case ITU_T_T35_PROVIDER_CODE_ATSC: {
+ if (itut_t35->country_code != ITU_T_T35_COUNTRY_CODE_US)
+ break;
+
uint32_t user_identifier = bytestream2_get_be32(&gb);
switch (user_identifier) {
case MKBETAG('G', 'A', '9', '4'): { // closed captions
@@ -549,7 +552,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
}
break;
}
- case ITU_T_T35_PROVIDER_CODE_SMTPE: {
+ case 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 da5166319e..27baf3f18e 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.0.rc2.692.g299adb8693-goog
--- End Message ---
