From patchwork Sun Jan 23 03:51:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 33749 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1708781iog; Sat, 22 Jan 2022 19:52:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJysnbUVKOV60FGwsH6yfrjXCVdO0QPAgWV/BD+uMp6ZsGKJatzhxmdRtu5QFvaCBhAJgLNY X-Received: by 2002:a17:906:a103:: with SMTP id t3mr8219913ejy.567.1642909945645; Sat, 22 Jan 2022 19:52:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642909945; cv=none; d=google.com; s=arc-20160816; b=QcM7fl/mGUUpumGMnl44P/Xht93ofJTvcrDtXQ8egmeyPlOjHIZKq9x1OJsemqsgDc HoeGHO7YJgLeSh5XlcYC+K12S7DIImJIgwiPuz5Dba3pF7r2FYcOfbrqoQWl7OzmdqmY 4+mVGriO3PYk+azqE8i1CyPGNoMTcN7ij2GPjaCXKy4c91acHD9hy6filT7b1gL7/5nj xB296WnonGL1ylJptj+5ao0YRlTNBfhsM8IhFl+krje2MPW8Vgs8JzEVCEjvSKbJcoL7 7bM7eOcgOIFpcuFOaNil6dSOh6FNGxAMUz72YCWLyFvq06EJQ7a+e3GtDvuhjN7VFp3/ Dr1w== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=0oKOl9qT/R8NJfK9blMD60B0KxQcnNEont4Cy415nUw=; b=FRpSFFY1YNcW5g4uk/QHVcEICApCE2NQsEiyF6I15rBqCcqPREwPkLcQos91h+iozc 2olDAHx3nNuYiKIeN73whxaOTdzH73ceOVUzO+vQxvD+s82gVFEp1rz6a/Ag8h0J88uA eSyHYgc0jNg8/SpQoDi3Yozc7PRz1YbtEURM590DgttCDtP2BvMMZk6kiuxIsk9MgjGL mO74MWiFOwXW9g9xgKEgXwghQaD+EnORHqZ/ltQk8GF6ZxOBTnDtNw1U0jE166gCH/OW 0etRLmMfBGzQOYfiUiFxp9WQ+IQdwgeTdsGXFWbWSUFROcqE0keUH5Jh6WW1EfTYnNGI 5kdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=XC4nK3nT; 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 t19si6236214edi.514.2022.01.22.19.52.24; Sat, 22 Jan 2022 19:52:25 -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=XC4nK3nT; 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 8CCA568AFEF; Sun, 23 Jan 2022 05:52:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3D6768AFAB for ; Sun, 23 Jan 2022 05:52:14 +0200 (EET) Received: by mail-pj1-f45.google.com with SMTP id d15-20020a17090a110f00b001b4e7d27474so12978230pja.2 for ; Sat, 22 Jan 2022 19:52:14 -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; bh=s2DXGtxeoqqoX1q2jeDKzKd+lAL+bvAx5S6HHnBbjuU=; b=XC4nK3nTZW3xwaK5XLL5pw9vddKuKExMqbG14r0fVme5Kt3ApXId5nbNNnL6ptQCso MQOuJ6ljBjldJWoo9xn+2ZkYaRPPngt6PYgk3iRh1J5u2NMrnBGEMwQ4Ras/kQ37idEE VUGKXoOh6l9JmkQMzUeJzgc6slQIZlKWiKXa60dOQR05m1XxbwMIxgBfmDtS7Ayef5MY e5uSVZqgPLVcaHuCf97zNji4ZOcbi5O1z8A/Js1JL0TeEtP1FGmseu1B8ouLLzYTTKPn P5dxv35YyMQs6vN8nHXCD4Xulwh6+iu7cikuEBU8ReP25UDjyINSYXmx0plCocaDf7p8 FElg== 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; bh=s2DXGtxeoqqoX1q2jeDKzKd+lAL+bvAx5S6HHnBbjuU=; b=PHEHLo7fSVztPJ+qIQuHWw7Vr4XdZ59eYn9wMwo8y05YdrleXMRG0Zl3Wv3xe3bNvh MGwXmakdVGtiYWawF7vv7FiAeDt9udook9d8tzbOZCemA1JM4jNW3nrOH1EXeS+oJXw3 J6F33niKH2NHnjcZHwcG6slaTJo/MBC3nCQtOu3FS73jDhQ+MDDDUaYFvlM/6d/uWjTD QEy4MJKf+kBMXqhgtxiaqdph9BXlE/AZe5lcapFJRjnxdhML/F5d2ieqofrn9x/OfLzS dqdP5NPtbnT6rvOYyVgmqL1JseydlHWKXWdvJYp1TNpY6znQd7jv3+Sno5DETXd6puXt /EPw== X-Gm-Message-State: AOAM530Duiui1nxnM2Nv6n6KfEVoxiMnA8/kYQ7dqf0dKJHzoD7Rv2Z1 prHoE/4qiaydfJI79wmGUMyo6f1muio= X-Received: by 2002:a17:90a:43:: with SMTP id 3mr7562944pjb.244.1642909932480; Sat, 22 Jan 2022 19:52:12 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id f13sm12015747pfc.70.2022.01.22.19.52.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Jan 2022 19:52:12 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Jan 2022 11:51:56 +0800 Message-Id: <1642909918-26903-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/rtpdec: Fix negative missed packets in warning message 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: 0XTh8jU28ODy From: Limin Wang Signed-off-by: Limin Wang --- libavformat/rtpdec.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 20fe2b8..f285a41 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -835,9 +835,14 @@ static int rtp_parse_queued_packet(RTPDemuxContext *s, AVPacket *pkt) if (s->queue_len <= 0) return -1; - if (!has_next_packet(s)) + if (!has_next_packet(s)) { + int pkt_missed = s->queue->seq - s->seq - 1; + + if (pkt_missed < 0) + pkt_missed += UINT16_MAX; av_log(s->ic, AV_LOG_WARNING, - "RTP: missed %d packets\n", s->queue->seq - s->seq - 1); + "RTP: missed %d packets\n", pkt_missed); + } /* Parse the first packet in the queue, and dequeue it */ rv = rtp_parse_packet_internal(s, pkt, s->queue->buf, s->queue->len);