summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/example_video.c4
-rw-r--r--include/kitchensink/internal/subtitle/kitsubtitle.h2
-rw-r--r--include/kitchensink/internal/video/kitvideo.h2
-rw-r--r--include/kitchensink/kitplayer.h4
-rw-r--r--src/internal/subtitle/kitsubtitle.c2
-rw-r--r--src/internal/video/kitvideo.c18
-rw-r--r--src/kitplayer.c8
7 files changed, 18 insertions, 22 deletions
diff --git a/examples/example_video.c b/examples/example_video.c
index 01f44b8..94bb738 100644
--- a/examples/example_video.c
+++ b/examples/example_video.c
@@ -309,9 +309,9 @@ int main(int argc, char *argv[]) {
SDL_RenderClear(renderer);
// Refresh videotexture and render it
- Kit_GetVideoData(player, video_tex);
+ Kit_GetVideoDataTexture(player, video_tex);
SDL_RenderCopy(renderer, video_tex, NULL, NULL);
- Kit_GetSubtitleData(player, subtitle_tex);
+ Kit_GetSubtitleDataTexture(player, subtitle_tex);
SDL_RenderCopy(renderer, subtitle_tex, NULL, NULL);
// Render GUI
diff --git a/include/kitchensink/internal/subtitle/kitsubtitle.h b/include/kitchensink/internal/subtitle/kitsubtitle.h
index 51de9b9..a8b4cc0 100644
--- a/include/kitchensink/internal/subtitle/kitsubtitle.h
+++ b/include/kitchensink/internal/subtitle/kitsubtitle.h
@@ -9,6 +9,6 @@
#include "kitchensink/internal/kitdecoder.h"
KIT_LOCAL Kit_Decoder* Kit_CreateSubtitleDecoder(const Kit_Source *src, Kit_SubtitleFormat *format, int w, int h);
-KIT_LOCAL int Kit_GetSubtitleDecoderData(Kit_Decoder *dec, SDL_Texture *texture);
+KIT_LOCAL int Kit_GetSubtitleDecoderDataTexture(Kit_Decoder *dec, SDL_Texture *texture);
#endif // KITSUBTITLE_H
diff --git a/include/kitchensink/internal/video/kitvideo.h b/include/kitchensink/internal/video/kitvideo.h
index 5a5624f..6978d9f 100644
--- a/include/kitchensink/internal/video/kitvideo.h
+++ b/include/kitchensink/internal/video/kitvideo.h
@@ -7,6 +7,6 @@
#include "kitchensink/internal/kitdecoder.h"
KIT_LOCAL Kit_Decoder* Kit_CreateVideoDecoder(const Kit_Source *src, Kit_VideoFormat *format);
-KIT_LOCAL int Kit_GetVideoDecoderData(Kit_Decoder *dec, SDL_Texture *texture);
+KIT_LOCAL int Kit_GetVideoDecoderDataTexture(Kit_Decoder *dec, SDL_Texture *texture);
#endif // KITVIDEO_H
diff --git a/include/kitchensink/kitplayer.h b/include/kitchensink/kitplayer.h
index a5c93a2..4c80e9a 100644
--- a/include/kitchensink/kitplayer.h
+++ b/include/kitchensink/kitplayer.h
@@ -56,8 +56,8 @@ KIT_API Kit_Player* Kit_CreatePlayer(const Kit_Source *src);
KIT_API void Kit_ClosePlayer(Kit_Player *player);
KIT_API int Kit_UpdatePlayer(Kit_Player *player);
-KIT_API int Kit_GetVideoData(Kit_Player *player, SDL_Texture *texture);
-KIT_API int Kit_GetSubtitleData(Kit_Player *player, SDL_Texture *texture);
+KIT_API int Kit_GetVideoDataTexture(Kit_Player *player, SDL_Texture *texture);
+KIT_API int Kit_GetSubtitleDataTexture(Kit_Player *player, SDL_Texture *texture);
KIT_API int Kit_GetAudioData(Kit_Player *player, unsigned char *buffer, int length);
KIT_API void Kit_GetPlayerInfo(const Kit_Player *player, Kit_PlayerInfo *info);
diff --git a/src/internal/subtitle/kitsubtitle.c b/src/internal/subtitle/kitsubtitle.c
index c9691c7..38d4768 100644
--- a/src/internal/subtitle/kitsubtitle.c
+++ b/src/internal/subtitle/kitsubtitle.c
@@ -205,7 +205,7 @@ static void _merge_subtitle_texture(void *ptr, void *userdata) {
}
-int Kit_GetSubtitleDecoderData(Kit_Decoder *dec, SDL_Texture *texture) {
+int Kit_GetSubtitleDecoderDataTexture(Kit_Decoder *dec, SDL_Texture *texture) {
assert(dec != NULL);
assert(texture != NULL);
diff --git a/src/internal/video/kitvideo.c b/src/internal/video/kitvideo.c
index ef0d568..631ff35 100644
--- a/src/internal/video/kitvideo.c
+++ b/src/internal/video/kitvideo.c
@@ -33,7 +33,7 @@ static Kit_VideoPacket* _CreateVideoPacket(AVFrame *frame, double pts) {
return p;
}
-static void _FindPixelFormat(enum AVPixelFormat fmt, unsigned int *out_fmt) {
+static unsigned int _FindPixelFormat(enum AVPixelFormat fmt) {
switch(fmt) {
case AV_PIX_FMT_YUV420P9:
case AV_PIX_FMT_YUV420P10:
@@ -41,17 +41,13 @@ static void _FindPixelFormat(enum AVPixelFormat fmt, unsigned int *out_fmt) {
case AV_PIX_FMT_YUV420P14:
case AV_PIX_FMT_YUV420P16:
case AV_PIX_FMT_YUV420P:
- *out_fmt = SDL_PIXELFORMAT_YV12;
- break;
+ return SDL_PIXELFORMAT_YV12;
case AV_PIX_FMT_YUYV422:
- *out_fmt = SDL_PIXELFORMAT_YUY2;
- break;
+ return SDL_PIXELFORMAT_YUY2;
case AV_PIX_FMT_UYVY422:
- *out_fmt = SDL_PIXELFORMAT_UYVY;
- break;
+ return SDL_PIXELFORMAT_UYVY;
default:
- *out_fmt = SDL_PIXELFORMAT_RGBA32;
- break;
+ return SDL_PIXELFORMAT_RGBA32;
}
}
@@ -160,7 +156,7 @@ Kit_Decoder* Kit_CreateVideoDecoder(const Kit_Source *src, Kit_VideoFormat *form
format->width = dec->codec_ctx->width;
format->height = dec->codec_ctx->height;
format->stream_index = src->video_stream_index;
- _FindPixelFormat(dec->codec_ctx->pix_fmt, &format->format);
+ format->format = _FindPixelFormat(dec->codec_ctx->pix_fmt);
// ... then allocate the video decoder
Kit_VideoDecoder *video_dec = calloc(1, sizeof(Kit_VideoDecoder));
@@ -207,7 +203,7 @@ exit_0:
return NULL;
}
-int Kit_GetVideoDecoderData(Kit_Decoder *dec, SDL_Texture *texture) {
+int Kit_GetVideoDecoderDataTexture(Kit_Decoder *dec, SDL_Texture *texture) {
assert(dec != NULL);
assert(texture != NULL);
diff --git a/src/kitplayer.c b/src/kitplayer.c
index fceb233..7e29252 100644
--- a/src/kitplayer.c
+++ b/src/kitplayer.c
@@ -176,7 +176,7 @@ void Kit_ClosePlayer(Kit_Player *player) {
free(player);
}
-int Kit_GetVideoData(Kit_Player *player, SDL_Texture *texture) {
+int Kit_GetVideoDataTexture(Kit_Player *player, SDL_Texture *texture) {
assert(player != NULL);
if(player->video_dec == NULL) {
return 0;
@@ -190,7 +190,7 @@ int Kit_GetVideoData(Kit_Player *player, SDL_Texture *texture) {
return 0;
}
- return Kit_GetVideoDecoderData(player->video_dec, texture);
+ return Kit_GetVideoDecoderDataTexture(player->video_dec, texture);
}
int Kit_GetAudioData(Kit_Player *player, unsigned char *buffer, int length) {
@@ -216,7 +216,7 @@ int Kit_GetAudioData(Kit_Player *player, unsigned char *buffer, int length) {
return Kit_GetAudioDecoderData(player->audio_dec, buffer, length);
}
-int Kit_GetSubtitleData(Kit_Player *player, SDL_Texture *texture) {
+int Kit_GetSubtitleDataTexture(Kit_Player *player, SDL_Texture *texture) {
assert(player != NULL);
if(player->subtitle_dec == NULL) {
return 0;
@@ -230,7 +230,7 @@ int Kit_GetSubtitleData(Kit_Player *player, SDL_Texture *texture) {
return 0;
}
- return Kit_GetSubtitleDecoderData(player->subtitle_dec, texture);
+ return Kit_GetSubtitleDecoderDataTexture(player->subtitle_dec, texture);
}
void Kit_GetPlayerInfo(const Kit_Player *player, Kit_PlayerInfo *info) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 11:02:49 +0000