LGPL

[vlc] / modules / access / v4l2 / v4l2.h

diff --git a/modules/access/v4l2/v4l2.h b/modules/access/v4l2/v4l2.h
index a96abeecb0ce57f5f34e5061b1e4295ba880e07a..7d5634756d00028626663a7ea2325b74a75e44b6 100644 (file)
--- a/modules/access/v4l2/v4l2.h
+++ b/modules/access/v4l2/v4l2.h
@@ -1,101 +1,61 @@
 /*****************************************************************************
  * v4l2.h : Video4Linux2 input module for vlc
  *****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <vlc_common.h>
+#include "videodev2.h"
 
-#if defined(HAVE_LINUX_VIDEODEV2_H)
-#   include <linux/videodev2.h>
-#elif defined(HAVE_SYS_VIDEOIO_H)
-#   include <sys/videoio.h>
-#else
-#   error "No Video4Linux2 headers found."
-#endif
-
-/* Hacks to compile with old headers */
-#ifdef __linux__
-# include <linux/version.h>
-# if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
-#  warning Please update Video4Linux2 headers!
-#  define V4L2_CTRL_FLAG_VOLATILE 0x0080
-# endif
-# if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)
-#  define V4L2_CTRL_TYPE_BITMASK 8
-# endif
-#endif
-
-#ifdef HAVE_LIBV4L2
-#   include <libv4l2.h>
-#else
-#   define v4l2_close close
-#   define v4l2_dup dup
-#   define v4l2_ioctl ioctl
-#   define v4l2_read read
-#   define v4l2_mmap mmap
-#   define v4l2_munmap munmap
-#endif
+/* libv4l2 functions */
+extern int v4l2_fd_open (int, int);
+extern int (*v4l2_close) (int);
+extern int (*v4l2_ioctl) (int, unsigned long int, ...);
+extern ssize_t (*v4l2_read) (int, void *, size_t);
+extern void * (*v4l2_mmap) (void *, size_t, int, int, int, int64_t);
+extern int (*v4l2_munmap) (void *, size_t);
 
 #define CFG_PREFIX "v4l2-"
 
-/* TODO: remove this, use callbacks */
-typedef enum {
-    IO_METHOD_READ=1,
-    IO_METHOD_MMAP,
-    IO_METHOD_USERPTR,
-} io_method;
-
 typedef struct vlc_v4l2_ctrl vlc_v4l2_ctrl_t;
 
-/* TODO: move this to access.c and demux.c (separately) */
-struct demux_sys_t
-{
-    int  i_fd;
-
-    /* Video */
-    io_method io;
-
-    struct buffer_t *p_buffers;
-    unsigned int i_nbuffers;
-#define blocksize i_nbuffers /* HACK HACK */
-
-    int i_fourcc;
-    uint32_t i_block_flags;
-
-    es_out_id_t *p_es;
-
-    vlc_v4l2_ctrl_t *controls;
-
-#ifdef HAVE_LIBV4L2
-    bool b_libv4l2;
-#endif
-};
-
 struct buffer_t
 {
     void *  start;
     size_t  length;
 };
 
-/* video.c */
+/* v4l2.c */
 void ParseMRL(vlc_object_t *, const char *);
-int OpenVideo(vlc_object_t *, demux_sys_t *, bool);
-block_t* GrabVideo(vlc_object_t *, demux_sys_t *);
+int OpenDevice (vlc_object_t *, const char *, uint32_t *);
+v4l2_std_id var_InheritStandard (vlc_object_t *, const char *);
+
+/* video.c */
+int SetupInput (vlc_object_t *, int fd);
+int SetupFormat (vlc_object_t *, int, uint32_t,
+                 struct v4l2_format *, struct v4l2_streamparm *);
+#define SetupFormat(o,fd,fcc,fmt,p) \
+        SetupFormat(VLC_OBJECT(o),fd,fcc,fmt,p)
+int SetupTuner (vlc_object_t *, int fd, uint32_t);
+
+int StartUserPtr (vlc_object_t *, int);
+struct buffer_t *StartMmap (vlc_object_t *, int, uint32_t *);
+void StopMmap (int, struct buffer_t *, uint32_t);
+
+block_t* GrabVideo (vlc_object_t *, int, const struct buffer_t *);
 
 /* demux.c */
 int DemuxOpen(vlc_object_t *);
@@ -108,6 +68,10 @@ void GetMaxDimensions(vlc_object_t *, int fd, uint32_t fmt, float fps_min,
 int AccessOpen(vlc_object_t *);
 void AccessClose(vlc_object_t *);
 
+/* radio.c */
+int RadioOpen(vlc_object_t *);
+void RadioClose(vlc_object_t *);
+
 /* controls.c */
 vlc_v4l2_ctrl_t *ControlsInit(vlc_object_t *, int fd);
 void ControlsDeinit(vlc_object_t *, vlc_v4l2_ctrl_t *);