[Qt] Fix Network Open Tab

Network Open Tab assumes all rtp/udp addresses are multicast #2221
Please review.

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index a3b100ec5836fd7066c1be755834d60123cfd9e7..47eedfb805662881c752b424ca64a0cf2cc578fc 100644 (file)
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -471,8 +471,13 @@ void NetOpenPanel::updateProtocol( int idx_proto ) {
     {
         if( idx_proto != UDP_PROTO && idx_proto != RTP_PROTO )
             addr.replace( QRegExp("^.*://@*"), proto + "://");
-        else
+        else if ( ( addr.contains(QRegExp("://((22[4-9])|(23\\d)|(\\[?[fF]{2}[0-9a-fA-F]{2}:))"))) ||
+                ( !addr.contains(QRegExp("^\\d{1,3}[.]\\d{1,3}[.]\\d{1,3}[.]\\d{1,3}")) &&
+                !addr.contains(QRegExp(":[a-fA-F0-9]{1,4}:")) ) )
              addr.replace( QRegExp("^.*://"), proto + "://@");
+    else
+             addr.replace( QRegExp("^.*://"), proto + "://");
+        addr.replace( QRegExp("@+"), "@");
         ui.addressText->setText( addr );
     }
     updateMRL();
@@ -483,15 +488,16 @@ void NetOpenPanel::updateMRL() {
     QString addr = ui.addressText->text();
     addr = QUrl::toPercentEncoding( addr, ":/?#@!$&'()*+,;=" );
     int idx_proto = ui.protocolCombo->currentIndex();
-
+    int addr_is_multicast = addr.contains(QRegExp("^(22[4-9])|(23\\d)|(\\[?[fF]{2}[0-9a-fA-F]{2}:)"))?1:0;
+    int addr_is_ipv4 = addr.contains(QRegExp("^\\d{1,3}[.]\\d{1,3}[.]\\d{1,3}[.]\\d{1,3}"))?1:0;
+    int addr_is_ipv6 = addr.contains(QRegExp(":[a-fA-F0-9]{1,4}:"))?1:0;
+    int addr_has_port = addr.contains(QRegExp("[^:]{5}:\\d{1,5}$"))?1:0;
     if( addr.contains( "://"))
     {
         /* Match the correct item in the comboBox */
         ui.protocolCombo->setCurrentIndex(
                 ui.protocolCombo->findData( addr.section( ':', 0, 0 ) ) );
-
-        if( idx_proto != UDP_PROTO || idx_proto != RTP_PROTO )
-            mrl = addr;
+        mrl = addr;
     }
     else
     {
@@ -517,23 +523,31 @@ void NetOpenPanel::updateMRL() {
             emit methodChanged("rtsp-caching");
             break;
         case UDP_PROTO:
-            mrl = "udp://@";
+            if(( addr_is_multicast ) || ( !addr_is_ipv4 && !addr_is_ipv6 ))
+                mrl = "udp://@";
+        else
+                    mrl = "udp://";
             /* Add [] to IPv6 */
-            if ( addr.contains(':') && !addr.contains('[') )
+            if ( addr_is_ipv6  && !addr.contains('[') )
             {
                 mrl += "[" + addr + "]";
             }
             else mrl += addr;
-            mrl += QString(":%1").arg( ui.portSpin->value() );
+            if(!addr_has_port)
+                mrl += QString(":%1").arg( ui.portSpin->value() );
             emit methodChanged("udp-caching");
             break;
         case RTP_PROTO:
-            mrl = "rtp://@";
-            if ( addr.contains(':') && !addr.contains('[') )
+            if(( addr_is_multicast ) || ( !addr_is_ipv4 && !addr_is_ipv6 ))
+                    mrl = "rtp://@";
+            else
+                    mrl = "rtp://";
+            if ( addr_is_ipv6 && !addr.contains('[') )
                 mrl += "[" + addr + "]"; /* Add [] to IPv6 */
             else
                 mrl += addr;
-            mrl += QString(":%1").arg( ui.portSpin->value() );
+            if(!addr_has_port)
+                mrl += QString(":%1").arg( ui.portSpin->value() );
             emit methodChanged("rtp-caching");
             break;
         case RTMP_PROTO:

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index d46df3e5415e745744946ef8ddf3c6ec0447cdf8..9e803ef43fddfd85b3b378db5af30802c6bfa329 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -30,7 +30,6 @@
 
 #include <QTabWidget>
 #include <QGridLayout>
-#include <QFileDialog>
 #include <QRegExp>
 #include <QMenu>