Commit Graph

142 Commits

Author SHA1 Message Date
Jonathan Thomas
a42e257521 Many small improvements, bug fixes, and build system fixes for newer systems that have both qt4 and qt5. 2013-09-08 16:08:56 -05:00
Jonathan Thomas
12ca79ce0b Fixed bug on JSON output on a ChunkWriter. Also, moved some ChunkWriter defaults into the header. 2013-08-28 17:00:57 -05:00
Jonathan Thomas
ae8552fdb3 Completed the ChunkReader, new exceptions for ChunkNotFound, and correctly locates and uses the chunk readers to get the requested frame. 2013-08-28 15:28:19 -05:00
Jonathan Thomas
fb9edb15b5 Hooked up the ChunkReader, integrated into cmake, and have it successfully "loading" the JSON info file and validating the chunk folder path. 2013-08-28 13:51:22 -05:00
Jonathan Thomas
b3c6b79793 Added 3 video streams in a chunk (final, preview, and thumb) at 3 different quality versions. 2013-08-27 16:57:49 -05:00
Jonathan Thomas
e3636bd3e9 Write JSON info file for the ChunkWriter 2013-08-27 14:27:24 -05:00
Jonathan Thomas
1e2d93721d Improved ChunkWriter to create chunk folder and write JSON meta data 2013-08-27 13:37:00 -05:00
Jonathan Thomas
5e3c0717b1 Added more defintion to the ChunkWriter class, and added in the license file to jsoncpp. 2013-08-01 13:45:09 -05:00
Jonathan Thomas
b8baaef658 Incorporated JSON library (http://jsoncpp.sourceforge.net/) into project, and tweaked build rules and headers to successfully integrate it. licensed under MIT license. 2013-07-31 16:18:54 -05:00
Jonathan Thomas
bcfbe60a4a initial chunck readers/writers 2013-07-31 12:45:47 -05:00
Jonathan Thomas
4ce7cd22ba Fixed a build error on Linux... which was a regression from my previous Mac fix. 2013-06-09 14:31:52 -05:00
Jonathan Thomas
6cac382773 Fixed most build warnings on Mac OS X 2013-06-09 01:08:23 -05:00
Jonathan Thomas
c679e857fd Fixed an SDL_main macro issue which was breaking Mac builds. 2013-06-07 13:15:41 -05:00
Jonathan Thomas
6171abfe1a Added a Sleep.h header, which defines an OS specific sleep metho. 2013-06-06 12:12:08 -05:00
Jonathan Thomas
5ce6add42f Added gravity to the TextReader, so text can be easily anchored to the corners. 2013-03-06 23:36:28 -06:00
Jonathan Thomas
aa09fdc69b Fixed many, many blackmagic bugs, and have a pretty good demo built. 2013-02-15 00:23:55 -06:00
Jonathan Thomas
c07b97d52a Experimenting with image sequence performance (using Tif images) 2013-02-13 02:46:55 -06:00
Jonathan Thomas
ca09838b0f Optimized the compositing of simple layers (with no transformation), by not resizing it's canvas to match the timeline. Also, improved the Decklink reader to wait for the frame to become available (if it's in the future), and to jump ahead on the timeline if it gets behind. Blackmagic program can now composite 4 layers in real time. 2013-02-12 02:42:18 -06:00
Jonathan Thomas
cc32bbf38a Made decklinkOutput keep scheduling the last successfull frame, if the queue runs out. Also, made the timeline multi-threaded, and improved the DecklinkInput.cpp to keep frames in order, by returning the correct frame based on the number. 2013-02-12 01:28:48 -06:00
Jonathan Thomas
4a4d9e2a34 Improved the timeline compositing performance, fixed some blackmagic bugs, and finally have an actual chromakey demo working! 2013-02-10 21:16:46 -06:00
Jonathan Thomas
2a743123ee Improved DecklinkReader to be multi-threaded, using the OpenShot cache object to keep things in order. Performance is very smooth on the blackmagic test executable now. 2013-02-10 15:46:41 -06:00
Jonathan Thomas
09a02c0adf Adding the initial version of the decklink writer, and a fully working (full circle) blackmagic example executabe, which processes real-time HD video and output's it via HDMI. 2013-02-10 02:19:40 -06:00
Jonathan Thomas
0a13525afd Completed the DecklinkReader class, and improved the conditional black magic code to include SWIG. The Decklink reader fully works, multi-threaded, and looks good. 2013-02-09 01:54:40 -06:00
Jonathan Thomas
182febe5b7 Fixed conditional compile flag for black magic, and improved the quality of the TextReader font rendering. 2013-02-08 02:15:16 -06:00
Jonathan Thomas
78b1e9b16b Added a TextReader class, which renders text as an image. 2013-02-07 17:11:23 -06:00