virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'cus/stable'

Browse Source 
* cus/stable:
  ffplay: reallocate SDL overlays for OSX when changing full screen

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-10-22 16:38:03 +02:00
parent d8cae42d72 8085a5b7cd
commit 9ab5e64897
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ffplay.c
View File

@@ -102,6 +102,7 @@ typedef struct VideoPicture {
SDL_Overlay *bmp; SDL_Overlay *bmp;
int width, height; /* source height & width */ int width, height; /* source height & width */
int allocated; int allocated;
int reallocate;
enum PixelFormat pix_fmt; enum PixelFormat pix_fmt;
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
@@ -1338,7 +1339,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts1, int64_
vp->duration = frame_delay; vp->duration = frame_delay;
/* alloc or resize hardware picture buffer */ /* alloc or resize hardware picture buffer */
if (!vp->bmp || if (!vp->bmp || vp->reallocate ||
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
vp->width != is->out_video_filter->inputs[0]->w || vp->width != is->out_video_filter->inputs[0]->w ||
vp->height != is->out_video_filter->inputs[0]->h) { vp->height != is->out_video_filter->inputs[0]->h) {
@@ -1349,6 +1350,7 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts1, int64_
SDL_Event event; SDL_Event event;
vp->allocated = 0; vp->allocated = 0;
vp->reallocate = 0;
/* the allocation must be done in the main thread to avoid /* the allocation must be done in the main thread to avoid
locking problems */ locking problems */
@@ -2703,6 +2705,12 @@ static void stream_cycle_channel(VideoState *is, int codec_type)
static void toggle_full_screen(VideoState *is) static void toggle_full_screen(VideoState *is)
{ {
is_full_screen = !is_full_screen; is_full_screen = !is_full_screen;
#if defined(__APPLE__) && SDL_VERSION_ATLEAST(1, 2, 14)
/* OSX needs to reallocate the SDL overlays */
for (int i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
is->pictq[i].reallocate = 1;
}
#endif
video_open(is); video_open(is);
} }