Skip to content

[Fix]: SPUPNG indexing, EOD counter advance, and header path determinism #2134

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 2 commits into
base: master
Choose a base branch
from
+15 −5
Open

[Fix]: SPUPNG indexing, EOD counter advance, and header path determinism #2134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0414138
fix(spupng): fix file numbering, EOD index waste, and non-determinist…
x15sr71 Feb 22, 2026
3857a57
docs: add changelog entry
x15sr71 Feb 22, 2026
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
1 change: 1 addition & 0 deletions docs/CHANGES.TXT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
0.96.6 (2026-02-19)
-------------------
- FIX: spupng start numbering at sub0000, avoid index advance on empty EOD, normalize header filename
- New: 32-bit (x86) Windows build and installer (#2116)
- New: Add optional machine-readable JSON output for -out=report via --report-format json
- New: Add Snap packaging support with Snapcraft configuration and GitHub Actions CI workflow
Expand Down
19 changes: 14 additions & 5 deletions src/lib_ccx/ccx_encoders_spupng.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ struct spupng_t *spunpg_init(struct ccx_s_write *out)

if (NULL == sp->pngfile || NULL == sp->relative_path_png)
ccx_common_logging.fatal_ftn(EXIT_NOT_ENOUGH_MEMORY, "spunpg_init: Memory allocation failed (sp->pngfile)");
sp->fileIndex = 0;
sp->fileIndex = -1; /* first call to inc_spupng_fileindex will set this to 0 → sub0000.png */
snprintf(sp->pngfile, pngfile_size, "%s/sub%04d.png", sp->dirname, sp->fileIndex);

// Make relative path
Expand Down Expand Up @@ -136,8 +136,18 @@ void spunpg_free(struct spupng_t *sp)
void spupng_write_header(struct spupng_t *sp, int multiple_files, char *first_input_file)
{
fprintf(sp->fpxml, "<subpictures>\n<stream>\n");

if (multiple_files)
fprintf(sp->fpxml, "<!-- %s -->\n", first_input_file);
{
/* Normalize to basename so XML output is platform-independent */
const char *base = strrchr(first_input_file, '/');
if (!base)
base = strrchr(first_input_file, '\\');

base = base ? base + 1 : first_input_file;

fprintf(sp->fpxml, "<!-- %s -->\n", base);
}
}

void spupng_write_footer(struct spupng_t *sp)
Expand Down Expand Up @@ -397,14 +407,13 @@ int write_cc_bitmap_as_spupng(struct cc_subtitle *sub, struct encoder_ctx *conte
if (sub->data == NULL)
return 0;

inc_spupng_fileindex(sp);

if (sub->nb_data == 0 && (sub->flags & SUB_EOD_MARKER))
{
context->prev_start = -1;
// No subtitle data, skip writing
return 0;
}

inc_spupng_fileindex(sp);
rect = sub->data;
for (i = 0; i < sub->nb_data; i++)
{
Expand Down
Loading