diff options
| author | Tuomas Virtanen <katajakasa@gmail.com> | 2018-09-29 15:59:27 +0300 |
|---|---|---|
| committer | Tuomas Virtanen <katajakasa@gmail.com> | 2018-09-29 15:59:27 +0300 |
| commit | 1f1e88d1da59361ed3aa42549a6ed67c6cd11727 (patch) | |
| tree | 8c7fe3946ad230abd82f5445350c89cb99f7c3b7 /src/internal/subtitle/renderers | |
| parent | 66fb5c295f89b6061585436e1411490393c5137a (diff) | |
Use newer ass_render_chunk() API
Diffstat (limited to 'src/internal/subtitle/renderers')
| -rw-r--r-- | src/internal/subtitle/renderers/kitsubass.c | 19 | ||||
| -rw-r--r-- | src/internal/subtitle/renderers/kitsubimage.c | 4 | ||||
| -rw-r--r-- | src/internal/subtitle/renderers/kitsubrenderer.c | 4 |
3 files changed, 22 insertions, 5 deletions
diff --git a/src/internal/subtitle/renderers/kitsubass.c b/src/internal/subtitle/renderers/kitsubass.c index 7db72dd..88159d9 100644 --- a/src/internal/subtitle/renderers/kitsubass.c +++ b/src/internal/subtitle/renderers/kitsubass.c @@ -40,7 +40,7 @@ static void Kit_ProcessAssImage(SDL_Surface *surface, const ASS_Image *img) { }
}
-static void ren_render_ass_cb(Kit_SubtitleRenderer *ren, void *src, double start_pts, double end_pts) {
+static void ren_render_ass_cb(Kit_SubtitleRenderer *ren, void *src, double pts, double start, double end) {
assert(ren != NULL);
assert(src != NULL);
@@ -48,11 +48,26 @@ static void ren_render_ass_cb(Kit_SubtitleRenderer *ren, void *src, double start AVSubtitle *sub = src;
// Read incoming subtitle packets to libASS
+ long long start_ms = (start + pts) * 1000;
+ long long end_ms = end * 1000;
if(Kit_LockDecoderOutput(ren->dec) == 0) {
for(int r = 0; r < sub->num_rects; r++) {
if(sub->rects[r]->ass == NULL)
continue;
- ass_process_data(ass_ren->track, sub->rects[r]->ass, strlen(sub->rects[r]->ass));
+ if(LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57,25,100)) {
+ ass_process_data(
+ ass_ren->track,
+ sub->rects[r]->ass,
+ strlen(sub->rects[r]->ass));
+ } else {
+ // This requires the sub_text_format codec_opt set for ffmpeg
+ ass_process_chunk(
+ ass_ren->track,
+ sub->rects[r]->ass,
+ strlen(sub->rects[r]->ass),
+ start_ms,
+ end_ms);
+ }
}
Kit_UnlockDecoderOutput(ren->dec);
}
diff --git a/src/internal/subtitle/renderers/kitsubimage.c b/src/internal/subtitle/renderers/kitsubimage.c index 0cd0cce..b9a8e48 100644 --- a/src/internal/subtitle/renderers/kitsubimage.c +++ b/src/internal/subtitle/renderers/kitsubimage.c @@ -17,13 +17,15 @@ typedef struct Kit_ImageSubtitleRenderer { float scale_y;
} Kit_ImageSubtitleRenderer;
-static void ren_render_image_cb(Kit_SubtitleRenderer *ren, void *sub_src, double start_pts, double end_pts) {
+static void ren_render_image_cb(Kit_SubtitleRenderer *ren, void *sub_src, double pts, double start, double end) {
assert(ren != NULL);
assert(sub_src != NULL);
AVSubtitle *sub = sub_src;
SDL_Surface *dst = NULL;
SDL_Surface *src = NULL;
+ double start_pts = pts + start;
+ double end_pts = pts + end;
// If this subtitle has no rects, we still need to clear screen from old subs
if(sub->num_rects == 0) {
diff --git a/src/internal/subtitle/renderers/kitsubrenderer.c b/src/internal/subtitle/renderers/kitsubrenderer.c index 77ad201..d41d61d 100644 --- a/src/internal/subtitle/renderers/kitsubrenderer.c +++ b/src/internal/subtitle/renderers/kitsubrenderer.c @@ -17,11 +17,11 @@ Kit_SubtitleRenderer* Kit_CreateSubtitleRenderer(Kit_Decoder *dec) { return ren;
}
-void Kit_RunSubtitleRenderer(Kit_SubtitleRenderer *ren, void *src, double start_pts, double end_pts) {
+void Kit_RunSubtitleRenderer(Kit_SubtitleRenderer *ren, void *src, double pts, double start, double end) {
if(ren == NULL)
return;
if(ren->ren_render != NULL)
- ren->ren_render(ren, src, start_pts, end_pts);
+ ren->ren_render(ren, src, pts, start, end);
}
int Kit_GetSubtitleRendererData(Kit_SubtitleRenderer *ren, Kit_TextureAtlas *atlas, SDL_Texture *texture, double current_pts) {
|