From patchwork Fri Mar 27 17:52:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Nicholson X-Patchwork-Id: 18442 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 4A3D74494CD for ; Fri, 27 Mar 2020 19:58:22 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 275ED68B863; Fri, 27 Mar 2020 19:58:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB1B968B84B for ; Fri, 27 Mar 2020 19:58:15 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id h15so12464056wrx.9 for ; Fri, 27 Mar 2020 10:58:15 -0700 (PDT) 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=kmajwRfLHSrUcXJMRNJvF/z8Xo26/CGfFsy/6QH5Hzo=; b=qoK/XEi2y41i/i7iCqLIuzuItZ9j3vN9ZmATkwnfRKAiEq7+Nv1/oJGm+SduYYWCEw /MiNSo7Y7I8pWuQU7tr5dN9teOSFaaXoOWXc9sRosoq+W+RFhrV36pcKB+BOv2O8XbZf s+bkTr1YaufOZ7ckRtZRRKVCOLdeq0BxOmyo52C0vu7lwmTvauqBxhNCtjwTmpzyVQeV YdGXULL/wCRH7rs9/bFBcHf9Hxu37SY0SxjUykJ2up3daP3Kug8Mub1wSkZXu5cfHFC7 ZMJrsiUZsBnLNy9jDcB//fOLKQyl5qLxx9V7snI7zXobzC+lz0hvegeR7t9kKphZzxPU D95Q== 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=kmajwRfLHSrUcXJMRNJvF/z8Xo26/CGfFsy/6QH5Hzo=; b=p/nympo726TpKDf6Fsu49MLTRa9BYPH6+4wQRiP96dLGl1dB+yY16BuKh530JAPho3 0TFzL92PnoKZo3eMIWiyiwOYf0CVFrKGsgEOOaVMLbg2YpbjlRuq919EqUphmDqxiu46 RBvKBqFO6Wl8KPJFateAHHd9ADB4jyWAfc5+sWOec8Dvwwy+MImXGCMV2ncuWZ7JJlSv GNPK/8gFPS+EzM42VG5VT80TSNwZGjkBNe4d7U5+63UAR7PA2i2WtT5wk2WydjHZRpJm opFCxGJBT5ItBduxSPyTDJJwoIsDVE2yukQ2X2ziaIzSpJLxVdRCFBRSJzdxALflyOvD cIBg== X-Gm-Message-State: ANhLgQ2P/cKEa2tSs9CCWTl75tGUEobiu5QYpNX/O6qVH5LczqsmERro eGgIZKoD5QbtsrAGhZLyvj7Ido/G X-Google-Smtp-Source: ADFU+vtcMjdEZlGgn0xgV41BE5SoLhXuiz2DfbCKNfsuLs6G4EThCLsXW7wdNUTmdk1q35eADCo2zQ== X-Received: by 2002:a5d:5447:: with SMTP id w7mr548624wrv.299.1585331582957; Fri, 27 Mar 2020 10:53:02 -0700 (PDT) Received: from Rosss-MacBook.localdomain ([89.101.86.58]) by smtp.gmail.com with ESMTPSA id g195sm8613211wme.32.2020.03.27.10.53.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Mar 2020 10:53:02 -0700 (PDT) From: phunkyfish To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Mar 2020 17:52:57 +0000 Message-Id: <20200327175257.10276-1-phunkyfish@gmail.com> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) 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 | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index cd6fc32a29..1aec070382 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,39 @@ 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)) { + 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 +2562,8 @@ static int rtp_read_header(AVFormatContext *s) s->pb = NULL; return ret; +fail_nobuf: + ret = AVERROR(ENOBUFS); fail: avcodec_parameters_free(&par); if (in)