Commit Graph

197 Commits

Author SHA1 Message Date
Martin Pulec
0d3d0eb32c tile.h: dropped unneeded declarations 2011-05-30 11:47:26 +02:00
Martin Pulec
3c912d7f55 Added possibility to send throught multiple links
+ basis for 4K transmit
2011-04-28 16:41:50 +02:00
Martin Pulec
23a0237780 Quad - bump to new API
* changed grabbing to read in loop. Just in case.
2011-04-22 01:11:34 +02:00
Martin Pulec
3cc893c481 Some SDL merge cleanups
* dropped buggy event handling loop from main.c
2011-04-19 13:26:44 +02:00
Martin Pulec
bfd7c026b3 Merge branch 'CVS' into 4K
Conflicts:
	DeckLink/include/DeckLinkAPI.h
	quad/Examples/ASI/asicfg.c
	quad/Examples/ASI/cknull.c
	quad/Examples/ASI/rxcfg.c
	quad/Examples/ASI/rxtest.c
	quad/Examples/ASI/txcfg.c
	quad/Examples/ASI/txtest.c
	quad/Examples/Makefile
	quad/Examples/SDI/Makefile
	quad/Examples/SDI/capture.c
	quad/Examples/SDI/eg1.c
	quad/Examples/mastercfg.c
	quad/Examples/pci_ids.h
	quad/Examples/util.c
	quad/doc/ASI/ioctls.txt
	quad/doc/ASI/sysfs.txt
	quad/doc/SDI/examples.txt
	quad/doc/SDI/ioctls.txt
	quad/doc/examples.txt
	quad/doc/functions.txt
	quad/doc/memory.txt
	quad/doc/sysfs.txt
	quad/include/asi.h
	quad/include/master.h
	quad/include/sdi.h
	quad/src/Makefile
	quad/src/as.c
	quad/src/asicore.c
	quad/src/asicore.h
	quad/src/asmi.c
	quad/src/dvbm.h
	quad/src/dvbm_fd.c
	quad/src/dvbm_fd.h
	quad/src/dvbm_fdu.c
	quad/src/dvbm_fdu.h
	quad/src/dvbm_lpfd.c
	quad/src/dvbm_lpfd.h
	quad/src/dvbm_q3inoe.c
	quad/src/dvbm_q3inoe.h
	quad/src/dvbm_q3ioe.c
	quad/src/dvbm_q3ioe.h
	quad/src/dvbm_qdual.c
	quad/src/dvbm_qdual.h
	quad/src/dvbm_qi.c
	quad/src/dvbm_qi.h
	quad/src/dvbm_qlf.c
	quad/src/dvbm_qlf.h
	quad/src/dvbm_qo.c
	quad/src/dvbm_qo.h
	quad/src/dvbm_rx.c
	quad/src/dvbm_rx.h
	quad/src/dvbm_rxu.c
	quad/src/dvbm_tx.c
	quad/src/dvbm_tx.h
	quad/src/dvbm_txu.c
	quad/src/dvbmaster.c
	quad/src/eeprom.c
	quad/src/eeprom.h
	quad/src/gt64131.c
	quad/src/gt64131.h
	quad/src/jtag.c
	quad/src/lsdma.c
	quad/src/lsdma.h
	quad/src/mdev.c
	quad/src/mdev.h
	quad/src/miface.c
	quad/src/miface.h
	quad/src/plx9080.c
	quad/src/plx9080.h
	quad/src/sa.c
	quad/src/sdicore.c
	quad/src/sdicore.h
	quad/src/sdim.h
	quad/src/sdim_lpfd.c
	quad/src/sdim_qie.c
	quad/src/sdim_qoe.c
	quad/src/sdim_qoe.h
	quad/src/sdimaster.c
	ultragrid/Makefile.in
	ultragrid/acconfig.h
	ultragrid/configure.in
	ultragrid/src/audio/audio.c
	ultragrid/src/audio/audio.h
	ultragrid/src/bitstream.c
	ultragrid/src/compat/drand48.c
	ultragrid/src/compat/gettimeofday.c
	ultragrid/src/compat/inet_ntop.c
	ultragrid/src/compat/inet_pton.c
	ultragrid/src/compat/platform_semaphore.c
	ultragrid/src/compat/vsnprintf.c
	ultragrid/src/config.h.in
	ultragrid/src/crypto/crypt_aes.c
	ultragrid/src/crypto/crypt_aes_impl.c
	ultragrid/src/crypto/crypt_des.c
	ultragrid/src/crypto/md5.c
	ultragrid/src/crypto/random.c
	ultragrid/src/debug.c
	ultragrid/src/host.h
	ultragrid/src/ihdtv/ihdtv.c
	ultragrid/src/ihdtv/ihdtv.h
	ultragrid/src/main.c
	ultragrid/src/ntp.c
	ultragrid/src/pdb.c
	ultragrid/src/rtp/decoders.c
	ultragrid/src/rtp/decoders.h
	ultragrid/src/rtp/net_udp.c
	ultragrid/src/rtp/pbuf.c
	ultragrid/src/rtp/pbuf.h
	ultragrid/src/rtp/ptime.c
	ultragrid/src/rtp/rtp.c
	ultragrid/src/rtp/rtp_callback.c
	ultragrid/src/rtp/rtp_callback.h
	ultragrid/src/tfrc.c
	ultragrid/src/transmit.c
	ultragrid/src/transmit.h
	ultragrid/src/tv.c
	ultragrid/src/video_capture.c
	ultragrid/src/video_capture.h
	ultragrid/src/video_capture/decklink.cpp
	ultragrid/src/video_capture/hdstation.c
	ultragrid/src/video_capture/null.c
	ultragrid/src/video_capture/quad.c
	ultragrid/src/video_capture/quad.h
	ultragrid/src/video_capture/quicktime.c
	ultragrid/src/video_capture/testcard.c
	ultragrid/src/video_codec.c
	ultragrid/src/video_codec.h
	ultragrid/src/video_compress.c
	ultragrid/src/video_compress.h
	ultragrid/src/video_display.c
	ultragrid/src/video_display.h
	ultragrid/src/video_display/dxt.c
	ultragrid/src/video_display/dxt.h
	ultragrid/src/video_display/gl_sdl.c
	ultragrid/src/video_display/gl_sdl.h
	ultragrid/src/video_display/hdstation.c
	ultragrid/src/video_display/hdstation.h
	ultragrid/src/video_display/null.c
	ultragrid/src/video_display/null.h
	ultragrid/src/video_display/sage.c
	ultragrid/src/video_display/sage.h
	ultragrid/src/video_display/sdl.c
	ultragrid/src/video_display/sdl.h
	ultragrid/test/run_tests.c
	ultragrid/test/test_aes.c
	ultragrid/test/test_bitstream.c
	ultragrid/test/test_des.c
	ultragrid/test/test_md5.c
	ultragrid/test/test_net_udp.c
	ultragrid/test/test_random.c
	ultragrid/test/test_rtp.c
	ultragrid/test/test_tv.c
	ultragrid/test/test_video_capture.c
	ultragrid/test/test_video_display.c
