From d62f121e2a43331effda47047a8ad523c2aba92e Mon Sep 17 00:00:00 2001
From: John Stebbins <jstebbins.hb@gmail.com>
Date: Thu, 2 Apr 2020 12:22:27 -0600
Subject: [PATCH] subtitles: don't add extra null byte to extradata
---
libhb/decssasub.c | 2 +-
libhb/extradata.c | 20 +-------------------
libhb/handbrake/extradata.h | 1 -
libhb/handbrake/ssautil.h | 4 ++--
libhb/muxavformat.c | 4 +++-
libhb/ssautil.c | 14 +++++++++++---
libhb/stream.c | 2 +-
7 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/libhb/decssasub.c b/libhb/decssasub.c
index 6b057f07b..f4cdb1cd5 100644
--- a/libhb/decssasub.c
+++ b/libhb/decssasub.c
@@ -58,7 +58,7 @@ static int extradataInit( hb_work_private_t * pv )
}
if (st->codecpar->extradata != NULL)
{
- hb_set_text_extradata(&pv->subtitle->extradata, st->codecpar->extradata, st->codecpar->extradata_size);
+ hb_set_extradata(&pv->subtitle->extradata, st->codecpar->extradata, st->codecpar->extradata_size);
}
return 0;
}
diff --git a/libhb/extradata.c b/libhb/extradata.c
index 50ee0b4a2..11db07c63 100644
--- a/libhb/extradata.c
+++ b/libhb/extradata.c
@@ -29,24 +29,6 @@ int hb_set_extradata(hb_data_t **extradata, const uint8_t *bytes, size_t length)
return 0;
}
-int hb_set_text_extradata(hb_data_t **extradata, const uint8_t *bytes, size_t length)
-{
- hb_data_close(extradata);
-
- if (length > 0)
- {
- *extradata = hb_data_init(length + 1);
- if (*extradata == NULL)
- {
- hb_error("extradata: malloc failure");
- return 1;
- }
- memcpy((*extradata)->bytes, bytes, length);
- (*extradata)->bytes[length] = 0;
- }
- return 0;
-}
-
int hb_set_ssa_extradata(hb_data_t **extradata, const char *font, int fs, int w, int h)
{
hb_data_close(extradata);
@@ -88,7 +70,7 @@ int hb_set_ssa_extradata(hb_data_t **extradata, const char *font, int fs, int w,
goto fail;
}
- size_t size = strlen(header) + 1;
+ size_t size = strlen(header);
*extradata = hb_data_init(size);
if (*extradata == NULL)
{
diff --git a/libhb/handbrake/extradata.h b/libhb/handbrake/extradata.h
index 4c6d797bc..b652394f9 100644
--- a/libhb/handbrake/extradata.h
+++ b/libhb/handbrake/extradata.h
@@ -19,7 +19,6 @@ int hb_set_extradata(hb_data_t **extradata, const uint8_t *bytes, size_t length)
int hb_set_h264_extradata(hb_data_t **extradata, uint8_t *sps, size_t sps_length, uint8_t *pps, size_t pps_length);
int hb_set_xiph_extradata(hb_data_t **extradata, uint8_t headers[3][HB_CONFIG_MAX_SIZE]);
-int hb_set_text_extradata(hb_data_t **extradata, const uint8_t *bytes, size_t length);
int hb_set_ssa_extradata(hb_data_t **extradata, const char *font, int fs, int w, int h);
int hb_parse_av1_extradata(hb_data_t *extradata, int *level_idx, int *high_tier);
diff --git a/libhb/handbrake/ssautil.h b/libhb/handbrake/ssautil.h
index 8e7271819..9e26d39f8 100644
--- a/libhb/handbrake/ssautil.h
+++ b/libhb/handbrake/ssautil.h
@@ -20,9 +20,9 @@ typedef struct hb_tx3g_style_context_s hb_tx3g_style_context_t;
#define HB_STYLE_FLAG_BOLD 0x0002
#define HB_STYLE_FLAG_UNDERLINE 0x0004
-hb_subtitle_style_context_t * hb_subtitle_style_init(const char * ssa_header);
+hb_subtitle_style_context_t * hb_subtitle_style_init(const uint8_t * ssa_buf, int size);
hb_tx3g_style_context_t * hb_tx3g_style_init(
- int height, const char * ssa_header);
+ int height, const uint8_t * ssa_buf, int size);
void hb_subtitle_style_close(hb_subtitle_style_context_t ** ctx);
void hb_tx3g_style_close(hb_tx3g_style_context_t ** ctx);
diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
index 2043ad45b..de1ac3805 100644
--- a/libhb/muxavformat.c
+++ b/libhb/muxavformat.c
@@ -980,7 +980,9 @@ static int avformatInit( hb_mux_object_t * m )
subtitle->config.external_filename == NULL)
{
track->st->codecpar->codec_id = AV_CODEC_ID_MOV_TEXT;
- track->tx3g = hb_tx3g_style_init(job->height, (char*)subtitle->extradata);
+ track->tx3g = hb_tx3g_style_init(job->height,
+ subtitle->extradata->bytes,
+ subtitle->extradata->size);
}
else
{
diff --git a/libhb/ssautil.c b/libhb/ssautil.c
index f7a655e93..e818ad032 100644
--- a/libhb/ssautil.c
+++ b/libhb/ssautil.c
@@ -577,9 +577,17 @@ static int add_style(hb_subtitle_style_context_t *ctx,
return 0;
}
-hb_subtitle_style_context_t * hb_subtitle_style_init(const char * ssa_header)
+hb_subtitle_style_context_t * hb_subtitle_style_init(const uint8_t * ssa_buf, int size)
{
hb_subtitle_style_context_t * ctx;
+ char * ssa_header = malloc(size + 1);
+
+ if (ssa_header == NULL)
+ {
+ return NULL;
+ }
+ memcpy(ssa_header, ssa_buf, size);
+ ssa_header[size] = 0;
ctx = calloc(1, sizeof(*ctx));
if (ctx == NULL)
@@ -765,7 +773,7 @@ static int tx3g_update_style(hb_tx3g_style_context_t *ctx, int utf8_end_pos)
}
hb_tx3g_style_context_t *
-hb_tx3g_style_init(int height, const char * ssa_header)
+hb_tx3g_style_init(int height, const uint8_t * ssa_buf, int size)
{
hb_tx3g_style_context_t * ctx;
@@ -774,7 +782,7 @@ hb_tx3g_style_init(int height, const char * ssa_header)
{
return NULL;
}
- ctx->in_style = hb_subtitle_style_init(ssa_header);
+ ctx->in_style = hb_subtitle_style_init(ssa_buf, size);
ctx->height = height;
ctx->style_atoms.buf = NULL;
ctx->style_atoms.size = 0;
diff --git a/libhb/stream.c b/libhb/stream.c
index 840dd891c..1f1083e5c 100644
--- a/libhb/stream.c
+++ b/libhb/stream.c
@@ -5846,7 +5846,7 @@ static void add_ffmpeg_subtitle( hb_title_t *title, hb_stream_t *stream, int id
// Copy the extradata for the subtitle track
if (codecpar->extradata != NULL)
{
- hb_set_text_extradata(&subtitle->extradata, codecpar->extradata, codecpar->extradata_size);
+ hb_set_extradata(&subtitle->extradata, codecpar->extradata, codecpar->extradata_size);
}
if (st->disposition & AV_DISPOSITION_DEFAULT)
--
GitLab