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 13C0B4D432 for ; Wed, 24 Dec 2025 01:50:17 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'iYKNP8muVhfRkLiW7p2Zh1qwoy5tDmevnuZD38JE0Zo=', expected b'AT5rHXe1fCIs744UmjAdb5XayDRCpyuXH6Hl4igMAzw=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1766541006; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=iYKNP8muVhfRkLiW7p2Zh1qwoy5tDmevnuZD38JE0Zo=; b=MrTjMKvk44d7znIHeB5EtJgbj6yQfX5IOKhl3hmi30vADauPJZWObMQSqtwhG8FZvw+6/ kYegT5J4mWGUbzf8USVs47u4AqgWBN0hKNrY5YW34P7suFSvRylpddQdBvoYrgs/pOcpdrb hh/Yn6QzBrm1Tnc1YYVlFZ7GsXtjJbKvYbU6R8uMWNQcr3RN+Lg58OmlUhsHljo12fMxFcO lNobUWDrD94pDLvh/7vPPPiiwBS8Am9UhjyD+ZeZREY9K5z5r4X9IancfMsYz6bXloOkcc3 v9NFUs9PU0iiXQKMyowmGv9L0OGLas07rmmB7t0eXtVIc2QuQDl1v1lbjWUA== Received: from [172.20.0.4] (unknown [172.20.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 78BAA690B5C; Wed, 24 Dec 2025 03:50:06 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1766540991; b=lCt1mFkT/AV4lT+jPKQiE3o4fxdwQL8qfklpN16HjS2tO+2jrjC94gNJMt43NEtQXdgHy /B2hww4yRHc/f0EPt+y83MqJyGpDKLlXeIIK1oZcFd8H/YQvqA3k2iiYUzj/J0viTzpJSG3 Lqx9fHMKGYaccCzjURIbGps14wYTTzD7Sfwhy3bkLdcrK3dUzvFqy6QuLpLFLhvISqvMkLX Sa+KFc7h5p+C7RHUJ53qHPekV+wsbwKEQBI2n9MtUyXifB+Zcazd+/z1L18tl42FGgaa1GI uFt7cNHwkZU4vvASGU0bWnScODu4EzzbQlmED8mUFcE7bbl2E+4JxoPaxx9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1766540991; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=j6iMu71XYonHftfLdo8MC0uhIqe1lpR4zl+rdmvRFoU=; b=a1gr9t1DGUtSIFSTcwTRIfLSX05WtFsf1g+C+7CgUTPvZkUi5nStwY3snKWRloSMQhGIm RoH7GvHkjXP8QTUgTpsnsVTeZ5f1c33eL/Q+tLgkSWqS8hjr7K6DUigjPGzk6JH/57cubNL ryk+gW1BUAXYTfJGbkRHXRjHPzSIIm7gCXBVbgVBamq5xW1Dliqd6sluvjFgMDRu3dgo4jl HcLEDY2e/qx1DSFz+rXd0l5dmZxXcdPj/HbnxPz2trpVZZoUS0PnKBq2M8poicXzCAiYD/K JSglej2yR3NYO6Ex3GseOfXqHfIS/DS6qHVbi4ebnY2fhbI2FNQhO4PHyeYA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1766540981; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=AT5rHXe1fCIs744UmjAdb5XayDRCpyuXH6Hl4igMAzw=; b=Qyd0apKdvgDITgc8aBuS3d7X+f7z3k95bNaerp5WMiQ/fVf2CnfeMXB5qUHch1aW6EPjZ nreW2mZYKTkuX1tvr4c+RtF/tym9lSRMopCesbF1KxGwUXdLsUKHLYnFUWmaijcwWB/sU/Q LdNnk1dbE6YWvQMs+4MDvGPvbeF6EzvpUJwIGJqbJ/MJgf31x4bkysSiSbPdJQWwfZ+Xemc LSCjtirktcijC5l5IbFj8Sybt2c+KT2tmE4xbAdJEfYpb+Q1OzYcBFgUomPUqpd1T67tDRB J/XK6vbJg2Go6vWJ9DKRAufazJ2ec8wfvjdMkotCZM4RL4bbAAouUMJh9hPQ== Received: from 55ca25703178 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id CDFF7690AE9 for ; Wed, 24 Dec 2025 03:49:41 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Dec 2025 01:49:41 -0000 Message-ID: <176654098202.25.16412375468347697572@4457048688e7> Message-ID-Hash: VT2KBYCNMWROV6LIWHBWUXJ735AF6FRE X-Message-ID-Hash: VT2KBYCNMWROV6LIWHBWUXJ735AF6FRE X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] Parse matroska LanguageBCP47 field and add it to AVStream::metadata (PR #21288) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: moi15moi via ffmpeg-devel Cc: moi15moi Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: 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 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 -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org