From patchwork Mon Mar 31 17:24:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 3916951 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 11582BF540 for ; Mon, 31 Mar 2014 17:25:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EEE9420173 for ; Mon, 31 Mar 2014 17:25:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E155020380 for ; Mon, 31 Mar 2014 17:25:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753747AbaCaRYq (ORCPT ); Mon, 31 Mar 2014 13:24:46 -0400 Received: from mail-ve0-f172.google.com ([209.85.128.172]:37803 "EHLO mail-ve0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753462AbaCaRYp (ORCPT ); Mon, 31 Mar 2014 13:24:45 -0400 Received: by mail-ve0-f172.google.com with SMTP id jx11so8580392veb.3 for ; Mon, 31 Mar 2014 10:24:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=wR7pbEVV0SDK3qz8NeNpXUXrn2MrMUPAOzQCcEjJwws=; b=tqBSika1g+Ui4cc0IktuHL4tV4RRVnMxMX+JMBSm8fujnqOA4mcOf8DLi0dpjffF+7 tKn+B4Tpa8dvPmF/jhtN50lOAxHR0/4SnV0LraVkuEG5LFESjbocyDqddqpXaVBBnpbI msTad2goKYgAIUgEw/cc2V0waqWQh8C61+SuJkyDcchvjxoNwObD9I2JlDPE1qWNDD14 xV5F5BtzRiOC8g6vEn3YRXSU6A4AmnWg+5kVCUxbgfsrBtRcjos28q8txEoA5/bX96oc 3sDWkEKElvQkimDjAxTpc82+UdBpwVWAnIHZ2YwvFHqfiVxZjuQtjvqCsbxzfB9i1yWY +Jfw== X-Received: by 10.220.198.197 with SMTP id ep5mr2641104vcb.21.1396286684754; Mon, 31 Mar 2014 10:24:44 -0700 (PDT) MIME-Version: 1.0 Received: by 10.221.31.73 with HTTP; Mon, 31 Mar 2014 10:24:14 -0700 (PDT) In-Reply-To: <5339840D.9000702@xs4all.nl> References: <1396277573-9513-1-git-send-email-prabhakar.csengg@gmail.com> <1396277573-9513-2-git-send-email-prabhakar.csengg@gmail.com> <5339840D.9000702@xs4all.nl> From: Prabhakar Lad Date: Mon, 31 Mar 2014 22:54:14 +0530 Message-ID: Subject: Re: [PATCH 1/2] media: davinci: vpif capture: upgrade the driver with v4l offerings To: Hans Verkuil Cc: LMML , DLOS , LKML , Hans Verkuil , Mauro Carvalho Chehab Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Hans, On Mon, Mar 31, 2014 at 8:34 PM, Hans Verkuil wrote: > Hi Prabhakar, > > This looks really nice! > Writing a video driver has become really easy with almost 90% of work done by v4l core itself :) > I'll do a full review on Friday, but in the meantime can you post the output OK. > of 'v4l2-compliance -s' using the latest v4l2-compliance version? I've made > some commits today, so you need to do a git pull of v4l-utils.git. > I had compilation failures for v4l2-compliance following is the patch fixing that, (I am facing some issues in cross compilation once done I'll post the o/p of it) --------------X------------X------------------- From 14029f4ca57be5f2b0ec053d375655ca5a60f698 Mon Sep 17 00:00:00 2001 From: "Lad, Prabhakar" Date: Mon, 31 Mar 2014 22:24:33 +0530 Subject: [PATCH] v4l-utils: v4l-compliance: fix compilation this patch fixes following build error, In file included from v4l2-compliance.h:31, from v4l2-compliance.cpp:37: ./cv4l-helpers.h:9: error: a class-key must be used when declaring a friend ./cv4l-helpers.h:9: error: friend declaration does not name a class or function ./cv4l-helpers.h: In member function 'int cv4l_buffer::querybuf(const cv4l_queue&, unsigned int)': ./cv4l-helpers.h:103: error: 'v4l_fd* cv4l_queue::fd' is protected ./cv4l-helpers.h:213: error: within this context ./cv4l-helpers.h: In member function 'int cv4l_buffer::dqbuf(const cv4l_queue&)': ./cv4l-helpers.h:103: error: 'v4l_fd* cv4l_queue::fd' is protected ./cv4l-helpers.h:221: error: within this context ./cv4l-helpers.h: In member function 'int cv4l_buffer::qbuf(const cv4l_queue&)': ./cv4l-helpers.h:103: error: 'v4l_fd* cv4l_queue::fd' is protected ./cv4l-helpers.h:229: error: within this context ./cv4l-helpers.h: In member function 'int cv4l_buffer::prepare_buf(const cv4l_queue&)': ./cv4l-helpers.h:103: error: 'v4l_fd* cv4l_queue::fd' is protected ./cv4l-helpers.h:237: error: within this context v4l2-compliance.cpp: In function 'void v4l_fd_test_init(v4l_fd*, int)': v4l2-compliance.cpp:132: error: invalid conversion from 'void* (*)(void*, size_t, int, int, int, int64_t)' to 'void* (*)(void*, size_t, int, int, int, off_t)' Signed-off-by: Lad, Prabhakar --- utils/v4l2-compliance/cv4l-helpers.h | 2 +- utils/v4l2-compliance/v4l2-compliance.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/v4l2-compliance/cv4l-helpers.h b/utils/v4l2-compliance/cv4l-helpers.h index 2423ef9..e2729a6 100644 --- a/utils/v4l2-compliance/cv4l-helpers.h +++ b/utils/v4l2-compliance/cv4l-helpers.h @@ -6,7 +6,7 @@ class cv4l_buffer; class cv4l_queue : v4l_queue { - friend cv4l_buffer; + friend class cv4l_buffer; public: cv4l_queue(v4l_fd *_fd, unsigned type = V4L2_BUF_TYPE_VIDEO_CAPTURE, unsigned memory = V4L2_MEMORY_MMAP) diff --git a/utils/v4l2-compliance/v4l2-compliance.h b/utils/v4l2-compliance/v4l2-compliance.h index f2f7072..b6d4dae 100644 --- a/utils/v4l2-compliance/v4l2-compliance.h +++ b/utils/v4l2-compliance/v4l2-compliance.h @@ -137,7 +137,7 @@ static inline int test_ioctl(int fd, unsigned long cmd, ...) } static inline void *test_mmap(void *start, size_t length, int prot, int flags, - int fd, int64_t offset) + int fd, off_t offset) { return wrapper ? v4l2_mmap(start, length, prot, flags, fd, offset) : mmap(start, length, prot, flags, fd, offset);