avplay: properly close/reopen AVAudioResampleContext on channel layout change

[ffmpeg] / libavformat / tcp.c

diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index cf294dc4b9666a424e59b0aa38d9e489ab0bfc73..0ed11f321f6ac2b313d1fcb32d59df79d9f993c6 100644 (file)
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -19,10 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
+#include "libavutil/parseutils.h"
 #include <unistd.h>
 #include "internal.h"
 #include "network.h"
 #include "os_support.h"
+#include "url.h"
 #if HAVE_POLL_H
 #include <poll.h>
 #endif
@@ -35,11 +37,15 @@ typedef struct TCPContext {
 /* return non zero if error */
 static int tcp_open(URLContext *h, const char *uri, int flags)
 {
-    struct addrinfo hints, *ai, *cur_ai;
+    struct addrinfo hints = { 0 }, *ai, *cur_ai;
     int port, fd = -1;
-    TCPContext *s = NULL;
+    TCPContext *s = h->priv_data;
+    int listen_socket = 0;
+    const char *p;
+    char buf[256];
     int ret;
     socklen_t optlen;
+    int timeout = 100;
     char hostname[1024],proto[1024],path[1024];
     char portstr[10];
 
@@ -48,13 +54,20 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
     if (strcmp(proto,"tcp") || port <= 0 || port >= 65536)
         return AVERROR(EINVAL);
 
-    memset(&hints, 0, sizeof(hints));
+    p = strchr(uri, '?');
+    if (p) {
+        if (av_find_info_tag(buf, sizeof(buf), "listen", p))
+            listen_socket = 1;
+        if (av_find_info_tag(buf, sizeof(buf), "timeout", p)) {
+            timeout = strtol(buf, NULL, 10);
+        }
+    }
     hints.ai_family = AF_UNSPEC;
     hints.ai_socktype = SOCK_STREAM;
     snprintf(portstr, sizeof(portstr), "%d", port);
     ret = getaddrinfo(hostname, portstr, &hints, &ai);
     if (ret) {
-        av_log(NULL, AV_LOG_ERROR,
+        av_log(h, AV_LOG_ERROR,
                "Failed to resolve hostname %s: %s\n",
                hostname, gai_strerror(ret));
         return AVERROR(EIO);
@@ -63,29 +76,42 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
     cur_ai = ai;
 
  restart:
+    ret = AVERROR(EIO);
     fd = socket(cur_ai->ai_family, cur_ai->ai_socktype, cur_ai->ai_protocol);
     if (fd < 0)
         goto fail;
-    ff_socket_nonblock(fd, 1);
 
+    if (listen_socket) {
+        int fd1;
+        ret = bind(fd, cur_ai->ai_addr, cur_ai->ai_addrlen);
+        listen(fd, 1);
+        fd1 = accept(fd, NULL, NULL);
+        closesocket(fd);
+        fd = fd1;
+        ff_socket_nonblock(fd, 1);
+    } else {
  redo:
-    ret = connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen);
+        ff_socket_nonblock(fd, 1);
+        ret = connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen);
+    }
+
     if (ret < 0) {
         struct pollfd p = {fd, POLLOUT, 0};
-        if (ff_neterrno() == AVERROR(EINTR)) {
-            if (url_interrupt_cb()) {
+        ret = ff_neterrno();
+        if (ret == AVERROR(EINTR)) {
+            if (ff_check_interrupt(&h->interrupt_callback)) {
                 ret = AVERROR_EXIT;
                 goto fail1;
             }
             goto redo;
         }
-        if (ff_neterrno() != AVERROR(EINPROGRESS) &&
-            ff_neterrno() != AVERROR(EAGAIN))
+        if (ret != AVERROR(EINPROGRESS) &&
+            ret != AVERROR(EAGAIN))
             goto fail;
 
         /* wait until we are connected or until abort */
-        for(;;) {
-            if (url_interrupt_cb()) {
+        while(timeout--) {
+            if (ff_check_interrupt(&h->interrupt_callback)) {
                 ret = AVERROR_EXIT;
                 goto fail1;
             }
@@ -93,23 +119,21 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
             if (ret > 0)
                 break;
         }
-
+        if (ret <= 0) {
+            ret = AVERROR(ETIMEDOUT);
+            goto fail;
+        }
         /* test error */
         optlen = sizeof(ret);
         getsockopt (fd, SOL_SOCKET, SO_ERROR, &ret, &optlen);
         if (ret != 0) {
-            av_log(NULL, AV_LOG_ERROR,
+            av_log(h, AV_LOG_ERROR,
                    "TCP connection to %s:%d failed: %s\n",
                    hostname, port, strerror(ret));
+            ret = AVERROR(ret);
             goto fail;
         }
     }
-    s = av_malloc(sizeof(TCPContext));
-    if (!s) {
-        freeaddrinfo(ai);
-        return AVERROR(ENOMEM);
-    }
-    h->priv_data = s;
     h->is_streamed = 1;
     s->fd = fd;
     freeaddrinfo(ai);
@@ -123,7 +147,6 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
             closesocket(fd);
         goto restart;
     }
-    ret = AVERROR(EIO);
  fail1:
     if (fd >= 0)
         closesocket(fd);
@@ -136,7 +159,7 @@ static int tcp_read(URLContext *h, uint8_t *buf, int size)
     TCPContext *s = h->priv_data;
     int ret;
 
-    if (!(h->flags & URL_FLAG_NONBLOCK)) {
+    if (!(h->flags & AVIO_FLAG_NONBLOCK)) {
         ret = ff_network_wait_fd(s->fd, 0);
         if (ret < 0)
             return ret;
@@ -150,7 +173,7 @@ static int tcp_write(URLContext *h, const uint8_t *buf, int size)
     TCPContext *s = h->priv_data;
     int ret;
 
-    if (!(h->flags & URL_FLAG_NONBLOCK)) {
+    if (!(h->flags & AVIO_FLAG_NONBLOCK)) {
         ret = ff_network_wait_fd(s->fd, 1);
         if (ret < 0)
             return ret;
@@ -163,7 +186,6 @@ static int tcp_close(URLContext *h)
 {
     TCPContext *s = h->priv_data;
     closesocket(s->fd);
-    av_free(s);
     return 0;
 }
 
@@ -174,11 +196,12 @@ static int tcp_get_file_handle(URLContext *h)
 }
 
 URLProtocol ff_tcp_protocol = {
-    "tcp",
-    tcp_open,
-    tcp_read,
-    tcp_write,
-    NULL, /* seek */
-    tcp_close,
+    .name                = "tcp",
+    .url_open            = tcp_open,
+    .url_read            = tcp_read,
+    .url_write           = tcp_write,
+    .url_close           = tcp_close,
     .url_get_file_handle = tcp_get_file_handle,
+    .priv_data_size      = sizeof(TCPContext),
+    .flags               = URL_PROTOCOL_FLAG_NETWORK,
 };