2011-04-18 18:55:12 +02:00
Lukas Hejtmanek
de5b48f669 fix decoder 2011-04-01 12:37:59 +02:00
Lukas Hejtmanek
c04c3bba44 color spec fix 2011-04-01 10:27:26 +02:00
Lukas Hejtmanek
09f0e11090 help typo 2011-03-31 18:55:23 +02:00
Lukas Hejtmanek
f2825b22cd small fixes 2011-03-31 18:52:17 +02:00
Lukas Hejtmanek
e830035526 decklink fixes 2011-03-31 18:24:42 +02:00
Lukas Hejtmanek
3c477650f5 send fix 2011-03-31 14:59:51 +02:00
Lukas Hejtmanek
bb858f8450 merge declink from CVS 2011-03-31 12:40:07 +02:00
Lukas Hejtmanek
957a17756d 1) fix data alignment in transmit. 2) testcard did not send color_spec 2011-03-30 17:47:50 +02:00
xliska
f95c6dc1f2 We don't want to build the Quad code on Mac OS X. 2010-08-04 13:56:51 +00:00
xliska
2051c1f733 Quad probing code moved from quad_init. Cleanups. 2010-07-22 16:05:47 +00:00
xliska
ee798c84d2 Working capture from QUAD SDI card using the ioctl interface!
Some additional cleanups in configure.
2010-07-16 15:59:57 +00:00
xliska
281c2865fd Trivial change of the quad capture module due to changes in the Quad SDK.
Merged the CVS tree with code by Tomas Sedmik

New features:
* switching between windowed and fullscreen mode ("f" key) for both SDL and GL displays

* splashscreen moved to GIMP header file. The splashscreen is compiled in.
  Also, the splashscreen is displayed for both SDL and GL displays now.

* code fragments for Shader units moved to respective display module header files.
  UltraGrid is not depending on external files anymore!
