virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

ffplay: force setting video mode on fullscreen toggle

Browse Source 
Fixes ticket #736. Based on the patch by glangshaw.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2011-12-13 23:27:24 +01:00
parent 54c7e81a53
commit 9fb2b41258
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ffplay.c
View File

@ -922,7 +922,7 @@ static void do_exit(VideoState *is)
exit(0); exit(0);
} }
static int video_open(VideoState *is){ static int video_open(VideoState *is, int force_set_video_mode){
int flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL; int flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL;
int w,h; int w,h;
@ -949,7 +949,7 @@ static int video_open(VideoState *is){
h = 480; h = 480;
} }
if(screen && is->width == screen->w && screen->w == w if(screen && is->width == screen->w && screen->w == w
&& is->height== screen->h && screen->h == h) && is->height== screen->h && screen->h == h && !force_set_video_mode)
return 0; return 0;
screen = SDL_SetVideoMode(w, h, 0, flags); screen = SDL_SetVideoMode(w, h, 0, flags);
if (!screen) { if (!screen) {
@ -970,7 +970,7 @@ static int video_open(VideoState *is){
static void video_display(VideoState *is) static void video_display(VideoState *is)
{ {
if(!screen) if(!screen)
video_open(is); video_open(is, 0);
if (is->audio_st && is->show_mode != SHOW_MODE_VIDEO) if (is->audio_st && is->show_mode != SHOW_MODE_VIDEO)
video_audio_display(is); video_audio_display(is);
else if (is->video_st) else if (is->video_st)
@ -2781,7 +2781,7 @@ static void toggle_full_screen(VideoState *is)
is->pictq[i].reallocate = 1; is->pictq[i].reallocate = 1;
} }
#endif #endif
video_open(is); video_open(is, 1);
} }
static void toggle_pause(VideoState *is) static void toggle_pause(VideoState *is)
@ -2933,7 +2933,7 @@ static void event_loop(VideoState *cur_stream)
do_exit(cur_stream); do_exit(cur_stream);
break; break;
case FF_ALLOC_EVENT: case FF_ALLOC_EVENT:
video_open(event.user.data1); video_open(event.user.data1, 0);
alloc_picture(event.user.data1); alloc_picture(event.user.data1);
break; break;
case FF_REFRESH_EVENT: case FF_REFRESH_EVENT: