From patchwork Tue May 23 18:44:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kucera X-Patchwork-Id: 3721 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp2036704vsk; Tue, 23 May 2017 12:28:24 -0700 (PDT) X-Received: by 10.28.105.21 with SMTP id e21mr3325683wmc.4.1495567704268; Tue, 23 May 2017 12:28:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495567704; cv=none; d=google.com; s=arc-20160816; b=B3KmRF128h1hp9sNF5Fy3qcvmhuUokSSH7Jh00xE/NuVLc0Vci0P9s4JU56B/iYeSD JegObzqoLHAGBrWSuaIpzHWukVgrSvbkqXHciUnAf9fUT5uEBU5kgzyOYxYvrYjBDikx Ahi0Aawqu2b0Llge7xcNUVbKOzhSmAzJw9Yob1iueHMMM1i3CQOBhL8J4wjmuDBhcepY J893uNsK7zbzxsLwI5ZytXjLm7w1aRe4VWUtk0Su6HyUInPbLTKJXEgGBdiZnU28s33i FIJ6bgCAEGFzuC02ZfLF1TOk9yvIszS/4K5cPr9JiltDIX41xzi8BZQG1BfHW3exlvls D2Kw== 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:arc-authentication-results; bh=iZ6y++skQSGlukGwWhdXm9bqKjBmncwRf+2tPM5YLw8=; b=yZ7qhku0NNlTcY2Jd000KJzltx1iErhw3hLcAvAu2xv7EgDp2W5/Eh9CNp2pgh2674 FBEBJh4+gLwM0wwJRsd4rrhARwa33W3kzAR6dEYZMo1Z4GVR5KWlStKLUwojU68xxYfr dUAU7q9orZ/yoe4P3hUy7JjB5UWrt2Tc/lZqoIThFV0/QGu9RGmXbsHZO3mXS6rFLjO1 eX2BVtBr68WnhV6Mk5yMIXjZiwecbwqs031gQHlGQLxW6XMP0L+baTbD75+vS03efKGD WT68rIlA734BhQmp1Qau2t25VklLu3Epux6LLg+otsaps5fScnGByPEEZ1ASRhV7KmMH c9Dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE 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 n72si1881929wmi.138.2017.05.23.12.28.23; Tue, 23 May 2017 12:28:24 -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; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE 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 230C8689B0E; Tue, 23 May 2017 22:28:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BEE286808C2 for ; Tue, 23 May 2017 21:50:33 +0300 (EEST) Received: by mail-wm0-f65.google.com with SMTP id g15so21946396wmc.2 for ; Tue, 23 May 2017 11:50:35 -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; bh=jUjOe9Qrut0NZlZgpOGjPX+//cqGWCZN3olmgScwBys=; b=uWWu/rZIocLClzeDY6oWqoHIK7S4ZGWTHL/OGBASP/pywXJuLYn2wPKEBP01Sn3afz +DHaf1FFG72IhVl0m0prPEjqW8qkhe+2dt3PiEIn6sQRtBitjfm1rjNU7tf8anz5jhqp kw/sD4XpdIfjTROKHgJFClsIebXKdpnDz2q3ZLUjFojBhFoGbkkrD+H2NkydkgkcSrqB 30XjBfwO/8ZJeJWGxgwbtdzAfmwyD4yw5mor406cGvMzpGSJ3NtN2QuH/DdpvxGR9f9Y OMigxUIR4JpNCa+JcF4/J07ATISJQOD5mnjgj/Vyp6lMINRBjE/ROAocaudXU7+74IQ9 9zcA== 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; bh=jUjOe9Qrut0NZlZgpOGjPX+//cqGWCZN3olmgScwBys=; b=fFCIJ3kI0TA+h5vhQFX7FIZ84lgEoE9PqRye9tlZYy6ShSEcxAFxUSZI+nhlOYf7F3 zZU7I/5JCuBw56DEGNu3FrgrtCllxQIzTrOYPoEbXewJsQzF20b2MyFjvGx+YTFD20Yl LjgefCDg550q+dppd5Qt9PWSOCKjtIqsRRsbaSC4FFxIHCm6l7lWjWuYnMT4SmRx8iaO IBwoTe2xjPNryiJK+s8uMPsCervy6Ax+5BMFKV5y6PUc9cnUFf4Wyg+N1Yi6oV3gN7+l lTv7yvHIH0y4G9J9oeR6MaX/RdICF8tPzp28aaPWRFS2YdNmIW4U4oV9A0gyVzmBFx0O dfWg== X-Gm-Message-State: AODbwcB4OAUa4XWVkcI6eR1hmYjnskXG3hJqPBiGr48ChriwrF+5aZeB L4TqdgO5GsHDyzL6 X-Received: by 10.28.197.11 with SMTP id v11mr3247962wmf.84.1495565052986; Tue, 23 May 2017 11:44:12 -0700 (PDT) Received: from localhost.localdomain (ip-89-177-134-12.net.upcbroadband.cz. [89.177.134.12]) by smtp.gmail.com with ESMTPSA id y6sm2015568wrc.51.2017.05.23.11.44.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 May 2017 11:44:12 -0700 (PDT) From: Daniel Kucera To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 May 2017 20:44:02 +0200 Message-Id: <20170523184402.25394-1-daniel.kucera@gmail.com> X-Mailer: git-send-email 2.11.0 X-Mailman-Approved-At: Tue, 23 May 2017 22:28:13 +0300 Subject: [FFmpeg-devel] [PATCH] udp: ignore UDP packets without payload 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: Daniel Kucera MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Time to time some devices send UDP packets without payload. ffmpeg previously exited on receiving such packet, this patch fixes this behaviour. Signed-off-by: Daniel Kucera --- libavformat/udp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index 3835f989c4..28fa7b2354 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -1039,7 +1039,11 @@ static int udp_read(URLContext *h, uint8_t *buf, int size) av_fifo_generic_read(s->fifo, buf, avail, NULL); av_fifo_drain(s->fifo, AV_RL32(tmp) - avail); pthread_mutex_unlock(&s->mutex); - return avail; + if (avail > 0){ + return avail; + } else { + continue; + } } else if(s->circular_buffer_error){ int err = s->circular_buffer_error; pthread_mutex_unlock(&s->mutex);