Commit Graph

287 Commits

Author SHA1 Message Date
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
FeRD (Frank Dana)
e74d71f545 FFmpegReader/Writer: limit hwaccel to FFmpeg 3.4+
Add a new #define HAVE_HW_ACCEL, which is only set on FFmpeg 3.4+,
and use that to restrict the use of hw-accel features, leaving
IS_FFMPEG_3_2 to determine only whether code is compatible with
FFmpeg 3.2+.
2020-02-10 01:50:31 -05:00
Frank Dana
8ea7449363 Merge branch 'develop' into json-parsing 2020-01-20 15:25:40 -05:00
Jonathan Thomas
187b2055dd Preventing crash where last_video_frame is NULL 2020-01-08 00:09:01 -06:00
FeRD (Frank Dana)
22bf6edfba Enhance Json data handling
- Parsing from string to Json::Value is now done by utility function
  openshot::stringToJson() in Json.cpp, all SetJson() methods call it.
- Expand use of const member functions and args where appropriate.
- Use std::to_string() to format int/float values as strings.
- Correct mentions of nonexistent Json::JsonValue type in docstrings
2019-12-27 08:51:51 -05:00
FeRD (Frank Dana)
bd4d2bfdc4 Cover all values in switch(enum_type) 2019-12-15 12:40:32 -05:00
Jonathan Thomas
d6a4cb1dec Moving back to SWS_BICUBIC for high quality mode (during export mostly). This provides a sharper image when enlarging images than SWS_LANCZOS, and only has a slight performance disadvantage. 2019-11-17 16:34:50 -06:00
Frank Dana
8bde07682c Merge branch 'develop' into std-prefixes 2019-10-22 21:00:27 -04:00
Jonathan Thomas
d49dddf79a Merge pull request #326 from ferdnyc/hwaccel-testing
Some minor fixes made while testing hwaccel
2019-10-22 18:31:03 -05:00
Jonathan Thomas
9e674ce6c6 Merge pull request #338 from ferdnyc/map-tweaks
FFmpegReader::CheckMissingFrame -- checked_frames std::map tweaks
2019-10-22 17:24:17 -05:00
Frank Dana
ca885d59e0 Merge pull request #315 from ferdnyc/exception-default-args
Exceptions: Make (most) file_path args optional
2019-10-11 21:46:43 -04:00
Frank Dana
be24c58a03 Merge pull request #312 from ferdnyc/detect-interlace
FFmpegReader: Detect interlaced video on file open
2019-10-11 21:44:14 -04:00
FeRD (Frank Dana)
e070d04796 FFmpegReader::CheckMissingFrame std::map tweaks 2019-10-02 00:18:47 -04:00
FeRD (Frank Dana)
1435267b62 Add lock to CreateFrame (patch by laochen, #272) 2019-10-01 23:27:36 -04:00
Frank Dana
9e0d194072 Add comment re: updates to interlace params 2019-09-22 01:37:32 -04:00
FeRD (Frank Dana)
e3b6478a0b FFmpegReader: Fix hardware device message
- Don't precede with two blank lines
- "Decodiing" was misspelled
- Less cryptic text
2019-09-13 07:43:46 -04:00
FeRD (Frank Dana)
366ff2c5e6 src: Don't pass "" file_path args to exceptions 2019-08-27 15:47:39 -04:00
Frank Dana
67934675eb Merge branch 'develop' into std-prefixes 2019-08-25 04:05:58 -04:00
FeRD (Frank Dana)
c4a6ead569 FFmpegReader: Detect interlaced video
Move interlace detection to UpdateVideoInfo() so it'll be done
before we read any frames, and use the field_order member of the
codec attributes (an AVFieldOrder enum) as the data source.
2019-08-20 04:32:47 -04:00
Frank Dana
857297abdf Merge pull request #288 from SuslikV/patch-5
Fix crash during seeking at the start of the file
2019-08-17 14:13:45 -04:00
FeRD (Frank Dana)
352fd6629a Remaining std:: prefixes 2019-08-04 23:51:02 -04:00
FeRD (Frank Dana)
b4b6223e89 std:: prefixes for FFmpegReader.h/.cpp 2019-08-04 22:23:33 -04:00
eisneinechse
f434b063d9 Move #endif
Move av_hwdevice_get_hwframe_constraints inside the part of the code only compiled when testing VAAPI constraint detection.
2019-07-31 20:56:11 -07:00
SuslikV
bacd46df33 Fix crash during seeking at the start of the file
Due to seeking optimizations the file can be closed and reopened. The packet's pointer becomes NULL in this case. This change ensures that packet's pointer is valid after seeking performed (if any).
2019-07-30 21:30:09 +03:00
Jonathan Thomas
12fce8040f Merge pull request #266 from ferdnyc/zmq-default-params
Default values for ZMQ logging calls
2019-07-29 16:30:22 -05:00