Changeset 3698 for pjproject/trunk/pjmedia/src/pjmedia-videodev/sdl_dev.c

Timestamp:

Aug 15, 2011 10:06:40 PM (13 years ago)

Author:

nanang

Message:

Re #1285: Updates for SDL 1.3 only:

• Changed window mode from 'resizable' to 'borderless'.
• Fixed window resize handling so resizing won't need destroy-recreate the SDL objects (this also fixes lost-focus problem in resizing window on Windows platform).

File:

• pjproject/trunk/pjmedia/src/pjmedia-videodev/sdl_dev.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia-videodev/sdl_dev.c

@@ -541 +541 @@
 #if SDL_VERSION_ATLEAST(1,3,0)
     if (!strm->window) {
-        Uint32 flags = SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE;
+        Uint32 flags = SDL_WINDOW_SHOWN | /*SDL_WINDOW_RESIZABLE*/
+                       SDL_WINDOW_BORDERLESS;
 
 #   if PJMEDIA_VIDEO_DEV_SDL_HAS_OPENGL
@@ -691 +692 @@
     strm->status = PJ_SUCCESS;
     if (strm->new_fmt || strm->new_disp_size) {
-        if (strm->new_disp_size)
-            pj_memcpy(&strm->param.disp_size, strm->new_disp_size,
+        if (strm->new_disp_size) {
+            pj_memcpy(&strm->param.disp_size, strm->new_disp_size,
                       sizeof(strm->param.disp_size));
+#if SDL_VERSION_ATLEAST(1,3,0)
+            if (strm->scr_tex) {
+                strm->dstrect.x = strm->dstrect.y = 0;
+                strm->dstrect.w = (Uint16)strm->param.disp_size.w;
+                strm->dstrect.h = (Uint16)strm->param.disp_size.h;
+                SDL_RenderSetViewport(strm->renderer, &strm->dstrect);
+                strm->new_fmt = NULL;
+                strm->new_disp_size = NULL;
+                return;
+            }
+#endif
+        }
 
         /* Re-initialize SDL */
@@ -755 +768 @@
         SDL_UpdateTexture(stream->scr_tex, NULL, frame->buf, stream->pitch);
         SDL_RenderClear(stream->renderer);
-        SDL_RenderCopy(stream->renderer, stream->scr_tex, NULL, NULL);
+        SDL_RenderCopy(stream->renderer, stream->scr_tex,
+                       &stream->rect, &stream->dstrect);
         SDL_RenderPresent(stream->renderer);
     }