PR #21288 opened by moi15moi URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21288 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21288.patch
Fix https://code.ffmpeg.org/FFmpeg/FFmpeg/issues/21257 >From 0997bc9b4398dcd38a9a56685f4b2b39fa47ce79 Mon Sep 17 00:00:00 2001 From: moi15moi <[email protected]> Date: Tue, 23 Dec 2025 20:46:54 -0500 Subject: [PATCH] Parse matroska LanguageBCP47 field and add it to AVStream::metadata Fix https://code.ffmpeg.org/FFmpeg/FFmpeg/issues/21257 --- libavformat/avformat.h | 3 +++ libavformat/matroska.h | 1 + libavformat/matroskadec.c | 5 +++++ libavformat/matroskaenc.c | 3 +++ 4 files changed, 12 insertions(+) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index cee845b308..bc27e26a4f 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -393,6 +393,9 @@ struct AVFrame; language -- main language in which the work is performed, preferably in ISO 639-2 format. Multiple languages can be specified by separating them with commas. + language_bcp47 -- main language in which the work is performed, + in BCP-47 format. Multiple languages can be specified by + separating them with commas. performer -- artist who performed the work, if different from artist. E.g for "Also sprach Zarathustra", artist would be "Richard Strauss" and performer "London Philharmonic Orchestra". diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 719f2ef796..aa0b7a5df8 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -94,6 +94,7 @@ #define MATROSKA_ID_SEEKPREROLL 0x56BB #define MATROSKA_ID_TRACKNAME 0x536E #define MATROSKA_ID_TRACKLANGUAGE 0x22B59C +#define MATROSKA_ID_TRACKLANGUAGEBCP47 0x22B59D #define MATROSKA_ID_TRACKFLAGENABLED 0xB9 #define MATROSKA_ID_TRACKFLAGDEFAULT 0x88 #define MATROSKA_ID_TRACKFLAGFORCED 0x55AA diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 8b5eda8213..43757788b1 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -269,6 +269,7 @@ typedef struct MatroskaTrack { char *codec_id; EbmlBin codec_priv; char *language; + char *language_bcp47; double time_scale; uint64_t default_duration; uint64_t flag_default; @@ -615,6 +616,7 @@ static EbmlSyntax matroska_track[] = { { MATROSKA_ID_CODECPRIVATE, EBML_BIN, 0, 0, offsetof(MatroskaTrack, codec_priv) }, { MATROSKA_ID_CODECDELAY, EBML_UINT, 0, 0, offsetof(MatroskaTrack, codec_delay), { .u = 0 } }, { MATROSKA_ID_TRACKLANGUAGE, EBML_STR, 0, 0, offsetof(MatroskaTrack, language), { .s = "eng" } }, + { MATROSKA_ID_TRACKLANGUAGEBCP47, EBML_STR, 0, 0, offsetof(MatroskaTrack, language_bcp47) }, { MATROSKA_ID_TRACKDEFAULTDURATION, EBML_UINT, 0, 0, offsetof(MatroskaTrack, default_duration) }, { MATROSKA_ID_TRACKTIMECODESCALE, EBML_FLOAT, 0, 0, offsetof(MatroskaTrack, time_scale), { .f = 1.0 } }, { MATROSKA_ID_TRACKFLAGCOMMENTARY, EBML_UINT, 0, 0, offsetof(MatroskaTrack, flag_comment), { .u = 0 } }, @@ -3242,6 +3244,9 @@ static int matroska_parse_tracks(AVFormatContext *s) av_dict_set(&st->metadata, "language", track->language, 0); av_dict_set(&st->metadata, "title", track->name, 0); + if (strcmp(track->language_bcp47, "und")) + av_dict_set(&st->metadata, "language_bcp47", track->language_bcp47, 0); + if (track->time_scale < 0.01) { av_log(matroska->ctx, AV_LOG_WARNING, "Track TimestampScale too small %f, assuming 1.0.\n", diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 18f17f4329..b95daa8005 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1903,6 +1903,9 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, tag = av_dict_get(st->metadata, "language", NULL, 0); put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, tag && tag->value[0] ? tag->value : "und"); + tag = av_dict_get(st->metadata, "language_bcp47", NULL, 0); + put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGEBCP47, + tag && tag->value[0] ? tag->value : "und"); // The default value for TRACKFLAGDEFAULT is 1, so add element // if we need to clear it. -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
