Reduce memory usage of subtitles

3 files changed, 9 insertions, 9 deletions

diff --git a/include/kitchensink/internal/subtitle/kitatlas.h b/include/kitchensink/internal/subtitle/kitatlas.h
index c901259..d9207c1 100644
--- a/include/kitchensink/internal/subtitle/kitatlas.h
+++ b/include/kitchensink/internal/subtitle/kitatlas.h
@@ -10,10 +10,8 @@
 typedef struct Kit_TextureAtlasItem {

     int cur_shelf; //< Current shelf number in cache

     int cur_slot; //< Current slot on shelf in cache

-    bool is_copied; //< Is copied to cache surface

     SDL_Rect source; //< Source coordinates on cache surface

     SDL_Rect target; //< Target coordinates on output surface

-    SDL_Surface *surface; //< Current item surface

 } Kit_TextureAtlasItem;

 

 typedef struct Kit_Shelf {

@@ -34,10 +32,9 @@ typedef struct Kit_TextureAtlas {
 

 KIT_LOCAL Kit_TextureAtlas* Kit_CreateAtlas();

 KIT_LOCAL void Kit_FreeAtlas(Kit_TextureAtlas *atlas);

-KIT_LOCAL void Kit_RefreshAtlas(Kit_TextureAtlas *atlas, double current_pts);

 KIT_LOCAL void Kit_ClearAtlasContent(Kit_TextureAtlas *atlas);

-KIT_LOCAL int Kit_UpdateAtlasTexture(Kit_TextureAtlas *atlas, SDL_Texture *texture);

+KIT_LOCAL void Kit_CheckAtlasTextureSize(Kit_TextureAtlas *atlas, SDL_Texture *texture);

 KIT_LOCAL int Kit_GetAtlasItems(const Kit_TextureAtlas *atlas, SDL_Rect *sources, SDL_Rect *targets, int limit);

-KIT_LOCAL int Kit_AddAtlasItem(Kit_TextureAtlas *atlas, SDL_Surface *surface, const SDL_Rect *target);

+KIT_LOCAL int Kit_AddAtlasItem(Kit_TextureAtlas *atlas, SDL_Texture *texture, SDL_Surface *surface, const SDL_Rect *target);

 

 #endif // KITATLAS_H

diff --git a/include/kitchensink/internal/subtitle/kitsubtitle.h b/include/kitchensink/internal/subtitle/kitsubtitle.h
index 7ea6fbd..8bb2a62 100644
--- a/include/kitchensink/internal/subtitle/kitsubtitle.h
+++ b/include/kitchensink/internal/subtitle/kitsubtitle.h
@@ -9,8 +9,9 @@
 

 KIT_LOCAL Kit_Decoder* Kit_CreateSubtitleDecoder(

     const Kit_Source *src, int stream_index, int video_w, int video_h, int screen_w, int screen_h);

-KIT_LOCAL int Kit_GetSubtitleDecoderData(

-    Kit_Decoder *dec, SDL_Texture *texture, SDL_Rect *sources, SDL_Rect *targets, int limit);

+KIT_LOCAL void Kit_GetSubtitleDecoderTexture(Kit_Decoder *dec, SDL_Texture *texture);

 KIT_LOCAL void Kit_SetSubtitleDecoderSize(Kit_Decoder *dec, int w, int h);

+KIT_LOCAL int Kit_GetSubtitleDecoderInfo(

+    Kit_Decoder *dec, SDL_Texture *texture, SDL_Rect *sources, SDL_Rect *targets, int limit);

 

 #endif // KITSUBTITLE_H

diff --git a/include/kitchensink/internal/subtitle/renderers/kitsubrenderer.h b/include/kitchensink/internal/subtitle/renderers/kitsubrenderer.h
index e07aa55..3c37b00 100644
--- a/include/kitchensink/internal/subtitle/renderers/kitsubrenderer.h
+++ b/include/kitchensink/internal/subtitle/renderers/kitsubrenderer.h
@@ -1,6 +1,8 @@
 #ifndef KITSUBRENDERER_H

 #define KITSUBRENDERER_H

 

+#include <SDL_render.h>

+

 #include "kitchensink/kitsource.h"

 

 typedef struct Kit_SubtitleRenderer Kit_SubtitleRenderer;

@@ -8,7 +10,7 @@ typedef struct Kit_TextureAtlas Kit_TextureAtlas;
 typedef struct Kit_Decoder Kit_Decoder;

 

 typedef void (*ren_render_cb)(Kit_SubtitleRenderer *ren, void *src, double start_pts, double end_pts);

-typedef int (*ren_get_data_cb)(Kit_SubtitleRenderer *ren, Kit_TextureAtlas *atlas, double current_pts);

+typedef int (*ren_get_data_cb)(Kit_SubtitleRenderer *ren, Kit_TextureAtlas *atlas, SDL_Texture *texture, double current_pts);

 typedef void (*ren_set_size_cb)(Kit_SubtitleRenderer *ren, int w, int h);

 typedef void (*ren_close_cb)(Kit_SubtitleRenderer *ren);

 

@@ -23,7 +25,7 @@ struct Kit_SubtitleRenderer {
 

 KIT_LOCAL Kit_SubtitleRenderer* Kit_CreateSubtitleRenderer(Kit_Decoder *dec);

 KIT_LOCAL void Kit_RunSubtitleRenderer(Kit_SubtitleRenderer *ren, void *src, double start_pts, double end_pts);

-KIT_LOCAL int Kit_GetSubtitleRendererData(Kit_SubtitleRenderer *ren, Kit_TextureAtlas *atlas, double current_pts);

+KIT_LOCAL int Kit_GetSubtitleRendererData(Kit_SubtitleRenderer *ren, Kit_TextureAtlas *atlas, SDL_Texture *texture, double current_pts);

 KIT_LOCAL void Kit_SetSubtitleRendererSize(Kit_SubtitleRenderer *ren, int w, int h);

 KIT_LOCAL void Kit_CloseSubtitleRenderer(Kit_SubtitleRenderer *ren);