From patchwork Mon Apr 6 16:56:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Nicholson X-Patchwork-Id: 18712 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 8CEC344B378 for ; Mon, 6 Apr 2020 20:05:10 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 62E4968B199; Mon, 6 Apr 2020 20:05:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 457D0689C58 for ; Mon, 6 Apr 2020 20:05:04 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id h2so143796wmb.4 for ; Mon, 06 Apr 2020 10:05:04 -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=A+5Znx8tb6l3HTRng91zkSlr/2yQWct1rHDXGlaE1Pg=; b=SpGdR5hRfwBi5J5AVDsp1eDlP9jHjv2zt8W1Sv73UgJ8/e/jRpg90jupJC6ujc9YXT bcytzOMCP3M5HvP6xqupo8YEYy2rXMbshDYf2McEBYh6LYzcSppMjl0tJpEavkzkW/ah UW+2kLx0/xmdebKT+1BTRdRImg97nSg7l/4z0atC51mGlQLWZNCM7SkDS1lkmQ6oGYkv ML1Uwr84IY8Y5Qg8RWs3SxHpUKr9xcNgh8EileB3ZQIIYvR0Bei3eQQnLcFqrVwqcqpa JRxgMhlKO/LKOsB/FZCflKRmIuupeVCTg05HcEwfPcSuVOvVc9MZ1T+ClFusoHsZQV78 m2Sg== 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=A+5Znx8tb6l3HTRng91zkSlr/2yQWct1rHDXGlaE1Pg=; b=isJyZSpMAq9J0xUxcOwR6qAhAjrF9lTtxTtrONHyWqIiB261FrnsDVU3umyd8Vep5K Ucr+nTP+tJNi8qdQfnBCw5mS25pB2jDP+OD6OsAFuSBAhPHwnPDogq1M15h5/zmlKQeI 49KHLsW8ICQ8mc7n/NFx57VCKSbtrNTyrgRRQoh6jr91Y8F0FrWC4zuzNOfVo7RCX2rW g1/jPwEA0VKLJ5xqL3VILoBfad9XtyVX2lkWyxPQUvsut+Xl5LGSk3/repCxTTXV6PUB vUfOYggQsL8ob8jUrj5YOmsU61TcRBoXJgWjvX4NoDISmeBP8RepDVcfT3j2/4Zw53yi fEXg== X-Gm-Message-State: AGi0PuajuUJPtfp4aXGWSosTGZZqnOPB+aDWjVsLYk+vr+vvEy0m1gPN h19weyUY0QwWATkGmixhXZR/t1X/ X-Google-Smtp-Source: APiQypKyLxn26rOsDnpmY4QNxVBea+aaqN0T7k1LcP7k0mNFobBCNVgDJOAASOcfMUzo3wXMP3AlSQ== X-Received: by 2002:a05:600c:a:: with SMTP id g10mr63574wmc.153.1586192219621; Mon, 06 Apr 2020 09:56:59 -0700 (PDT) Received: from Rosss-MacBook.localdomain ([89.101.86.58]) by smtp.gmail.com with ESMTPSA id j135sm188193wmj.46.2020.04.06.09.56.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Apr 2020 09:56:58 -0700 (PDT) From: phunkyfish To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Apr 2020 17:56:51 +0100 Message-Id: <20200406165651.58783-1-phunkyfish@gmail.com> X-Mailer: git-send-email 2.24.1 (Apple Git-126) In-Reply-To: <20200327175257.10276-1-phunkyfish@gmail.com> References: <20200327175257.10276-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 | 47 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index cd6fc32a29..0d0bc2be0d 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,13 +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)) { + 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); av_log(s, AV_LOG_VERBOSE, "SDP:\n%s\n", sdp); + if (nc < 0 || nc + sdp_length >= sizeof(sdp)) + goto fail_nobuf; avcodec_parameters_free(&par); ffio_init_context(&pb, sdp, strlen(sdp), 0, NULL, NULL, NULL, NULL); @@ -2534,6 +2562,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)