RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-10 19:51:43 +00:00
Code Issues Releases Wiki Activity

sub: minor simplifications

Browse Source 
The awkward "preprocess" step of putting the subtitles through single
filters before doing something else was made unnecessary by the recent
changes.

(Fun fact: I originally planned to move these extra things, like fixing
subtitle gaps/overlaps, to filters - but this would suffer from various
complications, and moving them to the renderers seems much simpler.)
This commit is contained in:
wm4 2015-12-05 23:56:53 +01:00
parent 94c062d0d2
commit 48ed48f7b8
1 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sub/dec_sub.c
View File

@ -337,7 +337,7 @@ static const char *guess_sub_cp(struct mp_log *log, void *talloc_ctx,
return guess; return guess;
} }
static void add_sub_list(struct dec_sub *sub, int at, struct packet_list *subs) static void add_sub_list(struct dec_sub *sub, struct packet_list *subs)
{ {
struct sd *sd = sub_get_last_sd(sub); struct sd *sd = sub_get_last_sd(sub);
assert(sd); assert(sd);
@ -345,7 +345,7 @@ static void add_sub_list(struct dec_sub *sub, int at, struct packet_list *subs)
sd->no_remove_duplicates = true; sd->no_remove_duplicates = true;
for (int n = 0; n < subs->num_packets; n++) for (int n = 0; n < subs->num_packets; n++)
decode_chain_recode(sub, sub->sd + at, sub->num_sd - at, subs->packets[n]); decode_chain_recode(sub, sub->sd, sub->num_sd, subs->packets[n]);
// Hack for broken FFmpeg packet format: make sd_ass keep the subtitle // Hack for broken FFmpeg packet format: make sd_ass keep the subtitle
// events on reset(), even if broken FFmpeg ASS packets were received // events on reset(), even if broken FFmpeg ASS packets were received
@ -384,45 +384,25 @@ bool sub_read_all_packets(struct dec_sub *sub, struct sh_stream *sh)
struct packet_list *subs = talloc_zero(NULL, struct packet_list); struct packet_list *subs = talloc_zero(NULL, struct packet_list);
// In some cases, we want to put the packets through a decoder first.
// Preprocess until sub->sd[preprocess].
int preprocess = 0;
// movtext is currently the only subtitle format that has text output,
// but binary input. Do charset conversion after converting to text.
if (sub->sd[0]->driver == &sd_movtext)
preprocess = 1;
// Broken Libav libavformat srt packet format (fix timestamps first).
if (sub->sd[0]->driver == &sd_lavf_srt)
preprocess = 1;
for (;;) { for (;;) {
struct demux_packet *pkt = demux_read_packet(sh); struct demux_packet *pkt = demux_read_packet(sh);
if (!pkt) if (!pkt)
break; break;
if (preprocess) { add_packet(subs, pkt);
decode_chain(sub->sd, preprocess, pkt); talloc_free(pkt);
talloc_free(pkt);
while (1) {
pkt = get_decoded_packet(sub->sd[preprocess - 1]);
if (!pkt)
break;
add_packet(subs, pkt);
}
} else {
add_packet(subs, pkt);
talloc_free(pkt);
}
} }
if (opts->sub_cp && !sh->sub->is_utf8) // movtext is currently the only subtitle format that has text output,
// but binary input. Skip charset conversion (they're UTF-8 anyway).
bool binary = sub->sd[0]->driver == &sd_movtext;
if (opts->sub_cp && !sh->sub->is_utf8 && !binary)
sub->charset = guess_sub_cp(sub->log, sub, subs, opts->sub_cp); sub->charset = guess_sub_cp(sub->log, sub, subs, opts->sub_cp);
if (sub->charset && sub->charset[0] && !mp_charset_is_utf8(sub->charset)) if (sub->charset && sub->charset[0] && !mp_charset_is_utf8(sub->charset))
MP_INFO(sub, "Using subtitle charset: %s\n", sub->charset); MP_INFO(sub, "Using subtitle charset: %s\n", sub->charset);
add_sub_list(sub, preprocess, subs); add_sub_list(sub, subs);
pthread_mutex_unlock(&sub->lock); pthread_mutex_unlock(&sub->lock);
talloc_free(subs); talloc_free(subs);