aboutsummaryrefslogtreecommitdiffstats
path: root/utils/qvidcap
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2018-08-30 11:24:42 +0200
committerHans Verkuil <hans.verkuil@cisco.com>2018-08-31 14:37:10 +0200
commitbae4362ba87fcf3013fa7d9c52f1894d1cb2efdd (patch)
treed66f307ec6037b52f14409dfc1a4fa46cdd021d8 /utils/qvidcap
parent4cebd11836135287340f12a4e3df92a881157a5c (diff)
v4l2-ctl/qvidcap: add initial fwht support
This hooks in all the required sources, but it is not used yet. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Diffstat (limited to 'utils/qvidcap')
-rw-r--r--utils/qvidcap/Makefile.am2
-rw-r--r--utils/qvidcap/capture-win-gl.cpp2
l---------utils/qvidcap/codec-fwht.c1
l---------utils/qvidcap/codec-v4l2-fwht.c1
-rw-r--r--utils/qvidcap/qvidcap.pro1
5 files changed, 5 insertions, 2 deletions
diff --git a/utils/qvidcap/Makefile.am b/utils/qvidcap/Makefile.am
index fad3911e..be15b701 100644
--- a/utils/qvidcap/Makefile.am
+++ b/utils/qvidcap/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = qvidcap
man_MANS = qvidcap.1
qvidcap_SOURCES = qvidcap.cpp capture-win-gl.cpp capture-win-gl.h \
- v4l2-tpg-colors.c v4l2-tpg-core.c v4l-stream.c v4l2-info.cpp
+ v4l2-tpg-colors.c v4l2-tpg-core.c v4l-stream.c v4l2-info.cpp codec-fwht.c codec-v4l2-fwht.c
nodist_qvidcap_SOURCES = qrc_qvidcap.cpp moc_capture-win-gl.cpp v4l2-convert.h
qvidcap_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la ../libv4l2util/libv4l2util.la \
../libmedia_dev/libmedia_dev.la
diff --git a/utils/qvidcap/capture-win-gl.cpp b/utils/qvidcap/capture-win-gl.cpp
index fe3f5014..248d9fb7 100644
--- a/utils/qvidcap/capture-win-gl.cpp
+++ b/utils/qvidcap/capture-win-gl.cpp
@@ -1148,7 +1148,7 @@ void CaptureGLWin::sockReadEvent()
if (read_u32(sz))
goto new_conn;
- if (packet != V4L_STREAM_PACKET_FRAME_VIDEO) {
+ if (packet != V4L_STREAM_PACKET_FRAME_VIDEO_RLE) {
char buf[1024];
fprintf(stderr, "expected FRAME_VIDEO, got 0x%08x\n", packet);
diff --git a/utils/qvidcap/codec-fwht.c b/utils/qvidcap/codec-fwht.c
new file mode 120000
index 00000000..6370a83b
--- /dev/null
+++ b/utils/qvidcap/codec-fwht.c
@@ -0,0 +1 @@
+../common/codec-fwht.c \ No newline at end of file
diff --git a/utils/qvidcap/codec-v4l2-fwht.c b/utils/qvidcap/codec-v4l2-fwht.c
new file mode 120000
index 00000000..c9e3d4c8
--- /dev/null
+++ b/utils/qvidcap/codec-v4l2-fwht.c
@@ -0,0 +1 @@
+../common/codec-v4l2-fwht.c \ No newline at end of file
diff --git a/utils/qvidcap/qvidcap.pro b/utils/qvidcap/qvidcap.pro
index c0428d11..36ab0027 100644
--- a/utils/qvidcap/qvidcap.pro
+++ b/utils/qvidcap/qvidcap.pro
@@ -24,6 +24,7 @@ HEADERS += ../../config.h
SOURCES += capture-win-gl.cpp
SOURCES += qvidcap.cpp
SOURCES += ../common/v4l-stream.c
+SOURCES += ../common/codec-fwht.c
SOURCES += ../common/v4l2-tpg-core.c
SOURCES += ../common/v4l2-tpg-colors.c

Privacy Policy