From patchwork Sat Aug 9 09:37:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Schaefer X-Patchwork-Id: 25247 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1XG34j-000540-Hl; Sat, 09 Aug 2014 11:36:33 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-8) with esmtp id 1XG34h-0006Df-jt; Sat, 09 Aug 2014 11:36:33 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751463AbaHIJg2 (ORCPT + 1 other); Sat, 9 Aug 2014 05:36:28 -0400 Received: from mail-wg0-f52.google.com ([74.125.82.52]:61232 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751273AbaHIJgY (ORCPT ); Sat, 9 Aug 2014 05:36:24 -0400 Received: by mail-wg0-f52.google.com with SMTP id a1so6484574wgh.35 for ; Sat, 09 Aug 2014 02:36:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=voQWELmoeg/fTrOvnqkaP6ZnZYKVxXzhFXsuM6p2xZA=; b=h67RgR14VZfnXBNge2VHrbB0Sbcbn8k/AZVNUEfYwHiQGfeWMVfGxcih5tHCOJUii0 7eBpjX1meeWLqEqSuxWKsCdsXq5+w0InpIlPac4YTOhzGaGm5E7OAp1DP69rNOUQwcbT seUBG96U1rd654Smor8jTwQRh0l3xBzCy8qCBZY1ZdRxMI2pNwfS5on1yQe4Ai223OV4 AQjQ7stbiwsoracS8CIYRE4KvVI9bT90I7UOXGPde0LSDj6g+JG2f1D2fOHMZ2S4al33 +sCwMWTJImcsqX4OBOly83Ydd//3u1rbpjS7M4mprxx2nca7SwMOFkx6MnzVp/Zx1DhD HtWQ== X-Received: by 10.180.11.148 with SMTP id q20mr9880197wib.56.1407576983502; Sat, 09 Aug 2014 02:36:23 -0700 (PDT) Received: from Athlon64X2-5000.site (ip-178-201-83-172.hsi08.unitymediagroup.de. [178.201.83.172]) by mx.google.com with ESMTPSA id je17sm17003943wic.22.2014.08.09.02.36.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Aug 2014 02:36:22 -0700 (PDT) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: m.chehab@samsung.com Cc: hverkuil@xs4all.nl, linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= , Subject: [PATCH 2/2] em28xx-v4l: fix video buffer field order reporting in progressive mode Date: Sat, 9 Aug 2014 11:37:21 +0200 Message-Id: <1407577041-3301-2-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1407577041-3301-1-git-send-email-fschaefer.oss@googlemail.com> References: <1407577041-3301-1-git-send-email-fschaefer.oss@googlemail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.8.9.92719 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1100_1199 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, CT_TEXT_PLAIN_UTF8_CAPS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' The correct field order in progressive mode is V4L2_FIELD_NONE, not V4L2_FIELD_INTERLACED. Cc: Signed-off-by: Frank Schäfer --- drivers/media/usb/em28xx/em28xx-video.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index 9db219d..f6cf99f 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c @@ -435,7 +435,10 @@ static inline void finish_buffer(struct em28xx *dev, em28xx_isocdbg("[%p/%d] wakeup\n", buf, buf->top_field); buf->vb.v4l2_buf.sequence = dev->v4l2->field_count++; - buf->vb.v4l2_buf.field = V4L2_FIELD_INTERLACED; + if (dev->v4l2->progressive) + buf->vb.v4l2_buf.field = V4L2_FIELD_NONE; + else + buf->vb.v4l2_buf.field = V4L2_FIELD_INTERLACED; v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp); vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE);