record new upstream branch and merge it

4 files changed, 35 insertions, 12 deletions

diff --git a/src/internal/subtitle/kitsubtitle.c b/src/internal/subtitle/kitsubtitle.c
index d6bed5d..417b338 100644
--- a/src/internal/subtitle/kitsubtitle.c
+++ b/src/internal/subtitle/kitsubtitle.c
@@ -59,12 +59,12 @@ static void dec_decode_subtitle_cb(Kit_Decoder *dec, AVPacket *in_packet) {
                 subtitle_dec->scratch_frame.end_display_time = 30000;

             }

 

-            start = pts + subtitle_dec->scratch_frame.start_display_time / 1000.0F;

-            end = pts + subtitle_dec->scratch_frame.end_display_time / 1000.0F;

+            start = subtitle_dec->scratch_frame.start_display_time / 1000.0F;

+            end = subtitle_dec->scratch_frame.end_display_time / 1000.0F;

 

             // Create a packet. This should be filled by renderer.

             Kit_RunSubtitleRenderer(

-                subtitle_dec->renderer, &subtitle_dec->scratch_frame, start, end);

+                subtitle_dec->renderer, &subtitle_dec->scratch_frame, pts, start, end);

 

             // Free subtitle since it has now been handled

             avsubtitle_free(&subtitle_dec->scratch_frame);

diff --git a/src/internal/subtitle/renderers/kitsubass.c b/src/internal/subtitle/renderers/kitsubass.c
index 7db72dd..c229406 100644
--- a/src/internal/subtitle/renderers/kitsubass.c
+++ b/src/internal/subtitle/renderers/kitsubass.c
@@ -2,6 +2,7 @@
 #include <stdlib.h>

 

 #include <SDL_surface.h>

+#include <libavcodec/version.h>

 

 #include "kitchensink/kiterror.h"

 #include "kitchensink/internal/utils/kitlog.h"

@@ -40,7 +41,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 +49,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);

     }

@@ -150,7 +166,12 @@ Kit_SubtitleRenderer* Kit_CreateASSSubtitleRenderer(Kit_Decoder *dec, int video_
     // Read fonts from attachment streams and give them to libass

     for(int j = 0; j < dec->format_ctx->nb_streams; j++) {

         AVStream *st = dec->format_ctx->streams[j];

-        if(st->codec->codec_type == AVMEDIA_TYPE_ATTACHMENT && attachment_is_font(st)) {

+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 48, 101)

+        AVCodecContext *codec = st->codec;

+#else

+        AVCodecParameters *codec = st->codecpar;

+#endif

+        if(codec->codec_type == AVMEDIA_TYPE_ATTACHMENT && attachment_is_font(st)) {

             const AVDictionaryEntry *tag = av_dict_get(

                 st->metadata,

                 "filename",

@@ -159,9 +180,9 @@ Kit_SubtitleRenderer* Kit_CreateASSSubtitleRenderer(Kit_Decoder *dec, int video_
             if(tag) {

                 ass_add_font(

                     state->libass_handle,

-                    tag->value, 

-                    (char*)st->codec->extradata,

-                    st->codec->extradata_size);

+                    tag->value,

+                    (char*)codec->extradata,

+                    codec->extradata_size);

             }

         }

     }

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) {