Commit Graph

558 Commits

Author SHA1 Message Date
Jonathan Thomas
030d173e68 Adding additional meta data to effects Json() 2016-08-18 00:21:43 -05:00
Jonathan Thomas
a3ef86a695 Fixed some big performance issues (some which were causing crashes) in effects (Brightness and Saturation), and created a factory class for effects, to reduce redundent code. 2016-08-16 22:40:51 -05:00
Jonathan Thomas
d0b14fe3d3 Updated lots of JSON min/max properties to better reflect reasonable values 2016-08-16 02:12:51 -05:00
Jonathan Thomas
28cc591faf Implementing a small memory bug fix with regards to AV_FREE_FRAME and audio_frame. Also adding in support for duration to be set by JSON, to support long videos from openshot-qt. 2016-08-15 00:44:51 -05:00
Jonathan Thomas
98ccfb5ee1 Fixing cmake build scripts to support 64bit on Windows. Also refactoring some pointer handling to support 64bit on Windows (Linux and Mac have always supported it). Adding instructions for setting up a Windows 64 bit build environment using MSYS2. 2016-08-12 19:15:19 -05:00
Jonathan Thomas
2523b31061 Fixing ambiguous reference to Json array index on Keyframe class 2016-08-03 18:44:20 -05:00
Jonathan Thomas
ea04ba5522 Merge pull request #31 from RussNelson/AudioSampleBuffer
Improve more comments
2016-08-02 19:18:04 -05:00
Jonathan Thomas
adcb3c8e44 Merge pull request #30 from RussNelson/cache-comment
Improve comments, fix indents
2016-08-02 19:17:14 -05:00
Jonathan Thomas
d7f4b08844 Making some small tweaks for consistency / code format 2016-08-02 18:18:24 -05:00
Jonathan Thomas
da618e7248 Merge branch 'komackaj-enable_system_jsoncpp' 2016-08-02 18:08:37 -05:00
Jonathan Thomas
d743d4988b Merge branch 'enable_system_jsoncpp' of https://github.com/komackaj/libopenshot into komackaj-enable_system_jsoncpp
# Conflicts:
#	src/CMakeLists.txt
2016-08-02 18:08:02 -05:00
Jonathan Thomas
2c51ecce44 Merge pull request #19 from sbraz/tests
Exit tests with the return value from RunAllTests()
2016-08-02 17:37:44 -05:00
Jonathan Thomas
10f0881241 Merge pull request #10 from mlocati/win-fix-build-imagemagick
Fix build ImageMagick under Windows
2016-08-02 17:35:50 -05:00
Jonathan Thomas
8ea9b12b5e Small change to memory allocation in FFmpegWriter, to be consistent
between different versions of FFmpeg/LibAV
2016-07-31 15:18:11 -05:00
Jonathan Thomas
d1aa4050e4 Memory leaks fixed on FFmpegWriter with regards to all_resampled_samples and correct usage of av_freep 2016-07-31 13:56:38 -05:00
Jonathan Thomas
734dc5b32f Fixing a crash on Windows by using a different overload of AddImage that doesn't do a memcpy. There is still a memory leak on the FFmpegWriter somewhere, which eventually starts to return NULL from av_malloc, and breaks on Windows (and probably other OSes too). 2016-07-30 16:57:48 -05:00
Jonathan Thomas
9839899a60 Big memory leak fixes in FFmpegReader and FrameMapper, and fixed logic in Frame Mapper with regards to special framerate conversions (24, 25, and 30)... which were causing some inadvertent audio drift. 2016-07-27 13:18:55 -05:00
Jonathan Thomas
92a9db2aa3 Improved detection of missing audio frames, and missing video frames. Also improved logic for giving up on missing frames in general. Also removed some deadlocks related to Seeking (Close() and Open() were deadlocking). The end result is much improved compatability with reading video files. 2016-06-29 02:42:00 -05:00
Russ Nelson
49752ac3aa improve comments 2016-05-08 19:23:57 -04:00
Russ Nelson
26901f2bcf improve comments, fix indent 2016-05-08 19:14:19 -04:00
Jonathan Thomas
4808be25ff Added 4 new clip keyframes (channel mapping, channel filter, has_video, and has_audio). These are a bit different though, as they are evaluated as boolean (-1 = ignored, 0 = disabled, 1 = enabled). Also fixed some issues with video playback (where it gets stuck in fast forward), and fixed some race conditions when opening FFmpegReader. Also added more debug output. 2016-04-24 15:37:47 -05:00
Jonathan Thomas
37f1894300 Fixed a race condition in video playback thread! Also, added new method to get the average magnitude of a range of audio samples. 2016-04-22 02:43:06 -05:00
Jonathan Thomas
179d091005 Moved AppendDebugMessage to ZmqLogger, and updated 100+ references to use this new function. Removed debug var from readers/writers, and moved it to ZmqLogger.Enable(true/false). This allows debug output from all classes and functions, without any duplicate code. Also added some additional debug output for video playback and audio readers. 2016-04-21 01:39:17 -05:00
Jonathan Thomas
30648360c7 Adding some additional locks around adding images to a frame in FFmpegReader 2016-04-14 09:41:10 -05:00
Jonathan Thomas
7c49628d93 Added new optional file logging abilities to ZmqLogger, which are guaranteed to write to disk (even if a crash happens immediately after logging) 2016-04-12 16:42:36 -05:00