| blob | c7a08cea241350391907fda959b3777cb5e76d8a |
1 diff -ruN ivtv-utils-1.4.0/test/Makefile ivtv-utils-1.4.0-mod/test/Makefile
2 --- ivtv-utils-1.4.0/test/Makefile 2009-05-21 16:25:43.000000000 +0200
3 +++ ivtv-utils-1.4.0/test/Makefile 2009-07-20 21:13:53.000000000 +0200
4 @@ -1,5 +1,4 @@
5 INSTALLDIR = /usr/local/bin
6 -HEADERDIR = /usr/include/linux
8 EXES = vbi wss vbi-passthrough vbi-detect ivtv-pcm-tester \
9 mpeg-read-test mpeg-freq-test mpeg-read-sleep-test \
10 diff -ruN ivtv-utils-1.4.0/utils/linux/ivtvfb.h ivtv-utils-1.4.0-mod/utils/linux/ivtvfb.h
11 --- ivtv-utils-1.4.0/utils/linux/ivtvfb.h 2009-05-21 16:25:43.000000000 +0200
12 +++ /dev/null 1970-01-01 01:00:00.000000000 +0100
13 @@ -1,37 +0,0 @@
14 -/*
15 - On Screen Display cx23415 Framebuffer driver
16 -
17 - Copyright (C) 2006, 2007 Ian Armstrong <ian@iarmst.demon.co.uk>
18 -
19 - This program is free software; you can redistribute it and/or modify
20 - it under the terms of the GNU General Public License as published by
21 - the Free Software Foundation; either version 2 of the License, or
22 - (at your option) any later version.
23 -
24 - This program is distributed in the hope that it will be useful,
25 - but WITHOUT ANY WARRANTY; without even the implied warranty of
26 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27 - GNU General Public License for more details.
28 -
29 - You should have received a copy of the GNU General Public License
30 - along with this program; if not, write to the Free Software
31 - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
32 - */
33 -
34 -#ifndef __LINUX_IVTVFB_H__
35 -#define __LINUX_IVTVFB_H__
36 -
37 -#include <linux/types.h>
38 -
39 -/* Framebuffer external API */
40 -
41 -struct ivtvfb_dma_frame {
42 - void *source;
43 - unsigned long dest_offset;
44 - int count;
45 -};
46 -
47 -#define IVTVFB_IOC_DMA_FRAME _IOW('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame)
48 -#define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t)
49 -
50 -#endif
51 diff -ruN ivtv-utils-1.4.0/utils/linux/ivtv.h ivtv-utils-1.4.0-mod/utils/linux/ivtv.h
52 --- ivtv-utils-1.4.0/utils/linux/ivtv.h 2009-05-21 16:25:43.000000000 +0200
53 +++ /dev/null 1970-01-01 01:00:00.000000000 +0100
54 @@ -1,68 +0,0 @@
55 -/*
56 - Public ivtv API header
57 - Copyright (C) 2003-2004 Kevin Thayer <nufan_wfk at yahoo.com>
58 - Copyright (C) 2004-2007 Hans Verkuil <hverkuil@xs4all.nl>
59 -
60 - This program is free software; you can redistribute it and/or modify
61 - it under the terms of the GNU General Public License as published by
62 - the Free Software Foundation; either version 2 of the License, or
63 - (at your option) any later version.
64 -
65 - This program is distributed in the hope that it will be useful,
66 - but WITHOUT ANY WARRANTY; without even the implied warranty of
67 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
68 - GNU General Public License for more details.
69 -
70 - You should have received a copy of the GNU General Public License
71 - along with this program; if not, write to the Free Software
72 - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
73 - */
74 -
75 -#ifndef __LINUX_IVTV_H__
76 -#define __LINUX_IVTV_H__
77 -
78 -#include <linux/types.h>
79 -#include <linux/videodev2.h>
80 -
81 -/* ivtv knows several distinct output modes: MPEG streaming,
82 - YUV streaming, YUV updates through user DMA and the passthrough
83 - mode.
84 -
85 - In order to clearly tell the driver that we are in user DMA
86 - YUV mode you need to call IVTV_IOC_DMA_FRAME with y_source == NULL
87 - first (althrough if you don't then the first time
88 - DMA_FRAME is called the mode switch is done automatically).
89 -
90 - When you close the file handle the user DMA mode is exited again.
91 -
92 - While in one mode, you cannot use another mode (EBUSY is returned).
93 -
94 - All this means that if you want to change the YUV interlacing
95 - for the user DMA YUV mode you first need to do call IVTV_IOC_DMA_FRAME
96 - with y_source == NULL before you can set the correct format using
97 - VIDIOC_S_FMT.
98 -
99 - Eventually all this should be replaced with a proper V4L2 API,
100 - but for now we have to do it this way. */
101 -
102 -struct ivtv_dma_frame {
103 - enum v4l2_buf_type type; /* V4L2_BUF_TYPE_VIDEO_OUTPUT */
104 - __u32 pixelformat; /* 0 == same as destination */
105 - void *y_source; /* if NULL and type == V4L2_BUF_TYPE_VIDEO_OUTPUT,
106 - then just switch to user DMA YUV output mode */
107 - void *uv_source; /* Unused for RGB pixelformats */
108 - struct v4l2_rect src;
109 - struct v4l2_rect dst;
110 - __u32 src_width;
111 - __u32 src_height;
112 -};
113 -
114 -#define IVTV_IOC_DMA_FRAME _IOW ('V', BASE_VIDIOC_PRIVATE+0, struct ivtv_dma_frame)
115 -
116 -/* These are the VBI types as they appear in the embedded VBI private packets. */
117 -#define IVTV_SLICED_TYPE_TELETEXT_B (1)
118 -#define IVTV_SLICED_TYPE_CAPTION_525 (4)
119 -#define IVTV_SLICED_TYPE_WSS_625 (5)
120 -#define IVTV_SLICED_TYPE_VPS (7)
121 -
122 -#endif /* _LINUX_IVTV_H */
123 diff -ruN ivtv-utils-1.4.0/utils/Makefile ivtv-utils-1.4.0-mod/utils/Makefile
124 --- ivtv-utils-1.4.0/utils/Makefile 2009-05-21 16:25:43.000000000 +0200
125 +++ ivtv-utils-1.4.0/utils/Makefile 2009-07-20 21:14:51.000000000 +0200
126 @@ -1,6 +1,5 @@
127 PREFIX = /usr/local
128 BINDIR = $(PREFIX)/bin
129 -HDRDIR = /usr/include/linux
131 X86 := $(shell if echo - | $(CC) -E -dM - | egrep -e '__i386__|__x86_64__' >/dev/null; \
132 then echo y; else echo n; fi)
133 @@ -14,8 +13,6 @@
134 BIN := $(EXES) ivtv-tune/ivtv-tune cx25840ctl/cx25840ctl
137 -HEADERS := linux/ivtv.h linux/ivtvfb.h
138 -
139 CFLAGS = -D_GNU_SOURCE -O2 -Wall -g -I.
140 CXXFLAGS = $(CFLAGS)
142 @@ -42,8 +39,6 @@
143 $(CC) -lpthread -o $@ $^
145 install: all
146 - install -d $(DESTDIR)/$(HDRDIR)
147 - install -m 0644 $(HEADERS) $(DESTDIR)/$(HDRDIR)
148 install -d $(DESTDIR)/$(BINDIR)
149 install -m 0755 $(BIN) $(DESTDIR)/$(BINDIR)