diff options
author | Tuomas Virtanen <katajakasa@gmail.com> | 2016-01-17 22:46:18 +0200 |
---|---|---|
committer | Tuomas Virtanen <katajakasa@gmail.com> | 2016-01-17 22:46:18 +0200 |
commit | 766a346e516a58fd110caca311ecaec68b47bc12 (patch) | |
tree | 189acf02cec11701e48d7a94e9748c83deb46baa /include/kitchensink | |
parent | defe24601e2338a6a6d3145220e25c56bf1c3147 (diff) |
Add support for libass subtitles
Diffstat (limited to 'include/kitchensink')
-rw-r--r-- | include/kitchensink/internal/kitlibstate.h | 14 | ||||
-rw-r--r-- | include/kitchensink/kitchensink.h | 25 | ||||
-rw-r--r-- | include/kitchensink/kitlib.h | 33 | ||||
-rw-r--r-- | include/kitchensink/kitplayer.h | 4 |
4 files changed, 52 insertions, 24 deletions
diff --git a/include/kitchensink/internal/kitlibstate.h b/include/kitchensink/internal/kitlibstate.h new file mode 100644 index 0000000..e16a5c9 --- /dev/null +++ b/include/kitchensink/internal/kitlibstate.h @@ -0,0 +1,14 @@ +#ifndef KITLIBSTATE_H +#define KITLIBSTATE_H + +#include <ass/ass.h> +#include "kitchensink/kitconfig.h" + +typedef struct Kit_LibraryState { + unsigned int init_flags; + ASS_Library *libass_handle; +} Kit_LibraryState; + +KIT_LOCAL Kit_LibraryState* Kit_GetLibraryState(); + +#endif // KITLIBSTATE_H diff --git a/include/kitchensink/kitchensink.h b/include/kitchensink/kitchensink.h index 0d40442..be318a5 100644 --- a/include/kitchensink/kitchensink.h +++ b/include/kitchensink/kitchensink.h @@ -1,34 +1,11 @@ #ifndef KITCHENSINK_H #define KITCHENSINK_H +#include "kitchensink/kitlib.h" #include "kitchensink/kiterror.h" #include "kitchensink/kitsource.h" #include "kitchensink/kitplayer.h" #include "kitchensink/kitutils.h" #include "kitchensink/kitconfig.h" -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct Kit_Version { - unsigned char major; - unsigned char minor; - unsigned char patch; -} Kit_Version; - -enum { - KIT_INIT_FORMATS = 0x1, - KIT_INIT_NETWORK = 0x2, -}; - -KIT_API int Kit_Init(unsigned int flags); -KIT_API void Kit_Quit(); - -KIT_API void Kit_GetVersion(Kit_Version *version); - -#ifdef __cplusplus -} -#endif - #endif // KITCHENSINK_H diff --git a/include/kitchensink/kitlib.h b/include/kitchensink/kitlib.h new file mode 100644 index 0000000..9a827be --- /dev/null +++ b/include/kitchensink/kitlib.h @@ -0,0 +1,33 @@ +#ifndef KITLIB_H +#define KITLIB_H + +#include "kitchensink/kiterror.h" +#include "kitchensink/kitsource.h" +#include "kitchensink/kitplayer.h" +#include "kitchensink/kitutils.h" +#include "kitchensink/kitconfig.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct Kit_Version { + unsigned char major; + unsigned char minor; + unsigned char patch; +} Kit_Version; + +enum { + KIT_INIT_FORMATS = 0x1, + KIT_INIT_NETWORK = 0x2, +}; + +KIT_API int Kit_Init(unsigned int flags); +KIT_API void Kit_Quit(); +KIT_API void Kit_GetVersion(Kit_Version *version); + +#ifdef __cplusplus +} +#endif + +#endif // KITLIB_H diff --git a/include/kitchensink/kitplayer.h b/include/kitchensink/kitplayer.h index 1d1f5f9..5a6d9b4 100644 --- a/include/kitchensink/kitplayer.h +++ b/include/kitchensink/kitplayer.h @@ -82,6 +82,10 @@ typedef struct Kit_Player { void *swr; ///< FFmpeg: Audio resampler void *sws; ///< FFmpeg: Video converter + // libass + void *ass_renderer; + void *ass_track; + // Other uint8_t seek_flag; const Kit_Source *src; ///< Reference to Audio/Video source |