Commit Graph

568 Commits

Author SHA1 Message Date
Frank Dana
6638f4184c Merge pull request #475 from ferdnyc/ffmpeg-writer
Memory-safety fixes to FFmpegWriter, FrameMapper, DummyReader
2020-07-11 23:39:52 -04:00
Frank Dana
2520996d85 Merge pull request #510 from ferdnyc/store-qt-version
Add version/feature #defines to OpenShotVersion.h
2020-07-08 17:28:18 -04:00
Frank Dana
adab668486 Merge branch 'develop' into ffmpeg-writer 2020-07-08 17:26:38 -04:00
Frank Dana
687a9cc894 Merge pull request #533 from musteresel/improve-dummyreader-doc
Add a note about the buffering behavior of Timeline to DummyReader
2020-07-08 17:20:55 -04:00
Frank Dana
001b2d8a71 MagickUtils: Add #pragma to silence IM6 warning 2020-06-18 05:47:40 -04:00
Daniel Jour
bec21b1c77 Add a note about the buffering behavior of Timeline to DummyReader
Using DummyReader with a custom cache with a Timeline can lead to
strange exceptions due to Timeline's buffering.  Therefore adding a
note to the DummyReader documentation about that.
2020-06-12 22:30:54 +02:00
FeRD (Frank Dana)
8af624fc4e Add an APPIMAGE_BUILD option to libopenshot
- Defaults OFF, must be enabled during build generation
- Set (cmake -DAPPIMAGE_BUILD=1) by GitLab linux builder
- Stored as a symbol in the library (via OpenShotVersion.h #defines)
- Also visible in Python module (`if openshot.APPIMAGE_BUILD: pass`)

Also, use CMAKE_SWIG_FLAGS properly (as a list), fix some indentation
2020-06-11 17:40:53 -04:00
FeRD (Frank Dana)
07fef5b878 Merge branch 'develop' into store-qt-version 2020-06-11 12:06:10 -04:00
Jonathan Thomas
8b12c1fa21 Replacing WriteFrame() method with custom constructor which can accept a CacheBase* pointer, for instances where a DummyReader needs some specific test Frame objects 2020-06-06 17:25:45 -05:00
Jonathan Thomas
7831cfe912 Adding some new functionality and documentation to DummyReader. Adding the ability to add test frames, with fake image and audio data. This will can be used in unittests, and will soon be used to verify some new audio improvements (coming soon). 2020-06-06 01:55:52 -05:00
Jonathan Thomas
10ed4baae3 Merge pull request #496 from OpenShot/emojis
Transform Improvements (Keyframe origin point)
2020-05-25 17:41:55 -05:00
FeRD (Frank Dana)
affd4b2488 Add some missing juce:: prefixing 2020-05-19 06:33:30 -04:00
Stefan Strogin
13290364e7 FFmpegUtilities: replace variable definition with statement expression
It is needed to avoid multiple definitions of AV_GET_CODEC_CONTEXT,
which is considered as an error with '-fno-common' which is default
since gcc-10.

Fixes: #511
2020-05-16 02:33:37 +03:00
FeRD (Frank Dana)
0e79844ed9 Add more build-config variables
- HAVE_IMAGEMAGICK and HAVE_RESVG will be #defined 0 or 1
- AV{CODEC,FORMAT,UTIL}_VERSION_STR will contain the FFmpeg
  component versions detected by CMake when configuring the build
2020-05-09 18:33:03 -04:00
FeRD (Frank Dana)
5c688f1edf Add QT_VERSION_STR define to OpenShotVersion.h
The CMake process will pick up Qt's Qt5Core_VERSION_STRING and
stick it in a cache variable (with forced updating each run),
and a new `#define` in the header exports it to the library and
to the Python bindings so that it can be queried at runtime.
2020-05-07 11:56:44 -04:00
Frank Dana
6336f30ee3 Various: Remove unused variables (#467)
Several data members and local variables were flagged by static
analysis tools as never being used anywhere in the code.
2020-04-22 02:02:55 -04:00
Frank Dana
f36bb334e2 Exceptions: Rename BaseException, for python (#497)
BaseException is a python standard library exception class, so it's
not a great idea to redefine that name in our bindings. Renamed
to ExceptionBase, which is more in keeping with our class naming
system anyway.
2020-04-22 02:01:01 -04:00
FeRD (Frank Dana)
f62f2bac6b Overrides for derived-class methods 2020-04-15 21:45:04 -04:00
FeRD (Frank Dana)
f354850984 Effects: Mark overridden methods accordingly 2020-04-15 21:44:17 -04:00
Jonathan Thomas
2bea436f3e Adding keyframable origin point (for shear and rotation) 2020-04-13 16:55:29 -05:00
FeRD (Frank Dana)
3680144511 FrameMapper: Eliminate is_open member variable
It was being used uninitialized because it's never actually set,
therefore it serves no purpose.
2020-03-22 12:35:31 -04:00
FeRD (Frank Dana)
527acfe77a FFmpegWriter: (a/v)_codec => (a/v)_codec_ctx
The audio_codec and video_codec vars have type AVCodecContext.
Renaming them to reflect that makes the code easier to follow.

A couple of places in FFmpegUtilities macros that also used
context variables named _codec got the same fix.
2020-03-22 12:29:36 -04:00
Jonathan Thomas
8b3167a99a Adding ability for a Clip to auto-detect and instantiate a Timeline Reader from the *.osp file type. Added new Timeline constructor, to auto load UTF-8 JSON file, and regex convert all paths to absolute. Fixed a dead lock issue when a Timeline loads another Timeline. 2020-03-09 16:49:06 -05:00
Jonathan Thomas
4f591c7b94 Merge pull request #396 from ferdnyc/json-parsing
Behind-the-scenes code tidying for Json data handling
2020-02-27 15:32:05 -06:00
Jonathan Thomas
4ddf775cdf Merge pull request #421 from ferdnyc/ffmpegwriter-opts
FFmpegWriter: Overload Set___Options() methods
2020-02-27 15:27:31 -06:00