From 7e95bbec4dd8eb2a96387eceeda6c0c236766fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= Date: Mon, 3 Mar 2025 13:22:08 +0100 Subject: [PATCH 1/2] lavc: Replace 181 magic number with ITU_T_T35_COUNTRY_CODE_US --- libavcodec/atsc_a53.c | 3 ++- libavcodec/vaapi_encode_h264.c | 3 ++- libavcodec/vaapi_encode_h265.c | 3 ++- libavcodec/vulkan_encode_h264.c | 3 ++- libavcodec/vulkan_encode_h265.c | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libavcodec/atsc_a53.c b/libavcodec/atsc_a53.c index 1e9ea15ae0..2fdaa66e88 100644 --- a/libavcodec/atsc_a53.c +++ b/libavcodec/atsc_a53.c @@ -22,6 +22,7 @@ #include "libavutil/mem.h" #include "atsc_a53.h" #include "get_bits.h" +#include "itut35.h" int ff_alloc_a53_sei(const AVFrame *frame, size_t prefix_len, void **data, size_t *sei_size) @@ -44,7 +45,7 @@ int ff_alloc_a53_sei(const AVFrame *frame, size_t prefix_len, sei_data = (uint8_t*)*data + prefix_len; // country code - sei_data[0] = 181; + sei_data[0] = ITU_T_T35_COUNTRY_CODE_US; sei_data[1] = 0; sei_data[2] = 49; diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index ed20b9cd24..3f9b1be627 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -36,6 +36,7 @@ #include "hw_base_encode_h264.h" #include "h264_levels.h" #include "h2645data.h" +#include "itut35.h" #include "vaapi_encode.h" #include "version.h" @@ -501,7 +502,7 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, if (err < 0) return err; if (priv->sei_a53cc_data != NULL) { - priv->sei_a53cc.itu_t_t35_country_code = 181; + priv->sei_a53cc.itu_t_t35_country_code = ITU_T_T35_COUNTRY_CODE_US; priv->sei_a53cc.data = (uint8_t *)priv->sei_a53cc_data + 1; priv->sei_a53cc.data_length = sei_a53cc_len - 1; diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 44d9fdbbd5..c8f08ae443 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -36,6 +36,7 @@ #include "codec_internal.h" #include "h2645data.h" #include "h265_profile_level.h" +#include "itut35.h" #include "vaapi_encode.h" #include "hevc/hevc.h" @@ -603,7 +604,7 @@ static int vaapi_encode_h265_init_picture_params(AVCodecContext *avctx, if (err < 0) return err; if (priv->sei_a53cc_data != NULL) { - priv->sei_a53cc.itu_t_t35_country_code = 181; + priv->sei_a53cc.itu_t_t35_country_code = ITU_T_T35_COUNTRY_CODE_US; priv->sei_a53cc.data = (uint8_t *)priv->sei_a53cc_data + 1; priv->sei_a53cc.data_length = sei_a53cc_len - 1; diff --git a/libavcodec/vulkan_encode_h264.c b/libavcodec/vulkan_encode_h264.c index cdc87fb4ca..51ced5d6ad 100644 --- a/libavcodec/vulkan_encode_h264.c +++ b/libavcodec/vulkan_encode_h264.c @@ -29,6 +29,7 @@ #include "codec_internal.h" #include "version.h" #include "hw_base_encode_h264.h" +#include "itut35.h" #include "vulkan_encode.h" @@ -233,7 +234,7 @@ static int vk_enc_h264_update_pic_info(AVCodecContext *avctx, if (err < 0) return err; if (enc->sei_a53cc_data != NULL) { - enc->sei_a53cc.itu_t_t35_country_code = 181; + enc->sei_a53cc.itu_t_t35_country_code = ITU_T_T35_COUNTRY_CODE_US; enc->sei_a53cc.data = (uint8_t *)enc->sei_a53cc_data + 1; enc->sei_a53cc.data_length = sei_a53cc_len - 1; diff --git a/libavcodec/vulkan_encode_h265.c b/libavcodec/vulkan_encode_h265.c index cd50f2f756..1776da4aa3 100644 --- a/libavcodec/vulkan_encode_h265.c +++ b/libavcodec/vulkan_encode_h265.c @@ -28,6 +28,7 @@ #include "codec_internal.h" #include "version.h" #include "hw_base_encode_h265.h" +#include "itut35.h" #include "vulkan_encode.h" @@ -280,7 +281,7 @@ static int vk_enc_h265_update_pic_info(AVCodecContext *avctx, if (err < 0) return err; if (enc->sei_a53cc_data != NULL) { - enc->sei_a53cc.itu_t_t35_country_code = 181; + enc->sei_a53cc.itu_t_t35_country_code = ITU_T_T35_COUNTRY_CODE_US; enc->sei_a53cc.data = (uint8_t *)enc->sei_a53cc_data + 1; enc->sei_a53cc.data_length = sei_a53cc_len - 1; -- 2.39.5