From patchwork Mon Dec 6 04:45:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 32056 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4096030iog; Sun, 5 Dec 2021 20:46:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJxRmQEwuomsErVaiApgsnJLUBh9ADUrPulTMihpqp3q6KgkHht0XKDcmTFwA6+cjHD0/11b X-Received: by 2002:a17:907:3da3:: with SMTP id he35mr42280092ejc.464.1638765975433; Sun, 05 Dec 2021 20:46:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638765975; cv=none; d=google.com; s=arc-20160816; b=ksiCH3YLN14O2rwVXOCix3/iWfe3q+3UBq3N8V++M9zAxsYUgHOCb+/qbfSjfVsMt/ MpgCuMt+kp0ZP/Ttk4Phz40gWEohRDTmvCT31bJdwNdf/bbmmm3D21TIszk12S7wVgSP 2LO7tJ3K34hMUHeiqVoyw1u8iMLygePQho2wym2OfONBqKrnYRFe9TVYBEutc9sNwqSD Y+x6CAJgVQg9bug6y+sHmHiF47TzGJPjhP2L8spbchLpz6jVc6NJu51ViIMHfWVtbWGu i7FYL48bZYo2dgogWABJQlOovtRLh71hEyYOcqoi5djyW79NLckgpyMspOWNCUBRi+KT Rhhg== 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:dkim-signature:delivered-to; bh=hkVHUA7ZHF7t4FG5ZQ0DrBOIVD97nrrmqn/RJfP93Wg=; b=r5yIyzIFZmx0Gt/56Xbgl/b7Qj0SxxRVZJ1jYj1KhJ20+cCAISjgO+GR102LbhaFxH KeyGUR9ZS4phLx3o0TqTjeuZjDU6AdRH1S+4mK4oGNXniQymrSJQTMWBMcpV4MudJax9 z7pY1YuKyYpFgX1P3/18t7qVIp5WFeuK+aEH+MH7Sp4Qp9tyDqBg0yNvs50hOWc9q19J jsStf5JPNRbsrCJ0h8UMmEvDKP8jYaDOE4u1ooezm24xU9aJV3AVKjBHPpfmthE5r3q7 Sbnx496A5jmuXq+9myuIEqV62EVBDs+/5/9CWtvKkeCAgNi4LLao55KHjC2AFxHRzx6T yooQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ht3wUEYY; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l11si19764287ejo.694.2021.12.05.20.46.15; Sun, 05 Dec 2021 20:46:15 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ht3wUEYY; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7B9DD68A920; Mon, 6 Dec 2021 06:45:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D028868A8A0 for ; Mon, 6 Dec 2021 06:45:29 +0200 (EET) Received: by mail-pl1-f173.google.com with SMTP id o14so6280001plg.5 for ; Sun, 05 Dec 2021 20:45:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+iKfSq3Rv/GwfkssFeiYcD7BBCSYnDjyWsXMxxAm8L0=; b=ht3wUEYY7cS4SyQEriJRlUJjUUAeQ78V5xeubsbDcVjTxS7gfeLnJbHLF830P7nar5 6LB5rwR2Yzsg1Nnvk98DAPuIbhtb1053cdr0Dukr/fse9L+U6ASH5sC8LP/hGe4gBppH lGm13nUGwonpcM62BJgzF2HbZStMGU1BW7Ke4UvmfG3t0HBx+3vyWazdUqhDIrkpZByr eNo6/Q4UXnz0F7XP9Db9QUGQ22ii+zXrfM6qqdbA5f9TmdkXFn7z5zQs5PfZryzcijnQ 1ovkZkdiqpFIkcHhCyXoHHwUAxfmvVwULcaKUEHO4UO9Tg/oUkKMqr8oWxoBixF8Nj6d nVYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+iKfSq3Rv/GwfkssFeiYcD7BBCSYnDjyWsXMxxAm8L0=; b=WUjfDU3HfM57VDNIupO1VcDO0Imiyesrjsqz+NOOz7Sxmk4PnNHjwsIf+PWRx2O+/V cGiD8wtEawO7hj7fUzryqgI55wxl8GGZJL9CmiLXFkaG16K7p6nzI6KgE6DliTDCzi4i 2VPGMP0VNRQysJ8xw7Wd3kQT5i17a0acxmR391ApRhDyfmrJGfLrEBm0s20XavL/arEh vshY5AfDNdXQI6tt3v+l/7Gh4EEbsGjQGiJTjhjDiV5rvBxRbFoAI34/F4TsqAge9Uf7 /CSpqIix4s1wdkzmPApgURsoR34AK34tOIopkdUpJglYGHr/CHvTJ644vPbRXNNwnH3B 49CA== X-Gm-Message-State: AOAM532htC+BANp8K70wlPKe6fYAndbT7PxMlF+rVbbQKSBjy8/3nfpL Uj8bbt1G+vOCEGQD9QSYG7YuoLTqYjU= X-Received: by 2002:a17:90b:34b:: with SMTP id fh11mr33829439pjb.14.1638765928153; Sun, 05 Dec 2021 20:45:28 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id mn15sm8278289pjb.35.2021.12.05.20.45.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Dec 2021 20:45:27 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Dec 2021 12:45:03 +0800 Message-Id: <1638765904-2521-5-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1638765904-2521-1-git-send-email-lance.lmwang@gmail.com> References: <1638714396-23062-1-git-send-email-lance.lmwang@gmail.com> <1638765904-2521-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 5/6] avformat/rtsp: add error code handling for ff_rtsp_skip_packet() 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: A/sKmFv1a8IG From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtsp.c | 15 ++++++++++----- libavformat/rtsp.h | 4 +++- libavformat/rtspenc.c | 7 +++++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index b3d1e91..4ae810d 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1145,7 +1145,7 @@ void ff_rtsp_parse_line(AVFormatContext *s, } /* skip a RTP/TCP interleaved packet */ -void ff_rtsp_skip_packet(AVFormatContext *s) +int ff_rtsp_skip_packet(AVFormatContext *s) { RTSPState *rt = s->priv_data; int ret, len, len1; @@ -1153,7 +1153,7 @@ void ff_rtsp_skip_packet(AVFormatContext *s) ret = ffurl_read_complete(rt->rtsp_hd, buf, 3); if (ret != 3) - return; + return ret < 0 ? ret : AVERROR(EIO); len = AV_RB16(buf + 1); av_log(s, AV_LOG_TRACE, "skipping RTP packet len=%d\n", len); @@ -1165,9 +1165,11 @@ void ff_rtsp_skip_packet(AVFormatContext *s) len1 = sizeof(buf); ret = ffurl_read_complete(rt->rtsp_hd, buf, len1); if (ret != len1) - return; + return ret < 0 ? ret : AVERROR(EIO); len -= len1; } + + return 0; } int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply, @@ -1201,8 +1203,11 @@ start: if (ch == '$' && q == buf) { if (return_on_interleaved_data) { return 1; - } else - ff_rtsp_skip_packet(s); + } else { + ret = ff_rtsp_skip_packet(s); + if (ret < 0) + return ret; + } } else if (ch != '\r') { if ((q - buf) < sizeof(buf) - 1) *q++ = ch; diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index d6fdfe0..8b64e29 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -560,8 +560,10 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply, /** * Skip a RTP/TCP interleaved packet. + * + * @return 0 on success, < 0 on failure. */ -void ff_rtsp_skip_packet(AVFormatContext *s); +int ff_rtsp_skip_packet(AVFormatContext *s); /** * Connect to the RTSP server and set up the individual media streams. diff --git a/libavformat/rtspenc.c b/libavformat/rtspenc.c index e0fed1e..2a00b3e 100644 --- a/libavformat/rtspenc.c +++ b/libavformat/rtspenc.c @@ -200,8 +200,11 @@ static int rtsp_write_packet(AVFormatContext *s, AVPacket *pkt) ret = ff_rtsp_read_reply(s, &reply, NULL, 1, NULL); if (ret < 0) return AVERROR(EPIPE); - if (ret == 1) - ff_rtsp_skip_packet(s); + if (ret == 1) { + ret = ff_rtsp_skip_packet(s); + if (ret < 0) + return ret; + } /* XXX: parse message */ if (rt->state != RTSP_STATE_STREAMING) return AVERROR(EPIPE);