Skip to content

sub/sd_sbr: pass track language to sbr_load_text #17273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kasper93 merged 1 commit into from
Jan 15, 2026
Merged

sub/sd_sbr: pass track language to sbr_load_text #17273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions sub/dec_sub.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ struct dec_sub {

struct mp_codec_params *codec;
double start, end;
char *lang;

double last_vo_pts;
struct sd *sd;
Expand Down Expand Up @@ -171,6 +172,7 @@ static struct sd *init_decoder(struct dec_sub *sub)
.order = sub->order,
.attachments = sub->attachments,
.codec = sub->codec,
.lang = sub->lang,
.preload_ok = true,
};

Expand Down Expand Up @@ -204,6 +206,7 @@ struct dec_sub *sub_create(struct mpv_global *global, struct track *track,
.shared_opts_cache = m_config_cache_alloc(sub, global, &mp_subtitle_shared_sub_opts),
.sh = track->stream,
.codec = track->stream->codec,
.lang = track->lang,
.attachments = talloc_steal(sub, attachments),
.play_dir = 1,
.order = order,
Expand Down
1 change: 1 addition & 0 deletions sub/sd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ struct sd {

struct attachment_list *attachments;
struct mp_codec_params *codec;
const char *lang;

// Set to false as soon as the decoder discards old subtitle events.
// (only needed if sd_functions.accept_packets_in_advance == false)
Expand Down
2 changes: 1 addition & 1 deletion sub/sd_sbr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ static void decode(struct sd *sd, struct demux_packet *packet)
packet->buffer,
packet->len,
fmt,
NULL
sd->lang
);

// Since `demux_sbr` only ever sends us one packet,
Expand Down