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

Timestamp:

Dec 23, 2019 3:27:09 AM (4 years ago)

Author:

nanang

Message:

Re #2255: Fixed wrong check of fullscreen mode in window creation and added pjsua app commands for fullscreen.

File:

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

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

@@ -702 +702 @@
         }
 
-        if (!((strm->param.flags & PJMEDIA_VID_DEV_CAP_OUTPUT_FULLSCREEN) &&
-            strm->param.window_fullscreen))
+        if ((strm->param.flags & PJMEDIA_VID_DEV_CAP_OUTPUT_FULLSCREEN) &&
+            strm->param.window_fullscreen)
         {
             flags |= SDL_WINDOW_FULLSCREEN;
@@ -1205 +1205 @@
         return status;  
     } else if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_FULLSCREEN) {
-        int flag;
+        Uint32 flag;
+
+        flag = SDL_GetWindowFlags(strm->window);
         if (*(pj_bool_t *)pval)
-            flag = SDL_WINDOW_FULLSCREEN;
+            flag |= SDL_WINDOW_FULLSCREEN;
         else
-            flag = 0;
+            flag &= (~SDL_WINDOW_FULLSCREEN);
+
         SDL_SetWindowFullscreen(strm->window, flag);
+
+        /* Trying to restore the border after returning from fullscreen,
+         * unfortunately not sure how to put back the resizable flag.
+         */
+        if ((flag & SDL_WINDOW_FULLSCREEN)==0 &&
+            (flag & SDL_WINDOW_BORDERLESS)==0)
+        {
+            SDL_SetWindowBordered(strm->window, PJ_FALSE);
+            SDL_SetWindowBordered(strm->window, PJ_TRUE);
+        }
+
         return PJ_SUCCESS;
     }