Skip to content

fix(608): only apply pop-on→roll-up EOF fallback when start time is unset #2291

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

Open
x15sr71 wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Open

fix(608): only apply pop-on→roll-up EOF fallback when start time is unset #2291

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
6 changes: 3 additions & 3 deletions src/lib_ccx/ccx_decoders_608.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,18 +317,18 @@ int write_cc_buffer(ccx_decoder_608_context *context, struct cc_subtitle *sub)
if (context->mode == MODE_FAKE_ROLLUP_1 && // Use the actual start of data instead of last buffer change
context->ts_start_of_current_line != -1)
context->current_visible_start_ms = context->ts_start_of_current_line;

// Pop-on -> roll-up transition that never saw a scrolling CR (e.g. EOF
// with fewer lines than the roll-up window). The CR handler never ran,
// so back-fill current_visible_start_ms from the first-char FTS instead
// of emitting a caption starting at 0.
if (context->rollup_from_popon && context->ts_first_char_rollup_transition > 0)
if (context->rollup_from_popon &&
context->ts_first_char_rollup_transition > 0 &&
context->current_visible_start_ms <= 0)
{
context->current_visible_start_ms = context->ts_first_char_rollup_transition;
context->rollup_from_popon = 0;
context->ts_first_char_rollup_transition = -1;
}

start_time = context->current_visible_start_ms;
end_time = get_visible_end(context->timing, context->my_field);
sub->type = CC_608;
Expand Down
Loading