commit 731c31ec84dc287aa383dbfaee27769a8cb1516a
author Treehugger Robot <treehugger-gerrit@google.com> Mon Dec 14 17:43:47 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 14 17:43:47 2020 +0000
tree e558ffdbcc7c8943aa24784cd82fc718c88d4790
parent 0ba11a6bdda77f1df7146157a9ffb39b4f990e03
parent 5137c69cb86fc85b27aad73362c29548f2bd916e

Merge "Handle RTSP make port error case"

media/libstagefright/rtsp/ARTPConnection.cpp

diff --git a/media/libstagefright/rtsp/ARTPConnection.cpp b/media/libstagefright/rtsp/ARTPConnection.cpp
index 6a4706d..7b36875 100644
--- a/media/libstagefright/rtsp/ARTPConnection.cpp
+++ b/media/libstagefright/rtsp/ARTPConnection.cpp
@@ -121,7 +121,7 @@
     unsigned start = (unsigned)((rand()* 1000LL)/RAND_MAX) + 15550;
     start &= ~1;
 
-    for (unsigned port = start; port < 65536; port += 2) {
+    for (unsigned port = start; port < 65535; port += 2) {
         struct sockaddr_in addr;
         memset(addr.sin_zero, 0, sizeof(addr.sin_zero));
         addr.sin_family = AF_INET;
@@ -139,6 +139,13 @@
                  (const struct sockaddr *)&addr, sizeof(addr)) == 0) {
             *rtpPort = port;
             return;
+        } else {
+            // we should recreate a RTP socket to avoid bind other port in same RTP socket
+            close(*rtpSocket);
+
+            *rtpSocket = socket(AF_INET, SOCK_DGRAM, 0);
+            CHECK_GE(*rtpSocket, 0);
+            bumpSocketBufferSize(*rtpSocket);
         }
     }