From patchwork Thu Nov 9 09:31:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nablet Developer X-Patchwork-Id: 5994 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1809753jah; Thu, 9 Nov 2017 01:32:47 -0800 (PST) X-Google-Smtp-Source: ABhQp+Qm0n2g04/wK8ppETezrwPRAgZtPVUcB72kgoUrsuXWavxnduf3nlFOJd5GGCIkXss6xKe+ X-Received: by 10.223.176.27 with SMTP id f27mr2910813wra.105.1510219967345; Thu, 09 Nov 2017 01:32:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510219967; cv=none; d=google.com; s=arc-20160816; b=pUMVsIptFUK+nA8qsQBEz1Aq0Y2CchxTRDiMHltjv1v+u8KIKhlnEbt5634sE6GW+D 9NlYzlw1tX7oeZeuft4WE4qsTiNZGEFiCBZsnE9fUVMfVJVuyTw0jEtjC+dG2YwTNHKl zcqqJ6QquXa0vDI+vQN2cS1vRrMGqQIQQsYi1REkwIKvPOYKD2Jpgacg8XmUP8aVVMOu iprKxL6cYlr8Soj/yic9iiv2XK05ZpNz+XWZBG/6fGQbzkFUOVpjrz1Z01L/yJjuFpLT vSjcr8gbLD8K0ZXTqV4ZD88V28uL6cqlqCvOX4XWJJbnO4UROxvx3cZBALjYktzcIJYo rpWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=y9+9uu6tsh8I6R/VXhtFM5bCWLXRC3YwYp0lNIwLiZ4=; b=ayerFP58Cwc4/IcK8RFghL6U/lvpuwKUi57JjTgMmT+S05xzXyudCwRSpzBAFvOaxW 2xTTHtF2eGZpLr24tiOLgge3llbc5DrDot8QnEB+5mUGfHwukkIdrg9nwmJAb4jwKcgd N0g8RRIMg511aCYznW5VokRO6WOfqV334P7whzV1Okz2xyc8rv5EVqMPbHAzk1qL3db0 LKmSFJEzDPj2+WQR+hluRM9LOXhWbyXasYfnvWLjcPrqzbEkkKOaKcJUh8uAn7f+mmj8 W2hzolevlJNXQddnikB7Ekcd0fATq97GQd95i8fE4XukwgoTKwVB9K3gzA7LZRUI6SEO SgwQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 63si5199088wrg.546.2017.11.09.01.32.46; Thu, 09 Nov 2017 01:32:47 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6EBD2689E3E; Thu, 9 Nov 2017 11:32:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 085A5689E03 for ; Thu, 9 Nov 2017 11:32:13 +0200 (EET) Received: from ubuntu-server.internal.divx.com ([91.216.211.197]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MH5lK-1eQShn1eJ0-00DkW6; Thu, 09 Nov 2017 10:32:25 +0100 From: Nablet Developer To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Nov 2017 16:31:31 +0700 Message-Id: <1510219892-8142-3-git-send-email-sdk@nablet.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510219892-8142-1-git-send-email-sdk@nablet.com> References: <1510219892-8142-1-git-send-email-sdk@nablet.com> X-Provags-ID: V03:K0:ySo6nH5P8TK6K29dhHdEh61/Vyh12JOS2UX9gNVp4Kpuvn9rI/N MEBdmTDxiP331RjjIyr0nxkynOluxZqSA1maeUA77MOHMHUZFRt+ecoYbODeQi/WlhptYiL YvbPyC7JVVgRs3fkrDN7exYZTFZ6xkHUWQbJTd3x5Z7n8AbYQOoF9uD5uxd7pwLSD4LGNqt mVNxfwzJ9XBkY3eRFlFNw== X-UI-Out-Filterresults: notjunk:1; V01:K0:xoUAymhruvo=:G3YnSqH0XL54s/tZDT5OWf qwBsiJtZ3crCQAXFI7IG1OEMypY/KfDMszgkz1TzDmA2PYMUH94cmGo3K3uC3Adf8logKsOs7 QITXRLHPuaJtGnuhK2KSDtICF2O2OyrJN0+fVsogVAgczf6ieFbdhkSDy8yETVxBQdd5HRMhK 5y+6OtpSui6poOhCV+0yqWwDIFTRzXXPNOqXWDS0L9xYAOwjk1vBzn3btG8G+XONbRsi9XcNw lDuYOnz7VBHxkLRzK4r4NnQ69gFtzkHBdzox6z96W/v3KTFp1kiRQMmJDp5TzdAhY5Mc5lO5q 0sjMLYP6cQl88IgJ5cXf9YEIM5eiDOmGAQ/HNMVPgF1rlK+pDKtCdWZVl9qcTDHCsEGGtDPMA qZz7PHcbszD4sIBVTcQ6qFEyTW3BRlB0DB6QbWYCp0Lw6UGC1oP2VZmynRZAT2swflr1QPEGU Q9WEb30Fj4h16g6rvTU53bZmlXTH9DCusbv02Rql9U7p1/8plqkCkkkRYRXjFacSDZkJJt36z qEtt/RAu8A+zTysEwRcKP7H+GtSbLB0ZJ0Y0reF/33kAcdSx+DTi1XnHETXzcKBmeWlcgyQle XU95ofG6n6YMQ1ESCVOg0YwrYygZsdYQWlq+90vpZ+DrXYRyf78Qya0KIHKVYD2zrcnsIVwof uTENz3fDCuG9m/yXBD34Z2fkwVbM94RF2jT4LbwuO5fgUxi1wzVfYqFQabZOcNu+ZE9kC1CnE YuBwF8/SvvrqpHwGCfZCxJwYtzyQhxneoMWkdw== Subject: [FFmpeg-devel] [PATCH 2/3] avformat/tcp: use generic socket API X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Nablet Developer MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" this allows to implement other protocols which use API similar to BSD sockets (e.g. Haivision SRT) Signed-off-by: Nablet Developer --- libavformat/tcp.c | 118 +++++++++++++++++++++++++++--------------------------- libavformat/tcp.h | 59 +++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 58 deletions(-) create mode 100644 libavformat/tcp.h diff --git a/libavformat/tcp.c b/libavformat/tcp.c index 07b4ed9..a775230 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -32,26 +32,12 @@ #include #endif -typedef struct TCPContext { - const AVClass *class; - int fd; - int listen; - int open_timeout; - int rw_timeout; - int listen_timeout; - int recv_buffer_size; - int send_buffer_size; -} TCPContext; - -#define OFFSET(x) offsetof(TCPContext, x) +#include "tcp.h" + #define D AV_OPT_FLAG_DECODING_PARAM #define E AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { - { "listen", "Listen for incoming connections", OFFSET(listen), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, .flags = D|E }, - { "timeout", "set timeout (in microseconds) of socket I/O operations", OFFSET(rw_timeout), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, - { "listen_timeout", "Connection awaiting timeout (in milliseconds)", OFFSET(listen_timeout), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, - { "send_buffer_size", "Socket send buffer size (in bytes)", OFFSET(send_buffer_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, - { "recv_buffer_size", "Socket receive buffer size (in bytes)", OFFSET(recv_buffer_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, + TCP_COMMON_OPTS { NULL } }; @@ -63,7 +49,7 @@ static const AVClass tcp_class = { }; /* return non zero if error */ -static int tcp_open(URLContext *h, const char *uri, int flags) +int ff_tcp_open(URLContext *h, const char *uri, int flags) { struct addrinfo hints = { 0 }, *ai, *cur_ai; int port, fd = -1; @@ -75,10 +61,15 @@ static int tcp_open(URLContext *h, const char *uri, int flags) char portstr[10]; s->open_timeout = 5000000; + s->api = s->api ? s->api : &bsd_socket_api; + s->proto = s->proto ? s->proto : "tcp"; + av_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), &port, path, sizeof(path), uri); - if (strcmp(proto, "tcp")) + if (strcmp(proto, s->proto)) { + av_log(h, AV_LOG_ERROR, "incorrect protocol %s %s\n", proto, s->proto); return AVERROR(EINVAL); + } if (port <= 0 || port >= 65536) { av_log(h, AV_LOG_ERROR, "Port missing in uri\n"); return AVERROR(EINVAL); @@ -132,37 +123,42 @@ static int tcp_open(URLContext *h, const char *uri, int flags) } #endif - fd = ff_socket(cur_ai->ai_family, - cur_ai->ai_socktype, - cur_ai->ai_protocol); + fd = s->api->socket(cur_ai->ai_family, + cur_ai->ai_socktype, + cur_ai->ai_protocol); if (fd < 0) { - ret = ff_neterrno(); + ret = s->api->neterrno(); goto fail; } /* Set the socket's send or receive buffer sizes, if specified. If unspecified or setting fails, system default is used. */ if (s->recv_buffer_size > 0) { - setsockopt (fd, SOL_SOCKET, SO_RCVBUF, &s->recv_buffer_size, sizeof (s->recv_buffer_size)); + s->api->setsockopt (fd, SOL_SOCKET, SO_RCVBUF, &s->recv_buffer_size, sizeof (s->recv_buffer_size)); } if (s->send_buffer_size > 0) { - setsockopt (fd, SOL_SOCKET, SO_SNDBUF, &s->send_buffer_size, sizeof (s->send_buffer_size)); + s->api->setsockopt (fd, SOL_SOCKET, SO_SNDBUF, &s->send_buffer_size, sizeof (s->send_buffer_size)); + } + + if (s->set_options_pre) { + if ((ret = s->set_options_pre(h, fd)) < 0) + goto fail1; } if (s->listen == 2) { // multi-client - if ((ret = ff_listen(fd, cur_ai->ai_addr, cur_ai->ai_addrlen)) < 0) + if ((ret = ff_listen_ex(s->api, fd, cur_ai->ai_addr, cur_ai->ai_addrlen)) < 0) goto fail1; } else if (s->listen == 1) { // single client - if ((ret = ff_listen_bind(fd, cur_ai->ai_addr, cur_ai->ai_addrlen, - s->listen_timeout, h)) < 0) + if ((ret = ff_listen_bind_ex(s->api, fd, cur_ai->ai_addr, cur_ai->ai_addrlen, + s->listen_timeout, h)) < 0) goto fail1; // Socket descriptor already closed here. Safe to overwrite to client one. fd = ret; } else { - if ((ret = ff_listen_connect(fd, cur_ai->ai_addr, cur_ai->ai_addrlen, - s->open_timeout / 1000, h, !!cur_ai->ai_next)) < 0) { + if ((ret = ff_listen_connect_ex(s->api, fd, cur_ai->ai_addr, cur_ai->ai_addrlen, + s->open_timeout / 1000, h, !!cur_ai->ai_next)) < 0) { if (ret == AVERROR_EXIT) goto fail1; @@ -171,6 +167,11 @@ static int tcp_open(URLContext *h, const char *uri, int flags) } } + if (s->set_options_post) { + if ((ret = s->set_options_post(h, fd)) < 0) + goto fail1; + } + h->is_streamed = 1; s->fd = fd; @@ -182,18 +183,18 @@ static int tcp_open(URLContext *h, const char *uri, int flags) /* Retry with the next sockaddr */ cur_ai = cur_ai->ai_next; if (fd >= 0) - closesocket(fd); + s->api->close(fd); ret = 0; goto restart; } fail1: if (fd >= 0) - closesocket(fd); + s->api->close(fd); freeaddrinfo(ai); return ret; } -static int tcp_accept(URLContext *s, URLContext **c) +int ff_tcp_accept(URLContext *s, URLContext **c) { TCPContext *sc = s->priv_data; TCPContext *cc; @@ -202,42 +203,43 @@ static int tcp_accept(URLContext *s, URLContext **c) if ((ret = ffurl_alloc(c, s->filename, s->flags, &s->interrupt_callback)) < 0) return ret; cc = (*c)->priv_data; - ret = ff_accept(sc->fd, sc->listen_timeout, s); + ret = ff_accept_ex(sc->api, sc->fd, sc->listen_timeout, s); if (ret < 0) return ret; cc->fd = ret; + cc->api = sc->api; return 0; } -static int tcp_read(URLContext *h, uint8_t *buf, int size) +int ff_tcp_read(URLContext *h, uint8_t *buf, int size) { TCPContext *s = h->priv_data; int ret; if (!(h->flags & AVIO_FLAG_NONBLOCK)) { - ret = ff_network_wait_fd_timeout(s->fd, 0, h->rw_timeout, &h->interrupt_callback); + ret = ff_network_wait_fd_timeout_ex(s->api, s->fd, 0, h->rw_timeout, &h->interrupt_callback); if (ret) return ret; } - ret = recv(s->fd, buf, size, 0); - return ret < 0 ? ff_neterrno() : ret; + ret = s->api->recv(s->fd, buf, size, 0); + return ret < 0 ? s->api->neterrno() : ret; } -static int tcp_write(URLContext *h, const uint8_t *buf, int size) +int ff_tcp_write(URLContext *h, const uint8_t *buf, int size) { TCPContext *s = h->priv_data; int ret; if (!(h->flags & AVIO_FLAG_NONBLOCK)) { - ret = ff_network_wait_fd_timeout(s->fd, 1, h->rw_timeout, &h->interrupt_callback); + ret = ff_network_wait_fd_timeout_ex(s->api, s->fd, 1, h->rw_timeout, &h->interrupt_callback); if (ret) return ret; } - ret = send(s->fd, buf, size, MSG_NOSIGNAL); - return ret < 0 ? ff_neterrno() : ret; + ret = s->api->send(s->fd, buf, size, MSG_NOSIGNAL); + return ret < 0 ? s->api->neterrno() : ret; } -static int tcp_shutdown(URLContext *h, int flags) +int ff_tcp_shutdown(URLContext *h, int flags) { TCPContext *s = h->priv_data; int how; @@ -250,23 +252,23 @@ static int tcp_shutdown(URLContext *h, int flags) how = SHUT_RD; } - return shutdown(s->fd, how); + return s->api->shutdown(s->fd, how); } -static int tcp_close(URLContext *h) +int ff_tcp_close(URLContext *h) { TCPContext *s = h->priv_data; - closesocket(s->fd); + s->api->close(s->fd); return 0; } -static int tcp_get_file_handle(URLContext *h) +int ff_tcp_get_file_handle(URLContext *h) { TCPContext *s = h->priv_data; return s->fd; } -static int tcp_get_window_size(URLContext *h) +int ff_tcp_get_window_size(URLContext *h) { TCPContext *s = h->priv_data; int avail; @@ -280,22 +282,22 @@ static int tcp_get_window_size(URLContext *h) } #endif - if (getsockopt(s->fd, SOL_SOCKET, SO_RCVBUF, &avail, &avail_len)) { - return ff_neterrno(); + if (s->api->getsockopt(s->fd, SOL_SOCKET, SO_RCVBUF, &avail, &avail_len)) { + return s->api->neterrno(); } return avail; } const URLProtocol ff_tcp_protocol = { .name = "tcp", - .url_open = tcp_open, - .url_accept = tcp_accept, - .url_read = tcp_read, - .url_write = tcp_write, - .url_close = tcp_close, - .url_get_file_handle = tcp_get_file_handle, - .url_get_short_seek = tcp_get_window_size, - .url_shutdown = tcp_shutdown, + .url_open = ff_tcp_open, + .url_accept = ff_tcp_accept, + .url_read = ff_tcp_read, + .url_write = ff_tcp_write, + .url_close = ff_tcp_close, + .url_get_file_handle = ff_tcp_get_file_handle, + .url_get_short_seek = ff_tcp_get_window_size, + .url_shutdown = ff_tcp_shutdown, .priv_data_size = sizeof(TCPContext), .flags = URL_PROTOCOL_FLAG_NETWORK, .priv_data_class = &tcp_class, diff --git a/libavformat/tcp.h b/libavformat/tcp.h new file mode 100644 index 0000000..df6cc07 --- /dev/null +++ b/libavformat/tcp.h @@ -0,0 +1,59 @@ +/* + * TCP protocol + * Copyright (c) 2002 Fabrice Bellard + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +typedef struct TCPContext { + const AVClass *class; + int fd; + int listen; + int open_timeout; + int rw_timeout; + int listen_timeout; + int recv_buffer_size; + int send_buffer_size; + const char * proto; + const struct socket_api * api; + int (*set_options_pre)(URLContext *h, int fd); + int (*set_options_post)(URLContext *h, int fd); +} TCPContext; + +#define OFFSET(x) offsetof(TCPContext, x) +#define TCP_COMMON_OPTS \ + { "listen", "Listen for incoming connections", OFFSET(listen), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, .flags = D|E }, \ + { "timeout", "set timeout (in microseconds) of socket I/O operations", OFFSET(rw_timeout), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, \ + { "listen_timeout", "Connection awaiting timeout (in milliseconds)", OFFSET(listen_timeout), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, \ + { "send_buffer_size", "Socket send buffer size (in bytes)", OFFSET(send_buffer_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, \ + { "recv_buffer_size", "Socket receive buffer size (in bytes)", OFFSET(recv_buffer_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, + +int ff_tcp_open(URLContext *h, const char *uri, int flags); + +int ff_tcp_accept(URLContext *s, URLContext **c); + +int ff_tcp_read(URLContext *h, uint8_t *buf, int size); + +int ff_tcp_write(URLContext *h, const uint8_t *buf, int size); + +int ff_tcp_shutdown(URLContext *h, int flags); + +int ff_tcp_close(URLContext *h); + +int ff_tcp_get_file_handle(URLContext *h); + +int ff_tcp_get_window_size(URLContext *h);