Commit Graph

425 Commits

Author SHA1 Message Date
Jonathan Thomas
5f48fbf1a4 Merge pull request #251 from ferdnyc/crop-args
Crop.h: Remove nonexistent color argument
2019-06-21 00:25:29 -05:00
Jonathan Thomas
967f23b8a4 Merge pull request #245 from ferdnyc/license-block
Upgrade Doxygen documentation formatting/content
2019-06-21 00:24:54 -05:00
Frank Dana
a47d5b58fd Add backwards-compatible Imagemagick 7 support (#252)
* Add ImageMagick 7 compatibility

A new header, `imclude/MagickUtilities.h`, is created to hold the
compatibility `#define`s.

The image-conversion code in `src/Frame.cpp` received the only
major changes — instead of doing the export by hand (and having
to account for changes in the underlying API), it uses the
`MagickCore::ExportImagePixels()` function which does basically
the same work, but accounts for all of the API changes for us.
The API of that function is _unchanged_ from IM6 to IM7.

TODO: `MagickCore::ExportImagePixels()` will return an `exception`
struct if it encounters any problems. Currently the code ignores
that, which it should not.

* Add ImageMagick 7 compatibility

A new header, `imclude/MagickUtilities.h`, is created to hold the
compatibility `#define`s.

The image-conversion code in `src/Frame.cpp` received the only
major changes — instead of doing the export by hand (and having
to account for changes in the underlying API), it uses the
`MagickCore::ExportImagePixels()` function which does basically
the same work, but accounts for all of the API changes for us.
The API of that function is _unchanged_ from IM6 to IM7.

TODO: `MagickCore::ExportImagePixels()` will return an `exception`
struct if it encounters any problems. Currently the code ignores
that, which it should not.

Thanks @ferdnyc
2019-06-21 00:07:49 -05:00
eisneinechse
d6eef8f0db Merge branch 'develop' into develop 2019-06-20 13:46:35 -07:00
eisneinechse
c54a3705ff Update FFmpegUtilities.h
Warnings are now silenced in FFmpegUtilities.h, where it should be.
2019-06-20 13:41:03 -07:00
FeRD (Frank Dana)
0dcbc20921 Doxygen docs: Link to install docs
This adds references to all three `INSTALL-*.md` documents to
the main page text in `include/OpenShot.h`, replacing the previous
link to the PDF.
2019-06-12 22:55:54 -04:00
FeRD (Frank Dana)
4455f77bd9 Crop.h: Remove nonexistent color argument
Doxygen caught this one: the default constructor for Crop()
doesn't take an argument 'color', though it was documented to.
2019-06-12 21:27:53 -04:00
FeRD (Frank Dana)
5292661dec Also remove install guide ref from OpenShot.h 2019-06-12 21:26:18 -04:00
FeRD (Frank Dana)
9261f46772 More copyright, missed a few older ones 2019-06-11 06:51:37 -04:00
FeRD (Frank Dana)
f170fdd009 Update copyright range to current year 2019-06-11 06:48:32 -04:00
FeRD (Frank Dana)
0327c2ab5c Remove license block from documentation comment 2019-06-09 08:31:04 -04:00
Jonathan Thomas
2b308c6d59 Update Frame.h 2019-06-08 12:23:26 -05:00
Jonathan Thomas
13e74b147a Adding new CheckPixel method to validate a specific pixel color 2019-05-31 19:02:28 -05:00
Jonathan Thomas
9ffd6a6f75 Fixing crash when destructing Timeline/Clips/FrameMapper 2019-05-13 23:55:03 -05:00
Jonathan Thomas
968e472c73 Tweak how Timeline manages the cache object (sometimes itself, and sometimes by the user if they call SetCache) 2019-05-13 17:11:40 -05:00
Chris Kirmse
d5a29500a5 change freeing of frame_mappers allocated in Timeline
- each class is now responsible to free whatever it allocates
- all tests passed on my machine with ffmpeg 3.2
- Clip is now more careful about freeing a reader if it allocated it as well
2019-05-09 10:51:40 -07:00
Chris Kirmse
833fcb8e8e fix a number of memory leaks
- some were with libav functions
- same were due to non-virtual destructors
2019-05-08 15:02:33 -07:00
Jonathan Thomas
d23197c9b6 Updating hwaccel table to use emojis (instead of words) take 3 2019-05-08 14:00:55 -05:00
Jonathan Thomas
2c825335c1 Merge branch 'develop' into rename-rshift 2019-05-02 13:24:14 -05:00
Jonathan Thomas
70f07ca4f8 Improving HW-ACCEL documentation 2019-04-30 13:17:43 -05:00
Jonathan Thomas
140fbaddff Added new AudioDeviceInfo struct, and populate a vector of them on QtPlayer initialization. This allows a user to overwrite the preferred audio device by using the setting PLAYBACK_AUDIO_DEVICE_NAME. 2019-04-23 16:45:02 -05:00
Jonathan Thomas
79335277cb Removing old commented out code 2019-04-21 14:37:06 -05:00
eisneinechse
65d9134722 Remove DECODE varaible.
Turn out that a buggy graphic driver was the problem.
2019-04-21 12:18:44 -07:00
eisneinechse
825e38ac9d Removing old way to select hardware support
Removing the decode setting makes hardware supported decode break.
There must be some hidden dependency on that variable somewhere
which might also be responsible for the problems with nVidia on
Linux. TODO Remove the dependency
2019-04-21 10:04:24 -07:00
Jonathan Thomas
b3f5406db3 More code reformatting on FFmpegWriter.h/.cpp 2019-04-18 14:04:37 -05:00