Changeset 4060

Timestamp:

Apr 17, 2012 9:55:30 AM (11 years ago)

Author:

ming

Message:

Re #1355: vidgui: new rendering window may cause all rendering processes to stop
Despite this fix, there is still a possibility that the rendering window can occasionally get stuck because SDL_PollEvent() gets stuck. This is most likely because there are two unsynchronized event pollers, Qt and SDL. The problem only happened on Windows with SDL 1.3 r5538, runs fine on Mac.

Location:

pjproject/trunk

Files:

• pjsip-apps/src/vidgui/vidgui.cpp (modified) (2 diffs)
• pjsip-apps/src/vidgui/vidwin.cpp (modified) (1 diff)
• pjsip-apps/src/vidgui/vidwin.h (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_vid.c (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/vidgui/vidgui.cpp

@@ -261 +261 @@
 
         video_prev_ = new VidWin(&wi.hwnd);
-        vbox_left->addWidget(video_prev_, 1);
+        video_prev_->putIntoLayout(vbox_left);
         //Using this will cause SDL window to display blank
         //screen sometimes, probably because it's using different
@@ -340 +340 @@
 
             video_= new VidWin(&wi.hwnd);
-            vbox_left->addWidget(video_, 1);
+            video_->putIntoLayout(vbox_left);
 
             break;

pjproject/trunk/pjsip-apps/src/vidgui/vidwin.cpp

@@ -51 +51 @@
 }
 
+void VidWin::putIntoLayout(QBoxLayout *box)
+{
+    box->addWidget(this, 1);
+    show();
+    activateWindow();
+}
+
 bool VidWin::event(QEvent *e)
 {

pjproject/trunk/pjsip-apps/src/vidgui/vidwin.h

@@ -22 +22 @@
 #include <pjsua.h>
 #include <QWidget>
+#include <QBoxLayout>
 
 class VidWin : public QWidget
@@ -33 +34 @@
     virtual ~VidWin();
     QSize sizeHint() const { return size_hint; }
+
+    void putIntoLayout(QBoxLayout *layout);
 
 protected:

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c

@@ -174 +174 @@
     p->rend_id = PJMEDIA_VID_DEFAULT_RENDER_DEV;
     p->show = PJ_TRUE;
+    p->wnd_flags = 0;
 }