RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavd/opengl: use SDL2 

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Josh de Kock <josh@itanimul.li>
This commit is contained in:
Lukasz Marek 2016-09-18 19:13:12 +02:00 committed by Josh de Kock
parent f94b8d2557
commit 645353829f
1 changed files with 49 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
libavdevice/opengl_enc.c
View File

@ -46,7 +46,7 @@
#include <GL/glx.h> #include <GL/glx.h>
#endif #endif
#if HAVE_SDL #if HAVE_SDL2
#include <SDL.h> #include <SDL.h>
#endif #endif
@ -174,8 +174,9 @@ static const GLushort g_index[6] =
typedef struct OpenGLContext { typedef struct OpenGLContext {
AVClass *class; ///< class for private options AVClass *class; ///< class for private options
#if HAVE_SDL #if HAVE_SDL2
SDL_Surface *surface; SDL_Window *window;
SDL_GLContext glcontext;
#endif #endif
FFOpenGLFunctions glprocs; FFOpenGLFunctions glprocs;
@ -341,30 +342,14 @@ static int opengl_control_message(AVFormatContext *h, int type, void *data, size
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
} }
#if HAVE_SDL #if HAVE_SDL2
static int opengl_sdl_recreate_window(OpenGLContext *opengl, int width, int height)
{
opengl->surface = SDL_SetVideoMode(width, height,
32, SDL_OPENGL | SDL_RESIZABLE);
if (!opengl->surface) {
av_log(opengl, AV_LOG_ERROR, "Unable to set video mode: %s\n", SDL_GetError());
return AVERROR_EXTERNAL;
}
SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
return 0;
}
static int opengl_sdl_process_events(AVFormatContext *h) static int opengl_sdl_process_events(AVFormatContext *h)
{ {
int ret;
OpenGLContext *opengl = h->priv_data; OpenGLContext *opengl = h->priv_data;
AVDeviceRect message;
SDL_Event event; SDL_Event event;
SDL_PumpEvents(); SDL_PumpEvents();
while (SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0) { while (SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT) > 0) {
switch (event.type) { switch (event.type) {
case SDL_QUIT: case SDL_QUIT:
return AVERROR(EIO); return AVERROR(EIO);
@ -375,23 +360,14 @@ static int opengl_sdl_process_events(AVFormatContext *h)
return AVERROR(EIO); return AVERROR(EIO);
} }
return 0; return 0;
case SDL_VIDEORESIZE: { case SDL_WINDOWEVENT:
char buffer[100]; switch(event.window.event) {
int reinit; case SDL_WINDOWEVENT_RESIZED:
AVDeviceRect message; case SDL_WINDOWEVENT_SIZE_CHANGED:
/* clean up old context because SDL_SetVideoMode may lose its state. */ SDL_GL_GetDrawableSize(opengl->window, &message.width, &message.height);
SDL_VideoDriverName(buffer, sizeof(buffer)); return opengl_control_message(h, AV_APP_TO_DEV_WINDOW_SIZE, &message, sizeof(AVDeviceRect));
reinit = !av_strncasecmp(buffer, "quartz", sizeof(buffer)); default:
if (reinit) { break;
opengl_deinit_context(opengl);
}
if ((ret = opengl_sdl_recreate_window(opengl, event.resize.w, event.resize.h)) < 0)
return ret;
if (reinit && (ret = opengl_init_context(opengl)) < 0)
return ret;
message.width = opengl->surface->w;
message.height = opengl->surface->h;
return opengl_control_message(h, AV_APP_TO_DEV_WINDOW_SIZE, &message, sizeof(AVDeviceRect));
} }
} }
} }
@ -400,23 +376,34 @@ static int opengl_sdl_process_events(AVFormatContext *h)
static int av_cold opengl_sdl_create_window(AVFormatContext *h) static int av_cold opengl_sdl_create_window(AVFormatContext *h)
{ {
int ret;
char buffer[100];
OpenGLContext *opengl = h->priv_data; OpenGLContext *opengl = h->priv_data;
AVDeviceRect message; AVDeviceRect message;
if (SDL_Init(SDL_INIT_VIDEO)) { if (SDL_Init(SDL_INIT_VIDEO)) {
av_log(opengl, AV_LOG_ERROR, "Unable to initialize SDL: %s\n", SDL_GetError()); av_log(opengl, AV_LOG_ERROR, "Unable to initialize SDL: %s\n", SDL_GetError());
return AVERROR_EXTERNAL; return AVERROR_EXTERNAL;
} }
if ((ret = opengl_sdl_recreate_window(opengl, opengl->window_width, opengl->window = SDL_CreateWindow(opengl->window_title,
opengl->window_height)) < 0) SDL_WINDOWPOS_UNDEFINED,
return ret; SDL_WINDOWPOS_UNDEFINED,
av_log(opengl, AV_LOG_INFO, "SDL driver: '%s'.\n", SDL_VideoDriverName(buffer, sizeof(buffer))); opengl->window_width, opengl->window_height,
message.width = opengl->surface->w; SDL_WINDOW_RESIZABLE | SDL_WINDOW_OPENGL);
message.height = opengl->surface->h; if (!opengl->window) {
SDL_WM_SetCaption(opengl->window_title, NULL); av_log(opengl, AV_LOG_ERROR, "Unable to create default window: %s\n", SDL_GetError());
opengl_control_message(h, AV_APP_TO_DEV_WINDOW_SIZE, &message, sizeof(AVDeviceRect)); return AVERROR_EXTERNAL;
return 0; }
opengl->glcontext = SDL_GL_CreateContext(opengl->window);
if (!opengl->glcontext) {
av_log(opengl, AV_LOG_ERROR, "Unable to create OpenGL context on default window: %s\n", SDL_GetError());
return AVERROR_EXTERNAL;
}
SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
av_log(opengl, AV_LOG_INFO, "SDL driver: '%s'.\n", SDL_GetCurrentVideoDriver());
SDL_GL_GetDrawableSize(opengl->window, &message.width, &message.height);
return opengl_control_message(h, AV_APP_TO_DEV_WINDOW_SIZE, &message, sizeof(AVDeviceRect));
} }
static int av_cold opengl_sdl_load_procedures(OpenGLContext *opengl) static int av_cold opengl_sdl_load_procedures(OpenGLContext *opengl)
@ -460,14 +447,14 @@ static int av_cold opengl_sdl_load_procedures(OpenGLContext *opengl)
#undef LOAD_OPENGL_FUN #undef LOAD_OPENGL_FUN
} }
#endif /* HAVE_SDL */ #endif /* HAVE_SDL2 */
#if defined(__APPLE__) #if defined(__APPLE__)
static int av_cold opengl_load_procedures(OpenGLContext *opengl) static int av_cold opengl_load_procedures(OpenGLContext *opengl)
{ {
FFOpenGLFunctions *procs = &opengl->glprocs; FFOpenGLFunctions *procs = &opengl->glprocs;
#if HAVE_SDL #if HAVE_SDL2
if (!opengl->no_window) if (!opengl->no_window)
return opengl_sdl_load_procedures(opengl); return opengl_sdl_load_procedures(opengl);
#endif #endif
@ -517,7 +504,7 @@ static int av_cold opengl_load_procedures(OpenGLContext *opengl)
return AVERROR(ENOSYS); \ return AVERROR(ENOSYS); \
} }
#if HAVE_SDL #if HAVE_SDL2
if (!opengl->no_window) if (!opengl->no_window)
return opengl_sdl_load_procedures(opengl); return opengl_sdl_load_procedures(opengl);
#endif #endif
@ -943,7 +930,7 @@ static int opengl_create_window(AVFormatContext *h)
int ret; int ret;
if (!opengl->no_window) { if (!opengl->no_window) {
#if HAVE_SDL #if HAVE_SDL2
if ((ret = opengl_sdl_create_window(h)) < 0) { if ((ret = opengl_sdl_create_window(h)) < 0) {
av_log(opengl, AV_LOG_ERROR, "Cannot create default SDL window.\n"); av_log(opengl, AV_LOG_ERROR, "Cannot create default SDL window.\n");
return ret; return ret;
@ -975,7 +962,9 @@ static int opengl_release_window(AVFormatContext *h)
int ret; int ret;
OpenGLContext *opengl = h->priv_data; OpenGLContext *opengl = h->priv_data;
if (!opengl->no_window) { if (!opengl->no_window) {
#if HAVE_SDL #if HAVE_SDL2
SDL_GL_DeleteContext(opengl->glcontext);
SDL_DestroyWindow(opengl->window);
SDL_Quit(); SDL_Quit();
#endif #endif
} else if ((ret = avdevice_dev_to_app_control_message(h, AV_DEV_TO_APP_DESTROY_WINDOW_BUFFER, NULL , 0)) < 0) { } else if ((ret = avdevice_dev_to_app_control_message(h, AV_DEV_TO_APP_DESTROY_WINDOW_BUFFER, NULL , 0)) < 0) {
@ -1109,9 +1098,9 @@ static av_cold int opengl_write_header(AVFormatContext *h)
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
#if HAVE_SDL #if HAVE_SDL2
if (!opengl->no_window) if (!opengl->no_window)
SDL_GL_SwapBuffers(); SDL_GL_SwapWindow(opengl->window);
#endif #endif
if (opengl->no_window && if (opengl->no_window &&
(ret = avdevice_dev_to_app_control_message(h, AV_DEV_TO_APP_DISPLAY_WINDOW_BUFFER, NULL , 0)) < 0) { (ret = avdevice_dev_to_app_control_message(h, AV_DEV_TO_APP_DISPLAY_WINDOW_BUFFER, NULL , 0)) < 0) {
@ -1204,7 +1193,7 @@ static int opengl_draw(AVFormatContext *h, void *input, int repaint, int is_pkt)
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
int ret; int ret;
#if HAVE_SDL #if HAVE_SDL2
if (!opengl->no_window && (ret = opengl_sdl_process_events(h)) < 0) if (!opengl->no_window && (ret = opengl_sdl_process_events(h)) < 0)
goto fail; goto fail;
#endif #endif
@ -1245,9 +1234,9 @@ static int opengl_draw(AVFormatContext *h, void *input, int repaint, int is_pkt)
ret = AVERROR_EXTERNAL; ret = AVERROR_EXTERNAL;
OPENGL_ERROR_CHECK(opengl); OPENGL_ERROR_CHECK(opengl);
#if HAVE_SDL #if HAVE_SDL2
if (!opengl->no_window) if (!opengl->no_window)
SDL_GL_SwapBuffers(); SDL_GL_SwapWindow(opengl->window);
#endif #endif
if (opengl->no_window && if (opengl->no_window &&
(ret = avdevice_dev_to_app_control_message(h, AV_DEV_TO_APP_DISPLAY_WINDOW_BUFFER, NULL , 0)) < 0) { (ret = avdevice_dev_to_app_control_message(h, AV_DEV_TO_APP_DISPLAY_WINDOW_BUFFER, NULL , 0)) < 0) {