Changeset 6123 for pjproject

Timestamp:

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

Author:

nanang

Message:

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

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia-videodev/sdl_dev.c (modified) (2 diffs)
• pjsip-apps/src/pjsua/pjsua_app_legacy.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;
     }

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_legacy.c

@@ -297 +297 @@
     puts("| vid win move ID X Y       Move window ID to position X,Y                    |");
     puts("| vid win resize ID w h     Resize window ID to the specified width, height   |");
+    puts("| vid win full on|off ID    Set fullscreen on/off for window ID               |");
     puts("| vid conf list             List all video ports in video conference bridge   |");
     puts("| vid conf cc P Q           Connect port P to Q in the video conf bridge      |");
@@ -500 +501 @@
         } else if (argc==3 && strcmp(argv[2], "arrange")==0) {
             arrange_window(PJSUA_INVALID_ID);
+        } else if (argc==5 && (strcmp(argv[2], "full")==0))
+        {
+            pjsua_vid_win_id wid = atoi(argv[4]);
+            pj_bool_t fullscreen = (strcmp(argv[3], "on")==0);
+            status = pjsua_vid_win_set_fullscreen(wid, fullscreen);
         } else
             goto on_error;