From patchwork Sat Aug 25 21:24:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Hilb X-Patchwork-Id: 10140 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp4839300jap; Sat, 25 Aug 2018 14:25:40 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdb55BhrAFsfbgRd0uQwAftjaIe4Ez2vGX/42/+CTjKgf0EblqYR/abY7kunPjdMKZyX3LPL X-Received: by 2002:a1c:3545:: with SMTP id c66-v6mr1951258wma.120.1535232340846; Sat, 25 Aug 2018 14:25:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535232340; cv=none; d=google.com; s=arc-20160816; b=qMARLIZDs71xqq9lVnhfYYPVW6YxvmQyJ6GwXTCQKEqu+F3Tfui1sV+adaR/c+LKpn Rd2tI5XzHQ+T3inByk8HGGx7L5zxCrEZyOlYZOQJZZlDnczfFDtcMKokKtzQOskXZB7n xnwyK1P8Rbnxseu4GEJv1rF+p2N+c2+MP3LmJ4R3k/QbFVyU1WkolKBZg03emlMHQ49X MvNwdkqfXoCxbJFJvERazmorlMq44hibwkTfB8ToRNu5v5l0qLn/povIEC7QIBTFeFwW CqzhH/fJi3Va8TEkLHRzQFlV8DHo3rCcRefyPMY87AOJwOVVWED+ximEnkkq+cJrE8Ix LDmA== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:dkim-signature:from :delivered-to:arc-authentication-results; bh=g2YGr17is5PfD1Xs+FtGhASsvzRNjqI9WMQYelGC4jA=; b=QzRjyndAWoYLRhCHAyh3iM1Dodgt5jBXVZPQDh15XDlML0UQt0bPXb1VnxUlLe575m LxvKM9sAbYVA0cIWYA58Tu8NTRjeabmEiXZg74dY20S3jcRHW5STqk9gPXeoFa0YAJHs RORgA4T3AChuQpgaAcjfMAU3ftoMH9iWw4BozI4LX7sqJT8i3u11wWCB37fGrtPuHt/Q AiraXDOVa1QdOGmAb4ke0VB+RF0Pcb6j3prooT+GNMiAuwPZHdxyJB5fbKp0RK4Ljwed FPf0NF1NtNk4I4LUlFKTxmiWOm/ni1z4L07wh9SAX48MXkttnVRTF2TO8gqrQuGPHbhr Wp5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@bs0x539.de header.s=bs0x539.de header.b=ODZAEEa9; 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 w81-v6si3711334wma.11.2018.08.25.14.25.40; Sat, 25 Aug 2018 14:25:40 -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=@bs0x539.de header.s=bs0x539.de header.b=ODZAEEa9; 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 50982689AC5; Sun, 26 Aug 2018 00:25:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.bs0x539.de (mail.bs0x539.de [138.201.57.224]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E00F688251 for ; Sun, 26 Aug 2018 00:25:30 +0300 (EEST) From: Stephan Hilb DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bs0x539.de; s=bs0x539.de; t=1535232332; bh=63VWD0MMlQRlIBc38EPr9ez+gIym9p5hfBOdXd8MPAg=; h=From:To:Subject:Date; b=ODZAEEa9xvLCQLI/DOIDcZIbyToaJOpzUv7355lWoxCupUn47whFUnJLqL0Y9NIAa ELvGs0dOcsOZC6s76ANP+SyJk3VJYds3PSiAyTk2runNnPYl6tP4Nc8FoJjHKxRxi6 yDuJRfoMd2ZHjx15UWw22oNuPbMjgcmI5DLlxTF/GbBAOYbiSCi9z16WNRKuevyLVB I6hhvrs+8K3RfzhfHfILmwFDP4ASHMtXb6oBz/bn8mDppwnlRn83ldW8ipSJQ2ZN6S yTnbrZs6BiRglAh3HpeoxwnPbzSD9VfpKJxhakQnnV5qP4SuQOunUaHQ8pvS87MGcW faHwN008Lqc2A== To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Aug 2018 23:24:58 +0200 Message-Id: <20180825212458.3009-1-stephan@ecshi.net> Subject: [FFmpeg-devel] [PATCH] lavd/v4l2: skip buffers not matching frame_size 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" By adopting the same behaviour as if there was corrupted data in the buffer (see the check for V4L2_BUF_FLAG_ERROR) the resulting rawvideo now at least contains valid data (the previous frame being duplicated). Fixes video capturing for some stk1160 devices. --- libavdevice/v4l2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 10a0ff0dd6..ab903bbcee 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -534,11 +534,10 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt) s->frame_size = buf.bytesused; if (s->frame_size > 0 && buf.bytesused != s->frame_size) { - av_log(ctx, AV_LOG_ERROR, + av_log(ctx, AV_LOG_WARNING, "Dequeued v4l2 buffer contains %d bytes, but %d were expected. Flags: 0x%08X.\n", buf.bytesused, s->frame_size, buf.flags); - enqueue_buffer(s, &buf); - return AVERROR_INVALIDDATA; + buf.bytesused = 0; } }