From patchwork Wed Mar 4 23:46:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Nicholson X-Patchwork-Id: 18028 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 13FDA44AB55 for ; Thu, 5 Mar 2020 02:10:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E2DF368B1A7; Thu, 5 Mar 2020 02:10:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F13F868B1A7 for ; Thu, 5 Mar 2020 02:10:08 +0200 (EET) Received: by mail-ed1-f67.google.com with SMTP id c62so4525447edf.0 for ; Wed, 04 Mar 2020 16:10:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DpVoOwJnFSJLbQyuM+Q/W8KJmaVIR45kymYRLGKBjeQ=; b=HO7eCyhkaD/nBqwEWd6q7VX+xQ8JF9T6YxbAIxo5YtFH+m0ILW/DSaCkaHduRBhT7Q Y1jUUR1RPs7uxuVxJC/8CDbci0jL8LNQ9lB0RSKqz72cHLQdV+89uh1fvDXxx/MR3uSJ mQx0EQhovPz3p01IcWR0o/HtV0b3y4Zyd3agfMbcHWCezXe8I2nb7xk5PUZnp6Mg70eb 80lDLX6Po12yuRI8PMoDi0ZcvUbwvV2z+2oFpHN2J04jOD0z0Kl29mMDhuAbE+1gIkhj 18n//HBhS2sjeyNih2GhS+NOtQ7wSv6ydccgIN4EEYvnDmiOWv8IaGaMXj2ged3IrExg X7Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DpVoOwJnFSJLbQyuM+Q/W8KJmaVIR45kymYRLGKBjeQ=; b=Cnlxmex02DoEsF+CDb+ipWXIdMbq4ZK11qgM//2SfBP8g8UBGEQFcjslijEdVSOUBV uyUjkru163pbJGrOZH2Z2Dn3YE7uFX5fmEvEt0HZaQ7l76q/unyR38wXjl5yh1gMsE7Y cWo7F3+lt3A88hWiLUjo93EJukpPKmGvISBuqK0xNT7vrTH/1KufmzcTmjiWVMoVbv6W V1myWPd8tXuEDGDJnyK+zMkfLpA533JiAtmLlrZcbc7Hu1vbtI8VuMag8HZjqhC9lDnC NoH+po3UPkfWyTsIclQ2DZ1/bPqsUjrbtu07dk172fPnQ6Bz91ETuSallYb8WpXrTsUa qP0g== X-Gm-Message-State: ANhLgQ0aNT/D7zbZM9ljT5cwX2ZUdLtBS4cIuX+cd35r6dFhdXCqPiEp rozenRtPn79B4Bgc4pEoSyjWMy4Zshw= X-Google-Smtp-Source: ADFU+vtghfTctUMsBu+owZTq26XfSUjvl5EL+H56QdmUlOzIdsDot6SSxkSyKgOCcceanTWp2/WpOg== X-Received: by 2002:adf:fa43:: with SMTP id y3mr6265448wrr.404.1583365652795; Wed, 04 Mar 2020 15:47:32 -0800 (PST) Received: from Rosss-MacBook.localdomain ([89.101.86.58]) by smtp.gmail.com with ESMTPSA id b24sm6492235wmj.13.2020.03.04.15.47.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Mar 2020 15:47:32 -0800 (PST) From: phunkyfish To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Mar 2020 23:46:49 +0000 Message-Id: <20200304234649.22892-1-phunkyfish@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) In-Reply-To: <20200302192109.16576-1-phunkyfish@gmail.com> References: <20200302192109.16576-1-phunkyfish@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/rtp: Pass sources and block filter addresses via sdp file for rtp 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: phunkyfish Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/rtsp.c | 48 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index cd6fc32a29..f6d66526b0 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -2447,8 +2447,8 @@ static int rtp_probe(const AVProbeData *p) static int rtp_read_header(AVFormatContext *s) { uint8_t recvbuf[RTP_MAX_PACKET_LENGTH]; - char host[500], sdp[500]; - int ret, port; + char host[500], sdp[1000], filters_buf[1000]; + int ret, port, sdp_length, nc; URLContext* in = NULL; int payload_type; AVCodecParameters *par = NULL; @@ -2456,6 +2456,7 @@ static int rtp_read_header(AVFormatContext *s) AVIOContext pb; socklen_t addrlen = sizeof(addr); RTSPState *rt = s->priv_data; + const char *p; if (!ff_network_init()) return AVERROR(EIO); @@ -2513,12 +2514,40 @@ static int rtp_read_header(AVFormatContext *s) av_url_split(NULL, 0, NULL, 0, host, sizeof(host), &port, NULL, 0, s->url); - snprintf(sdp, sizeof(sdp), - "v=0\r\nc=IN IP%d %s\r\nm=%s %d RTP/AVP %d\r\n", - addr.ss_family == AF_INET ? 4 : 6, host, - par->codec_type == AVMEDIA_TYPE_DATA ? "application" : - par->codec_type == AVMEDIA_TYPE_VIDEO ? "video" : "audio", - port, payload_type); + sdp_length = snprintf(sdp, sizeof(sdp), + "v=0\r\nc=IN IP%d %s\r\n", + addr.ss_family == AF_INET ? 4 : 6, host); + + p = strchr(s->url, '?'); + if (p) { + static const char *filters[][2] = {{"sources", "incl"}, {"block", "excl"}, {NULL, NULL}}; + int i; + char *q; + for (i = 0; filters[i][0]; i++) { + if (av_find_info_tag(filters_buf, sizeof(filters_buf), filters[i][0], p)) { + /* av_log(s, AV_LOG_VERBOSE, "rtp_read_header() found %s %s\n", filters[i][0], filters_buf); */ + q = filters_buf; + while ((q = strchr(q, ',')) != NULL) + *q = ' '; + nc = snprintf(sdp + sdp_length, sizeof(sdp) - sdp_length, + "a=source-filter:%s IN IP%d %s %s\r\n", + filters[i][1], + addr.ss_family == AF_INET ? 4 : 6, host, + filters_buf); + if (nc < 0 || nc + sdp_length >= sizeof(sdp)) + goto fail_nobuf; + sdp_length += nc; + } + } + } + + nc = snprintf(sdp + sdp_length, sizeof(sdp) - sdp_length, + "m=%s %d RTP/AVP %d\r\n", + par->codec_type == AVMEDIA_TYPE_DATA ? "application" : + par->codec_type == AVMEDIA_TYPE_VIDEO ? "video" : "audio", + port, payload_type); + if (nc < 0 || nc + sdp_length >= sizeof(sdp)) + goto fail_nobuf; av_log(s, AV_LOG_VERBOSE, "SDP:\n%s\n", sdp); avcodec_parameters_free(&par); @@ -2534,6 +2563,9 @@ static int rtp_read_header(AVFormatContext *s) s->pb = NULL; return ret; +fail_nobuf: + ret = AVERROR(ENOBUFS); + av_log(s, AV_LOG_ERROR, "rtp_read_header(): not enough buffer space for sdp-headers\n"); fail: avcodec_parameters_free(&par); if (in)