From patchwork Sun Dec 5 14:26:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31980 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3324559iog; Sun, 5 Dec 2021 06:27:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJwY2eW2UpEEMnwMLpg/ElDFtcPah5ukFgcqKlfVm3HF0MAE2pDo0tlmB84pW5QVlD2L9X9v X-Received: by 2002:a05:6402:27c8:: with SMTP id c8mr46034299ede.151.1638714471455; Sun, 05 Dec 2021 06:27:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638714471; cv=none; d=google.com; s=arc-20160816; b=imcbxE9XEMYeyaAYRqmbEDOOf5ZkqpZ7DYWmkdSUnptJX7zH7uSa1dHxrQnIPxSrT7 QToa81oAR7rlveAVhtNaxwFUD8Q2zErZgNEDAQOiRb5Y05SnNROQKazzJbJzhllp1LAS +P/23+u6ZJqM2p2adfYMMvuKZhsGwqdatlQef+2aYX5mGXkKPEQZC4rJi2iL0Q5fwtwd p47DWiCZOahK8f5BIwqrvQLS+DBdsL3drshNRiR8I4kBFrIZHOMsKLp5Vj0VxxbL2jQK INagm1pKmk2Lez2UlN2NnSMNcThwNnNe4tQy971bzmjscPf/9tRuq8IjZr5nJL6Iwffj 6caQ== 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=ZIE8XGQ7JiSmtJqsxtZHsr9cNbaEGVSt8XDer/hebNE=; b=xKWoHzjPLSUUCb1rZxctpHQwzIacqtEKiQppiZg8/rbstv093BXm+sc/khmkbVdZ7E rdiEpzbKCV+K0z+5KKjhfuG5v2JMDfw7VK5WSoO4KWWsRM7uDgtbJVUyWMLGWd6fdGP/ tCcKTUJZDkqKh71nlXcKldd57NfY4VRoQ3nNhf6STAdDeJ/f32CR1xMoacdlEJU6S0Bu BfEL6kcR9TvIg+FZZX2gWKSXUZ9LJL7UxnT6gibqzHiimFzi2ePqqquELFCpTWQmFviZ pxwM1pw7MswZkUXUG6D/Xsr+1Tv3LOvJrft8QAtNvq65qzz31hv+421wTh0a3KSGS3wY yQxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=VcM7h2cl; 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 x25si11883879ejj.243.2021.12.05.06.27.51; Sun, 05 Dec 2021 06:27:51 -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=VcM7h2cl; 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 F099268AE80; Sun, 5 Dec 2021 16:27:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F3EE68AE57 for ; Sun, 5 Dec 2021 16:26:53 +0200 (EET) Received: by mail-pf1-f174.google.com with SMTP id b68so7683302pfg.11 for ; Sun, 05 Dec 2021 06:26:53 -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=6nODyHSCeXvoCgob8pb3aTn1fdszXyOayOP1bbhfjkU=; b=VcM7h2clo3sXs1eqOeNLypwdJkKpJ4bKDJjrGaoPI/PE2OqfJyl5OGTSE/jVF/+KQi GpLGmTYaDWMAevxDHbxADyTl8wQCSgEPt9X+ak1fwbHWDB8qZD1LKt3LSz+HYbZ7mCPO QpXKWS+nfdTWv9zzVfMhX0CWDTyEBbBVMwAByTf0ZxoGZ6l+kYxpDJEg0EZYtx7xsN2b j+FJV9UCVQ8KPD8ezGBPFnOiJISGAq9RVWg21YA3HhkLrO9uNvQxJCwB/rXBMx50Z9N9 4A0OsQAQ7TyYQeKeZpNAywD6fY124tkak8QSQcF0w6Ases6ECq9cNwl1ofA7JGmppE/G n8oQ== 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=6nODyHSCeXvoCgob8pb3aTn1fdszXyOayOP1bbhfjkU=; b=JMTj0++4y20x6nwo8CNlSV1/tLsfoNfz/I/f66Lg2yCmMkKi1cg6hhn9eg8FaF1HaJ nr1aJBGp1ZEf844haNLHQrgPEraOh2rMkohdTIJfNX2C7ZdQGVSdDh13nvLQgkhP8zKT /vDdPQ7BGSlpZEN7IkQ8CWwkaTgKFN1OCWwCijBQqoQcld9qt+kgT1zu/EwB9uO09XqJ ANzGVMqOC4BgAOz7oR4QmizxrR1cg8TJ4Gmwyop/Ceq4MsbEfYONP5HYMsOI+wmaNGaL Aaj+1qomoQYcd7t5tbX1kqh/dgSYBRZkheE7KQq248CrJQ71foMqdPdOzITpkTRXscje 2tAg== X-Gm-Message-State: AOAM532/uEFVoZQADPZZSlmEnP/XcZ5uj8jE8h3Y9N82dy8D6+ojajia Kl1czPZ5R33sjmVPMDOWzwZNZfgo2Vk= X-Received: by 2002:a63:8ac4:: with SMTP id y187mr13902328pgd.462.1638714410781; Sun, 05 Dec 2021 06:26:50 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id x9sm10192265pjq.50.2021.12.05.06.26.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Dec 2021 06:26:50 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Dec 2021 22:26:36 +0800 Message-Id: <1638714396-23062-6-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1638714396-23062-1-git-send-email-lance.lmwang@gmail.com> References: <1638714396-23062-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 6/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: PuhEqaGWMwNK 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 a8d079e..6442e5b 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 AVERROR_EOF; 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 AVERROR_EOF; 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..4a413f0 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);