2010-07-15 12:25:58 +00:00
xliska
ec9765d019 Removing share and corresponding part of install in Makefile.in in preparation
for patches by Tomas Sedmik.
2010-07-15 11:45:03 +00:00
xliska
fce992f443 New Quad driver and SDK Version 2.7.1 (2010-03-23) compatible up to Linux 2.6.29. 2010-07-15 11:10:58 +00:00
xliska
1c66afe418 Removing the quad driver and includes. To be replaced by newer version. 2010-07-15 11:04:39 +00:00
xliska
2b38f8faa5 Correct compilation of the Quad code. 2010-07-09 15:21:58 +00:00
xliska
e4c8962c6c Stupid mistake. There is no library necessary to be linked with the quad module. 2010-07-08 11:40:22 +00:00
xliska
a456a3a4c0 Correct building of the Quad code. 2010-07-08 11:16:02 +00:00
xliska
76fa38b4b6 Revamped mode settings and help for hdstation (Sebastian)
Correct building of the Quad code.
2010-07-08 11:14:08 +00:00
xliska
aeb90b2dfa Switched to 16 bits per sample for audio sending. This is just a general compatibility issue. 24b does not alway work which introduces additional issues while debugging the audio.
Correct numbers of Blackmagic devices.
2010-04-28 09:48:46 +00:00
xliska
b6e82b61f2 Blackmagic SDK 7.3.2
added appropriate Blackmagic drivers and library src
revamped blackmagic capture module

result: Blackmagic Decklink finaly working ;)

THX to Dalibor Matura
2010-03-24 15:39:12 +00:00
Lukas Hejtmanek
5d3e1e547f fix assertion in quicktime_done 2010-02-18 14:12:37 +01:00
Lukas Hejtmanek
b7596a9032 cosmetics fix. 2010-02-18 12:27:30 +01:00
Lukas Hejtmanek
46b9f6770a small quicktime fixes. 2010-02-18 12:24:55 +01:00
Lukas Hejtmanek
7dbd7c5dbe really fix semantics 2010-02-17 18:30:26 +01:00
Lukas Hejtmanek
14b027aff0 semantics fix 2010-02-17 18:29:31 +01:00
Lukas Hejtmanek
390e84b43d larger fixes of mode table detection 2010-02-17 18:27:14 +01:00
Lukas Hejtmanek
aa1f06ee77 compile fixes 2010-02-17 17:32:25 +01:00
Lukas Hejtmanek
eae3da7929 use AUX_* macros in hdstation instead of selfish aux interpretation 2010-02-17 17:24:00 +01:00
Lukas Hejtmanek
ca871d6ea0 move AUX_* macros to video_codec.h, will use them 2010-02-17 17:22:03 +01:00
Lukas Hejtmanek
10122a4713 set fps and aux according to the mode table 2010-02-17 17:21:25 +01:00
Lukas Hejtmanek
7f89656ced NULL terminate mode table 2010-02-17 17:09:32 +01:00
Lukas Hejtmanek
da9cd2e167 don't use strdup without a reason. also hdstation really does support UYVY and 2Vuy modes as they are the same as DVS8. 2010-02-15 23:33:08 +01:00
Lukas Hejtmanek
b918e6811f include display mode table to video_capture as well. 2010-02-15 15:57:03 +01:00
Lukas Hejtmanek
516a3c2c34 small thinko fix. 2010-02-15 15:53:50 +01:00
Lukas Hejtmanek
df172884d0 video mode table 2010-02-15 15:52:44 +01:00
Milos Liska
034247cfa7 Merge branch 'master' of http://seth.ics.muni.cz/git/ultragrid 2010-02-12 10:23:38 +01:00
Milos Liska
bc03447a51 Dropped interlace option from video_capture/hdstation.c as it was confusing and already defined by the mode.
Some refactoring.
2010-02-11 18:03:53 +01:00
Lukas Hejtmanek
b77763e920 compile fix 2010-02-11 17:51:32 +01:00
Lukas Hejtmanek
63ebec88df introduce vc_copylineDVS10toV210 2010-02-11 17:50:00 +01:00
Lukas Hejtmanek
e63d06c234 quicktime display rework. reconfigure not yet supported. 2010-02-11 17:43:58 +01:00
Lukas Hejtmanek
1486469387 reworked hdstation capture 2010-02-11 11:32:59 +01:00
Lukas Hejtmanek
06d4418aba semicolon fix. 2010-02-11 11:21:37 +01:00
Lukas Hejtmanek
38cdd7b5c6 remove s->size from hdstation.c s->frame.data_len is the right place for that. 2010-02-09 23:16:25 +01:00
Milos Liska
1fcd553d8c Merge branch 'master' of http://seth.ics.muni.cz/git/ultragrid 2010-02-09 18:38:32 +01:00