Merge remote-tracking branch 'notaz/master'

diff --git a/linux/fbdev.c b/linux/fbdev.c
index 0718861..43f3010 100644 (file)
--- a/linux/fbdev.c
+++ b/linux/fbdev.c
@@ -66,9 +66,9 @@ void vout_fbdev_wait_vsync(struct vout_fbdev *fbdev)
        ioctl(fbdev->fd, FBIO_WAITFORVSYNC, &arg);
 }
 
-/* it is recommended to call vout_fbdev_clear() before this */
 void *vout_fbdev_resize(struct vout_fbdev *fbdev, int w, int h, int bpp,
-                     int left_border, int right_border, int top_border, int bottom_border, int buffer_cnt)
+       int left_border, int right_border, int top_border, int bottom_border,
+       int buffer_cnt, int first_write_to_front)
 {
        int w_total = left_border + w + right_border;
        int h_total = top_border + h + bottom_border;
@@ -100,9 +100,8 @@ void *vout_fbdev_resize(struct vout_fbdev *fbdev, int w, int h, int bpp,
                fbdev->fbvar_new.nonstd = 0; // can set YUV here on omapfb
                fbdev->buffer_count = buffer_cnt;
                fbdev->buffer_write = buffer_cnt > 1 ? 1 : 0;
-
-               // seems to help a bit to avoid glitches
-               vout_fbdev_wait_vsync(fbdev);
+               if (first_write_to_front)
+                       fbdev->buffer_write = 0;
 
                ret = ioctl(fbdev->fd, FBIOPUT_VSCREENINFO, &fbdev->fbvar_new);
                if (ret == -1) {
@@ -119,6 +118,9 @@ void *vout_fbdev_resize(struct vout_fbdev *fbdev, int w, int h, int bpp,
                                        "multibuffering disabled\n");
                }
 
+               // omap is still using the old mode until vsync,
+               // if the caller starts to write now we may get garbage on screen
+               vout_fbdev_wait_vsync(fbdev);
        }
 
        fbdev->fb_size = w_total * h_total * bpp / 8;
@@ -155,7 +157,8 @@ out:
 
 void vout_fbdev_clear(struct vout_fbdev *fbdev)
 {
-       memset(fbdev->mem, 0, fbdev->mem_size);
+       if (fbdev->mem)
+               memset(fbdev->mem, 0, fbdev->fb_size * fbdev->buffer_count);
 }
 
 void vout_fbdev_clear_lines(struct vout_fbdev *fbdev, int y, int count)
@@ -209,7 +212,7 @@ struct vout_fbdev *vout_fbdev_init(const char *fbdev_name, int *w, int *h, int b
        if (*h != 0)
                req_h = *h;
 
-       pret = vout_fbdev_resize(fbdev, req_w, req_h, bpp, 0, 0, 0, 0, buffer_cnt);
+       pret = vout_fbdev_resize(fbdev, req_w, req_h, bpp, 0, 0, 0, 0, buffer_cnt, 0);
        if (pret == NULL)
                goto fail;
 

diff --git a/linux/fbdev.h b/linux/fbdev.h
index 88cd519..b2ba18f 100644 (file)
--- a/linux/fbdev.h
+++ b/linux/fbdev.h
@@ -5,7 +5,7 @@ void *vout_fbdev_flip(struct vout_fbdev *fbdev);
 void  vout_fbdev_wait_vsync(struct vout_fbdev *fbdev);
 void *vout_fbdev_resize(struct vout_fbdev *fbdev, int w, int h, int bpp,
                        int left_border, int right_border, int top_border, int bottom_border,
-                       int buffer_count);
+                       int buffer_cnt, int first_write_to_front);
 void  vout_fbdev_clear(struct vout_fbdev *fbdev);
 void  vout_fbdev_clear_lines(struct vout_fbdev *fbdev, int y, int count);
 int   vout_fbdev_get_fd(struct vout_fbdev *fbdev);

diff --git a/plat_sdl.c b/plat_sdl.c
index 5e3eb7c..2d537f0 100644 (file)
--- a/plat_sdl.c
+++ b/plat_sdl.c
@@ -106,12 +106,12 @@ int plat_sdl_change_video_mode(int w, int h, int force)
       || plat_target.vout_method == vout_mode_overlay2x) {
     int W = plat_target.vout_method == vout_mode_overlay2x && w < 640 ? 2*w : w;
     plat_sdl_overlay = SDL_CreateYUVOverlay(W, h, SDL_UYVY_OVERLAY, plat_sdl_screen);
-    if (plat_sdl_overlay != NULL) {
-      SDL_LockYUVOverlay(plat_sdl_overlay);
+    if (plat_sdl_overlay != NULL && SDL_LockYUVOverlay(plat_sdl_overlay) == 0) {
       if ((long)plat_sdl_overlay->pixels[0] & 3)
         fprintf(stderr, "warning: overlay pointer is unaligned\n");
 
       plat_sdl_overlay_clear();
+
       SDL_UnlockYUVOverlay(plat_sdl_overlay);
     }
     else {