From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 478504009D for ; Tue, 19 Apr 2022 00:58:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6AA3468A8CD; Tue, 19 Apr 2022 03:58:40 +0300 (EEST) Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7225B68008D for ; Tue, 19 Apr 2022 03:58:34 +0300 (EEST) Received: by mail-lf1-f43.google.com with SMTP id w1so3391717lfa.4 for ; Mon, 18 Apr 2022 17:58:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=VmJ0L38exYsC7iGRHKisW2z+MLh59sF6Hme7TN4YdDI=; b=A94MjAgZiZoriWdY6OBs+18pXrPK3Kc0Qui9MgOIJwIcqaAtH7s61E393ooYrqGCly 6DwQgfi6x8Q+BN43sOZQi44l7ca80+uGJT4lFTDsyTIB0UHc9PpfgJG/kv/lzRlHchwb R9iBz/8aGv2otM9QQO+0W9DncYeN5fNVFtfz7Mm/0diWuc5xbnQ/ohib+dn5aZPO/wkG wIUBQlmBmY2ZoDLVSLClDM1caDW+NIWsC0Vsxdl2t1ZtEQdTbJGNUe1eC9J0rQ7d0xpd migJ1uO+I4/Iwqu+m6T0pOo/uW27iMu/0qiAPIvdUBQpxHmRY8T7LvI5MUDS5dQsA873 /iDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=VmJ0L38exYsC7iGRHKisW2z+MLh59sF6Hme7TN4YdDI=; b=B6dKxem88cn2yB0QalqKOiEYDeEINrjloBO0fRTAIGZX16HU4A1gW3BBErbmUEjXCw OpoR+YTGcA5ePMsmiPYckRjxu0gc2ULJbGrIJe3ChEd1yvOw+Xv+kEMteP3x+C4gSzbC UfRfEGNa6VO53f6SfgeVWTr0HDgkn9zGRJB1ZZKbORqU5eovzmsvgjFvY3GF6RNUjBuz zFStISVQ9hDEPEUDJT58OVyL2m/dIrK8j0GX4IBCqi4+cE6MkxOsT5msTMNKS9ESOrlH EPfqhfDsOH510fGqWCURq6jsOeBnTMiRHQ4+HPN4ZS/v1xZ/cBIGBsEH3cVzaY1W1TZK IHgQ== X-Gm-Message-State: AOAM531sdwpPxcdKp6bNlYFqedIhflB4mvtvu4JreZFJcqhnWkotAFTA Ghbzwo25xylRMnZAFXGN9tAxKlGt02m8INYg X-Google-Smtp-Source: ABdhPJyI+yj+fNOX4oR+lhB/Oh4K3xYApRUgXH/FrpA/VijZWxIWZ9lbRMKL7Mro0heZ8LBuzIW9+g== X-Received: by 2002:ac2:46fa:0:b0:46b:c3a7:97fe with SMTP id q26-20020ac246fa000000b0046bc3a797femr9353003lfo.95.1650329913595; Mon, 18 Apr 2022 17:58:33 -0700 (PDT) Received: from Dana.systemlords.lan (ptr-7sz70r29rb8x3w8lp35.18120a2.ip6.access.telenet.be. [2a02:1811:41e:dc00:a9fe:89bb:5198:6a41]) by smtp.gmail.com with ESMTPSA id y16-20020a2e9d50000000b00247b105c11dsm1311617ljj.34.2022.04.18.17.58.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Apr 2022 17:58:32 -0700 (PDT) From: James Darnley To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Apr 2022 02:58:29 +0200 Message-Id: <20220419005829.1886458-1-james.darnley@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_subtitles: add an option to choose sub stream by language 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: , Reply-To: FFmpeg development discussions and patches 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: --- doc/filters.texi | 5 +++++ libavfilter/vf_subtitles.c | 23 ++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index a161754233..cfbc807f16 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -21160,6 +21160,11 @@ Override default style or script info parameters of the subtitles. It accepts a string containing ASS style format @code{KEY=VALUE} couples separated by ",". @end table +@item language +Use first stream with the given language, ISO language code. @code{subtitles} +filter only. Requires the language metadata to be read from the file. +@end table + If the first key is not specified, it is assumed that the first value specifies the @option{filename}. diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index 82e140e986..95f0a940d9 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -54,6 +54,7 @@ typedef struct AssContext { char *fontsdir; char *charenc; char *force_style; + char *language; int stream_index; int alpha; uint8_t rgba_map[4]; @@ -271,6 +272,7 @@ static const AVOption subtitles_options[] = { {"stream_index", "set stream index", OFFSET(stream_index), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS}, {"si", "set stream index", OFFSET(stream_index), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS}, {"force_style", "force subtitle style", OFFSET(force_style), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS}, + {"language", "use first stream of this language", OFFSET(language), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, FLAGS}, {NULL}, }; @@ -340,9 +342,8 @@ static av_cold int init_subtitles(AVFilterContext *ctx) goto end; /* Locate subtitles stream */ - if (ass->stream_index < 0) - ret = av_find_best_stream(fmt, AVMEDIA_TYPE_SUBTITLE, -1, -1, NULL, 0); - else { + /* If the user has specified a particular stream use that. */ + if (ass->stream_index >= 0) { ret = -1; if (ass->stream_index < fmt->nb_streams) { for (j = 0; j < fmt->nb_streams; j++) { @@ -357,6 +358,22 @@ static av_cold int init_subtitles(AVFilterContext *ctx) } } + /* Otherwise find the first stream with the given language code. */ + else if (ass->language) { + ret = -1; + for (j = 0; j < fmt->nb_streams; j++) { + const AVDictionaryEntry *lang = av_dict_get(fmt->streams[j]->metadata, "language", NULL, 0); + if (lang && !strcmp(lang->value, ass->language)) { + ret = j; + break; + } + } + } + + /* Finally fall back to the "best" stream. */ + else + ret = av_find_best_stream(fmt, AVMEDIA_TYPE_SUBTITLE, -1, -1, NULL, 0); + if (ret < 0) { av_log(ctx, AV_LOG_ERROR, "Unable to locate subtitle stream in %s\n", ass->filename); -- 2.35.1 _______________________________________________ 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".