Commit Graph

61 Commits

Author SHA1 Message Date
xliska
e9bfd00dd0 - viewdxt and playdxt is no longer compiled
- MacOS app bundle target in Makefile (Carbon apps need this to receive and process signals corectly)

- minimal version of SGSettingsDialog
2009-04-14 11:49:15 +00:00
xmatela
a2e27cb2c9 uv->requested_display/capture should be set to something else then NULL (e.g. "none")
otherwise it segfaults on strcmp in initialize_video_display/capture
2009-03-19 17:21:46 +00:00
xliska
5b4410c478 iHDTV compatibility mode (v210 HDTV video sending and receiving in iHDTV mode works
on MacOS X. Video is displayed using Kona3 output now.)

Capture/sending and receving/display are being executed separately in multiple
threads (there are still some performance issues when both sending and
receiving the video using a single UltraGrid instance though). Revised UltraGrid initialization.
2009-01-06 17:04:46 +00:00
xliska
ae0522f568 SDL_GL_SWAP_CONTROL with SDL > 1.2.10
linking Alsa code with dynamic libasound.so, static alsa libraries are being
dropped from most recent linux distributions
2008-11-17 15:13:44 +00:00
xliska
f93380a784 SDK3.2.0 should be added correctly (including the binary blobs) now 2008-11-10 17:13:24 +00:00
xliska
428a24fb81 Displaying progressive frames.
Fixed bug while probing for AJA Kona3. Ultragrid was trying to display the
video using kona module even in case that non Kona3 video output component was
detected.
2008-09-12 08:59:26 +00:00
xliska
49d2bbb585 New DVS SDK and related changes.
sdk3.2.0.0/development/src/driver/Makefile

and

sdk3.2.0.0/development/src_sdio/driver/Makefile

are modified. Rest of the sdk3.2.0.0 is original from the tarball distributed by DVS.
2008-09-12 08:45:03 +00:00
xliska
ef9481be55 Corrected error message after loading of gl_sdl.glsl fails. 2008-07-18 12:40:02 +00:00
xliska
3afa8fe79b Sorted out some shader compilation issues. Removed unused stuff. Fixed some DXT
issues on MacOS X.

DXT display stil fails on MiniMac with Intel GPU and Tiger installed.

463             dxt_bind_texture(s);
(gdb)

	Program received signal EXC_BAD_ACCESS, Could not access memory.
	Reason: KERN_PROTECTION_FAILURE at address: 0x00000000
	0x00000000 in ?? ()
	(gdb) quit

Ultragrid fails on glActiveTexture(GL_TEXTURE0); which is the first thing done while binding textures.
(Ultragrid was compiled without optimizations and with debug info enabled, so this ?? is really confusing me)

