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

lavd/sdl2: remove unused code

This commit is contained in:
Josh de Kock 2016-09-24 18:57:55 +01:00
parent b98dafe045
commit fbb1fcd4d0
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavdevice/sdl2.c
View File

@ -48,10 +48,6 @@ typedef struct {
SDL_Rect texture_rect; SDL_Rect texture_rect;
int inited; int inited;
SDL_Thread *event_thread;
SDL_mutex *mutex;
SDL_cond *init_cond;
int quit;
} SDLContext; } SDLContext;
static const struct sdl_texture_format_entry { static const struct sdl_texture_format_entry {
@ -140,20 +136,9 @@ static int sdl2_write_trailer(AVFormatContext *s)
{ {
SDLContext *sdl = s->priv_data; SDLContext *sdl = s->priv_data;
sdl->quit = 1;
if (sdl->texture) if (sdl->texture)
SDL_DestroyTexture(sdl->texture); SDL_DestroyTexture(sdl->texture);
sdl->texture = NULL; sdl->texture = NULL;
if (sdl->event_thread)
SDL_WaitThread(sdl->event_thread, NULL);
sdl->event_thread = NULL;
if (sdl->mutex)
SDL_DestroyMutex(sdl->mutex);
sdl->mutex = NULL;
if (sdl->init_cond)
SDL_DestroyCond(sdl->init_cond);
sdl->init_cond = NULL;
if (sdl->renderer) if (sdl->renderer)
SDL_DestroyRenderer(sdl->renderer); SDL_DestroyRenderer(sdl->renderer);
@ -204,7 +189,7 @@ static int sdl2_write_header(AVFormatContext *s)
if (!sdl->texture_fmt) { if (!sdl->texture_fmt) {
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"Unsupported pixel format '%s', choose one of yuv420p, yuyv422, uyvy422, BGRA\n", "Unsupported pixel format '%s'.\n",
av_get_pix_fmt_name(codecpar->format)); av_get_pix_fmt_name(codecpar->format));
goto fail; goto fail;
} }
@ -255,7 +240,7 @@ fail:
static int sdl2_write_packet(AVFormatContext *s, AVPacket *pkt) static int sdl2_write_packet(AVFormatContext *s, AVPacket *pkt)
{ {
int ret = 0; int ret, quit = 0;
SDLContext *sdl = s->priv_data; SDLContext *sdl = s->priv_data;
AVCodecParameters *codecpar = s->streams[0]->codecpar; AVCodecParameters *codecpar = s->streams[0]->codecpar;
uint8_t *data[4]; uint8_t *data[4];
@ -268,14 +253,14 @@ static int sdl2_write_packet(AVFormatContext *s, AVPacket *pkt)
switch (event.key.keysym.sym) { switch (event.key.keysym.sym) {
case SDLK_ESCAPE: case SDLK_ESCAPE:
case SDLK_q: case SDLK_q:
sdl->quit = 1; quit = 1;
break; break;
default: default:
break; break;
} }
break; break;
case SDL_QUIT: case SDL_QUIT:
sdl->quit = 1; quit = 1;
break; break;
case SDL_WINDOWEVENT: case SDL_WINDOWEVENT:
switch(event.window.event){ switch(event.window.event){
@ -294,13 +279,12 @@ static int sdl2_write_packet(AVFormatContext *s, AVPacket *pkt)
} }
} }
if (sdl->quit) { if (quit) {
sdl2_write_trailer(s); sdl2_write_trailer(s);
return AVERROR(EIO); return AVERROR(EIO);
} }
av_image_fill_arrays(data, linesize, pkt->data, codecpar->format, codecpar->width, codecpar->height, 1); av_image_fill_arrays(data, linesize, pkt->data, codecpar->format, codecpar->width, codecpar->height, 1);
SDL_LockMutex(sdl->mutex);
switch (sdl->texture_fmt) { switch (sdl->texture_fmt) {
/* case SDL_PIXELFORMAT_ARGB4444: /* case SDL_PIXELFORMAT_ARGB4444:
* case SDL_PIXELFORMAT_RGBA4444: * case SDL_PIXELFORMAT_RGBA4444:
@ -346,7 +330,6 @@ static int sdl2_write_packet(AVFormatContext *s, AVPacket *pkt)
SDL_RenderClear(sdl->renderer); SDL_RenderClear(sdl->renderer);
SDL_RenderCopy(sdl->renderer, sdl->texture, NULL, &sdl->texture_rect); SDL_RenderCopy(sdl->renderer, sdl->texture, NULL, &sdl->texture_rect);
SDL_RenderPresent(sdl->renderer); SDL_RenderPresent(sdl->renderer);
SDL_UnlockMutex(sdl->mutex);
return ret; return ret;
} }