From patchwork Sat Apr 17 16:55:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: minlei sun X-Patchwork-Id: 26975 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:c04b:0:0:0:0:0 with SMTP id c72csp1244163ybf; Sat, 17 Apr 2021 09:55:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJykM5NJerG2MYOd4USShrPyDRBFWKnJtnbkkj0IsSZYyjBcXMjNQ7chkemxhrCrQe79sa1i X-Received: by 2002:aa7:cfd0:: with SMTP id r16mr3039614edy.330.1618678548301; Sat, 17 Apr 2021 09:55:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618678548; cv=none; d=google.com; s=arc-20160816; b=owwtbp30N3Q5Dn5yxNXzlnm3oLlWusMwXUdIYlIWqfYhDpmOQNd3nCgDPACM7CevI6 2RjKH5GPu1Ag75DUJaB4l3yMZAR7fbH0o+lxDcJGjGOHMGFWi3WtYGIDqw+EqnL88beS 2mqVUliquanrbuz5pRqhQVkipQVahqiMcqIR1WDNEkU4dhYQ0OIuj2VntaTlxAvqrZQH ZBpANL2y1CWdZpiq/UANGk3dYnYlJyP2vmJJG3jv4zJMsqR3D3nsWzmZTIkwE7bKQT+P Y+8PcByzBkmbWHXTXdeOlLbH0k2Kg7WsC40egQ9+h0esYMeLn8cERUILdTiBvtJ/VsG7 be7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=fTdadX+pM+8zWH6PI7i/tj3FFR3rywMvlXe63ONJbzU=; b=MWvJMozM1odCxcrkuNmtrNZbBro0P136GYQIjwIHjHJIdV0uF3svguJ83AJ5FmF5qZ TdfR4HHyWO5UmFoR6aJySmqk7IdH/nKzMktHX5E5L+amxcg0CQWzitYFO3Cvvb5ATf6h R/zMVM6ADYQnax7J1OSGRfV2eGO1yaAuIIb44eY42LcAK9MCMI3nyzpxOYI6BG+OrTa7 /dC7L8T4h5gjsEzUD1TXepdb6+93IokhPnP6EW7fJAAgoxBUkxPiPe+qSwOpR1MqJyR8 2M06dlQkJ6xCR9tfwBcFH5a35UsNkij4TAOiHSAtD9MSKZPOMjcGGKR/+feOr4C62JGV Kpmw== 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 a20si7175316ejf.345.2021.04.17.09.55.47; Sat, 17 Apr 2021 09:55:48 -0700 (PDT) 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 0AAEB680760; Sat, 17 Apr 2021 19:55:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from epoint.com.cn (unknown [61.155.218.132]) by ffbox0-bg.mplayerhq.hu (Postfix) with SMTP id 31A076806EC for ; Sat, 17 Apr 2021 19:55:33 +0300 (EEST) Received: from localhost.localdomain ([180.106.92.8]) (envelope-sender ) by 192.168.0.30 with ESMTP for ; Sun, 18 Apr 2021 00:55:16 +0800 X-WM-AuthFlag: YES X-WM-AuthUser: sunml@epoint.com.cn From: sunml@epoint.com.cn To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Apr 2021 00:55:26 +0800 Message-Id: <20210417165528.79321-1-sunml@epoint.com.cn> X-Mailer: git-send-email 2.24.3 (Apple Git-128) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 1/3] libavformat/rtsp.h : Add member ignore_rtcp to RTSPState X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Minlei Sun Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ruyE8OQmeea5 Content-Length: 791 From: Minlei Sun Signed-off-by: Minlei Sun --- libavformat/rtsp.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index 1310dd9c08..516391673a 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -416,6 +416,11 @@ typedef struct RTSPState { */ char *user_agent; + /** + * ignore rtcp data + */ + int ignore_rtcp; + char default_lang[4]; int buffer_size; int pkt_size; From patchwork Sat Apr 17 16:55:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: minlei sun X-Patchwork-Id: 26966 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:c04b:0:0:0:0:0 with SMTP id c72csp1244309ybf; Sat, 17 Apr 2021 09:56:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjbBarT9pM2FudKZhDDWPkEk9UTIT35sn1Kuov+FYJKdCKl3L3+q4DLAVMkwL0NfcR6sG+ X-Received: by 2002:a50:8fe6:: with SMTP id y93mr16302727edy.224.1618678568807; Sat, 17 Apr 2021 09:56:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618678568; cv=none; d=google.com; s=arc-20160816; b=n0kYWy/bMMUm8hOiIfJeRmI9QF6vDfT3fGB0I+x9AerHP39HxNLfLvOdmRcyL42q5t KcO4BPTAK+OEvM5Qe3QUnxiNTbNCWu0C8UpjUumWinUrh1hyiXsYFjCoIXKD71AtCwqJ F6YYwC5tUNaLnwu+ETp0U42esFkkSASf2O0ClG5cxTAvgS3Wab6w9ZWRAkb3YTuUcXeI s2qsGMYl+N6Cn7CP9ox7GhsmEiq9lsgRlfslMpOTbAlN8o/M0w+5LFjXze7MqSjXqEyH W4bm0PdhKeG3ggK+PL5Yj7w7JtDMTCaesotLxAUT5evgxo4C+hDrUEZeNPl9GjpeBkLO qzeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=e5nI4ZJQ67nsq00yJ17LJ8/UyrPR9bzZeu9FiLkatjY=; b=CetaaWVSje2R0vdpv9MtOKWFECtEVlwOCHOYFedEeX866n+zvIrdl55ZGxlxwSDjUb ETcUh8cuSHVlbLv5h4r7NZwT4ddOnhUfvRE0O4fN5gVdP+XmdBFn3WRmezV6lATvddK/ kOxYnr2ZHRZR+mbOlsKr/5/ROXYGCOInlwLQ7VG0fZd1K7aeX5/9qbpsCHI1Lri7MXoz Gz9fKQQzjYMt8416sIPTtfzt+FqDJ06pAQ/CTJBHIyI4UNn5z954yopRODhb55F8aUu5 heglw6dmHwx2epq2YjmcO32q1TF+XbljWFli8waAPNXfgXP8UqCHRWPS64UMeRnj6Vub u3JA== 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 z4si5468266edc.579.2021.04.17.09.56.08; Sat, 17 Apr 2021 09:56:08 -0700 (PDT) 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 6D170680857; Sat, 17 Apr 2021 19:55:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from epoint.com.cn (unknown [61.155.218.132]) by ffbox0-bg.mplayerhq.hu (Postfix) with SMTP id 36F856807CF for ; Sat, 17 Apr 2021 19:55:33 +0300 (EEST) Received: from localhost.localdomain ([180.106.92.8]) (envelope-sender ) by 192.168.0.30 with ESMTP for ; Sun, 18 Apr 2021 00:55:16 +0800 X-WM-AuthFlag: YES X-WM-AuthUser: sunml@epoint.com.cn From: sunml@epoint.com.cn To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Apr 2021 00:55:27 +0800 Message-Id: <20210417165528.79321-2-sunml@epoint.com.cn> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20210417165528.79321-1-sunml@epoint.com.cn> References: <20210417165528.79321-1-sunml@epoint.com.cn> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 2/3] libavformat/rtsp.c : Add ignore_rtcp option to ff_rtsp_options X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Minlei Sun Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: aBkFWsOUqUUY Content-Length: 1006 From: Minlei Sun Signed-off-by: Minlei Sun --- libavformat/rtsp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 25bdf475b3..32043bfff6 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -105,6 +105,7 @@ const AVOption ff_rtsp_options[] = { #if FF_API_OLD_RTSP_OPTIONS { "user-agent", "override User-Agent header (deprecated, use user_agent)", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC|AV_OPT_FLAG_DEPRECATED }, #endif + { "ignore_rtcp", "When receiving rtcp type message, it is ignored", OFFSET(ignore_rtcp), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC }, { NULL }, }; From patchwork Sat Apr 17 16:55:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: minlei sun X-Patchwork-Id: 26978 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:c04b:0:0:0:0:0 with SMTP id c72csp1244215ybf; Sat, 17 Apr 2021 09:55:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFR9mt5k57zRItDA5M/jePBLSTehCkKSH1IZPZmRendMpBtVUOgI8Ct2fOG5yb6EJWgfT0 X-Received: by 2002:a17:907:94ca:: with SMTP id dn10mr13609347ejc.123.1618678556324; Sat, 17 Apr 2021 09:55:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618678556; cv=none; d=google.com; s=arc-20160816; b=Bt+dAcfHc0JVPsGPXqpIkdzevyPEZEbqmsL2fIkQaaMA5HtU8eKX33h4QRIb1H9GzZ +D3YSBbacq/Dw0hYHXk3VZby+wzjmb/ISnd8SdML5HJWAD4/vdn0bQ4O6RNsGzBu5yh8 1e9VIKsAFwbBzb/4nIrY8ufDz0o9k5cdBhfaVV77JAIKGcpnMgWVm5H8l6JtTMxeFjPO GWVFa/uanti4O5AeE+qUx7WE0DjUHf7du3kJVJ9Oz3rlqY6BEd031/amUQ/9ibSnsb2P DqwcvVHJST8tewJJkaMXoaBIfik2pnNOOqptlpXSEyXZHGz9VsprdclOayt0MStk9gkK MMXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=6QMchVFs0up1cAi04gj8o+IgW0MBeKxD/S/PJoRak0s=; b=yA5Myoz3fMtIs84sl2RxlJc/hdPuWNXXyrtnnWAzcn8xIWl4Hv0Lt3/0C2HeWm7Apc LhgyTCnL51qKoxhip7xMNG7sqkFslcHsftA3RSouwJWZwSItrGXul7KfUsb4VAdGfm3T ceNVm/TdWi4iS6qdBDoEncT5KuYTrcHoy00nABb3Auv5o7LH0orwVuQV496PfI8wUQ/R SSzx8h5q/56Mqp49t/hz1zDNcmqTj67/H34FTGaSapoLR6QWrhkCIEU4P6Qs+cgEcI+8 PTW8hKwmlqQFvBIp3t1TyKNoY1wbpcujyVmBhE+NeOFIB5RsQcIqXyjVj+R2tafMrwJE EIzA== 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 t8si7826117ejy.77.2021.04.17.09.55.55; Sat, 17 Apr 2021 09:55:56 -0700 (PDT) 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 D57F868081F; Sat, 17 Apr 2021 19:55:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from epoint.com.cn (unknown [61.155.218.132]) by ffbox0-bg.mplayerhq.hu (Postfix) with SMTP id 34463680760 for ; Sat, 17 Apr 2021 19:55:33 +0300 (EEST) Received: from localhost.localdomain ([180.106.92.8]) (envelope-sender ) by 192.168.0.30 with ESMTP for ; Sun, 18 Apr 2021 00:55:17 +0800 X-WM-AuthFlag: YES X-WM-AuthUser: sunml@epoint.com.cn From: sunml@epoint.com.cn To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Apr 2021 00:55:28 +0800 Message-Id: <20210417165528.79321-3-sunml@epoint.com.cn> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20210417165528.79321-1-sunml@epoint.com.cn> References: <20210417165528.79321-1-sunml@epoint.com.cn> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 3/3] libavformat/rtspdec.c : Implement ignore_rtcp code X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Minlei Sun Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: LXxVd7w67eLp Content-Length: 760 From: Minlei Sun Signed-off-by: Minlei Sun --- libavformat/rtspdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index 113da975e1..1d5e674149 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -817,6 +817,8 @@ redo: } goto redo; found: + if (rt->ignore_rtcp && (id == 1 || id == 3 )) + goto redo; *prtsp_st = rtsp_st; return len; }