I'll give it one more try on MiniMac with Leopard.
2008-07-16 15:50:26 +00:00
xmatela
34eb4bd6c0 Added support for progressive frames in sage display. 2008-07-16 10:44:00 +00:00
xliska
ebe77ffd43 Fixed window creation for DXT display on Mac OS X. 2008-06-03 09:34:19 +00:00
xliska
6f84bfa43d Working (now really working) video downscaling for GL and DXT displays. 2008-05-26 17:32:27 +00:00
xliska
35af826330 Added scaling to the DXT display. Revised scaling in GL display.
I'm probably still not handling the glViewport and gluPerspective completely correctly for all display resolutions.
Basically it works fine for 1920x1200 and 1920x1080. There might be slightly cropped image or strange aspect ratio issues on lower resolutions.
2008-05-16 10:29:12 +00:00
xliska
025711fbc3 Ultragrid compiles on 32b Linux and some other minor modifications. 2008-04-29 09:43:49 +00:00
xliska
d6c18f2ecb I'm really wondering why and when I've introduced this silly code copy and paste error to the quicktime grabber :(( 2008-04-18 15:34:53 +00:00
xliska
53ac123acd Forgot to include <semaphore.h> on Linux.
Cleanup. Got rid of lots of warnings during compilation and some deprecated calls especially on MacOS X.

Changed code tested on both Mac OS X and Linux.
2008-04-17 16:23:58 +00:00
xliska
9022814b1c Fixed compilation on MacOS X Leopard. This should not break anything on Tiger. 2008-04-16 10:05:19 +00:00
xliska
fe4324c9dc Correct calling of SGIdle. Trying to implement event handling for SGSettingsDialog. 2008-04-03 12:32:49 +00:00
xliska
56015091fd Forgot to commit this one last Friday. When reading some 10-bits YUV quicktime
stuff I realized that 10 bit capture in quicktime couldn't work because
respective gworld was initialized to 2vuy. I just didn't know what that
quicktime gworld initialization stuff means exactly at the time of adapting the
quictktime capture code.

Not tested yet.
2008-03-25 09:13:14 +00:00
xliska
2e26217101 Corrected fields composition in 10-bits. We have dropped fields composition for DecompressSequence initialization.
Added forgotten -p to uv help.
2008-03-20 08:51:43 +00:00
xliska
2e980df4b6 Moving towards 10-bits. 10-bit video still garbled. v210 4:2:2 compression type is a tough beast.
Added 2 fields -> progressive frame conversion for 10 bit video.

Above all demystified the ImageDescriptionHandle structure and corrected its usage.

Corrected a comment on ICMFrameTimeRecord usage.
2008-03-19 15:09:44 +00:00
xliska
65774040b2 We can do 29.97 fps displaying 8-bit video now. ICMFrameTimeRecord magic sorted out.
Some comments added.
2008-03-19 12:24:58 +00:00
xliska
7b56db2231 A bit better performance. We can do 28,5 fps over the Kona3 now. 2008-03-18 12:38:01 +00:00
xliska
19d08a0e1d Kona finally displays video correctly (at least in 8 bits) aka we found out how
to set the goddamned (include some name-calling here) DecompressSequence thing in quicktime at least for one
mode.

10 bit video is still garbled.

Displaying is a little bit slower than expected. We are doing like 27fps right now.
2008-03-13 13:17:07 +00:00
xliska
ee538c006f Still playing with the decoder. Got available decoders from Kona. 2008-03-11 17:37:27 +00:00
xliska
b99a4cda14 Kona is able to display the video. Image is garbled so far. 2008-03-10 12:30:17 +00:00
xliska
d5e0019acc ifdefed one sem_getvalue in gl_sdl on MacOSX
moved some stuff from display_kona_probe to display_kona init so that ultragrid is
not reporting on kona when probing all displays

Sill playing with DecompressSequenceBeginS and DecompressSequenceFrameS
- DecompressSequenceFrameS returns codecNothingToBlitErr
2008-03-07 14:00:17 +00:00
xliska
465ce77e04 semaphore wrappers made inline. 2008-03-06 13:21:00 +00:00
xliska
449fbe2988 Added platform independent semaphores wrappers:
platform_sem_init
platform_sem_post
platform_sem_wait

with parameters identical to those on Linux.

Changed code in video_display/* and Makefile.in accordingly. The only thing left is some
workaround for sem_getvalue on Mac. I have some ideas how to do that (as seen in SDL implementation and
comming from the discussion with Jirka Matela). Unfortunately both are not thread safe.

Some cleaning in rtp_callback.c
2008-03-06 12:55:51 +00:00
xmatela
42e89dc947 Removed old unused thread synchronisation in following displays: sdl, gl_sdl, kona, dxt 2008-03-05 18:29:24 +00:00
xmatela
749af25d80 Removed old unused thread synchronisation i sage display 2008-03-05 17:31:02 +00:00
xliska
20cd46448c Some debugging. BTW: I found that unnamed semaphores are not implemented on MacOS X (see
http://www.wodeveloper.com/omniLists/macosx-dev/2004/July/msg00022.html for details).
Which is most probably a cause for various stuff not working in Ultragrid on MacOS X.

Displaying via kona is still not quite there :|
2008-03-05 14:16:25 +00:00
xmatela
366d3f07ed SAGE GSL-YUV support. 2008-03-04 19:22:15 +00:00
xliska
3ea601c202 displayModeID in QTVideoOutputSetDisplayMode should be correct now. Video decoder is still not working. 2008-03-03 18:13:07 +00:00
xliska
3029d0fe7c Not yet working attempt to support AJA Kona3 as an additional video output. 2008-02-22 15:22:54 +00:00
xmatela
f892781e1d Sage display supporting both 10 and 8 bit depths. 2008-02-20 16:48:28 +00:00
xliska
b2d6e2c87d A minor fix for the Makefile. 2008-02-18 20:17:36 +00:00
xmatela
cf2e9d95a0 SAGE display support linux only. 2008-02-18 18:06:40 +00:00
xliska
be21834439 make tests is working on Mac too. 2008-01-18 12:40:38 +00:00
xliska
c0ed08830e Forgotten commit. 2008-01-16 19:19:21 +00:00
xliska
8cbb9ef772 make tests fixed again 2008-01-10 11:07:42 +00:00
xliska
d53e2ab8b6 Makefile.in
- Makefile should create the bin directory for the linker

src/main.c
- #ifndef X_DISPLAY_MISSING added prior to the SDL events handling as this
cannot be linked without src/video_display/sdl.c which is not compiled without X
headers

src/video_display/xv.c
- removed TCL/TK relicts. I'm just wondering how come that this didn't emerge
earlier. This needs to be tested yet.

test/test_video_display.c
- we don't need to test ui functionality as it is not there

Thanks to Ali Asad Lotia for bug reporting.
2008-01-10 07:11:14 +00:00
xliska
cd5d56f42e ultragrid build unbroken on linux again. 2007-12-14 17:11:57 +00:00
xliska
1c2cd09241 FastDXT build unbroken on Linux. Now builds well for both Linux and MacOSX. 2007-12-14 16:45:46 +00:00
xliska
2ca9888d26 -FastDXT
- FastDXT compiles and links well on Mac now

- configure.in and Makefile.in
  - final linking of ultragrid depends on OS
  - ultragrid can be compiled and linked with SDL and OpenGL frameworks and with GLEW and FastDXT on Mac

- main.c
  - added -p parameter which means progressive frame is being sent or displayed (for sending and receiving video acquired from blackmagic)
  - more parametrization based on bitdepth choice
  - 8b should work even for grabbing from DVS Centaurus

- video_compress.c
  - dxt compressed video sending works on Mac now

- video_capture/quicktime.c
  - cleanup

- video_display/sdl.c
  - completely ported to Mac but quite slow now
  - understands -b 8|10 and -p parameters

- video_display/gl_sdl.c
  - ported to Mac but not working now

- video_display/dxt.c
  - ported to Mac but untested
2007-12-14 16:18:28 +00:00
xliska
f6c51dd4ec - unbreak on Mac ;-)
- OpenGL is conditional now as well
2007-12-11 19:34:16 +00:00
xliska
63340db57f - unbreaking on Linux
- endif cleanup
- 8 bit switch
2007-12-11 19:16:45 +00:00
xliska
1dc4de5daf Slightly better capturing performance with quicktime ;)
w54-179:~/ultragrid/ultragrid/bin hopet$ ./uv -t quicktime -m 8500 -f 60 172.30.80.31
UltraGrid v0.3.1
Display device: none
Capture device: quicktime
Frame rate    : 60
MTU           : 8500
Compression   : None
Video decoder : Uncompressed YUV
Display initialized-none
Available capture devices:
  device 1: Blackmagic 2K
  device 2: Blackmagic HDTV 1080
  device 3: Blackmagic HDTV 720
  device 4: Blackmagic NTSC/PAL
  device 5: DV Video
  device 6: IIDC FireWire Video
  device 7: USB Video Class Video
WARNING: System does not support real-time scheduling
1 frames in 1.19739e+09 seconds = 8.35149e-10 FPS
150 frames in 5.00023 seconds = 29.9986 FPS
151 frames in 5.03157 seconds = 30.0105 FPS
150 frames in 5.02346 seconds = 29.8599 FPS
151 frames in 5.02811 seconds = 30.0312 FPS
150 frames in 5.00026 seconds = 29.9985 FPS
150 frames in 5.00456 seconds = 29.9727 FPS
150 frames in 5.0211 seconds = 29.8739 FPS
150 frames in 5.01128 seconds = 29.9325 FPS
151 frames in 5.02928 seconds = 30.0242 FPS
151 frames in 5.02499 seconds = 30.0498 FPS
150 frames in 5.0242 seconds = 29.8555 FPS
151 frames in 5.02842 seconds = 30.0293 FPS
150 frames in 5.00381 seconds = 29.9771 FPS
150 frames in 5.01346 seconds = 29.9195 FPS
151 frames in 5.03015 seconds = 30.019 FPS
150 frames in 5.01184 seconds = 29.9291 FPS
150 frames in 5.01397 seconds = 29.9164 FPS
150 frames in 5.00302 seconds = 29.9819 FPS
151 frames in 5.02776 seconds = 30.0333 FPS
150 frames in 5.01413 seconds = 29.9154 FPS
151 frames in 5.03522 seconds = 29.9888 FPS
151 frames in 5.02037 seconds = 30.0774 FPS
150 frames in 5.00016 seconds = 29.999 FPS
2007-12-11 16:42:38 +00:00
hopet
c8947ef2a9 QuickTime capture is now working at full speed. 2007-12-11 16:25:38 +00:00
xliska
f48bf0712c Quicktime capture working with Blackmagic Declink. Currently gives only around
27 fps using SequenceGrabber.
2007-12-05 15:31:15 +00:00