diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 000000000..c5ec1048c
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,22 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 90
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 10
+# Issues with these labels will never be considered stale
+exemptLabels:
+ - pinned
+ - security
+ - enhancement
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+ This issue has been automatically marked as **stale** because it has not had
+ recent activity. It will be closed if no further activity occurs. Thank you
+ for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
+# Only close issues
+only: issues
+# Don't close issues which are assigned to somebody
+exemptAssignees: true
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 624950781..6b2645d81 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,15 +16,13 @@ linux-builder:
- unzip artifacts.zip
- export LIBOPENSHOT_AUDIO_DIR=$CI_PROJECT_DIR/build/install-x64
- mkdir -p build; cd build;
- - mkdir -p install-x64/python;
- - cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -D"CMAKE_BUILD_TYPE:STRING=Release" -D"USE_SYSTEM_JSONCPP=0" ../
+ - cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -D"PYTHON_MODULE_PATH=python" -D"RUBY_MODULE_PATH=ruby" -DCMAKE_BUILD_TYPE:STRING=Release -DUSE_SYSTEM_JSONCPP=0 ../
- make
- make install
- make doc
- ~/auto-update-docs "$CI_PROJECT_DIR/build" "$CI_COMMIT_REF_NAME"
- - mv install-x64/lib/python3.4/site-packages/*openshot* install-x64/python
- echo -e "CI_PROJECT_NAME:$CI_PROJECT_NAME\nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME\nCI_COMMIT_SHA:$CI_COMMIT_SHA\nCI_JOB_ID:$CI_JOB_ID" > "install-x64/share/$CI_PROJECT_NAME"
- - git log $(git describe --tags --abbrev=0)..HEAD --oneline --pretty=format:"%C(auto,yellow)%h%C(auto,magenta)% %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(25,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D" --date=short > "install-x64/share/$CI_PROJECT_NAME.log"
+ - git log $(git describe --tags --abbrev=0 @^)..@ --oneline --pretty=format:"%C(auto,yellow)%h%C(auto,magenta)% %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(25,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D" --date=short > "install-x64/share/$CI_PROJECT_NAME.log"
when: always
except:
- tags
@@ -45,13 +43,11 @@ mac-builder:
- unzip artifacts.zip
- export LIBOPENSHOT_AUDIO_DIR=$CI_PROJECT_DIR/build/install-x64
- mkdir -p build; cd build;
- - mkdir -p install-x64/python;
- - cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -DCMAKE_CXX_COMPILER=/usr/local/opt/gcc48/bin/g++-4.8 -DCMAKE_C_COMPILER=/usr/local/opt/gcc48/bin/gcc-4.8 -DCMAKE_PREFIX_PATH=/usr/local/qt5/5.5/clang_64 -DPYTHON_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m -DPYTHON_LIBRARY=/Library/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6.dylib -DPython_FRAMEWORKS=/Library/Frameworks/Python.framework/ -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -D"CMAKE_OSX_DEPLOYMENT_TARGET=10.9" -D"CMAKE_INSTALL_RPATH_USE_LINK_PATH=1" -D"ENABLE_RUBY=0" ../
+ - cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/build/install-x64" -DCMAKE_CXX_COMPILER=/usr/local/opt/gcc48/bin/g++-4.8 -DCMAKE_C_COMPILER=/usr/local/opt/gcc48/bin/gcc-4.8 -DCMAKE_PREFIX_PATH=/usr/local/qt5/5.5/clang_64 -DPYTHON_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m -DPYTHON_LIBRARY=/Library/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6.dylib -DPYTHON_MODULE_PATH=python -DPython_FRAMEWORKS=/Library/Frameworks/Python.framework/ -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" -D"CMAKE_OSX_DEPLOYMENT_TARGET=10.9" -D"CMAKE_INSTALL_RPATH_USE_LINK_PATH=1" -D"ENABLE_RUBY=0" ../
- make
- make install
- - mv install-x64/lib/python3.6/site-packages/*openshot* install-x64/python
- echo -e "CI_PROJECT_NAME:$CI_PROJECT_NAME\nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME\nCI_COMMIT_SHA:$CI_COMMIT_SHA\nCI_JOB_ID:$CI_JOB_ID" > "install-x64/share/$CI_PROJECT_NAME"
- - git log $(git describe --tags --abbrev=0)..HEAD --oneline --pretty=format:"%C(auto,yellow)%h%C(auto,magenta)% %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(25,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D" --date=short > "install-x64/share/$CI_PROJECT_NAME.log"
+ - git log $(git describe --tags --abbrev=0 @^)..@ --oneline --pretty=format:"%C(auto,yellow)%h%C(auto,magenta)% %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(25,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D" --date=short > "install-x64/share/$CI_PROJECT_NAME.log"
when: always
except:
- tags
@@ -73,14 +69,13 @@ windows-builder-x64:
- $env:RESVGDIR = "C:\msys64\usr"
- $env:Path = "C:\msys64\mingw64\bin;C:\msys64\mingw64\lib;C:\msys64\usr\lib\cmake\UnitTest++;C:\msys64\home\jonathan\depot_tools;C:\msys64\usr;C:\msys64\usr\lib;" + $env:Path;
- New-Item -ItemType Directory -Force -Path build
- - New-Item -ItemType Directory -Force -Path build\install-x64\python
- cd build
- - cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR\build\install-x64" -G "MSYS Makefiles" -DCMAKE_MAKE_PROGRAM=mingw32-make -D"CMAKE_BUILD_TYPE:STRING=Release" ../
+ - cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR\build\install-x64" -D"PYTHON_MODULE_PATH=python" -D"RUBY_MODULE_PATH=ruby" -G "MSYS Makefiles" -DCMAKE_MAKE_PROGRAM=mingw32-make -D"CMAKE_BUILD_TYPE:STRING=Release" ../
- mingw32-make install
- Move-Item -Force -path "install-x64\lib\python3.7\site-packages\*openshot*" -destination "install-x64\python\"
- New-Item -path "install-x64/share/" -Name "$CI_PROJECT_NAME" -Value "CI_PROJECT_NAME:$CI_PROJECT_NAME`nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME`nCI_COMMIT_SHA:$CI_COMMIT_SHA`nCI_JOB_ID:$CI_JOB_ID" -ItemType file -force
- - $PREV_GIT_LABEL=(git describe --tags --abbrev=0)
- - git log "$PREV_GIT_LABEL..HEAD" --oneline --pretty=format:"%C(auto,yellow)%h%C(auto,magenta)% %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(25,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D" --date=short > "install-x64/share/$CI_PROJECT_NAME.log"
+ - $PREV_GIT_LABEL=(git describe --tags --abbrev=0 '@^')
+ - git log "$PREV_GIT_LABEL..@" --oneline --pretty=format:"%C(auto,yellow)%h%C(auto,magenta)% %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(25,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D" --date=short > "install-x64/share/$CI_PROJECT_NAME.log"
when: always
except:
- tags
@@ -102,14 +97,12 @@ windows-builder-x86:
- $env:RESVGDIR = "C:\msys32\usr"
- $env:Path = "C:\msys32\mingw32\bin;C:\msys32\mingw32\lib;C:\msys32\usr\lib\cmake\UnitTest++;C:\msys32\home\jonathan\depot_tools;C:\msys32\usr;C:\msys32\usr\lib;" + $env:Path;
- New-Item -ItemType Directory -Force -Path build
- - New-Item -ItemType Directory -Force -Path build\install-x86\python
- cd build
- - cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR\build\install-x86" -G "MSYS Makefiles" -DCMAKE_MAKE_PROGRAM=mingw32-make -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_CXX_FLAGS=-m32" -D"CMAKE_EXE_LINKER_FLAGS=-Wl,--large-address-aware" -D"CMAKE_C_FLAGS=-m32" ../
+ - cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR\build\install-x86" -D"PYTHON_MODULE_PATH=python" -D"RUBY_MODULE_PATH=ruby" -G "MSYS Makefiles" -DCMAKE_MAKE_PROGRAM=mingw32-make -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_CXX_FLAGS=-m32" -D"CMAKE_EXE_LINKER_FLAGS=-Wl,--large-address-aware" -D"CMAKE_C_FLAGS=-m32" ../
- mingw32-make install
- - Move-Item -Force -path "install-x86\lib\python3.7\site-packages\*openshot*" -destination "install-x86\python\"
- New-Item -path "install-x86/share/" -Name "$CI_PROJECT_NAME" -Value "CI_PROJECT_NAME:$CI_PROJECT_NAME`nCI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME`nCI_COMMIT_SHA:$CI_COMMIT_SHA`nCI_JOB_ID:$CI_JOB_ID" -ItemType file -force
- - $PREV_GIT_LABEL=(git describe --tags --abbrev=0)
- - git log "$PREV_GIT_LABEL..HEAD" --oneline --pretty=format:"%C(auto,yellow)%h%C(auto,magenta)% %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(25,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D" --date=short > "install-x86/share/$CI_PROJECT_NAME.log"
+ - $PREV_GIT_LABEL=(git describe --tags --abbrev=0 '@^')
+ - git log "$PREV_GIT_LABEL..@" --oneline --pretty=format:"%C(auto,yellow)%h%C(auto,magenta)% %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(25,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D" --date=short > "install-x86/share/$CI_PROJECT_NAME.log"
when: always
except:
- tags
diff --git a/.travis.yml b/.travis.yml
index f449c3f0d..fca321d69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,9 +35,9 @@ addons:
matrix:
include:
- - name: "Coverage (Ubuntu 18.04 Bionic)"
+ - name: "Coverage + FFmpeg 3.4 GCC (Ubuntu 18.04 Bionic)"
env:
- - BUILD_VERSION=coverage_ffmpeg3
+ - BUILD_VERSION=coverage_ffmpeg34
- CMAKE_EXTRA_ARGS="-DENABLE_COVERAGE=1"
- TEST_TARGET=coverage
os: linux
@@ -50,6 +50,7 @@ matrix:
packages:
- *ff_common
- qt5-default
+ - libjsoncpp-dev
- lcov
- binutils-common # For c++filt
@@ -80,13 +81,14 @@ matrix:
- libavresample4
- libswresample3
- - name: "FFmpeg 3 GCC (Ubuntu 18.04 Bionic)"
+ - name: "FFmpeg 3.4 Clang (Ubuntu 18.04 Bionic)"
env:
- - BUILD_VERSION=ffmpeg3
+ - BUILD_VERSION=clang_ffmpeg34
- CMAKE_EXTRA_ARGS=""
- TEST_TARGET=test
os: linux
dist: bionic
+ compiler: clang
addons:
apt:
sources:
@@ -95,25 +97,32 @@ matrix:
packages:
- *ff_common
- qt5-default
- - libjsoncpp-dev
+ - libomp-dev
- - name: "FFmpeg 3 Clang (Ubuntu 18.04 Bionic)"
+ - name: "FFmpeg 3.2 GCC (Ubuntu 16.04 Xenial)"
env:
- - BUILD_VERSION=clang_ffmpeg3
+ - BUILD_VERSION=ffmpeg32
- CMAKE_EXTRA_ARGS=""
- - TEST_TARGET=test
+ - TEST_TARGET="os_test"
os: linux
- dist: bionic
- compiler: clang
+ dist: xenial
addons:
apt:
sources:
- sourceline: 'ppa:openshot.developers/libopenshot-daily'
- - sourceline: 'ppa:beineri/opt-qt-5.12.3-bionic'
+ - sourceline: 'ppa:beineri/opt-qt-5.10.0-xenial'
+ - sourceline: 'ppa:jon-hedgerows/ffmpeg-backports'
packages:
- *ff_common
- - qt5-default
- - libomp-dev
+ - libavcodec57
+ - libavdevice57
+ - libavfilter6
+ - libavformat57
+ - libavresample3
+ - libavutil55
+ - libpostproc54
+ - libswresample2
+ - libswscale4
- name: "FFmpeg 2 GCC (Ubuntu 16.04 Xenial)"
env:
@@ -132,10 +141,10 @@ matrix:
script:
- mkdir -p build; cd build;
- - cmake -DCMAKE_BUILD_TYPE:STRING="Debug" ${CMAKE_EXTRA_ARGS} ../
+ - cmake -DCMAKE_INSTALL_PREFIX:PATH="$TRAVIS_OS_NAME-x64" -DCMAKE_BUILD_TYPE:STRING="Debug" ${CMAKE_EXTRA_ARGS} ../
- make VERBOSE=1
- make ${TEST_TARGET}
- - make install DESTDIR="$BUILD_VERSION"
+ - make install
- cd ..
after_success:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cce01d357..124e9e5a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,8 +40,8 @@ For more information, please visit .
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
################ PROJECT VERSION ####################
-set(PROJECT_VERSION_FULL "0.2.4-dev1")
-set(PROJECT_SO_VERSION 18)
+set(PROJECT_VERSION_FULL "0.2.5-dev2")
+set(PROJECT_SO_VERSION 19)
# Remove the dash and anything following, to get the #.#.# version for project()
STRING(REGEX REPLACE "\-.*$" "" VERSION_NUM "${PROJECT_VERSION_FULL}")
@@ -73,9 +73,23 @@ include(FeatureSummary)
# Optional build settings for libopenshot
option(USE_SYSTEM_JSONCPP "Use system installed JsonCpp, if found" ON)
option(DISABLE_BUNDLED_JSONCPP "Don't fall back to bundled JsonCpp" OFF)
-option(DISABLE_TESTS "Don't build unit tests" OFF)
option(ENABLE_IWYU "Enable 'Include What You Use' scanner (CMake 3.3+)" OFF)
-option(ENABLE_COVERAGE "Enable coverage reporting" OFF)
+option(ENABLE_TESTS "Build unit tests (requires UnitTest++)" ON)
+option(ENABLE_DOCS "Build API documentation (requires Doxygen)" ON)
+
+# Legacy commandline override
+if (DISABLE_TESTS)
+ if(ENABLE_COVERAGE)
+ message(WARNING "ENABLE_COVERAGE requires tests, overriding DISABLE_TESTS")
+ set(ENABLE_TESTS ON)
+ else()
+ set(ENABLE_TESTS OFF)
+ endif()
+endif()
+
+if(DEFINED ENABLE_TESTS)
+ set(ENABLE_TESTS ${ENABLE_TESTS} CACHE BOOL "Build unit tests (requires UnitTest++)" FORCE)
+endif()
########## Configure Version.h header ##############
configure_file(include/OpenShotVersion.h.in include/OpenShotVersion.h @ONLY)
@@ -83,6 +97,13 @@ configure_file(include/OpenShotVersion.h.in include/OpenShotVersion.h @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/OpenShotVersion.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libopenshot)
+#### Work around a GCC < 9 bug with handling of _Pragma() in macros
+#### See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55578
+if ((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") AND
+ (${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "9.0.0"))
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -no-integrated-cpp")
+endif()
+
#### Enable C++11 (for std::shared_ptr support)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -92,10 +113,6 @@ IF (WIN32)
SET_PROPERTY(GLOBAL PROPERTY WIN32 "WIN32")
ENDIF(WIN32)
-include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}/include
- ${CMAKE_CURRENT_BINARY_DIR}/include)
-
############## Code Coverage #########################
if (DISABLE_TESTS AND ENABLE_COVERAGE)
message(WARNING "ENABLE_COVERAGE requires tests, overriding DISABLE_TESTS")
@@ -108,7 +125,7 @@ if (ENABLE_COVERAGE)
message(STATUS "Coverage enabled, setting build type to Debug")
endif()
include(CodeCoverage)
- APPEND_COVERAGE_COMPILER_FLAGS()
+ append_coverage_compiler_flags()
endif()
add_feature_info("Coverage" ENABLE_COVERAGE "analyze test coverage and generate report")
@@ -117,27 +134,33 @@ add_subdirectory(src)
################### DOCUMENTATION ###################
# Find Doxygen (used for documentation)
-include(cmake/Modules/UseDoxygen.cmake)
-
-# Doxygen was found
-if (TARGET doc)
- message(STATUS "Doxygen found, documentation target enabled")
- message("\nTo compile documentation in doc/html, run: 'make doc'")
-
- # Install docs, if the user builds them with `make doc`
- install(CODE "MESSAGE(\"Checking for documentation files to install...\")")
- install(CODE "MESSAGE(\"(Compile with 'make doc' command, requires Doxygen)\")")
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html/
- DESTINATION ${CMAKE_INSTALL_DOCDIR}/API
- MESSAGE_NEVER # Don't spew about file copies
- OPTIONAL ) # No error if the docs aren't found
+set(DOCS_ENABLED FALSE) # Only set true if Doxygen is found and configured
+if (ENABLE_DOCS)
+ include(cmake/Modules/UseDoxygen.cmake)
+
+ # Doxygen was found
+ if (TARGET doc)
+ message(STATUS "Doxygen found, documentation target enabled")
+ set(DOCS_ENABLED TRUE)
+
+ # Install docs, if the user builds them with `make doc`
+ install(CODE "MESSAGE(\"Checking for documentation files to install...\")")
+ install(CODE "MESSAGE(\"(Compile with 'make doc' command, requires Doxygen)\")")
+
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html/
+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/API
+ MESSAGE_NEVER # Don't spew about file copies
+ OPTIONAL ) # No error if the docs aren't found
+ endif()
endif()
+add_feature_info("Documentation" DOCS_ENABLED "Build API documentation with 'make doc'")
############# PROCESS tests/ DIRECTORY ##############
-if(NOT DISABLE_TESTS)
+if(ENABLE_TESTS)
+ set(TESTS_ENABLED TRUE) # May be overridden by tests/CMakeLists.txt
add_subdirectory(tests)
endif()
+add_feature_info("Unit tests" TESTS_ENABLED "Compile unit tests for library functions")
############## COVERAGE REPORTING #################
if (ENABLE_COVERAGE)
diff --git a/cmake/Modules/CodeCoverage.cmake b/cmake/Modules/CodeCoverage.cmake
index 786a06b4a..fde7f535c 100644
--- a/cmake/Modules/CodeCoverage.cmake
+++ b/cmake/Modules/CodeCoverage.cmake
@@ -59,6 +59,13 @@
# 2019-12-19, FeRD (Frank Dana)
# - Rename Lcov outputs, make filtered file canonical, fix cleanup for targets
#
+# 2020-01-19, Bob Apthorpe
+# - Added gfortran support
+#
+# 2020-02-17, FeRD (Frank Dana)
+# - Make all add_custom_target()s VERBATIM to auto-escape wildcard characters
+# in EXCLUDEs, and remove manual escaping from gcovr targets
+#
# USAGE:
#
# 1. Copy this file into your cmake modules path.
@@ -122,12 +129,22 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang")
message(FATAL_ERROR "Clang version must be 3.0.0 or greater! Aborting...")
endif()
elseif(NOT CMAKE_COMPILER_IS_GNUCXX)
- message(FATAL_ERROR "Compiler is not GNU gcc! Aborting...")
+ if("${CMAKE_Fortran_COMPILER_ID}" MATCHES "[Ff]lang")
+ # Do nothing; exit conditional without error if true
+ elseif("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU")
+ # Do nothing; exit conditional without error if true
+ else()
+ message(FATAL_ERROR "Compiler is not GNU gcc! Aborting...")
+ endif()
endif()
set(COVERAGE_COMPILER_FLAGS "-g -fprofile-arcs -ftest-coverage"
CACHE INTERNAL "")
+set(CMAKE_Fortran_FLAGS_COVERAGE
+ ${COVERAGE_COMPILER_FLAGS}
+ CACHE STRING "Flags used by the Fortran compiler during coverage builds."
+ FORCE )
set(CMAKE_CXX_FLAGS_COVERAGE
${COVERAGE_COMPILER_FLAGS}
CACHE STRING "Flags used by the C++ compiler during coverage builds."
@@ -145,6 +162,7 @@ set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE
CACHE STRING "Flags used by the shared libraries linker during coverage builds."
FORCE )
mark_as_advanced(
+ CMAKE_Fortran_FLAGS_COVERAGE
CMAKE_CXX_FLAGS_COVERAGE
CMAKE_C_FLAGS_COVERAGE
CMAKE_EXE_LINKER_FLAGS_COVERAGE
@@ -154,7 +172,7 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
message(WARNING "Code coverage results with an optimised (non-Debug) build may be misleading")
endif() # NOT CMAKE_BUILD_TYPE STREQUAL "Debug"
-if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
link_libraries(gcov)
endif()
@@ -242,6 +260,7 @@ function(setup_target_for_coverage_lcov)
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
DEPENDS ${Coverage_DEPENDENCIES}
+ VERBATIM # Protect arguments to commands
COMMENT "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report."
)
@@ -304,9 +323,8 @@ function(setup_target_for_coverage_gcovr_xml)
# Combine excludes to several -e arguments
set(GCOVR_EXCLUDE_ARGS "")
foreach(EXCLUDE ${GCOVR_EXCLUDES})
- string(REPLACE "*" "\\*" EXCLUDE_REPLACED ${EXCLUDE})
list(APPEND GCOVR_EXCLUDE_ARGS "-e")
- list(APPEND GCOVR_EXCLUDE_ARGS "${EXCLUDE_REPLACED}")
+ list(APPEND GCOVR_EXCLUDE_ARGS "${EXCLUDE}")
endforeach()
add_custom_target(${Coverage_NAME}
@@ -321,6 +339,7 @@ function(setup_target_for_coverage_gcovr_xml)
BYPRODUCTS ${Coverage_NAME}.xml
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
DEPENDS ${Coverage_DEPENDENCIES}
+ VERBATIM # Protect arguments to commands
COMMENT "Running gcovr to produce Cobertura code coverage report."
)
@@ -376,9 +395,8 @@ function(setup_target_for_coverage_gcovr_html)
# Combine excludes to several -e arguments
set(GCOVR_EXCLUDE_ARGS "")
foreach(EXCLUDE ${GCOVR_EXCLUDES})
- string(REPLACE "*" "\\*" EXCLUDE_REPLACED ${EXCLUDE})
list(APPEND GCOVR_EXCLUDE_ARGS "-e")
- list(APPEND GCOVR_EXCLUDE_ARGS "${EXCLUDE_REPLACED}")
+ list(APPEND GCOVR_EXCLUDE_ARGS "${EXCLUDE}")
endforeach()
add_custom_target(${Coverage_NAME}
@@ -393,9 +411,11 @@ function(setup_target_for_coverage_gcovr_html)
-r ${BASEDIR} ${GCOVR_EXCLUDE_ARGS}
--object-directory=${PROJECT_BINARY_DIR}
-o ${Coverage_NAME}/index.html
+
BYPRODUCTS ${PROJECT_BINARY_DIR}/${Coverage_NAME} # report directory
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
DEPENDS ${Coverage_DEPENDENCIES}
+ VERBATIM # Protect arguments to commands
COMMENT "Running gcovr to produce HTML code coverage report."
)
@@ -410,5 +430,6 @@ endfunction() # setup_target_for_coverage_gcovr_html
function(append_coverage_compiler_flags)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
+ set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
message(STATUS "Appending code coverage compiler flags: ${COVERAGE_COMPILER_FLAGS}")
endfunction() # append_coverage_compiler_flags
diff --git a/cmake/Modules/FindUnitTest++.cmake b/cmake/Modules/FindUnitTest++.cmake
index 545f62a88..ce1bdc458 100644
--- a/cmake/Modules/FindUnitTest++.cmake
+++ b/cmake/Modules/FindUnitTest++.cmake
@@ -1,43 +1,59 @@
-# Locate UNITTEST
+# Locate UnitTest++
# This module defines
-# UNITTEST++_LIBRARY
-# UNITTEST++_FOUND, if false, do not try to link to gdal
-# UNITTEST++_INCLUDE_DIR, where to find the headers
-
-FIND_PATH(UNITTEST++_INCLUDE_DIR UnitTest++.h
- ${UNITTEST_DIR}/include/unittest++
- $ENV{UNITTEST_DIR}/include/unittest++
- $ENV{UNITTEST_DIR}/src
+# UnitTest++_FOUND, if successful
+# UnitTest++_LIBRARIES, the library path
+# UnitTest++_INCLUDE_DIRS, where to find the headers
+
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+ pkg_check_modules(PC_UnitTest QUIET UnitTest++)
+ set(UnitTest++_VERSION ${PC_UnitTest_VERSION})
+endif()
+
+
+FIND_PATH(UnitTest++_INCLUDE_DIRS UnitTest++.h
+ DOC
+ "Location of UnitTest++ header files"
+ PATH_SUFFIXES
+ unittest++
+ UnitTest++ # Fedora, Arch
+ unittest-cpp # openSUSE
+ HINTS
+ ${PC_UnitTest++_INCLUDEDIR}
+ ${PC_UnitTest++_INCLUDE_DIRS}
+ PATHS
+ ${UnitTest++_ROOT}
+ ${UNITTEST_DIR}
+ $ENV{UNITTEST_DIR}/src
$ENV{UNITTEST_DIR}
~/Library/Frameworks
/Library/Frameworks
- /usr/local/include
- /usr/include
- /usr/include/unittest++
- /usr/include/UnitTest++ # Fedora
- /usr/include/unittest-cpp # openSUSE
- /usr/local/include/UnitTest++/ # Arch
- /sw/include # Fink
- /opt/local/include # DarwinPorts
- /opt/local/include/UnitTest++
- /opt/csw/include # Blastwave
- /opt/include
+ /usr/local
+ /sw # Fink
+ /opt
+ /opt/local # DarwinPorts
+ /opt/csw # Blastwave
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment]/include
- /usr/freeware/include
+ /usr/freeware
)
-FIND_LIBRARY(UNITTEST++_LIBRARY
- NAMES unittest++ UnitTest++
- PATHS
- ${UNITTEST_DIR}/lib
- $ENV{UNITTEST_DIR}/lib
- $ENV{UNITTEST_DIR}/build
+FIND_LIBRARY(UnitTest++_LIBRARIES
+ NAMES unittest++ UnitTest++
+ DOC
+ "Location of UnitTest++ shared library"
+ HINTS
+ ${PC_UnitTest++_LIBDIR}
+ ${PC_UnitTest++_LIBRARY_DIRS}
+ PATHS
+ ${UnitTest++_ROOT}
+ ${UnitTest++_ROOT}/lib
+ ${UNITTEST_DIR}
$ENV{UNITTEST_DIR}
+ $ENV{UNITTEST_DIR}/lib
+ $ENV{UNITTEST_DIR}/build
~/Library/Frameworks
/Library/Frameworks
/usr/local/lib
- /usr/lib
- /usr/lib64/ # Fedora
/sw/lib
/opt/local/lib
/opt/csw/lib
@@ -46,13 +62,24 @@ FIND_LIBRARY(UNITTEST++_LIBRARY
/usr/freeware/lib64
)
-SET(UNITTEST++_FOUND "NO")
-IF(UNITTEST++_LIBRARY AND UNITTEST++_INCLUDE_DIR)
- SET(UNITTEST++_FOUND "YES")
-ENDIF(UNITTEST++_LIBRARY AND UNITTEST++_INCLUDE_DIR)
+if(UnitTest++_LIBRARIES AND UnitTest++_INCLUDE_DIRS)
+ set(UnitTest++_FOUND TRUE)
+endif()
include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set UNITTEST++_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(UNITTEST++ DEFAULT_MSG
- UNITTEST++_LIBRARY UNITTEST++_INCLUDE_DIR)
+find_package_handle_standard_args(UnitTest++
+ REQUIRED_VARS
+ UnitTest++_LIBRARIES
+ UnitTest++_INCLUDE_DIRS
+ VERSION_VAR
+ UnitTest++_VERSION
+)
+
+# Excessive backwards-compatibility paranoia
+set(UnitTest++_LIBRARY "${UnitTest++_LIBRARIES}" PARENT_SCOPE)
+set(UnitTest++_INCLUDE_DIR "${UnitTest++_INCLUDE_DIRS}" PARENT_SCOPE)
+# Even more excessive backwards-compatibility paranoia
+set(UNITTEST++_FOUND "${UnitTest++_FOUND}" PARENT_SCOPE)
+set(UNITTEST++_LIBRARY "${UnitTest++_LIBRARIES}" PARENT_SCOPE)
+set(UNITTEST++_INCLUDE_DIR "${UnitTest++_INCLUDE_DIRS}" PARENT_SCOPE)
+
diff --git a/codecov.yml b/codecov.yml
index dfdc93755..ee151daaf 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -9,7 +9,8 @@ coverage:
ignore:
- "/src/examples"
- "/src/Qt/demo"
- - "/thirdparty"
+ - "/thirdparty/jsoncpp/*.cpp"
+ - "/thirdparty/jsoncpp/json/*.h"
- "/doc"
- "/cmake"
- "/*.md"
diff --git a/doc/HW-ACCEL.md b/doc/HW-ACCEL.md
index cbcf5e63f..497ae2b9b 100644
--- a/doc/HW-ACCEL.md
+++ b/doc/HW-ACCEL.md
@@ -26,7 +26,7 @@ The following table summarizes our current level of support:
## Supported FFmpeg Versions
-* HW accel is supported from FFmpeg version 3.2 (3.3 for nVidia drivers)
+* HW accel is supported from FFmpeg version 3.4
* HW accel was removed for nVidia drivers in Ubuntu for FFmpeg 4+
**Notice:** The FFmpeg versions of Ubuntu and PPAs for Ubuntu show the
diff --git a/include/CacheBase.h b/include/CacheBase.h
index aad65a846..da72e5dbd 100644
--- a/include/CacheBase.h
+++ b/include/CacheBase.h
@@ -110,9 +110,9 @@ namespace openshot {
/// Get and Set JSON methods
virtual std::string Json() = 0; ///< Generate JSON string of this object
- virtual void SetJson(std::string value) = 0; ///< Load JSON string into this object
- virtual Json::Value JsonValue() = 0; ///< Generate Json::JsonValue for this object
- virtual void SetJsonValue(Json::Value root) = 0; ///< Load Json::JsonValue into this object
+ virtual void SetJson(const std::string value) = 0; ///< Load JSON string into this object
+ virtual Json::Value JsonValue() = 0; ///< Generate Json::Value for this object
+ virtual void SetJsonValue(const Json::Value root) = 0; ///< Load Json::Value into this object
virtual ~CacheBase() = default;
};
diff --git a/include/CacheDisk.h b/include/CacheDisk.h
index e69cc3578..09ebd4abc 100644
--- a/include/CacheDisk.h
+++ b/include/CacheDisk.h
@@ -129,9 +129,9 @@ namespace openshot {
/// Get and Set JSON methods
std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue(); ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
};
}
diff --git a/include/CacheMemory.h b/include/CacheMemory.h
index fb3c75f66..ba771cedf 100644
--- a/include/CacheMemory.h
+++ b/include/CacheMemory.h
@@ -111,9 +111,9 @@ namespace openshot {
/// Get and Set JSON methods
std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue(); ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
};
}
diff --git a/include/ChunkReader.h b/include/ChunkReader.h
index 9d99fcd47..4d72c31da 100644
--- a/include/ChunkReader.h
+++ b/include/ChunkReader.h
@@ -157,10 +157,10 @@ namespace openshot
std::string Name() { return "ChunkReader"; };
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Open the reader. This is required before you can access frames or data from the reader.
void Open();
diff --git a/include/Clip.h b/include/Clip.h
index 6fa02c9a1..68d4622a1 100644
--- a/include/Clip.h
+++ b/include/Clip.h
@@ -187,18 +187,18 @@ namespace openshot {
openshot::ReaderBase* Reader();
/// Override End() method
- float End(); ///< Get end position (in seconds) of clip (trim end of video), which can be affected by the time curve.
+ float End() const; ///< Get end position (in seconds) of clip (trim end of video), which can be affected by the time curve.
void End(float value) { end = value; } ///< Set end position (in seconds) of clip (trim end of video)
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
- std::string PropertiesJSON(int64_t requested_frame);
+ std::string PropertiesJSON(int64_t requested_frame) const override;
/// @brief Remove an effect from the clip
/// @param effect Remove an effect from the clip.
diff --git a/include/ClipBase.h b/include/ClipBase.h
index cf0d11fab..1f7f55c47 100644
--- a/include/ClipBase.h
+++ b/include/ClipBase.h
@@ -56,10 +56,10 @@ namespace openshot {
std::string previous_properties; ///< This string contains the previous JSON properties
/// Generate JSON for a property
- Json::Value add_property_json(std::string name, float value, std::string type, std::string memo, Keyframe* keyframe, float min_value, float max_value, bool readonly, int64_t requested_frame);
+ Json::Value add_property_json(std::string name, float value, std::string type, std::string memo, const Keyframe* keyframe, float min_value, float max_value, bool readonly, int64_t requested_frame) const;
/// Generate JSON choice for a property (dropdown properties)
- Json::Value add_property_choice_json(std::string name, int value, int selected_value);
+ Json::Value add_property_choice_json(std::string name, int value, int selected_value) const;
public:
@@ -73,12 +73,12 @@ namespace openshot {
bool operator>= ( ClipBase& a) { return (Position() >= a.Position()); }
/// Get basic properties
- std::string Id() { return id; } ///< Get the Id of this clip object
- float Position() { return position; } ///< Get position on timeline (in seconds)
- int Layer() { return layer; } ///< Get layer of clip on timeline (lower number is covered by higher numbers)
- float Start() { return start; } ///< Get start position (in seconds) of clip (trim start of video)
- float End() { return end; } ///< Get end position (in seconds) of clip (trim end of video)
- float Duration() { return end - start; } ///< Get the length of this clip (in seconds)
+ std::string Id() const { return id; } ///< Get the Id of this clip object
+ float Position() const { return position; } ///< Get position on timeline (in seconds)
+ int Layer() const { return layer; } ///< Get layer of clip on timeline (lower number is covered by higher numbers)
+ float Start() const { return start; } ///< Get start position (in seconds) of clip (trim start of video)
+ float End() const { return end; } ///< Get end position (in seconds) of clip (trim end of video)
+ float Duration() const { return end - start; } ///< Get the length of this clip (in seconds)
/// Set basic properties
void Id(std::string value) { id = value; } ///> Set the Id of this clip object
@@ -88,14 +88,14 @@ namespace openshot {
void End(float value) { end = value; } ///< Set end position (in seconds) of clip (trim end of video)
/// Get and Set JSON methods
- virtual std::string Json() = 0; ///< Generate JSON string of this object
- virtual void SetJson(std::string value) = 0; ///< Load JSON string into this object
- virtual Json::Value JsonValue() = 0; ///< Generate Json::JsonValue for this object
- virtual void SetJsonValue(Json::Value root) = 0; ///< Load Json::JsonValue into this object
+ virtual std::string Json() const = 0; ///< Generate JSON string of this object
+ virtual void SetJson(const std::string value) = 0; ///< Load JSON string into this object
+ virtual Json::Value JsonValue() const = 0; ///< Generate Json::Value for this object
+ virtual void SetJsonValue(const Json::Value root) = 0; ///< Load Json::Value into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
- virtual std::string PropertiesJSON(int64_t requested_frame) = 0;
+ virtual std::string PropertiesJSON(int64_t requested_frame) const = 0;
virtual ~ClipBase() = default;
};
diff --git a/include/Color.h b/include/Color.h
index 47db29a7f..2b4a6d771 100644
--- a/include/Color.h
+++ b/include/Color.h
@@ -69,10 +69,10 @@ namespace openshot {
static long GetDistance(long R1, long G1, long B1, long R2, long G2, long B2);
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJson(std::string value); ///< Load JSON string into this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const; ///< Generate JSON string of this object
+ Json::Value JsonValue() const; ///< Generate Json::Value for this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
};
diff --git a/include/Coordinate.h b/include/Coordinate.h
index 5bfd893a8..a4b9599d2 100644
--- a/include/Coordinate.h
+++ b/include/Coordinate.h
@@ -66,10 +66,10 @@ namespace openshot {
Coordinate(double x, double y);
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJson(std::string value); ///< Load JSON string into this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const; ///< Generate JSON string of this object
+ Json::Value JsonValue() const; ///< Generate Json::Value for this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
};
}
diff --git a/include/DecklinkReader.h b/include/DecklinkReader.h
index de077bdf8..d846cca90 100644
--- a/include/DecklinkReader.h
+++ b/include/DecklinkReader.h
@@ -118,10 +118,10 @@ namespace openshot
std::string Name() { return "DecklinkReader"; };
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Open device and video stream - which is called by the constructor automatically
void Open();
diff --git a/include/DummyReader.h b/include/DummyReader.h
index 0b40f0790..fd17bed1c 100644
--- a/include/DummyReader.h
+++ b/include/DummyReader.h
@@ -87,10 +87,10 @@ namespace openshot
std::string Name() { return "DummyReader"; };
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Open File - which is called by the constructor automatically
void Open();
diff --git a/include/EffectBase.h b/include/EffectBase.h
index f462526db..1f967a021 100644
--- a/include/EffectBase.h
+++ b/include/EffectBase.h
@@ -94,14 +94,14 @@ namespace openshot
void InitEffectInfo();
/// Get and Set JSON methods
- virtual std::string Json() = 0; ///< Generate JSON string of this object
- virtual void SetJson(std::string value) = 0; ///< Load JSON string into this object
- virtual Json::Value JsonValue() = 0; ///< Generate Json::JsonValue for this object
- virtual void SetJsonValue(Json::Value root) = 0; ///< Load Json::JsonValue into this object
- Json::Value JsonInfo(); ///< Generate JSON object of meta data / info
+ virtual std::string Json() const = 0; ///< Generate JSON string of this object
+ virtual void SetJson(const std::string value) = 0; ///< Load JSON string into this object
+ virtual Json::Value JsonValue() const = 0; ///< Generate Json::Value for this object
+ virtual void SetJsonValue(const Json::Value root) = 0; ///< Load Json::Value into this object
+ Json::Value JsonInfo() const; ///< Generate JSON object of meta data / info
/// Get the order that this effect should be executed.
- int Order() { return order; }
+ int Order() const { return order; }
/// Set the order that this effect should be executed.
void Order(int new_order) { order = new_order; }
diff --git a/include/EffectInfo.h b/include/EffectInfo.h
index 1015b0da7..0e64327bb 100644
--- a/include/EffectInfo.h
+++ b/include/EffectInfo.h
@@ -51,7 +51,7 @@ namespace openshot
/// JSON methods
static std::string Json(); ///< Generate JSON string of this object
- static Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
+ static Json::Value JsonValue(); ///< Generate Json::Value for this object
};
diff --git a/include/FFmpegReader.h b/include/FFmpegReader.h
index 9faa86a35..e9cee5793 100644
--- a/include/FFmpegReader.h
+++ b/include/FFmpegReader.h
@@ -76,11 +76,11 @@ namespace openshot {
*
* @code
* // Create a reader for a video
- * FFmpegReader r("MyAwesomeVideo.webm");
+ * openshot::FFmpegReader r("MyAwesomeVideo.webm");
* r.Open(); // Open the reader
*
* // Get frame number 1 from the video
- * std::shared_ptr f = r.GetFrame(1);
+ * std::shared_ptr f = r.GetFrame(1);
*
* // Now that we have an openshot::Frame object, lets have some fun!
* f->Display(); // Display the frame on the screen
@@ -98,7 +98,7 @@ namespace openshot {
AVFormatContext *pFormatCtx;
int i, videoStream, audioStream;
AVCodecContext *pCodecCtx, *aCodecCtx;
-#if (LIBAVFORMAT_VERSION_MAJOR >= 57)
+#if HAVE_HW_ACCEL
AVBufferRef *hw_device_ctx = NULL; //PM
#endif
AVStream *pStream, *aStream;
@@ -147,12 +147,11 @@ namespace openshot {
int64_t current_video_frame; // can't reliably use PTS of video to determine this
int hw_de_supported = 0; // Is set by FFmpegReader
-#if IS_FFMPEG_3_2
+#if HAVE_HW_ACCEL
AVPixelFormat hw_de_av_pix_fmt = AV_PIX_FMT_NONE;
AVHWDeviceType hw_de_av_device_type = AV_HWDEVICE_TYPE_NONE;
-#endif
-
int IsHardwareDecodeSupported(int codecid);
+#endif
/// Check for the correct frames per second value by scanning the 1st few seconds of video packets.
void CheckFPS();
@@ -265,10 +264,10 @@ namespace openshot {
std::string Name() { return "FFmpegReader"; };
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Open File - which is called by the constructor automatically
void Open();
diff --git a/include/FFmpegUtilities.h b/include/FFmpegUtilities.h
index c673305eb..62d64df17 100644
--- a/include/FFmpegUtilities.h
+++ b/include/FFmpegUtilities.h
@@ -40,6 +40,10 @@
#ifndef IS_FFMPEG_3_2
#define IS_FFMPEG_3_2 (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 64, 101))
#endif
+
+ #ifndef HAVE_HW_ACCEL
+ #define HAVE_HW_ACCEL (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 107, 100))
+ #endif
// Include the FFmpeg headers
extern "C" {
diff --git a/include/FFmpegWriter.h b/include/FFmpegWriter.h
index dc3a2cf7b..1dfb21a93 100644
--- a/include/FFmpegWriter.h
+++ b/include/FFmpegWriter.h
@@ -75,15 +75,19 @@ namespace openshot {
* @code SIMPLE EXAMPLE
*
* // Create a reader for a video
- * FFmpegReader r("MyAwesomeVideo.webm");
- * r.Open(); // Open thetarget_ reader
+ * openshot::FFmpegReader r("MyAwesomeVideo.webm");
+ * r.Open(); // Open the target reader
*
* // Create a writer (which will create a WebM video)
- * FFmpegWriter w("/home/jonathan/NewVideo.webm");
+ * openshot::FFmpegWriter w("/home/jonathan/NewVideo.webm");
*
* // Set options
- * w.SetAudioOptions(true, "libvorbis", 44100, 2, ChannelLayout::LAYOUT_STEREO, 128000); // Sample Rate: 44100, Channels: 2, Bitrate: 128000
- * w.SetVideoOptions(true, "libvpx", openshot::Fraction(24,1), 720, 480, openshot::Fraction(1,1), false, false, 300000); // FPS: 24, Size: 720x480, Pixel Ratio: 1/1, Bitrate: 300000
+ *
+ * // Sample Rate: 44100, Channels: 2, Bitrate: 128000
+ * w.SetAudioOptions(true, "libvorbis", 44100, 2, openshot::ChannelLayout::LAYOUT_STEREO, 128000);
+ *
+ * // FPS: 24, Size: 720x480, Pixel Ratio: 1/1, Bitrate: 300000
+ * w.SetVideoOptions(true, "libvpx", openshot::Fraction(24,1), 720, 480, openshot::Fraction(1,1), false, false, 300000);
*
* // Open the writer
* w.Open();
@@ -102,15 +106,19 @@ namespace openshot {
* @code ADVANCED WRITER EXAMPLE
*
* // Create a reader for a video
- * FFmpegReader r("MyAwesomeVideo.webm");
+ * openshot::FFmpegReader r("MyAwesomeVideo.webm");
* r.Open(); // Open the reader
*
* // Create a writer (which will create a WebM video)
- * FFmpegWriter w("/home/jonathan/NewVideo.webm");
+ * openshot::FFmpegWriter w("/home/jonathan/NewVideo.webm");
*
* // Set options
- * w.SetAudioOptions(true, "libvorbis", 44100, 2, ChannelLayout::LAYOUT_STEREO, 128000); // Sample Rate: 44100, Channels: 2, Bitrate: 128000
- * w.SetVideoOptions(true, "libvpx", openshot::Fraction(24,1), 720, 480, openshot::Fraction(1,1), false, false, 300000); // FPS: 24, Size: 720x480, Pixel Ratio: 1/1, Bitrate: 300000
+ *
+ * // Sample Rate: 44100, Channels: 2, Bitrate: 128000
+ * w.SetAudioOptions(true, "libvorbis", 44100, 2, openshot::ChannelLayout::LAYOUT_STEREO, 128000);
+ *
+ * // FPS: 24, Size: 720x480, Pixel Ratio: 1/1, Bitrate: 300000
+ * w.SetVideoOptions(true, "libvpx", openshot::Fraction(24,1), 720, 480, openshot::Fraction(1,1), false, false, 300000);
*
* // Prepare Streams (Optional method that must be called before any SetOption calls)
* w.PrepareStreams();
@@ -285,8 +293,21 @@ namespace openshot {
/// @param channels The number of audio channels needed in this file
/// @param channel_layout The 'layout' of audio channels (i.e. mono, stereo, surround, etc...)
/// @param bit_rate The audio bit rate used during encoding
+ ///
+ /// \note This is an overloaded function.
void SetAudioOptions(bool has_audio, std::string codec, int sample_rate, int channels, openshot::ChannelLayout channel_layout, int bit_rate);
+ /// @brief Set audio export options.
+ ///
+ /// Enables the stream and configures a default 2-channel stereo layout.
+ ///
+ /// @param codec The codec used to encode the audio for this file
+ /// @param sample_rate The number of audio samples needed in this file
+ /// @param bit_rate The audio bit rate used during encoding
+ ///
+ /// \note This is an overloaded function.
+ void SetAudioOptions(std::string codec, int sample_rate, int bit_rate);
+
/// @brief Set the cache size
/// @param new_size The number of frames to queue before writing to the file
void SetCacheSize(int new_size) { cache_size = new_size; };
@@ -301,10 +322,27 @@ namespace openshot {
/// @param interlaced Does this video need to be interlaced?
/// @param top_field_first Which frame should be used as the top field?
/// @param bit_rate The video bit rate used during encoding
+ ///
+ /// \note This is an overloaded function.
void SetVideoOptions(bool has_video, std::string codec, openshot::Fraction fps, int width, int height, openshot::Fraction pixel_ratio, bool interlaced, bool top_field_first, int bit_rate);
+ /// @brief Set video export options.
+ ///
+ /// Enables the stream and configures non-interlaced video with a 1:1 pixel aspect ratio.
+ ///
+ /// @param codec The codec used to encode the images in this video
+ /// @param width The width in pixels of this video
+ /// @param height The height in pixels of this video
+ /// @param fps The number of frames per second
+ /// @param bit_rate The video bit rate used during encoding
+ ///
+ /// \note This is an overloaded function.
+ /// \warning Observe the argument order, which is consistent with the openshot::Timeline constructor, but differs from the other signature.
+ void SetVideoOptions(std::string codec, int width, int height, openshot::Fraction fps, int bit_rate);
+
/// @brief Set custom options (some codecs accept additional params). This must be called after the
/// PrepareStreams() method, otherwise the streams have not been initialized yet.
+ ///
/// @param stream The stream (openshot::StreamType) this option should apply to
/// @param name The name of the option you want to set (i.e. qmin, qmax, etc...)
/// @param value The new value of this option
@@ -316,12 +354,16 @@ namespace openshot {
/// @brief Add a frame to the stack waiting to be encoded.
/// @param frame The openshot::Frame object to write to this image
+ ///
+ /// \note This is an overloaded function.
void WriteFrame(std::shared_ptr frame);
/// @brief Write a block of frames from a reader
/// @param reader A openshot::ReaderBase object which will provide frames to be written
/// @param start The starting frame number of the reader
/// @param length The number of frames to write
+ ///
+ /// \note This is an overloaded function.
void WriteFrame(openshot::ReaderBase *reader, int64_t start, int64_t length);
/// @brief Write the file trailer (after all frames are written). This is called automatically
diff --git a/include/FrameMapper.h b/include/FrameMapper.h
index f2b030a36..8be4ec1bd 100644
--- a/include/FrameMapper.h
+++ b/include/FrameMapper.h
@@ -199,10 +199,10 @@ namespace openshot
std::string Name() { return "FrameMapper"; };
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Open the internal reader
void Open();
diff --git a/include/ImageReader.h b/include/ImageReader.h
index 8da450eb7..bb19dd3dc 100644
--- a/include/ImageReader.h
+++ b/include/ImageReader.h
@@ -106,10 +106,10 @@ namespace openshot
std::string Name() { return "ImageReader"; };
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Open File - which is called by the constructor automatically
void Open();
diff --git a/include/Json.h b/include/Json.h
index 3a10ab744..0bdf6e2c3 100644
--- a/include/Json.h
+++ b/include/Json.h
@@ -31,6 +31,12 @@
#ifndef OPENSHOT_JSON_H
#define OPENSHOT_JSON_H
+#include
#include "json/json.h"
+#include "Exceptions.h"
+
+namespace openshot {
+ const Json::Value stringToJson(const std::string value);
+}
#endif
diff --git a/include/KeyFrame.h b/include/KeyFrame.h
index 6ed395530..ee58da8f0 100644
--- a/include/KeyFrame.h
+++ b/include/KeyFrame.h
@@ -133,9 +133,9 @@ namespace openshot {
/// Get and Set JSON methods
std::string Json() const; ///< Generate JSON string of this object
- Json::Value JsonValue() const; ///< Generate Json::JsonValue for this object
- void SetJson(std::string value); ///< Load JSON string into this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ Json::Value JsonValue() const; ///< Generate Json::Value for this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Remove a point by matching a coordinate
void RemovePoint(Point p);
diff --git a/include/Point.h b/include/Point.h
index 3fdcd9176..4941c5589 100644
--- a/include/Point.h
+++ b/include/Point.h
@@ -119,10 +119,10 @@ namespace openshot
void Initialize_RightHandle(float x, float y);
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJson(std::string value); ///< Load JSON string into this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const; ///< Generate JSON string of this object
+ Json::Value JsonValue() const; ///< Generate Json::Value for this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
};
diff --git a/include/Profiles.h b/include/Profiles.h
index bc5fe3e01..3b5ebd0d1 100644
--- a/include/Profiles.h
+++ b/include/Profiles.h
@@ -90,10 +90,10 @@ namespace openshot
Profile(std::string path);
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJson(std::string value); ///< Load JSON string into this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const; ///< Generate JSON string of this object
+ Json::Value JsonValue() const; ///< Generate Json::Value for this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
};
}
diff --git a/include/QtHtmlReader.h b/include/QtHtmlReader.h
index c102038c4..d7052d494 100644
--- a/include/QtHtmlReader.h
+++ b/include/QtHtmlReader.h
@@ -131,10 +131,10 @@ namespace openshot
std::string Name() { return "QtHtmlReader"; };
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Open Reader - which is called by the constructor automatically
void Open();
diff --git a/include/QtImageReader.h b/include/QtImageReader.h
index 3153e7a39..3e456e394 100644
--- a/include/QtImageReader.h
+++ b/include/QtImageReader.h
@@ -104,10 +104,10 @@ namespace openshot
std::string Name() { return "QtImageReader"; };
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Open File - which is called by the constructor automatically
void Open();
diff --git a/include/QtTextReader.h b/include/QtTextReader.h
index e6a8c84b8..d226e920c 100644
--- a/include/QtTextReader.h
+++ b/include/QtTextReader.h
@@ -142,10 +142,10 @@ namespace openshot
std::string Name() { return "QtTextReader"; };
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Open Reader - which is called by the constructor automatically
void Open();
diff --git a/include/ReaderBase.h b/include/ReaderBase.h
index 267693388..dfb9873d4 100644
--- a/include/ReaderBase.h
+++ b/include/ReaderBase.h
@@ -140,10 +140,10 @@ namespace openshot
virtual std::string Name() = 0;
/// Get and Set JSON methods
- virtual std::string Json() = 0; ///< Generate JSON string of this object
- virtual void SetJson(std::string value) = 0; ///< Load JSON string into this object
- virtual Json::Value JsonValue() = 0; ///< Generate Json::JsonValue for this object
- virtual void SetJsonValue(Json::Value root) = 0; ///< Load Json::JsonValue into this object
+ virtual std::string Json() const = 0; ///< Generate JSON string of this object
+ virtual void SetJson(const std::string value) = 0; ///< Load JSON string into this object
+ virtual Json::Value JsonValue() const = 0; ///< Generate Json::Value for this object
+ virtual void SetJsonValue(const Json::Value root) = 0; ///< Load Json::Value into this object
/// Open the reader (and start consuming resources, such as images or video files)
virtual void Open() = 0;
diff --git a/include/Settings.h b/include/Settings.h
index 0a2cfb99d..554e7c286 100644
--- a/include/Settings.h
+++ b/include/Settings.h
@@ -124,7 +124,11 @@ namespace openshot {
/// The audio device name to use during playback
std::string PLAYBACK_AUDIO_DEVICE_NAME = "";
- /// Whether to dump ZeroMQ debug messages to stderr
+ /// The current install path of OpenShot (needs to be set when using Timeline(path), since certain
+ /// paths depend on the location of OpenShot transitions and files)
+ std::string PATH_OPENSHOT_INSTALL = "";
+
+ /// Whether to dump ZeroMQ debug messages to stderr
bool DEBUG_TO_STDERR = false;
/// Create or get an instance of this logger singleton (invoke the class with this method)
diff --git a/include/TextReader.h b/include/TextReader.h
index 2d54fdc25..b6dbf5cd0 100644
--- a/include/TextReader.h
+++ b/include/TextReader.h
@@ -119,7 +119,7 @@ namespace openshot
TextReader(int width, int height, int x_offset, int y_offset, GravityType gravity, std::string text, std::string font, double size, std::string text_color, std::string background_color);
/// Draw a box under rendered text using the specified color.
- /// @param text_background_color The background color behind the text
+ /// @param color The background color behind the text
void SetTextBackgroundColor(std::string color);
/// Close Reader
@@ -142,10 +142,10 @@ namespace openshot
std::string Name() { return "TextReader"; };
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Open Reader - which is called by the constructor automatically
void Open();
diff --git a/include/Timeline.h b/include/Timeline.h
index 2ff03d919..56a895866 100644
--- a/include/Timeline.h
+++ b/include/Timeline.h
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
#include "CacheBase.h"
#include "CacheDisk.h"
#include "CacheMemory.h"
@@ -156,6 +157,7 @@ namespace openshot {
CacheBase *final_cache; /// allocated_frame_mappers; ///< all the frame mappers we allocated and must free
bool managed_cache; ///< Does this timeline instance manage the cache object
+ std::string path; ///< Optional path of loaded UTF-8 OpenShot JSON project file
/// Process a new layer of video or audio
void add_layer(std::shared_ptr new_frame, Clip* source_clip, int64_t clip_frame_number, int64_t timeline_frame_number, bool is_top_clip, float max_volume);
@@ -209,6 +211,11 @@ namespace openshot {
/// @param channel_layout The channel layout (i.e. mono, stereo, 3 point surround, etc...)
Timeline(int width, int height, Fraction fps, int sample_rate, int channels, ChannelLayout channel_layout);
+ /// @brief Constructor for the timeline (which loads a JSON structure from a file path, and initializes a timeline)
+ /// @param projectPath The path of the UTF-8 *.osp project file (JSON contents). Contents will be loaded automatically.
+ /// @param convert_absolute_paths Should all paths be converted to absolute paths (based on the folder of the path provided)
+ Timeline(std::string projectPath, bool convert_absolute_paths);
+
virtual ~Timeline();
/// @brief Add an openshot::Clip to the timeline
@@ -268,10 +275,10 @@ namespace openshot {
std::string Name() { return "Timeline"; };
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Set Max Image Size (used for performance optimization). Convenience function for setting
/// Settings::Instance()->MAX_WIDTH and Settings::Instance()->MAX_HEIGHT.
diff --git a/include/WriterBase.h b/include/WriterBase.h
index 503be6bfb..1b55c72b6 100644
--- a/include/WriterBase.h
+++ b/include/WriterBase.h
@@ -107,10 +107,10 @@ namespace openshot
virtual void WriteFrame(openshot::ReaderBase* reader, int64_t start, int64_t length) = 0;
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJson(std::string value); ///< Load JSON string into this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const; ///< Generate JSON string of this object
+ Json::Value JsonValue() const; ///< Generate Json::Value for this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Display file information in the standard output stream (stdout)
void DisplayInfo();
diff --git a/include/effects/Bars.h b/include/effects/Bars.h
index 43a77a2ff..fa9df6f80 100644
--- a/include/effects/Bars.h
+++ b/include/effects/Bars.h
@@ -89,14 +89,14 @@ namespace openshot
std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number);
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
- std::string PropertiesJSON(int64_t requested_frame);
+ std::string PropertiesJSON(int64_t requested_frame) const override;
};
}
diff --git a/include/effects/Blur.h b/include/effects/Blur.h
index 167e93032..c254b8cde 100644
--- a/include/effects/Blur.h
+++ b/include/effects/Blur.h
@@ -67,7 +67,6 @@ namespace openshot
void init_effect_details();
/// Internal blur methods (inspired and credited to http://blog.ivank.net/fastest-gaussian-blur.html)
- int* initBoxes(float sigma, int n);
void boxBlurH(unsigned char *scl, unsigned char *tcl, int w, int h, int r);
void boxBlurT(unsigned char *scl, unsigned char *tcl, int w, int h, int r);
@@ -102,14 +101,14 @@ namespace openshot
std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number);
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
- std::string PropertiesJSON(int64_t requested_frame);
+ std::string PropertiesJSON(int64_t requested_frame) const override;
};
}
diff --git a/include/effects/Brightness.h b/include/effects/Brightness.h
index 2a6ab9129..69f2cf343 100644
--- a/include/effects/Brightness.h
+++ b/include/effects/Brightness.h
@@ -89,14 +89,14 @@ namespace openshot
std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number);
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
- std::string PropertiesJSON(int64_t requested_frame);
+ std::string PropertiesJSON(int64_t requested_frame) const override;
};
}
diff --git a/include/effects/ChromaKey.h b/include/effects/ChromaKey.h
index d0fa31d84..dbc81e9cf 100644
--- a/include/effects/ChromaKey.h
+++ b/include/effects/ChromaKey.h
@@ -86,13 +86,13 @@ namespace openshot
std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number);
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
// Get all properties for a specific frame
- std::string PropertiesJSON(int64_t requested_frame);
+ std::string PropertiesJSON(int64_t requested_frame) const override;
};
}
diff --git a/include/effects/ColorShift.h b/include/effects/ColorShift.h
index e9c11d68e..ada2acd68 100644
--- a/include/effects/ColorShift.h
+++ b/include/effects/ColorShift.h
@@ -93,14 +93,14 @@ namespace openshot
std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number);
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
- std::string PropertiesJSON(int64_t requested_frame);
+ std::string PropertiesJSON(int64_t requested_frame) const override;
};
}
diff --git a/include/effects/Crop.h b/include/effects/Crop.h
index 34cea89f5..2d4a2b2ee 100644
--- a/include/effects/Crop.h
+++ b/include/effects/Crop.h
@@ -88,14 +88,14 @@ namespace openshot
std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number);
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
- std::string PropertiesJSON(int64_t requested_frame);
+ std::string PropertiesJSON(int64_t requested_frame) const override;
};
}
diff --git a/include/effects/Deinterlace.h b/include/effects/Deinterlace.h
index b411b0230..eff7b2fe7 100644
--- a/include/effects/Deinterlace.h
+++ b/include/effects/Deinterlace.h
@@ -82,13 +82,13 @@ namespace openshot
std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number);
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
// Get all properties for a specific frame
- std::string PropertiesJSON(int64_t requested_frame);
+ std::string PropertiesJSON(int64_t requested_frame) const override;
};
}
diff --git a/include/effects/Hue.h b/include/effects/Hue.h
index 4670b6bff..9d86d5c2b 100644
--- a/include/effects/Hue.h
+++ b/include/effects/Hue.h
@@ -79,14 +79,14 @@ namespace openshot
std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number);
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
- std::string PropertiesJSON(int64_t requested_frame);
+ std::string PropertiesJSON(int64_t requested_frame) const override;
};
}
diff --git a/include/effects/Mask.h b/include/effects/Mask.h
index dba3b2d89..390ffa361 100644
--- a/include/effects/Mask.h
+++ b/include/effects/Mask.h
@@ -101,14 +101,14 @@ namespace openshot
std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number);
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
- std::string PropertiesJSON(int64_t requested_frame);
+ std::string PropertiesJSON(int64_t requested_frame) const override;
/// Get the reader object of the mask grayscale image
ReaderBase* Reader() { return reader; };
diff --git a/include/effects/Negate.h b/include/effects/Negate.h
index 3cbc7988d..6206a6607 100644
--- a/include/effects/Negate.h
+++ b/include/effects/Negate.h
@@ -70,13 +70,13 @@ namespace openshot
std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number);
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
// Get all properties for a specific frame
- std::string PropertiesJSON(int64_t requested_frame);
+ std::string PropertiesJSON(int64_t requested_frame) const override;
};
}
diff --git a/include/effects/Pixelate.h b/include/effects/Pixelate.h
index 3146d456c..9348ce863 100644
--- a/include/effects/Pixelate.h
+++ b/include/effects/Pixelate.h
@@ -88,14 +88,14 @@ namespace openshot
std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number);
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
- std::string PropertiesJSON(int64_t requested_frame);
+ std::string PropertiesJSON(int64_t requested_frame) const override;
};
}
diff --git a/include/effects/Saturation.h b/include/effects/Saturation.h
index de3cc7714..e8d0d9409 100644
--- a/include/effects/Saturation.h
+++ b/include/effects/Saturation.h
@@ -86,14 +86,14 @@ namespace openshot
std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number);
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
- std::string PropertiesJSON(int64_t requested_frame);
+ std::string PropertiesJSON(int64_t requested_frame) const override;
};
}
diff --git a/include/effects/Shift.h b/include/effects/Shift.h
index 243e442eb..765da7555 100644
--- a/include/effects/Shift.h
+++ b/include/effects/Shift.h
@@ -82,14 +82,14 @@ namespace openshot
std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number);
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
- std::string PropertiesJSON(int64_t requested_frame);
+ std::string PropertiesJSON(int64_t requested_frame) const override;
};
}
diff --git a/include/effects/Wave.h b/include/effects/Wave.h
index 62b08d1fa..ad516bde3 100644
--- a/include/effects/Wave.h
+++ b/include/effects/Wave.h
@@ -88,14 +88,14 @@ namespace openshot
std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number);
/// Get and Set JSON methods
- std::string Json(); ///< Generate JSON string of this object
- void SetJson(std::string value); ///< Load JSON string into this object
- Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
- void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
+ std::string Json() const override; ///< Generate JSON string of this object
+ void SetJson(const std::string value); ///< Load JSON string into this object
+ Json::Value JsonValue() const override; ///< Generate Json::Value for this object
+ void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object
/// Get all properties for a specific frame (perfect for a UI to display the current state
/// of all properties at any time)
- std::string PropertiesJSON(int64_t requested_frame);
+ std::string PropertiesJSON(int64_t requested_frame) const override;
};
}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 619d78ed6..a57780b0d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,25 +27,25 @@
# Collect and display summary of options/dependencies
include(FeatureSummary)
-# Automatically process Qt classes with meta-object compiler
-set(CMAKE_AUTOMOC True)
+include(GNUInstallDirs)
################ WINDOWS ##################
# Set some compiler options for Windows
# required for libopenshot-audio headers
-IF (WIN32)
+if (WIN32)
add_definitions( -DIGNORE_JUCE_HYPOT=1 )
- SET(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -include cmath")
-ENDIF(WIN32)
-IF (APPLE)
+ set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -include cmath")
+endif()
+
+if (APPLE)
# If you still get errors compiling with GCC 4.8, mac headers need to be patched: http://hamelot.co.uk/programming/osx-gcc-dispatch_block_t-has-not-been-declared-invalid-typedef/
- SET_PROPERTY(GLOBAL PROPERTY JUCE_MAC "JUCE_MAC")
- ADD_DEFINITIONS(-DNDEBUG)
- SET(EXTENSION "mm")
+ set_property(GLOBAL PROPERTY JUCE_MAC "JUCE_MAC")
+ add_definitions(-DNDEBUG)
+ set(EXTENSION "mm")
- SET(JUCE_PLATFORM_SPECIFIC_DIR build/macosx/platform_specific_code)
- SET(JUCE_PLATFORM_SPECIFIC_LIBRARIES "-framework Carbon -framework Cocoa -framework CoreFoundation -framework CoreAudio -framework CoreMidi -framework IOKit -framework AGL -framework AudioToolbox -framework QuartzCore -lobjc -framework Accelerate")
-ENDIF(APPLE)
+ set(JUCE_PLATFORM_SPECIFIC_DIR build/macosx/platform_specific_code)
+ set(JUCE_PLATFORM_SPECIFIC_LIBRARIES "-framework Carbon -framework Cocoa -framework CoreFoundation -framework CoreAudio -framework CoreMidi -framework IOKit -framework AGL -framework AudioToolbox -framework QuartzCore -lobjc -framework Accelerate")
+endif()
################ IMAGE MAGICK ##################
# Set the Quantum Depth that ImageMagick was built with (default to 16 bits)
@@ -66,39 +66,40 @@ ELSE (OPENSHOT_IMAGEMAGICK_COMPATIBILITY)
ENDIF (OPENSHOT_IMAGEMAGICK_COMPATIBILITY)
# Find the ImageMagick++ library
-FIND_PACKAGE(ImageMagick COMPONENTS Magick++ MagickWand MagickCore)
-IF (ImageMagick_FOUND)
+find_package(ImageMagick COMPONENTS Magick++ MagickWand MagickCore)
+if (ImageMagick_FOUND)
# Include ImageMagick++ headers (needed for compile)
include_directories(${ImageMagick_INCLUDE_DIRS})
# define a global var (used in the C++)
add_definitions( -DUSE_IMAGEMAGICK=1 )
- SET(CMAKE_SWIG_FLAGS "-DUSE_IMAGEMAGICK=1")
+ set(CMAKE_SWIG_FLAGS "-DUSE_IMAGEMAGICK=1")
-ENDIF (ImageMagick_FOUND)
+endif()
################# LIBOPENSHOT-AUDIO ###################
# Find JUCE-based openshot Audio libraries
-FIND_PACKAGE(OpenShotAudio 0.1.9 REQUIRED)
+find_package(OpenShotAudio 0.2.0 REQUIRED)
# Include Juce headers (needed for compile)
include_directories(${LIBOPENSHOT_AUDIO_INCLUDE_DIRS})
################# BLACKMAGIC DECKLINK ###################
# Find BlackMagic DeckLinkAPI libraries
-IF (ENABLE_BLACKMAGIC)
- FIND_PACKAGE(BlackMagic)
+if (ENABLE_BLACKMAGIC)
- IF (BLACKMAGIC_FOUND)
+ find_package(BlackMagic)
+
+ if (BLACKMAGIC_FOUND)
# Include Blackmagic headers (needed for compile)
include_directories(${BLACKMAGIC_INCLUDE_DIR})
# define a global var (used in the C++)
add_definitions( -DUSE_BLACKMAGIC=1 )
- SET(CMAKE_SWIG_FLAGS "-DUSE_BLACKMAGIC=1")
+ set(CMAKE_SWIG_FLAGS "-DUSE_BLACKMAGIC=1")
+ endif()
- ENDIF (BLACKMAGIC_FOUND)
-ENDIF (ENABLE_BLACKMAGIC)
+endif()
############### PROFILING #################
#set(PROFILER "/usr/lib/libprofiler.so.0.3.2")
@@ -150,6 +151,7 @@ set(OPENSHOT_SOURCES
Fraction.cpp
Frame.cpp
FrameMapper.cpp
+ Json.cpp
KeyFrame.cpp
OpenShotVersion.cpp
ZmqLogger.cpp
@@ -190,30 +192,30 @@ set(QT_PLAYER_SOURCES
Qt/VideoRenderer.cpp
Qt/VideoRenderWidget.cpp)
-
-# Get list of headers
-file(GLOB_RECURSE headers ${CMAKE_SOURCE_DIR}/include/*.h)
+# Get list of MOC'able headers
+file(GLOB_RECURSE OPENSHOT_QT_HEADERS ${CMAKE_SOURCE_DIR}/include/Qt/*.h)
# Disable RPATH
-SET(CMAKE_MACOSX_RPATH 0)
+set(CMAKE_MACOSX_RPATH 0)
############### CREATE LIBRARY #################
# Create shared openshot library
add_library(openshot SHARED)
-target_sources(openshot
- PRIVATE
- ${OPENSHOT_SOURCES} ${EFFECTS_SOURCES} ${QT_PLAYER_SOURCES}
- PUBLIC
- ${headers})
+target_sources(openshot PRIVATE
+ ${OPENSHOT_SOURCES}
+ ${EFFECTS_SOURCES}
+ ${QT_PLAYER_SOURCES}
+ ${OPENSHOT_QT_HEADERS}
+ )
# Set SONAME and other library properties
-set_target_properties(openshot
- PROPERTIES
- VERSION ${PROJECT_VERSION}
- SOVERSION ${PROJECT_SO_VERSION}
- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
- )
+set_target_properties(openshot PROPERTIES
+ AUTOMOC ON
+ VERSION ${PROJECT_VERSION}
+ SOVERSION ${PROJECT_SO_VERSION}
+ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
+ )
# Add optional ImageMagic-dependent sources
if(ImageMagick_FOUND)
@@ -294,7 +296,7 @@ endforeach()
################### FFMPEG #####################
# Find FFmpeg libraries (used for video encoding / decoding)
-FIND_PACKAGE(FFmpeg REQUIRED COMPONENTS avcodec avdevice avformat avutil swscale)
+find_package(FFmpeg REQUIRED COMPONENTS avcodec avdevice avformat avutil swscale)
foreach(ff_comp avcodec avdevice avformat avfilter avutil postproc swscale swresample avresample)
if(TARGET FFmpeg::${ff_comp})
@@ -390,9 +392,9 @@ add_executable(openshot-example examples/Example.cpp)
# Define path to test input files
SET(TEST_MEDIA_PATH "${PROJECT_SOURCE_DIR}/src/examples/")
-IF (WIN32)
+if (WIN32)
STRING(REPLACE "/" "\\\\" TEST_MEDIA_PATH TEST_MEDIA_PATH)
-ENDIF(WIN32)
+endif()
target_compile_definitions(openshot-example PRIVATE
-DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" )
@@ -410,42 +412,40 @@ add_executable(openshot-player Qt/demo/main.cpp)
target_link_libraries(openshot-player openshot)
############### TEST BLACKMAGIC CAPTURE APP ################
-IF (BLACKMAGIC_FOUND)
+if (BLACKMAGIC_FOUND)
# Create test executable
add_executable(openshot-blackmagic
examples/ExampleBlackmagic.cpp)
# Link test executable to the new library
target_link_libraries(openshot-blackmagic openshot)
-ENDIF (BLACKMAGIC_FOUND)
+endif()
############### INCLUDE SWIG BINDINGS ################
add_subdirectory(bindings)
############### INSTALL HEADERS & LIBRARY ################
-set(LIB_INSTALL_DIR lib${LIB_SUFFIX}) # determine correct lib folder
# Install primary library
-INSTALL(TARGETS openshot
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- RUNTIME DESTINATION ${LIB_INSTALL_DIR}
- COMPONENT library )
+install(TARGETS openshot
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/libopenshot
- FILES_MATCHING PATTERN "*.h")
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libopenshot
+ FILES_MATCHING PATTERN "*.h")
############### CPACK PACKAGING ##############
-IF(MINGW)
- SET(CPACK_GENERATOR "NSIS")
-ENDIF(MINGW)
-IF(UNIX AND NOT APPLE)
- SET(CPACK_GENERATOR "DEB")
-ENDIF(UNIX AND NOT APPLE)
-#IF(UNIX AND APPLE)
-# SET(CPACK_GENERATOR "DragNDrop")
-#ENDIF(UNIX AND APPLE)
-SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Jonathan Thomas") #required
-
-INCLUDE(CPack)
+if(MINGW)
+ set(CPACK_GENERATOR "NSIS")
+endif()
+if(UNIX AND NOT APPLE)
+ set(CPACK_GENERATOR "DEB")
+endif()
+#if(UNIX AND APPLE)
+# set(CPACK_GENERATOR "DragNDrop")
+#endif()
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Jonathan Thomas") #required
+
+include(CPack)
diff --git a/src/CacheBase.cpp b/src/CacheBase.cpp
index 4599d5ca5..bc57f3f45 100644
--- a/src/CacheBase.cpp
+++ b/src/CacheBase.cpp
@@ -53,7 +53,7 @@ void CacheBase::SetMaxBytesFromInfo(int64_t number_of_frames, int width, int hei
SetMaxBytes(bytes);
}
-// Generate Json::JsonValue for this object
+// Generate Json::Value for this object
Json::Value CacheBase::JsonValue() {
// Create root json object
@@ -66,8 +66,8 @@ Json::Value CacheBase::JsonValue() {
return root;
}
-// Load Json::JsonValue into this object
-void CacheBase::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void CacheBase::SetJsonValue(const Json::Value root) {
// Set data from Json (if key is found)
if (!root["max_bytes"].isNull())
diff --git a/src/CacheDisk.cpp b/src/CacheDisk.cpp
index 3f8bf37ed..9f67ce994 100644
--- a/src/CacheDisk.cpp
+++ b/src/CacheDisk.cpp
@@ -114,12 +114,8 @@ void CacheDisk::CalculateRanges() {
// Add JSON object with start/end attributes
// Use strings, since int64_ts are supported in JSON
- std::stringstream start_str;
- start_str << starting_frame;
- std::stringstream end_str;
- end_str << ending_frame;
- range["start"] = start_str.str();
- range["end"] = end_str.str();
+ range["start"] = std::to_string(starting_frame);
+ range["end"] = std::to_string(ending_frame);
ranges.append(range);
// Set new starting range
@@ -135,12 +131,8 @@ void CacheDisk::CalculateRanges() {
// Add JSON object with start/end attributes
// Use strings, since int64_ts are supported in JSON
- std::stringstream start_str;
- start_str << starting_frame;
- std::stringstream end_str;
- end_str << ending_frame;
- range["start"] = start_str.str();
- range["end"] = end_str.str();
+ range["start"] = std::to_string(starting_frame);
+ range["end"] = std::to_string(ending_frame);
ranges.append(range);
// Cache range JSON as string
@@ -469,7 +461,7 @@ std::string CacheDisk::Json() {
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
+// Generate Json::Value for this object
Json::Value CacheDisk::JsonValue() {
// Process range data (if anything has changed)
@@ -486,41 +478,23 @@ Json::Value CacheDisk::JsonValue() {
root["version"] = range_version_str.str();
// Parse and append range data (if any)
- Json::Value ranges;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( json_ranges.c_str(),
- json_ranges.c_str() + json_ranges.size(), &ranges, &errors );
- delete reader;
-
- if (success)
+ // Parse and append range data (if any)
+ try {
+ const Json::Value ranges = openshot::stringToJson(json_ranges);
root["ranges"] = ranges;
+ } catch (...) { }
// return JsonValue
return root;
}
// Load JSON string into this object
-void CacheDisk::SetJson(std::string value) {
+void CacheDisk::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -531,8 +505,8 @@ void CacheDisk::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void CacheDisk::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void CacheDisk::SetJsonValue(const Json::Value root) {
// Close timeline before we do anything (this also removes all open and closing clips)
Clear();
diff --git a/src/CacheMemory.cpp b/src/CacheMemory.cpp
index 0b2d9ab8a..70feef03d 100644
--- a/src/CacheMemory.cpp
+++ b/src/CacheMemory.cpp
@@ -92,12 +92,8 @@ void CacheMemory::CalculateRanges() {
// Add JSON object with start/end attributes
// Use strings, since int64_ts are supported in JSON
- std::stringstream start_str;
- start_str << starting_frame;
- std::stringstream end_str;
- end_str << ending_frame;
- range["start"] = start_str.str();
- range["end"] = end_str.str();
+ range["start"] = std::to_string(starting_frame);
+ range["end"] = std::to_string(ending_frame);
ranges.append(range);
// Set new starting range
@@ -113,12 +109,8 @@ void CacheMemory::CalculateRanges() {
// Add JSON object with start/end attributes
// Use strings, since int64_ts are not supported in JSON
- std::stringstream start_str;
- start_str << starting_frame;
- std::stringstream end_str;
- end_str << ending_frame;
- range["start"] = start_str.str();
- range["end"] = end_str.str();
+ range["start"] = std::to_string(starting_frame);
+ range["end"] = std::to_string(ending_frame);
ranges.append(range);
// Cache range JSON as string
@@ -327,7 +319,7 @@ std::string CacheMemory::Json() {
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
+// Generate Json::Value for this object
Json::Value CacheMemory::JsonValue() {
// Process range data (if anything has changed)
@@ -337,45 +329,25 @@ Json::Value CacheMemory::JsonValue() {
Json::Value root = CacheBase::JsonValue(); // get parent properties
root["type"] = cache_type;
- std::stringstream range_version_str;
- range_version_str << range_version;
- root["version"] = range_version_str.str();
+ root["version"] = std::to_string(range_version);
// Parse and append range data (if any)
- Json::Value ranges;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( json_ranges.c_str(),
- json_ranges.c_str() + json_ranges.size(), &ranges, &errors );
- delete reader;
-
- if (success)
+ try {
+ const Json::Value ranges = openshot::stringToJson(json_ranges);
root["ranges"] = ranges;
+ } catch (...) { }
// return JsonValue
return root;
}
// Load JSON string into this object
-void CacheMemory::SetJson(std::string value) {
-
- // Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
+void CacheMemory::SetJson(const std::string value) {
try
{
+ // Parse string to Json::Value
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -386,8 +358,8 @@ void CacheMemory::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void CacheMemory::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void CacheMemory::SetJsonValue(const Json::Value root) {
// Close timeline before we do anything (this also removes all open and closing clips)
Clear();
diff --git a/src/ChunkReader.cpp b/src/ChunkReader.cpp
index 7321cb268..c194ce33a 100644
--- a/src/ChunkReader.cpp
+++ b/src/ChunkReader.cpp
@@ -256,14 +256,14 @@ std::shared_ptr ChunkReader::GetFrame(int64_t requested_frame)
}
// Generate JSON string of this object
-std::string ChunkReader::Json() {
+std::string ChunkReader::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value ChunkReader::JsonValue() {
+// Generate Json::Value for this object
+Json::Value ChunkReader::JsonValue() const {
// Create root json object
Json::Value root = ReaderBase::JsonValue(); // get parent properties
@@ -279,23 +279,11 @@ Json::Value ChunkReader::JsonValue() {
}
// Load JSON string into this object
-void ChunkReader::SetJson(std::string value) {
-
- // Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
+void ChunkReader::SetJson(const std::string value) {
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -306,8 +294,8 @@ void ChunkReader::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void ChunkReader::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void ChunkReader::SetJsonValue(const Json::Value root) {
// Set parent data
ReaderBase::SetJsonValue(root);
diff --git a/src/Clip.cpp b/src/Clip.cpp
index ef6b98525..1968bb3b1 100644
--- a/src/Clip.cpp
+++ b/src/Clip.cpp
@@ -38,6 +38,7 @@
#include "../include/QtImageReader.h"
#include "../include/ChunkReader.h"
#include "../include/DummyReader.h"
+#include "../include/Timeline.h"
using namespace openshot;
@@ -159,7 +160,7 @@ Clip::Clip(std::string path) : resampler(NULL), audio_cache(NULL), reader(NULL),
// Get file extension (and convert to lower case)
std::string ext = get_file_extension(path);
- transform(ext.begin(), ext.end(), ext.begin(), ::tolower);
+ std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower);
// Determine if common video formats
if (ext=="avi" || ext=="mov" || ext=="mkv" || ext=="mpg" || ext=="mpeg" || ext=="mp3" || ext=="mp4" || ext=="mts" ||
@@ -172,6 +173,16 @@ Clip::Clip(std::string path) : resampler(NULL), audio_cache(NULL), reader(NULL),
} catch(...) { }
}
+ if (ext=="osp")
+ {
+ try
+ {
+ // Open common video format
+ reader = new Timeline(path, true);
+
+ } catch(...) { }
+ }
+
// If no video found, try each reader
if (!reader)
@@ -270,7 +281,7 @@ void Clip::Close()
}
// Get end position of clip (trim end of video), which can be affected by the time curve.
-float Clip::End()
+float Clip::End() const
{
// if a time curve is present, use its length
if (time.GetCount() > 1)
@@ -319,12 +330,10 @@ std::shared_ptr Clip::GetFrame(int64_t requested_frame)
// Now that we have re-mapped what frame number is needed, go and get the frame pointer
std::shared_ptr original_frame;
- #pragma omp critical (Clip_GetFrame)
original_frame = GetOrCreateFrame(new_frame_number);
// Create a new frame
std::shared_ptr frame(new Frame(new_frame_number, 1, 1, "#000000", original_frame->GetAudioSamplesCount(), original_frame->GetAudioChannelsCount()));
- #pragma omp critical (Clip_GetFrame)
{
frame->SampleRate(original_frame->SampleRate());
frame->ChannelsLayout(original_frame->ChannelsLayout());
@@ -645,14 +654,14 @@ std::shared_ptr Clip::GetOrCreateFrame(int64_t number)
}
// Generate JSON string of this object
-std::string Clip::Json() {
+std::string Clip::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
// Get all properties for a specific frame
-std::string Clip::PropertiesJSON(int64_t requested_frame) {
+std::string Clip::PropertiesJSON(int64_t requested_frame) const {
// Generate JSON properties list
Json::Value root;
@@ -739,8 +748,8 @@ std::string Clip::PropertiesJSON(int64_t requested_frame) {
return root.toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value Clip::JsonValue() {
+// Generate Json::Value for this object
+Json::Value Clip::JsonValue() const {
// Create root json object
Json::Value root = ClipBase::JsonValue(); // get parent properties
@@ -789,30 +798,20 @@ Json::Value Clip::JsonValue() {
if (reader)
root["reader"] = reader->JsonValue();
+ else
+ root["reader"] = Json::Value(Json::objectValue);
// return JsonValue
return root;
}
// Load JSON string into this object
-void Clip::SetJson(std::string value) {
+void Clip::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -823,8 +822,8 @@ void Clip::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void Clip::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void Clip::SetJsonValue(const Json::Value root) {
// Set parent data
ClipBase::SetJsonValue(root);
@@ -976,6 +975,12 @@ void Clip::SetJsonValue(Json::Value root) {
// Create new reader
reader = new DummyReader();
reader->SetJsonValue(root["reader"]);
+
+ } else if (type == "Timeline") {
+
+ // Create new reader (always load from file again)
+ // This prevents FrameMappers from being loaded on accident
+ reader = new Timeline(root["reader"]["path"].asString(), true);
}
// mark as managed reader and set parent
diff --git a/src/ClipBase.cpp b/src/ClipBase.cpp
index d1370205b..a51c65735 100644
--- a/src/ClipBase.cpp
+++ b/src/ClipBase.cpp
@@ -32,8 +32,8 @@
using namespace openshot;
-// Generate Json::JsonValue for this object
-Json::Value ClipBase::JsonValue() {
+// Generate Json::Value for this object
+Json::Value ClipBase::JsonValue() const {
// Create root json object
Json::Value root;
@@ -48,8 +48,8 @@ Json::Value ClipBase::JsonValue() {
return root;
}
-// Load Json::JsonValue into this object
-void ClipBase::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void ClipBase::SetJsonValue(const Json::Value root) {
// Set data from Json (if key is found)
if (!root["id"].isNull())
@@ -65,10 +65,10 @@ void ClipBase::SetJsonValue(Json::Value root) {
}
// Generate JSON for a property
-Json::Value ClipBase::add_property_json(std::string name, float value, std::string type, std::string memo, Keyframe* keyframe, float min_value, float max_value, bool readonly, int64_t requested_frame) {
+Json::Value ClipBase::add_property_json(std::string name, float value, std::string type, std::string memo, const Keyframe* keyframe, float min_value, float max_value, bool readonly, int64_t requested_frame) const {
// Requested Point
- Point requested_point(requested_frame, requested_frame);
+ const Point requested_point(requested_frame, requested_frame);
// Create JSON Object
Json::Value prop = Json::Value(Json::objectValue);
@@ -101,7 +101,7 @@ Json::Value ClipBase::add_property_json(std::string name, float value, std::stri
return prop;
}
-Json::Value ClipBase::add_property_choice_json(std::string name, int value, int selected_value) {
+Json::Value ClipBase::add_property_choice_json(std::string name, int value, int selected_value) const {
// Create choice
Json::Value new_choice = Json::Value(Json::objectValue);
diff --git a/src/Color.cpp b/src/Color.cpp
index 927fc1624..705ece4a1 100644
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -85,14 +85,14 @@ long Color::GetDistance(long R1, long G1, long B1, long R2, long G2, long B2)
}
// Generate JSON string of this object
-std::string Color::Json() {
+std::string Color::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value Color::JsonValue() {
+// Generate Json::Value for this object
+Json::Value Color::JsonValue() const {
// Create root json object
Json::Value root;
@@ -106,24 +106,12 @@ Json::Value Color::JsonValue() {
}
// Load JSON string into this object
-void Color::SetJson(std::string value) {
+void Color::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -134,8 +122,8 @@ void Color::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void Color::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void Color::SetJsonValue(const Json::Value root) {
// Set data from Json (if key is found)
if (!root["red"].isNull())
diff --git a/src/Coordinate.cpp b/src/Coordinate.cpp
index a0bdabcc3..f87fb7a0e 100644
--- a/src/Coordinate.cpp
+++ b/src/Coordinate.cpp
@@ -45,14 +45,14 @@ Coordinate::Coordinate(double x, double y) :
// Generate JSON string of this object
-std::string Coordinate::Json() {
+std::string Coordinate::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value Coordinate::JsonValue() {
+// Generate Json::Value for this object
+Json::Value Coordinate::JsonValue() const {
// Create root json object
Json::Value root;
@@ -69,24 +69,12 @@ Json::Value Coordinate::JsonValue() {
}
// Load JSON string into this object
-void Coordinate::SetJson(std::string value) {
+void Coordinate::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -97,8 +85,8 @@ void Coordinate::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void Coordinate::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void Coordinate::SetJsonValue(const Json::Value root) {
// Set data from Json (if key is found)
if (!root["X"].isNull())
diff --git a/src/DecklinkReader.cpp b/src/DecklinkReader.cpp
index 35ed18578..14c2f87ca 100644
--- a/src/DecklinkReader.cpp
+++ b/src/DecklinkReader.cpp
@@ -246,14 +246,14 @@ std::shared_ptr DecklinkReader::GetFrame(int64_t requested_frame)
// Generate JSON string of this object
-std::string DecklinkReader::Json() {
+std::string DecklinkReader::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value DecklinkReader::JsonValue() {
+// Generate Json::Value for this object
+Json::Value DecklinkReader::JsonValue() const {
// Create root json object
Json::Value root = ReaderBase::JsonValue(); // get parent properties
@@ -264,24 +264,12 @@ Json::Value DecklinkReader::JsonValue() {
}
// Load JSON string into this object
-void DecklinkReader::SetJson(std::string value) {
+void DecklinkReader::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -292,8 +280,8 @@ void DecklinkReader::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void DecklinkReader::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void DecklinkReader::SetJsonValue(const Json::Value root) {
// Set parent data
ReaderBase::SetJsonValue(root);
diff --git a/src/DummyReader.cpp b/src/DummyReader.cpp
index 997a020ae..8fd98bcbc 100644
--- a/src/DummyReader.cpp
+++ b/src/DummyReader.cpp
@@ -124,14 +124,14 @@ std::shared_ptr DummyReader::GetFrame(int64_t requested_frame)
}
// Generate JSON string of this object
-std::string DummyReader::Json() {
+std::string DummyReader::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value DummyReader::JsonValue() {
+// Generate Json::Value for this object
+Json::Value DummyReader::JsonValue() const {
// Create root json object
Json::Value root = ReaderBase::JsonValue(); // get parent properties
@@ -142,24 +142,12 @@ Json::Value DummyReader::JsonValue() {
}
// Load JSON string into this object
-void DummyReader::SetJson(std::string value) {
+void DummyReader::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -170,8 +158,8 @@ void DummyReader::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void DummyReader::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void DummyReader::SetJsonValue(const Json::Value root) {
// Set parent data
ReaderBase::SetJsonValue(root);
diff --git a/src/EffectBase.cpp b/src/EffectBase.cpp
index e4a9e0ab2..05ed97c2a 100644
--- a/src/EffectBase.cpp
+++ b/src/EffectBase.cpp
@@ -74,14 +74,14 @@ int EffectBase::constrain(int color_value)
}
// Generate JSON string of this object
-std::string EffectBase::Json() {
+std::string EffectBase::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value EffectBase::JsonValue() {
+// Generate Json::Value for this object
+Json::Value EffectBase::JsonValue() const {
// Create root json object
Json::Value root = ClipBase::JsonValue(); // get parent properties
@@ -97,24 +97,12 @@ Json::Value EffectBase::JsonValue() {
}
// Load JSON string into this object
-void EffectBase::SetJson(std::string value) {
+void EffectBase::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -125,8 +113,8 @@ void EffectBase::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void EffectBase::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void EffectBase::SetJsonValue(const Json::Value root) {
// Set parent data
ClipBase::SetJsonValue(root);
@@ -136,8 +124,8 @@ void EffectBase::SetJsonValue(Json::Value root) {
Order(root["order"].asInt());
}
-// Generate Json::JsonValue for this object
-Json::Value EffectBase::JsonInfo() {
+// Generate Json::Value for this object
+Json::Value EffectBase::JsonInfo() const {
// Create root json object
Json::Value root;
diff --git a/src/EffectInfo.cpp b/src/EffectInfo.cpp
index 8fb8a4fe4..6829f4eb5 100644
--- a/src/EffectInfo.cpp
+++ b/src/EffectInfo.cpp
@@ -56,7 +56,7 @@ EffectBase* EffectInfo::CreateEffect(std::string effect_type) {
else if (effect_type == "ChromaKey")
return new ChromaKey();
- else if (effect_type == "Color Shift")
+ else if (effect_type == "ColorShift")
return new ColorShift();
else if (effect_type == "Crop")
@@ -88,7 +88,7 @@ EffectBase* EffectInfo::CreateEffect(std::string effect_type) {
return NULL;
}
-// Generate Json::JsonValue for this object
+// Generate Json::Value for this object
Json::Value EffectInfo::JsonValue() {
// Create root json object
diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp
index 2bd5c53f6..2b03994be 100644
--- a/src/FFmpegReader.cpp
+++ b/src/FFmpegReader.cpp
@@ -35,13 +35,13 @@
#define ENABLE_VAAPI 0
-#if IS_FFMPEG_3_2
+#if HAVE_HW_ACCEL
#pragma message "You are compiling with experimental hardware decode"
#else
#pragma message "You are compiling only with software decode"
#endif
-#if IS_FFMPEG_3_2
+#if HAVE_HW_ACCEL
#define MAX_SUPPORTED_WIDTH 1950
#define MAX_SUPPORTED_HEIGHT 1100
@@ -71,14 +71,14 @@ typedef struct VAAPIDecodeContext {
enum AVPixelFormat surface_format;
int surface_count;
} VAAPIDecodeContext;
-#endif
-#endif
+#endif // ENABLE_VAAPI
+#endif // HAVE_HW_ACCEL
using namespace openshot;
int hw_de_on = 0;
-#if IS_FFMPEG_3_2
+#if HAVE_HW_ACCEL
AVPixelFormat hw_de_av_pix_fmt_global = AV_PIX_FMT_NONE;
AVHWDeviceType hw_de_av_device_type_global = AV_HWDEVICE_TYPE_NONE;
#endif
@@ -153,7 +153,7 @@ bool AudioLocation::is_near(AudioLocation location, int samples_per_frame, int64
return false;
}
-#if IS_FFMPEG_3_2
+#if HAVE_HW_ACCEL
// Get hardware pix format
static enum AVPixelFormat get_hw_dec_format(AVCodecContext *ctx, const enum AVPixelFormat *pix_fmts)
@@ -234,7 +234,7 @@ int FFmpegReader::IsHardwareDecodeSupported(int codecid)
}
return ret;
}
-#endif
+#endif // HAVE_HW_ACCEL
void FFmpegReader::Open() {
// Open reader if not already open
@@ -287,7 +287,7 @@ void FFmpegReader::Open() {
// If hw accel is selected but hardware cannot handle repeat with software decoding
do {
pCodecCtx = AV_GET_CODEC_CONTEXT(pStream, pCodec);
-#if IS_FFMPEG_3_2
+#if HAVE_HW_ACCEL
if (hw_de_on && (retry_decode_open==2)) {
// Up to here no decision is made if hardware or software decode
hw_de_supported = IsHardwareDecodeSupported(pCodecCtx->codec_id);
@@ -304,7 +304,7 @@ void FFmpegReader::Open() {
// Init options
av_dict_set(&opts, "strict", "experimental", 0);
-#if IS_FFMPEG_3_2
+#if HAVE_HW_ACCEL
if (hw_de_on && hw_de_supported) {
// Open Hardware Acceleration
int i_decoder_hw = 0;
@@ -433,13 +433,13 @@ void FFmpegReader::Open() {
throw InvalidCodec("Hardware device create failed.", path);
}
}
-#endif
+#endif // HAVE_HW_ACCEL
// Open video codec
if (avcodec_open2(pCodecCtx, pCodec, &opts) < 0)
throw InvalidCodec("A video codec was found, but could not be opened.", path);
-#if IS_FFMPEG_3_2
+#if HAVE_HW_ACCEL
if (hw_de_on && hw_de_supported) {
AVHWFramesConstraints *constraints = NULL;
void *hwconfig = NULL;
@@ -449,7 +449,7 @@ void FFmpegReader::Open() {
#if ENABLE_VAAPI
((AVVAAPIHWConfig *)hwconfig)->config_id = ((VAAPIDecodeContext *)(pCodecCtx->priv_data))->va_config;
constraints = av_hwdevice_get_hwframe_constraints(hw_device_ctx,hwconfig);
-#endif
+#endif // ENABLE_VAAPI
if (constraints) {
if (pCodecCtx->coded_width < constraints->min_width ||
pCodecCtx->coded_height < constraints->min_height ||
@@ -506,7 +506,7 @@ void FFmpegReader::Open() {
}
#else
retry_decode_open = 0;
-#endif
+#endif // HAVE_HW_ACCEL
} while (retry_decode_open); // retry_decode_open
// Free options
av_dict_free(&opts);
@@ -592,14 +592,14 @@ void FFmpegReader::Close() {
if (info.has_video) {
avcodec_flush_buffers(pCodecCtx);
AV_FREE_CONTEXT(pCodecCtx);
-#if IS_FFMPEG_3_2
+#if HAVE_HW_ACCEL
if (hw_de_on) {
if (hw_device_ctx) {
av_buffer_unref(&hw_device_ctx);
hw_device_ctx = NULL;
}
}
-#endif
+#endif // HAVE_HW_ACCEL
}
if (info.has_audio) {
avcodec_flush_buffers(aCodecCtx);
@@ -1100,19 +1100,22 @@ bool FFmpegReader::GetAVFrame() {
ret = avcodec_send_packet(pCodecCtx, packet);
+ #if HAVE_HW_ACCEL
// Get the format from the variables set in get_hw_dec_format
hw_de_av_pix_fmt = hw_de_av_pix_fmt_global;
hw_de_av_device_type = hw_de_av_device_type_global;
-
+ #endif // HAVE_HW_ACCEL
if (ret < 0 || ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) {
ZmqLogger::Instance()->AppendDebugMethod("FFmpegReader::GetAVFrame (Packet not sent)");
}
else {
AVFrame *next_frame2;
+ #if HAVE_HW_ACCEL
if (hw_de_on && hw_de_supported) {
next_frame2 = AV_ALLOCATE_FRAME();
}
else
+ #endif // HAVE_HW_ACCEL
{
next_frame2 = next_frame;
}
@@ -1125,6 +1128,7 @@ bool FFmpegReader::GetAVFrame() {
if (ret != 0) {
ZmqLogger::Instance()->AppendDebugMethod("FFmpegReader::GetAVFrame (invalid return frame received)");
}
+ #if HAVE_HW_ACCEL
if (hw_de_on && hw_de_supported) {
int err;
if (next_frame2->format == hw_de_av_pix_fmt) {
@@ -1138,6 +1142,7 @@ bool FFmpegReader::GetAVFrame() {
}
}
else
+ #endif // HAVE_HW_ACCEL
{ // No hardware acceleration used -> no copy from GPU memory needed
next_frame = next_frame2;
}
@@ -1151,9 +1156,11 @@ bool FFmpegReader::GetAVFrame() {
(AVPixelFormat)(pStream->codecpar->format), info.width, info.height);
}
}
+ #if HAVE_HW_ACCEL
if (hw_de_on && hw_de_supported) {
AV_FREE_FRAME(&next_frame2);
}
+ #endif // HAVE_HW_ACCEL
}
#else
avcodec_decode_video2(pCodecCtx, next_frame, &frameFinished, packet);
@@ -1169,7 +1176,7 @@ bool FFmpegReader::GetAVFrame() {
av_picture_copy((AVPicture *) pFrame, (AVPicture *) next_frame, pCodecCtx->pix_fmt, info.width,
info.height);
}
-#endif
+#endif // IS_FFMPEG_3_2
}
// deallocate the frame
@@ -2086,7 +2093,7 @@ bool FFmpegReader::CheckMissingFrame(int64_t requested_frame) {
// CPU time looking for missing images for all the audio-only frames.
if (checked_frames[requested_frame] > 8 && !missing_video_frames.count(requested_frame) &&
!processing_audio_frames.count(requested_frame) && processed_audio_frames.count(requested_frame) &&
- last_frame && last_video_frame->has_image_data && aCodecId == AV_CODEC_ID_MP3 && (vCodecId == AV_CODEC_ID_MJPEGB || vCodecId == AV_CODEC_ID_MJPEG)) {
+ last_frame && last_video_frame && last_video_frame->has_image_data && aCodecId == AV_CODEC_ID_MP3 && (vCodecId == AV_CODEC_ID_MJPEGB || vCodecId == AV_CODEC_ID_MJPEG)) {
missing_video_frames.insert(std::pair(requested_frame, last_video_frame->number));
missing_video_frames_source.insert(std::pair(last_video_frame->number, requested_frame));
missing_frames.Add(last_video_frame);
@@ -2427,14 +2434,14 @@ int64_t FFmpegReader::GetSmallestAudioFrame() {
}
// Generate JSON string of this object
-std::string FFmpegReader::Json() {
+std::string FFmpegReader::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value FFmpegReader::JsonValue() {
+// Generate Json::Value for this object
+Json::Value FFmpegReader::JsonValue() const {
// Create root json object
Json::Value root = ReaderBase::JsonValue(); // get parent properties
@@ -2446,23 +2453,11 @@ Json::Value FFmpegReader::JsonValue() {
}
// Load JSON string into this object
-void FFmpegReader::SetJson(std::string value) {
+void FFmpegReader::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse(value.c_str(), value.c_str() + value.size(),
- &root, &errors);
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try {
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -2472,8 +2467,8 @@ void FFmpegReader::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void FFmpegReader::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void FFmpegReader::SetJsonValue(const Json::Value root) {
// Set parent data
ReaderBase::SetJsonValue(root);
diff --git a/src/FFmpegWriter.cpp b/src/FFmpegWriter.cpp
index 245bd9bd6..e6a1d180a 100644
--- a/src/FFmpegWriter.cpp
+++ b/src/FFmpegWriter.cpp
@@ -35,7 +35,7 @@
using namespace openshot;
-#if IS_FFMPEG_3_2
+#if HAVE_HW_ACCEL
#pragma message "You are compiling with experimental hardware encode"
#else
#pragma message "You are compiling only with software encode"
@@ -44,7 +44,7 @@ using namespace openshot;
// Multiplexer parameters temporary storage
AVDictionary *mux_dict = NULL;
-#if IS_FFMPEG_3_2
+#if HAVE_HW_ACCEL
int hw_en_on = 1; // Is set in UI
int hw_en_supported = 0; // Is set by FFmpegWriter
AVPixelFormat hw_en_av_pix_fmt = AV_PIX_FMT_NONE;
@@ -81,7 +81,7 @@ static int set_hwframe_ctx(AVCodecContext *ctx, AVBufferRef *hw_device_ctx, int6
av_buffer_unref(&hw_frames_ref);
return err;
}
-#endif
+#endif // HAVE_HW_ACCEL
FFmpegWriter::FFmpegWriter(std::string path) :
path(path), fmt(NULL), oc(NULL), audio_st(NULL), video_st(NULL), audio_pts(0), video_pts(0), samples(NULL),
@@ -171,7 +171,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std::string codec, Fraction f
if (codec.length() > 0) {
AVCodec *new_codec;
// Check if the codec selected is a hardware accelerated codec
-#if IS_FFMPEG_3_2
+#if HAVE_HW_ACCEL
#if defined(__linux__)
if (strstr(codec.c_str(), "_vaapi") != NULL) {
new_codec = avcodec_find_encoder_by_name(codec.c_str());
@@ -225,7 +225,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std::string codec, Fraction f
#endif //__linux__
#else // not ffmpeg 3
new_codec = avcodec_find_encoder_by_name(codec.c_str());
-#endif //IS_FFMPEG_3_2
+#endif // HAVE_HW_ACCEL
if (new_codec == NULL)
throw InvalidCodec("A valid video codec could not be found for this file.", path);
else {
@@ -277,6 +277,14 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std::string codec, Fraction f
info.has_video = has_video;
}
+// Set video export options (overloaded function)
+void FFmpegWriter::SetVideoOptions(std::string codec, int width, int height, Fraction fps, int bit_rate) {
+ // Call full signature with some default parameters
+ FFmpegWriter::SetVideoOptions(true, codec, fps, width, height,
+ openshot::Fraction(1, 1), false, true, bit_rate);
+}
+
+
// Set audio export options
void FFmpegWriter::SetAudioOptions(bool has_audio, std::string codec, int sample_rate, int channels, ChannelLayout channel_layout, int bit_rate) {
// Set audio options
@@ -312,6 +320,15 @@ void FFmpegWriter::SetAudioOptions(bool has_audio, std::string codec, int sample
info.has_audio = has_audio;
}
+
+// Set audio export options (overloaded function)
+void FFmpegWriter::SetAudioOptions(std::string codec, int sample_rate, int bit_rate) {
+ // Call full signature with some default parameters
+ FFmpegWriter::SetAudioOptions(true, codec, sample_rate, 2,
+ openshot::LAYOUT_STEREO, bit_rate);
+}
+
+
// Set custom options (some codecs accept additional params)
void FFmpegWriter::SetOption(StreamType stream, std::string name, std::string value) {
// Declare codec context
@@ -392,11 +409,11 @@ void FFmpegWriter::SetOption(StreamType stream, std::string name, std::string va
// This might be better in an extra methods as more options
// and way to set quality are possible
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 39, 101)
- #if IS_FFMPEG_3_2
+ #if HAVE_HW_ACCEL
if (hw_en_on) {
av_opt_set_int(c->priv_data, "qp", std::min(std::stoi(value),63), 0); // 0-63
} else
- #endif
+ #endif // HAVE_HW_ACCEL
{
switch (c->codec_id) {
#if (LIBAVCODEC_VERSION_MAJOR >= 58)
@@ -442,7 +459,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::string name, std::string va
// This might be better in an extra methods as more options
// and way to set quality are possible
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 39, 101)
-#if IS_FFMPEG_3_2
+#if HAVE_HW_ACCEL
if (hw_en_on) {
double mbs = 15000000.0;
if (info.video_bit_rate > 0) {
@@ -455,7 +472,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::string name, std::string va
}
c->bit_rate = (int)(mbs);
} else
-#endif
+#endif // HAVE_HW_ACCEL
{
switch (c->codec_id) {
#if (LIBAVCODEC_VERSION_MAJOR >= 58)
@@ -955,16 +972,14 @@ void FFmpegWriter::flush_encoders() {
// Close the video codec
void FFmpegWriter::close_video(AVFormatContext *oc, AVStream *st)
{
-#if IS_FFMPEG_3_2
- // #if defined(__linux__)
- if (hw_en_on && hw_en_supported) {
- if (hw_device_ctx) {
- av_buffer_unref(&hw_device_ctx);
- hw_device_ctx = NULL;
- }
+#if HAVE_HW_ACCEL
+ if (hw_en_on && hw_en_supported) {
+ if (hw_device_ctx) {
+ av_buffer_unref(&hw_device_ctx);
+ hw_device_ctx = NULL;
}
- // #endif
-#endif
+ }
+#endif // HAVE_HW_ACCEL
}
// Close the audio codec
@@ -1342,7 +1357,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVStream *st) {
// Set number of threads equal to number of processors (not to exceed 16)
video_codec->thread_count = std::min(FF_NUM_PROCESSORS, 16);
-#if IS_FFMPEG_3_2
+#if HAVE_HW_ACCEL
if (hw_en_on && hw_en_supported) {
//char *dev_hw = NULL;
char adapter[256];
@@ -1385,7 +1400,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVStream *st) {
throw InvalidCodec("Could not create hwdevice", path);
}
}
-#endif
+#endif // HAVE_HW_ACCEL
/* find the video encoder */
codec = avcodec_find_encoder_by_name(info.vcodec.c_str());
@@ -1402,7 +1417,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVStream *st) {
AVDictionary *opts = NULL;
av_dict_set(&opts, "strict", "experimental", 0);
-#if IS_FFMPEG_3_2
+#if HAVE_HW_ACCEL
if (hw_en_on && hw_en_supported) {
video_codec->pix_fmt = hw_en_av_pix_fmt;
@@ -1451,7 +1466,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVStream *st) {
"width", info.width, "height", info.height, av_err2str(err), -1);
}
}
-#endif
+#endif // HAVE_HW_ACCEL
/* open the codec */
if (avcodec_open2(video_codec, codec, &opts) < 0)
@@ -1900,14 +1915,17 @@ void FFmpegWriter::process_video_packet(std::shared_ptr frame) {
frame_source = allocate_avframe(PIX_FMT_RGBA, source_image_width, source_image_height, &bytes_source, (uint8_t *) pixels);
#if IS_FFMPEG_3_2
AVFrame *frame_final;
+ #if HAVE_HW_ACCEL
if (hw_en_on && hw_en_supported) {
frame_final = allocate_avframe(AV_PIX_FMT_NV12, info.width, info.height, &bytes_final, NULL);
- } else {
+ } else
+ #endif // HAVE_HW_ACCEL
+ {
frame_final = allocate_avframe((AVPixelFormat)(video_st->codecpar->format), info.width, info.height, &bytes_final, NULL);
}
#else
AVFrame *frame_final = allocate_avframe(video_codec->pix_fmt, info.width, info.height, &bytes_final, NULL);
-#endif
+#endif // IS_FFMPEG_3_2
// Fill with data
AV_COPY_PICTURE_DATA(frame_source, (uint8_t *) pixels, PIX_FMT_RGBA, source_image_width, source_image_height);
@@ -1977,7 +1995,7 @@ bool FFmpegWriter::write_video_packet(std::shared_ptr frame, AVFrame *fra
// Assign the initial AVFrame PTS from the frame counter
frame_final->pts = write_video_count;
-#if IS_FFMPEG_3_2
+#if HAVE_HW_ACCEL
if (hw_en_on && hw_en_supported) {
if (!(hw_frame = av_frame_alloc())) {
fprintf(stderr, "Error code: av_hwframe_alloc\n");
@@ -1994,7 +2012,7 @@ bool FFmpegWriter::write_video_packet(std::shared_ptr frame, AVFrame *fra
}
av_frame_copy_props(hw_frame, frame_final);
}
-#endif
+#endif // HAVE_HW_ACCEL
/* encode the image */
int got_packet_ptr = 0;
int error_code = 0;
@@ -2003,9 +2021,12 @@ bool FFmpegWriter::write_video_packet(std::shared_ptr frame, AVFrame *fra
int frameFinished = 0;
int ret;
+ #if HAVE_HW_ACCEL
if (hw_en_on && hw_en_supported) {
ret = avcodec_send_frame(video_codec, hw_frame); //hw_frame!!!
- } else {
+ } else
+ #endif // HAVE_HW_ACCEL
+ {
ret = avcodec_send_frame(video_codec, frame_final);
}
error_code = ret;
@@ -2062,8 +2083,8 @@ bool FFmpegWriter::write_video_packet(std::shared_ptr frame, AVFrame *fra
// got data back (so encode this frame)
got_packet_ptr = 1;
}
-#endif
-#endif
+#endif // LIBAVFORMAT_VERSION_MAJOR >= 54
+#endif // IS_FFMPEG_3_2
/* if zero size, it means the image was buffered */
if (error_code == 0 && got_packet_ptr) {
@@ -2095,14 +2116,14 @@ bool FFmpegWriter::write_video_packet(std::shared_ptr frame, AVFrame *fra
// Deallocate packet
AV_FREE_PACKET(&pkt);
-#if IS_FFMPEG_3_2
+#if HAVE_HW_ACCEL
if (hw_en_on && hw_en_supported) {
if (hw_frame) {
av_frame_free(&hw_frame);
hw_frame = NULL;
}
}
-#endif
+#endif // HAVE_HW_ACCEL
}
// Success
@@ -2125,11 +2146,11 @@ void FFmpegWriter::InitScalers(int source_width, int source_height) {
// Init software rescalers vector (many of them, one for each thread)
for (int x = 0; x < num_of_rescalers; x++) {
// Init the software scaler from FFMpeg
-#if IS_FFMPEG_3_2
+#if HAVE_HW_ACCEL
if (hw_en_on && hw_en_supported) {
img_convert_ctx = sws_getContext(source_width, source_height, PIX_FMT_RGBA, info.width, info.height, AV_PIX_FMT_NV12, scale_mode, NULL, NULL, NULL);
} else
-#endif
+#endif // HAVE_HW_ACCEL
{
img_convert_ctx = sws_getContext(source_width, source_height, PIX_FMT_RGBA, info.width, info.height, AV_GET_CODEC_PIXEL_FORMAT(video_st, video_st->codec), scale_mode,
NULL, NULL, NULL);
diff --git a/src/Frame.cpp b/src/Frame.cpp
index 8a843aa81..9577a7f9e 100644
--- a/src/Frame.cpp
+++ b/src/Frame.cpp
@@ -581,7 +581,7 @@ void Frame::Save(std::string path, float scale, std::string format, int quality)
std::shared_ptr previewImage = GetImage();
// scale image if needed
- if (abs(scale) > 1.001 || abs(scale) < 0.999)
+ if (fabs(scale) > 1.001 || fabs(scale) < 0.999)
{
int new_width = width;
int new_height = height;
@@ -818,16 +818,23 @@ void Frame::AddImage(std::shared_ptr new_image, bool only_odd_lines)
// Ignore image of different sizes or formats
bool ret=false;
#pragma omp critical (AddImage)
- if (image == new_image || image->size() != image->size() || image->format() != image->format())
- ret=true;
- if (ret)
+ {
+ if (image == new_image || image->size() != new_image->size()) {
+ ret = true;
+ }
+ else if (new_image->format() != image->format()) {
+ new_image = std::shared_ptr(new QImage(new_image->convertToFormat(image->format())));
+ }
+ }
+ if (ret) {
return;
-
+ }
+
// Get the frame's image
const GenericScopedLock lock(addingImageSection);
#pragma omp critical (AddImage)
{
- const unsigned char *pixels = image->constBits();
+ unsigned char *pixels = image->bits();
const unsigned char *new_pixels = new_image->constBits();
// Loop through the scanlines of the image (even or odd)
@@ -836,13 +843,13 @@ void Frame::AddImage(std::shared_ptr new_image, bool only_odd_lines)
start = 1;
for (int row = start; row < image->height(); row += 2) {
- memcpy((unsigned char *) pixels, new_pixels + (row * image->bytesPerLine()), image->bytesPerLine());
- new_pixels += image->bytesPerLine();
+ int offset = row * image->bytesPerLine();
+ memcpy(pixels + offset, new_pixels + offset, image->bytesPerLine());
}
// Update height and width
- width = image->width();
height = image->height();
+ width = image->width();
has_image_data = true;
}
}
diff --git a/src/FrameMapper.cpp b/src/FrameMapper.cpp
index 6ace84002..7c4d04bb4 100644
--- a/src/FrameMapper.cpp
+++ b/src/FrameMapper.cpp
@@ -675,14 +675,14 @@ void FrameMapper::Close()
// Generate JSON string of this object
-std::string FrameMapper::Json() {
+std::string FrameMapper::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value FrameMapper::JsonValue() {
+// Generate Json::Value for this object
+Json::Value FrameMapper::JsonValue() const {
// Create root json object
Json::Value root = ReaderBase::JsonValue(); // get parent properties
@@ -693,24 +693,12 @@ Json::Value FrameMapper::JsonValue() {
}
// Load JSON string into this object
-void FrameMapper::SetJson(std::string value) {
+void FrameMapper::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -721,8 +709,8 @@ void FrameMapper::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void FrameMapper::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void FrameMapper::SetJsonValue(const Json::Value root) {
// Set parent data
ReaderBase::SetJsonValue(root);
diff --git a/src/ImageReader.cpp b/src/ImageReader.cpp
index ad871f1f7..9ce3a70ff 100644
--- a/src/ImageReader.cpp
+++ b/src/ImageReader.cpp
@@ -136,14 +136,14 @@ std::shared_ptr ImageReader::GetFrame(int64_t requested_frame)
}
// Generate JSON string of this object
-std::string ImageReader::Json() {
+std::string ImageReader::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value ImageReader::JsonValue() {
+// Generate Json::Value for this object
+Json::Value ImageReader::JsonValue() const {
// Create root json object
Json::Value root = ReaderBase::JsonValue(); // get parent properties
@@ -155,24 +155,12 @@ Json::Value ImageReader::JsonValue() {
}
// Load JSON string into this object
-void ImageReader::SetJson(std::string value) {
+void ImageReader::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -183,8 +171,8 @@ void ImageReader::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void ImageReader::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void ImageReader::SetJsonValue(const Json::Value root) {
// Set parent data
ReaderBase::SetJsonValue(root);
diff --git a/src/Json.cpp b/src/Json.cpp
new file mode 100644
index 000000000..0c83d9d62
--- /dev/null
+++ b/src/Json.cpp
@@ -0,0 +1,50 @@
+/**
+ * @file
+ * @brief Helper functions for Json parsing
+ * @author FeRD (Frank Dana)
+ *
+ * @ref License
+ */
+
+/* LICENSE
+ *
+ * Copyright (c) 2008-2019 OpenShot Studios, LLC
+ * . This file is part of
+ * OpenShot Library (libopenshot), an open-source project dedicated to
+ * delivering high quality video editing and animation solutions to the
+ * world. For more information visit .
+ *
+ * OpenShot Library (libopenshot) is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * OpenShot Library (libopenshot) is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with OpenShot Library. If not, see .
+ */
+
+#include "../include/Json.h"
+
+const Json::Value openshot::stringToJson(const std::string value) {
+
+ // Parse JSON string into JSON objects
+ Json::Value root;
+ Json::CharReaderBuilder rbuilder;
+ Json::CharReader* reader(rbuilder.newCharReader());
+
+ std::string errors;
+ bool success = reader->parse( value.c_str(), value.c_str() + value.size(),
+ &root, &errors );
+ delete reader;
+
+ if (!success)
+ // Raise exception
+ throw openshot::InvalidJSON("JSON could not be parsed (or is invalid)");
+
+ return root;
+}
diff --git a/src/KeyFrame.cpp b/src/KeyFrame.cpp
index c54bc7d44..57e424cf7 100644
--- a/src/KeyFrame.cpp
+++ b/src/KeyFrame.cpp
@@ -71,7 +71,7 @@ namespace {
}
double const x = p0.X * B[0] + p1.X * B[1] + p2.X * B[2] + p3.X * B[3];
double const y = p0.Y * B[0] + p1.Y * B[1] + p2.Y * B[2] + p3.Y * B[3];
- if (abs(target - x) < allowed_error) {
+ if (fabs(target - x) < allowed_error) {
return y;
}
if (x > target) {
@@ -325,15 +325,15 @@ std::string Keyframe::Json() const {
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
+// Generate Json::Value for this object
Json::Value Keyframe::JsonValue() const {
// Create root json object
Json::Value root;
root["Points"] = Json::Value(Json::arrayValue);
- // loop through points, and find a matching coordinate
- for (auto existing_point : Points) {
+ // loop through points
+ for (const auto existing_point : Points) {
root["Points"].append(existing_point.JsonValue());
}
@@ -342,24 +342,12 @@ Json::Value Keyframe::JsonValue() const {
}
// Load JSON string into this object
-void Keyframe::SetJson(std::string value) {
+void Keyframe::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -370,8 +358,8 @@ void Keyframe::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void Keyframe::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void Keyframe::SetJsonValue(const Json::Value root) {
// Clear existing points
Points.clear();
diff --git a/src/Point.cpp b/src/Point.cpp
index 52e7ffbe0..136799778 100644
--- a/src/Point.cpp
+++ b/src/Point.cpp
@@ -108,14 +108,14 @@ void Point::Initialize_RightHandle(float x, float y) {
}
// Generate JSON string of this object
-std::string Point::Json() {
+std::string Point::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value Point::JsonValue() {
+// Generate Json::Value for this object
+Json::Value Point::JsonValue() const {
// Create root json object
Json::Value root;
@@ -132,24 +132,12 @@ Json::Value Point::JsonValue() {
}
// Load JSON string into this object
-void Point::SetJson(std::string value) {
+void Point::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -160,8 +148,8 @@ void Point::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void Point::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void Point::SetJsonValue(const Json::Value root) {
if (!root["co"].isNull())
co.SetJsonValue(root["co"]); // update coordinate
diff --git a/src/Profiles.cpp b/src/Profiles.cpp
index e7c547717..5351520e9 100644
--- a/src/Profiles.cpp
+++ b/src/Profiles.cpp
@@ -133,14 +133,14 @@ Profile::Profile(std::string path) {
}
// Generate JSON string of this object
-std::string Profile::Json() {
+std::string Profile::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value Profile::JsonValue() {
+// Generate Json::Value for this object
+Json::Value Profile::JsonValue() const {
// Create root json object
Json::Value root;
@@ -163,24 +163,12 @@ Json::Value Profile::JsonValue() {
}
// Load JSON string into this object
-void Profile::SetJson(std::string value) {
+void Profile::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -191,8 +179,8 @@ void Profile::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void Profile::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void Profile::SetJsonValue(const Json::Value root) {
if (!root["height"].isNull())
info.height = root["height"].asInt();
diff --git a/src/Qt/VideoCacheThread.cpp b/src/Qt/VideoCacheThread.cpp
index 46b6f030a..6cff46ba8 100644
--- a/src/Qt/VideoCacheThread.cpp
+++ b/src/Qt/VideoCacheThread.cpp
@@ -29,13 +29,14 @@
*/
#include "../../include/Qt/VideoCacheThread.h"
+#include
namespace openshot
{
// Constructor
VideoCacheThread::VideoCacheThread()
: Thread("video-cache"), speed(1), is_playing(false), position(1)
- , reader(NULL), max_frames(OPEN_MP_NUM_PROCESSORS * 2), current_display_frame(1)
+ , reader(NULL), max_frames(std::min(OPEN_MP_NUM_PROCESSORS * 8, 64)), current_display_frame(1)
{
}
diff --git a/src/QtHtmlReader.cpp b/src/QtHtmlReader.cpp
index cfdde9f39..6b502fbd4 100644
--- a/src/QtHtmlReader.cpp
+++ b/src/QtHtmlReader.cpp
@@ -180,14 +180,14 @@ std::shared_ptr QtHtmlReader::GetFrame(int64_t requested_frame)
}
// Generate JSON string of this object
-std::string QtHtmlReader::Json() {
+std::string QtHtmlReader::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value QtHtmlReader::JsonValue() {
+// Generate Json::Value for this object
+Json::Value QtHtmlReader::JsonValue() const {
// Create root json object
Json::Value root = ReaderBase::JsonValue(); // get parent properties
@@ -206,24 +206,12 @@ Json::Value QtHtmlReader::JsonValue() {
}
// Load JSON string into this object
-void QtHtmlReader::SetJson(std::string value) {
+void QtHtmlReader::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -234,8 +222,8 @@ void QtHtmlReader::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void QtHtmlReader::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void QtHtmlReader::SetJsonValue(const Json::Value root) {
// Set parent data
ReaderBase::SetJsonValue(root);
diff --git a/src/QtImageReader.cpp b/src/QtImageReader.cpp
index 3e51d769b..cf64ef930 100644
--- a/src/QtImageReader.cpp
+++ b/src/QtImageReader.cpp
@@ -111,7 +111,12 @@ void QtImageReader::Open()
info.has_audio = false;
info.has_video = true;
info.has_single_image = true;
- info.file_size = image->byteCount();
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+ // byteCount() is deprecated from Qt 5.10
+ info.file_size = image->sizeInBytes();
+ #else
+ info.file_size = image->byteCount();
+ #endif
info.vcodec = "QImage";
info.width = image->width();
info.height = image->height();
@@ -269,14 +274,14 @@ std::shared_ptr QtImageReader::GetFrame(int64_t requested_frame)
}
// Generate JSON string of this object
-std::string QtImageReader::Json() {
+std::string QtImageReader::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value QtImageReader::JsonValue() {
+// Generate Json::Value for this object
+Json::Value QtImageReader::JsonValue() const {
// Create root json object
Json::Value root = ReaderBase::JsonValue(); // get parent properties
@@ -288,24 +293,12 @@ Json::Value QtImageReader::JsonValue() {
}
// Load JSON string into this object
-void QtImageReader::SetJson(std::string value) {
+void QtImageReader::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -316,8 +309,8 @@ void QtImageReader::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void QtImageReader::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void QtImageReader::SetJsonValue(const Json::Value root) {
// Set parent data
ReaderBase::SetJsonValue(root);
diff --git a/src/QtTextReader.cpp b/src/QtTextReader.cpp
index ee0c598a4..d91d164e6 100644
--- a/src/QtTextReader.cpp
+++ b/src/QtTextReader.cpp
@@ -197,14 +197,14 @@ std::shared_ptr QtTextReader::GetFrame(int64_t requested_frame)
}
// Generate JSON string of this object
-std::string QtTextReader::Json() {
+std::string QtTextReader::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value QtTextReader::JsonValue() {
+// Generate Json::Value for this object
+Json::Value QtTextReader::JsonValue() const {
// Create root json object
Json::Value root = ReaderBase::JsonValue(); // get parent properties
@@ -225,24 +225,12 @@ Json::Value QtTextReader::JsonValue() {
}
// Load JSON string into this object
-void QtTextReader::SetJson(std::string value) {
+void QtTextReader::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -253,8 +241,8 @@ void QtTextReader::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void QtTextReader::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void QtTextReader::SetJsonValue(const Json::Value root) {
// Set parent data
ReaderBase::SetJsonValue(root);
diff --git a/src/ReaderBase.cpp b/src/ReaderBase.cpp
index f4c377c5e..474dc624e 100644
--- a/src/ReaderBase.cpp
+++ b/src/ReaderBase.cpp
@@ -112,8 +112,8 @@ void ReaderBase::DisplayInfo() {
std::cout << "--> " << it.first << ": " << it.second << std::endl;
}
-// Generate Json::JsonValue for this object
-Json::Value ReaderBase::JsonValue() {
+// Generate Json::Value for this object
+Json::Value ReaderBase::JsonValue() const {
// Create root json object
Json::Value root;
@@ -159,15 +159,16 @@ Json::Value ReaderBase::JsonValue() {
// Append metadata map
root["metadata"] = Json::Value(Json::objectValue);
- for (auto it : info.metadata)
+
+ for (const auto it : info.metadata)
root["metadata"][it.first] = it.second;
// return JsonValue
return root;
}
-// Load Json::JsonValue into this object
-void ReaderBase::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void ReaderBase::SetJsonValue(const Json::Value root) {
// Set data from Json (if key is found)
if (!root["has_video"].isNull())
@@ -242,7 +243,7 @@ void ReaderBase::SetJsonValue(Json::Value root) {
info.audio_timebase.den = root["audio_timebase"]["den"].asInt();
}
if (!root["metadata"].isNull() && root["metadata"].isObject()) {
- for( Json::Value::iterator itr = root["metadata"].begin() ; itr != root["metadata"].end() ; itr++ ) {
+ for( Json::Value::const_iterator itr = root["metadata"].begin() ; itr != root["metadata"].end() ; itr++ ) {
std::string key = itr.key().asString();
info.metadata[key] = root["metadata"][key].asString();
}
diff --git a/src/TextReader.cpp b/src/TextReader.cpp
index 1983b104f..e317700c9 100644
--- a/src/TextReader.cpp
+++ b/src/TextReader.cpp
@@ -187,14 +187,14 @@ std::shared_ptr TextReader::GetFrame(int64_t requested_frame)
}
// Generate JSON string of this object
-std::string TextReader::Json() {
+std::string TextReader::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value TextReader::JsonValue() {
+// Generate Json::Value for this object
+Json::Value TextReader::JsonValue() const {
// Create root json object
Json::Value root = ReaderBase::JsonValue(); // get parent properties
@@ -216,24 +216,10 @@ Json::Value TextReader::JsonValue() {
}
// Load JSON string into this object
-void TextReader::SetJson(std::string value) {
-
- // Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
+void TextReader::SetJson(const std::string value) {
try
{
+ Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -244,8 +230,8 @@ void TextReader::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void TextReader::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void TextReader::SetJsonValue(const Json::Value root) {
// Set parent data
ReaderBase::SetJsonValue(root);
diff --git a/src/Timeline.cpp b/src/Timeline.cpp
index c54e54ff6..61ce31e33 100644
--- a/src/Timeline.cpp
+++ b/src/Timeline.cpp
@@ -34,7 +34,7 @@ using namespace openshot;
// Default Constructor for the timeline (which sets the canvas width and height)
Timeline::Timeline(int width, int height, Fraction fps, int sample_rate, int channels, ChannelLayout channel_layout) :
- is_open(false), auto_map_clips(true), managed_cache(true)
+ is_open(false), auto_map_clips(true), managed_cache(true), path("")
{
// Create CrashHandler and Attach (incase of errors)
CrashHandler::Instance();
@@ -64,6 +64,8 @@ Timeline::Timeline(int width, int height, Fraction fps, int sample_rate, int cha
info.display_ratio = openshot::Fraction(width, height);
info.display_ratio.Reduce();
info.pixel_ratio = openshot::Fraction(1, 1);
+ info.acodec = "openshot::timeline";
+ info.vcodec = "openshot::timeline";
// Init max image size
SetMaxSize(info.width, info.height);
@@ -73,6 +75,133 @@ Timeline::Timeline(int width, int height, Fraction fps, int sample_rate, int cha
final_cache->SetMaxBytesFromInfo(OPEN_MP_NUM_PROCESSORS * 2, info.width, info.height, info.sample_rate, info.channels);
}
+// Constructor for the timeline (which loads a JSON structure from a file path, and initializes a timeline)
+Timeline::Timeline(std::string projectPath, bool convert_absolute_paths) :
+ is_open(false), auto_map_clips(true), managed_cache(true), path(projectPath) {
+
+ // Create CrashHandler and Attach (incase of errors)
+ CrashHandler::Instance();
+
+ // Init final cache as NULL (will be created after loading json)
+ final_cache = NULL;
+
+ // Init viewport size (curve based, because it can be animated)
+ viewport_scale = Keyframe(100.0);
+ viewport_x = Keyframe(0.0);
+ viewport_y = Keyframe(0.0);
+
+ // Init background color
+ color.red = Keyframe(0.0);
+ color.green = Keyframe(0.0);
+ color.blue = Keyframe(0.0);
+
+ // Check if path exists
+ QFileInfo filePath(QString::fromStdString(path));
+ if (!filePath.exists()) {
+ throw InvalidFile("File could not be opened.", path);
+ }
+
+ // Check OpenShot Install Path exists
+ Settings *s = Settings::Instance();
+ QDir openshotPath(QString::fromStdString(s->PATH_OPENSHOT_INSTALL));
+ if (!openshotPath.exists()) {
+ throw InvalidFile("PATH_OPENSHOT_INSTALL could not be found.", s->PATH_OPENSHOT_INSTALL);
+ }
+ QDir openshotTransPath(openshotPath.filePath("transitions"));
+ if (!openshotTransPath.exists()) {
+ throw InvalidFile("PATH_OPENSHOT_INSTALL/transitions could not be found.", openshotTransPath.path().toStdString());
+ }
+
+ // Determine asset path
+ QString asset_name = filePath.baseName().left(30) + "_assets";
+ QDir asset_folder(filePath.dir().filePath(asset_name));
+ if (!asset_folder.exists()) {
+ // Create directory if needed
+ asset_folder.mkpath(".");
+ }
+
+ // Load UTF-8 project file into QString
+ QFile projectFile(QString::fromStdString(path));
+ projectFile.open(QFile::ReadOnly);
+ QString projectContents = QString::fromUtf8(projectFile.readAll());
+
+ // Convert all relative paths into absolute paths (if requested)
+ if (convert_absolute_paths) {
+
+ // Find all "image" or "path" references in JSON (using regex). Must loop through match results
+ // due to our path matching needs, which are not possible with the QString::replace() function.
+ QRegularExpression allPathsRegex(QStringLiteral("\"(image|path)\":.*?\"(.*?)\""));
+ std::vector matchedPositions;
+ QRegularExpressionMatchIterator i = allPathsRegex.globalMatch(projectContents);
+ while (i.hasNext()) {
+ QRegularExpressionMatch match = i.next();
+ if (match.hasMatch()) {
+ // Push all match objects into a vector (so we can reverse them later)
+ matchedPositions.push_back(match);
+ }
+ }
+
+ // Reverse the matches (bottom of file to top, so our replacements don't break our match positions)
+ std::vector::reverse_iterator itr;
+ for (itr = matchedPositions.rbegin(); itr != matchedPositions.rend(); itr++) {
+ QRegularExpressionMatch match = *itr;
+ QString relativeKey = match.captured(1); // image or path
+ QString relativePath = match.captured(2); // relative file path
+ QString absolutePath = "";
+
+ // Find absolute path of all path, image (including special replacements of @assets and @transitions)
+ if (relativePath.startsWith("@assets")) {
+ absolutePath = QFileInfo(asset_folder.absoluteFilePath(relativePath.replace("@assets", "."))).canonicalFilePath();
+ } else if (relativePath.startsWith("@transitions")) {
+ absolutePath = QFileInfo(openshotTransPath.absoluteFilePath(relativePath.replace("@transitions", "."))).canonicalFilePath();
+ } else {
+ absolutePath = QFileInfo(filePath.absoluteDir().absoluteFilePath(relativePath)).canonicalFilePath();
+ }
+
+ // Replace path in JSON content, if an absolute path was successfully found
+ if (!absolutePath.isEmpty()) {
+ projectContents.replace(match.capturedStart(0), match.capturedLength(0), "\"" + relativeKey + "\": \"" + absolutePath + "\"");
+ }
+ }
+ // Clear matches
+ matchedPositions.clear();
+ }
+
+ // Set JSON of project
+ SetJson(projectContents.toStdString());
+
+ // Calculate valid duration and set has_audio and has_video
+ // based on content inside this Timeline's clips.
+ float calculated_duration = 0.0;
+ for (auto clip : clips)
+ {
+ float clip_last_frame = clip->Position() + clip->Duration();
+ if (clip_last_frame > calculated_duration)
+ calculated_duration = clip_last_frame;
+ if (clip->Reader() && clip->Reader()->info.has_audio)
+ info.has_audio = true;
+ if (clip->Reader() && clip->Reader()->info.has_video)
+ info.has_video = true;
+
+ }
+ info.video_length = calculated_duration * info.fps.ToFloat();
+ info.duration = calculated_duration;
+
+ // Init FileInfo settings
+ info.acodec = "openshot::timeline";
+ info.vcodec = "openshot::timeline";
+ info.video_timebase = info.fps.Reciprocal();
+ info.has_video = true;
+ info.has_audio = true;
+
+ // Init max image size
+ SetMaxSize(info.width, info.height);
+
+ // Init cache
+ final_cache = new CacheMemory();
+ final_cache->SetMaxBytesFromInfo(OPEN_MP_NUM_PROCESSORS * 2, info.width, info.height, info.sample_rate, info.channels);
+}
+
Timeline::~Timeline() {
if (is_open)
// Auto Close if not already
@@ -706,7 +835,8 @@ void Timeline::Close()
is_open = false;
// Clear cache
- final_cache->Clear();
+ if (final_cache)
+ final_cache->Clear();
}
// Open the reader (and start consuming resources)
@@ -968,14 +1098,14 @@ void Timeline::SetCache(CacheBase* new_cache) {
}
// Generate JSON string of this object
-std::string Timeline::Json() {
+std::string Timeline::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value Timeline::JsonValue() {
+// Generate Json::Value for this object
+Json::Value Timeline::JsonValue() const {
// Create root json object
Json::Value root = ReaderBase::JsonValue(); // get parent properties
@@ -984,12 +1114,13 @@ Json::Value Timeline::JsonValue() {
root["viewport_x"] = viewport_x.JsonValue();
root["viewport_y"] = viewport_y.JsonValue();
root["color"] = color.JsonValue();
+ root["path"] = path;
// Add array of clips
root["clips"] = Json::Value(Json::arrayValue);
// Find Clips at this time
- for (auto existing_clip : clips)
+ for (const auto existing_clip : clips)
{
root["clips"].append(existing_clip->JsonValue());
}
@@ -998,7 +1129,7 @@ Json::Value Timeline::JsonValue() {
root["effects"] = Json::Value(Json::arrayValue);
// loop through effects
- for (auto existing_effect: effects)
+ for (const auto existing_effect: effects)
{
root["effects"].append(existing_effect->JsonValue());
}
@@ -1008,27 +1139,15 @@ Json::Value Timeline::JsonValue() {
}
// Load JSON string into this object
-void Timeline::SetJson(std::string value) {
+void Timeline::SetJson(const std::string value) {
// Get lock (prevent getting frames while this happens)
const GenericScopedLock lock(getFrameCriticalSection);
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -1039,8 +1158,8 @@ void Timeline::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void Timeline::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void Timeline::SetJsonValue(const Json::Value root) {
// Close timeline before we do anything (this also removes all open and closing clips)
bool was_open = is_open;
@@ -1049,6 +1168,10 @@ void Timeline::SetJsonValue(Json::Value root) {
// Set parent data
ReaderBase::SetJsonValue(root);
+ // Set data from Json (if key is found)
+ if (!root["path"].isNull())
+ path = root["path"].asString();
+
if (!root["clips"].isNull()) {
// Clear existing clips
clips.clear();
@@ -1107,21 +1230,9 @@ void Timeline::ApplyJsonDiff(std::string value) {
const GenericScopedLock lock(getFrameCriticalSection);
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success || !root.isArray())
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid).");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Process the JSON change array, loop through each item
for (const Json::Value change : root) {
std::string change_key = change["key"][(uint)0].asString();
diff --git a/src/WriterBase.cpp b/src/WriterBase.cpp
index 72b86b611..388219179 100644
--- a/src/WriterBase.cpp
+++ b/src/WriterBase.cpp
@@ -139,14 +139,14 @@ void WriterBase::DisplayInfo() {
}
// Generate JSON string of this object
-std::string WriterBase::Json() {
+std::string WriterBase::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value WriterBase::JsonValue() {
+// Generate Json::Value for this object
+Json::Value WriterBase::JsonValue() const {
// Create root json object
Json::Value root;
@@ -195,24 +195,12 @@ Json::Value WriterBase::JsonValue() {
}
// Load JSON string into this object
-void WriterBase::SetJson(std::string value) {
+void WriterBase::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -223,8 +211,8 @@ void WriterBase::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void WriterBase::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void WriterBase::SetJsonValue(const Json::Value root) {
// Set data from Json (if key is found)
if (!root["has_video"].isNull())
diff --git a/src/ZmqLogger.cpp b/src/ZmqLogger.cpp
index 61c0e1640..8802260f0 100644
--- a/src/ZmqLogger.cpp
+++ b/src/ZmqLogger.cpp
@@ -120,14 +120,20 @@ void ZmqLogger::Log(std::string message)
// Create a scoped lock, allowing only a single thread to run the following code at one time
const juce::GenericScopedLock lock(loggerCriticalSection);
+#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 3, 1)
// Send message over socket (ZeroMQ)
+ zmq::message_t reply(message);
+
+ // Set flags for immediate delivery (new API)
+ publisher->send(reply, zmq::send_flags::dontwait);
+#else
zmq::message_t reply (message.length());
std::memcpy (reply.data(), message.c_str(), message.length());
publisher->send(reply);
+#endif
- // Write to log file (if opened, and force it to write to disk in case of a crash)
- if (log_file.is_open())
- log_file << message << std::flush;
+ // Also log to file, if open
+ LogToFile(message);
}
// Log message to a file (if path set)
diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt
index 21405f637..6d7ce79ea 100644
--- a/src/bindings/python/CMakeLists.txt
+++ b/src/bindings/python/CMakeLists.txt
@@ -26,81 +26,99 @@
############### SWIG PYTHON BINDINGS ################
-FIND_PACKAGE(SWIG 3.0 REQUIRED)
-INCLUDE(${SWIG_USE_FILE})
+find_package(SWIG 3.0 REQUIRED)
+include(${SWIG_USE_FILE})
### Enable some legacy SWIG behaviors, in newer CMAKEs
if (POLICY CMP0078)
- cmake_policy(SET CMP0078 OLD)
+ cmake_policy(SET CMP0078 OLD)
endif()
if (POLICY CMP0086)
- cmake_policy(SET CMP0086 OLD)
+ cmake_policy(SET CMP0086 OLD)
endif()
-FIND_PACKAGE(PythonInterp 3)
-FIND_PACKAGE(PythonLibs 3)
-if (PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND)
-
- ### Include Python header files
- INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-
- ### Enable C++ support in SWIG
- set_property(SOURCE openshot.i PROPERTY CPLUSPLUS ON)
- set_property(SOURCE openshot.i PROPERTY SWIG_MODULE_NAME openshot)
-
- ### Suppress a ton of warnings in the generated SWIG C++ code
- set(SWIG_CXX_FLAGS "-Wno-unused-variable -Wno-unused-function -Wno-deprecated-copy -Wno-class-memaccess -Wno-cast-function-type \
--Wno-unused-parameter -Wno-catch-value -Wno-sign-compare -Wno-ignored-qualifiers")
- separate_arguments(sw_flags UNIX_COMMAND ${SWIG_CXX_FLAGS})
- set_property(SOURCE openshot.i PROPERTY GENERATED_COMPILE_OPTIONS ${sw_flags})
-
- ### Take include dirs from target, automatically if possible
- if (CMAKE_VERSION VERSION_GREATER 3.13)
- set_property(SOURCE openshot.i PROPERTY USE_TARGET_INCLUDE_DIRECTORIES True)
- else ()
- set_property(SOURCE openshot.i PROPERTY INCLUDE_DIRECTORIES $)
- endif ()
-
- ### Add the SWIG interface file (which defines all the SWIG methods)
- if (CMAKE_VERSION VERSION_LESS 3.8.0)
- swig_add_module(pyopenshot python openshot.i)
- else()
- swig_add_library(pyopenshot LANGUAGE python SOURCES openshot.i)
- endif()
-
- ### Set output name of target
- set_target_properties(${SWIG_MODULE_pyopenshot_REAL_NAME} PROPERTIES
- PREFIX "_" OUTPUT_NAME "openshot")
-
- ### Link the new python wrapper library with libopenshot
- target_link_libraries(${SWIG_MODULE_pyopenshot_REAL_NAME}
- PUBLIC ${PYTHON_LIBRARIES} openshot)
-
- ### Check if the following Debian-friendly python module path exists
- SET(PYTHON_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/dist-packages")
- if (NOT EXISTS ${PYTHON_MODULE_PATH})
-
- ### Calculate the python module path (using distutils)
- execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "\
-from distutils.sysconfig import get_python_lib; \
-print( get_python_lib( plat_specific=True, prefix='${CMAKE_INSTALL_PREFIX}' ) )"
- OUTPUT_VARIABLE _ABS_PYTHON_MODULE_PATH
- OUTPUT_STRIP_TRAILING_WHITESPACE )
-
- GET_FILENAME_COMPONENT(_ABS_PYTHON_MODULE_PATH
- "${_ABS_PYTHON_MODULE_PATH}" ABSOLUTE)
- FILE(RELATIVE_PATH _REL_PYTHON_MODULE_PATH
- ${CMAKE_INSTALL_PREFIX} ${_ABS_PYTHON_MODULE_PATH})
- SET(PYTHON_MODULE_PATH ${_ABS_PYTHON_MODULE_PATH})
- endif()
- message("PYTHON_MODULE_PATH: ${PYTHON_MODULE_PATH}")
-
- ############### INSTALL HEADERS & LIBRARY ################
- ### Install Python bindings
- INSTALL(TARGETS ${SWIG_MODULE_pyopenshot_REAL_NAME}
- LIBRARY DESTINATION ${PYTHON_MODULE_PATH} )
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/openshot.py
- DESTINATION ${PYTHON_MODULE_PATH} )
+find_package(PythonInterp 3)
+find_package(PythonLibs 3)
+
+if (NOT PYTHONLIBS_FOUND OR NOT PYTHONINTERP_FOUND)
+ return()
+endif()
+
+### Include Python header files
+include_directories(${PYTHON_INCLUDE_PATH})
+
+if (CMAKE_VERSION VERSION_LESS 3.12)
+ ### Include project headers
+ include_directories(
+ "${PROJECT_SOURCE_DIR}/include"
+ "${PROJECT_BINARY_DIR}/include")
+endif()
+### Enable C++ support in SWIG
+set_property(SOURCE openshot.i PROPERTY CPLUSPLUS ON)
+set_property(SOURCE openshot.i PROPERTY SWIG_MODULE_NAME openshot)
+
+### Suppress a ton of warnings in the generated SWIG C++ code
+set(SWIG_CXX_FLAGS "-Wno-unused-variable -Wno-unused-function \
+ -Wno-deprecated-copy -Wno-class-memaccess -Wno-cast-function-type \
+ -Wno-unused-parameter -Wno-catch-value -Wno-sign-compare -Wno-ignored-qualifiers")
+separate_arguments(sw_flags UNIX_COMMAND ${SWIG_CXX_FLAGS})
+set_property(SOURCE openshot.i PROPERTY GENERATED_COMPILE_OPTIONS ${sw_flags})
+
+### Take include dirs from target, automatically if possible
+if (CMAKE_VERSION VERSION_GREATER 3.13)
+ set_property(SOURCE openshot.i PROPERTY USE_TARGET_INCLUDE_DIRECTORIES True)
+elseif (CMAKE_VERSION VERSION_GREATER 3.12)
+ set_property(SOURCE openshot.i PROPERTY
+ INCLUDE_DIRECTORIES $)
endif ()
+
+### Add the SWIG interface file (which defines all the SWIG methods)
+if (CMAKE_VERSION VERSION_LESS 3.8.0)
+ swig_add_module(pyopenshot python openshot.i)
+else()
+ swig_add_library(pyopenshot LANGUAGE python SOURCES openshot.i)
+endif()
+
+### Set output name of target
+set_target_properties(${SWIG_MODULE_pyopenshot_REAL_NAME} PROPERTIES
+ PREFIX "_" OUTPUT_NAME "openshot")
+
+### Link the new python wrapper library with libopenshot
+target_link_libraries(${SWIG_MODULE_pyopenshot_REAL_NAME} PUBLIC
+ ${PYTHON_LIBRARIES} openshot)
+
+######### INSTALL PATH ########
+if (NOT DEFINED PYTHON_MODULE_PATH AND DEFINED $ENV{PYTHON_MODULE_PATH})
+ set(PYTHON_MODULE_PATH $ENV{PYTHON_MODULE_PATH})
+endif()
+
+if (NOT DEFINED PYTHON_MODULE_PATH)
+ if (WIN32 OR APPLE)
+ set (PYTHON_MODULE_PATH "python")
+ endif()
+
+ if (UNIX AND NOT APPLE)
+ ### Check if the following Debian-friendly python module path exists
+ set(PYTHON_MODULE_PATH
+ "lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/dist-packages")
+
+ if (NOT EXISTS "${CMAKE_INSTALL_PREFIX}/${PYTHON_MODULE_PATH}")
+ ### Calculate the python module path (using distutils)
+ execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "\
+from distutils.sysconfig import get_python_lib; \
+print( get_python_lib( plat_specific=True, prefix='' ) )"
+ OUTPUT_VARIABLE PYTHON_MODULE_PATH
+ OUTPUT_STRIP_TRAILING_WHITESPACE )
+ endif()
+ endif()
+endif()
+
+message(STATUS "PYTHON_MODULE_PATH: ${CMAKE_INSTALL_PREFIX}/${PYTHON_MODULE_PATH}")
+
+############### INSTALL HEADERS & LIBRARY ################
+### Install Python bindings
+install(TARGETS ${SWIG_MODULE_pyopenshot_REAL_NAME}
+ DESTINATION ${PYTHON_MODULE_PATH} )
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openshot.py
+ DESTINATION ${PYTHON_MODULE_PATH} )
diff --git a/src/bindings/python/openshot.i b/src/bindings/python/openshot.i
index 44b1953e1..53e514c15 100644
--- a/src/bindings/python/openshot.i
+++ b/src/bindings/python/openshot.i
@@ -59,57 +59,57 @@
%{
#include "OpenShotVersion.h"
-#include "../../../include/ReaderBase.h"
-#include "../../../include/WriterBase.h"
-#include "../../../include/CacheBase.h"
-#include "../../../include/CacheDisk.h"
-#include "../../../include/CacheMemory.h"
-#include "../../../include/ChannelLayouts.h"
-#include "../../../include/ChunkReader.h"
-#include "../../../include/ChunkWriter.h"
-#include "../../../include/ClipBase.h"
-#include "../../../include/Clip.h"
-#include "../../../include/Coordinate.h"
-#include "../../../include/Color.h"
-#include "../../../include/DummyReader.h"
-#include "../../../include/EffectBase.h"
-#include "../../../include/Effects.h"
-#include "../../../include/EffectInfo.h"
-#include "../../../include/Enums.h"
-#include "../../../include/Exceptions.h"
-#include "../../../include/FFmpegReader.h"
-#include "../../../include/FFmpegWriter.h"
-#include "../../../include/Fraction.h"
-#include "../../../include/Frame.h"
-#include "../../../include/FrameMapper.h"
-#include "../../../include/PlayerBase.h"
-#include "../../../include/Point.h"
-#include "../../../include/Profiles.h"
-#include "../../../include/QtHtmlReader.h"
-#include "../../../include/QtImageReader.h"
-#include "../../../include/QtPlayer.h"
-#include "../../../include/QtTextReader.h"
-#include "../../../include/KeyFrame.h"
-#include "../../../include/RendererBase.h"
-#include "../../../include/Settings.h"
-#include "../../../include/Timeline.h"
-#include "../../../include/ZmqLogger.h"
-#include "../../../include/AudioDeviceInfo.h"
+#include "ReaderBase.h"
+#include "WriterBase.h"
+#include "CacheBase.h"
+#include "CacheDisk.h"
+#include "CacheMemory.h"
+#include "ChannelLayouts.h"
+#include "ChunkReader.h"
+#include "ChunkWriter.h"
+#include "ClipBase.h"
+#include "Clip.h"
+#include "Coordinate.h"
+#include "Color.h"
+#include "DummyReader.h"
+#include "EffectBase.h"
+#include "Effects.h"
+#include "EffectInfo.h"
+#include "Enums.h"
+#include "Exceptions.h"
+#include "FFmpegReader.h"
+#include "FFmpegWriter.h"
+#include "Fraction.h"
+#include "Frame.h"
+#include "FrameMapper.h"
+#include "PlayerBase.h"
+#include "Point.h"
+#include "Profiles.h"
+#include "QtHtmlReader.h"
+#include "QtImageReader.h"
+#include "QtPlayer.h"
+#include "QtTextReader.h"
+#include "KeyFrame.h"
+#include "RendererBase.h"
+#include "Settings.h"
+#include "Timeline.h"
+#include "ZmqLogger.h"
+#include "AudioDeviceInfo.h"
%}
#ifdef USE_BLACKMAGIC
%{
- #include "../../../include/DecklinkReader.h"
- #include "../../../include/DecklinkWriter.h"
+ #include "DecklinkReader.h"
+ #include "DecklinkWriter.h"
%}
#endif
#ifdef USE_IMAGEMAGICK
%{
- #include "../../../include/ImageReader.h"
- #include "../../../include/ImageWriter.h"
- #include "../../../include/TextReader.h"
+ #include "ImageReader.h"
+ #include "ImageWriter.h"
+ #include "TextReader.h"
%}
#endif
@@ -166,68 +166,68 @@
}
%include "OpenShotVersion.h"
-%include "../../../include/ReaderBase.h"
-%include "../../../include/WriterBase.h"
-%include "../../../include/CacheBase.h"
-%include "../../../include/CacheDisk.h"
-%include "../../../include/CacheMemory.h"
-%include "../../../include/ChannelLayouts.h"
-%include "../../../include/ChunkReader.h"
-%include "../../../include/ChunkWriter.h"
-%include "../../../include/ClipBase.h"
-%include "../../../include/Clip.h"
-%include "../../../include/Coordinate.h"
-%include "../../../include/Color.h"
+%include "ReaderBase.h"
+%include "WriterBase.h"
+%include "CacheBase.h"
+%include "CacheDisk.h"
+%include "CacheMemory.h"
+%include "ChannelLayouts.h"
+%include "ChunkReader.h"
+%include "ChunkWriter.h"
+%include "ClipBase.h"
+%include "Clip.h"
+%include "Coordinate.h"
+%include "Color.h"
#ifdef USE_BLACKMAGIC
- %include "../../../include/DecklinkReader.h"
- %include "../../../include/DecklinkWriter.h"
+ %include "DecklinkReader.h"
+ %include "DecklinkWriter.h"
#endif
-%include "../../../include/DummyReader.h"
-%include "../../../include/EffectBase.h"
-%include "../../../include/Effects.h"
-%include "../../../include/EffectInfo.h"
-%include "../../../include/Enums.h"
-%include "../../../include/Exceptions.h"
-%include "../../../include/FFmpegReader.h"
-%include "../../../include/FFmpegWriter.h"
-%include "../../../include/Fraction.h"
-%include "../../../include/Frame.h"
-%include "../../../include/FrameMapper.h"
-%include "../../../include/PlayerBase.h"
-%include "../../../include/Point.h"
-%include "../../../include/Profiles.h"
-%include "../../../include/QtHtmlReader.h"
-%include "../../../include/QtImageReader.h"
-%include "../../../include/QtPlayer.h"
-%include "../../../include/QtTextReader.h"
-%include "../../../include/KeyFrame.h"
-%include "../../../include/RendererBase.h"
-%include "../../../include/Settings.h"
-%include "../../../include/Timeline.h"
-%include "../../../include/ZmqLogger.h"
-%include "../../../include/AudioDeviceInfo.h"
+%include "DummyReader.h"
+%include "EffectBase.h"
+%include "Effects.h"
+%include "EffectInfo.h"
+%include "Enums.h"
+%include "Exceptions.h"
+%include "FFmpegReader.h"
+%include "FFmpegWriter.h"
+%include "Fraction.h"
+%include "Frame.h"
+%include "FrameMapper.h"
+%include "PlayerBase.h"
+%include "Point.h"
+%include "Profiles.h"
+%include "QtHtmlReader.h"
+%include "QtImageReader.h"
+%include "QtPlayer.h"
+%include "QtTextReader.h"
+%include "KeyFrame.h"
+%include "RendererBase.h"
+%include "Settings.h"
+%include "Timeline.h"
+%include "ZmqLogger.h"
+%include "AudioDeviceInfo.h"
#ifdef USE_IMAGEMAGICK
- %include "../../../include/ImageReader.h"
- %include "../../../include/ImageWriter.h"
- %include "../../../include/TextReader.h"
+ %include "ImageReader.h"
+ %include "ImageWriter.h"
+ %include "TextReader.h"
#endif
/* Effects */
-%include "../../../include/effects/Bars.h"
-%include "../../../include/effects/Blur.h"
-%include "../../../include/effects/Brightness.h"
-%include "../../../include/effects/ChromaKey.h"
-%include "../../../include/effects/ColorShift.h"
-%include "../../../include/effects/Crop.h"
-%include "../../../include/effects/Deinterlace.h"
-%include "../../../include/effects/Hue.h"
-%include "../../../include/effects/Mask.h"
-%include "../../../include/effects/Negate.h"
-%include "../../../include/effects/Pixelate.h"
-%include "../../../include/effects/Saturation.h"
-%include "../../../include/effects/Shift.h"
-%include "../../../include/effects/Wave.h"
+%include "effects/Bars.h"
+%include "effects/Blur.h"
+%include "effects/Brightness.h"
+%include "effects/ChromaKey.h"
+%include "effects/ColorShift.h"
+%include "effects/Crop.h"
+%include "effects/Deinterlace.h"
+%include "effects/Hue.h"
+%include "effects/Mask.h"
+%include "effects/Negate.h"
+%include "effects/Pixelate.h"
+%include "effects/Saturation.h"
+%include "effects/Shift.h"
+%include "effects/Wave.h"
/* Wrap std templates (list, vector, etc...) */
diff --git a/src/bindings/ruby/CMakeLists.txt b/src/bindings/ruby/CMakeLists.txt
index bf7e6421f..dc571a814 100644
--- a/src/bindings/ruby/CMakeLists.txt
+++ b/src/bindings/ruby/CMakeLists.txt
@@ -25,8 +25,8 @@
################################################################################
############### RUBY BINDINGS ################
-FIND_PACKAGE(SWIG 3.0 REQUIRED)
-INCLUDE(${SWIG_USE_FILE})
+find_package(SWIG 3.0 REQUIRED)
+include(${SWIG_USE_FILE})
### Enable some legacy SWIG behaviors, in newer CMAKEs
if (POLICY CMP0078)
@@ -36,56 +36,77 @@ if (POLICY CMP0086)
cmake_policy(SET CMP0086 OLD)
endif()
-FIND_PACKAGE(Ruby)
-IF (RUBY_FOUND)
+find_package(Ruby)
+if (NOT RUBY_FOUND)
+ return()
+endif()
- ### Include the Ruby header files
- INCLUDE_DIRECTORIES(${RUBY_INCLUDE_DIRS})
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+### Include the Ruby header files
+include_directories(${RUBY_INCLUDE_DIRS})
- ### Enable C++ in SWIG
- set_property(SOURCE openshot.i PROPERTY CPLUSPLUS ON)
- set_property(SOURCE openshot.i PROPERTY SWIG_MODULE_NAME openshot)
+if (CMAKE_VERSION VERSION_LESS 3.12)
+ ### Include Ruby header files and project headers
+ include_directories(
+ "${PROJECT_SOURCE_DIR}/include"
+ "${PROJECT_BINARY_DIR}/include")
+endif()
- ### Suppress a ton of warnings in the generated SWIG C++ code
- set(SWIG_CXX_FLAGS "-Wno-unused-variable -Wno-unused-function -Wno-deprecated-copy -Wno-class-memaccess -Wno-cast-function-type \
--Wno-unused-parameter -Wno-catch-value -Wno-sign-compare -Wno-ignored-qualifiers")
- separate_arguments(sw_flags UNIX_COMMAND ${SWIG_CXX_FLAGS})
- set_property(SOURCE openshot.i PROPERTY GENERATED_COMPILE_OPTIONS ${sw_flags})
+### Enable C++ in SWIG
+set_property(SOURCE openshot.i PROPERTY CPLUSPLUS ON)
+set_property(SOURCE openshot.i PROPERTY SWIG_MODULE_NAME openshot)
- ### Take include dirs from target, automatically if possible
- if (CMAKE_VERSION VERSION_GREATER 3.13)
- set_property(SOURCE openshot.i PROPERTY USE_TARGET_INCLUDE_DIRECTORIES True)
- else ()
- set_property(SOURCE openshot.i PROPERTY INCLUDE_DIRECTORIES $)
- endif ()
+### Suppress a ton of warnings in the generated SWIG C++ code
+set(SWIG_CXX_FLAGS "-Wno-unused-variable -Wno-unused-function \
+ -Wno-deprecated-copy -Wno-class-memaccess -Wno-cast-function-type \
+ -Wno-unused-parameter -Wno-catch-value -Wno-sign-compare -Wno-ignored-qualifiers")
+separate_arguments(sw_flags UNIX_COMMAND ${SWIG_CXX_FLAGS})
+set_property(SOURCE openshot.i PROPERTY GENERATED_COMPILE_OPTIONS ${sw_flags})
- ### Add the SWIG interface file (which defines all the SWIG methods)
- if (CMAKE_VERSION VERSION_LESS 3.8.0)
- swig_add_module(rbopenshot ruby openshot.i)
- else()
- swig_add_library(rbopenshot LANGUAGE ruby SOURCES openshot.i)
- endif()
+### Take include dirs from target, automatically if possible
+if (CMAKE_VERSION VERSION_GREATER 3.13)
+ set_property(SOURCE openshot.i PROPERTY USE_TARGET_INCLUDE_DIRECTORIES True)
+else ()
+ set_property(SOURCE openshot.i PROPERTY
+ INCLUDE_DIRECTORIES $)
+endif ()
- ### Set name of target (with no prefix, since Ruby does not like that)
- SET_TARGET_PROPERTIES(${SWIG_MODULE_rbopenshot_REAL_NAME} PROPERTIES
- PREFIX "" OUTPUT_NAME "openshot")
+### Add the SWIG interface file (which defines all the SWIG methods)
+if (CMAKE_VERSION VERSION_LESS 3.8.0)
+ swig_add_module(rbopenshot ruby openshot.i)
+else()
+ swig_add_library(rbopenshot LANGUAGE ruby SOURCES openshot.i)
+endif()
- ### Link the new Ruby wrapper library with libopenshot
- target_link_libraries(${SWIG_MODULE_rbopenshot_REAL_NAME}
- ${RUBY_LIBRARY} openshot)
+### Link the new Ruby wrapper library with libopenshot
+target_link_libraries(${SWIG_MODULE_rbopenshot_REAL_NAME} PUBLIC
+ ${RUBY_LIBRARY} openshot)
- ### FIND THE RUBY INTERPRETER (AND THE LOAD_PATH FOLDER)
- EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE}
- -r rbconfig -e "print RbConfig::CONFIG['vendorarchdir']"
- OUTPUT_VARIABLE RUBY_VENDOR_ARCH_DIR)
- MESSAGE(STATUS "Ruby executable: ${RUBY_EXECUTABLE}")
- MESSAGE(STATUS "Ruby vendor arch dir: ${RUBY_VENDOR_ARCH_DIR}")
- MESSAGE(STATUS "Ruby include path: ${RUBY_INCLUDE_PATH}")
+######### INSTALL PATH ########
+if (NOT DEFINED RUBY_MODULE_PATH AND DEFINED $ENV{RUBY_MODULE_PATH})
+ set(RUBY_MODULE_PATH $ENV{RUBY_MODULE_PATH})
+endif()
+
+if (NOT DEFINED RUBY_MODULE_PATH)
+ if (WIN32 OR APPLE)
+ set (RUBY_MODULE_PATH "ruby")
+ endif()
+
+ if (UNIX AND NOT APPLE)
+ ### FIND THE RUBY INTERPRETER (AND THE LOAD_PATH FOLDER)
+ execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig
+ -e "dir = RbConfig::CONFIG['vendorarchdir']"
+ -e "dir.start_with?(RbConfig::CONFIG['prefix']) && dir.sub!(RbConfig::CONFIG['prefix']+'/', '')"
+ -e "p dir"
+ OUTPUT_VARIABLE RUBY_MODULE_PATH
+ OUTPUT_STRIP_TRAILING_WHITESPACE )
+ # Ruby quotes its output strings
+ string(REPLACE "\"" "" RUBY_MODULE_PATH "${RUBY_MODULE_PATH}")
+ endif()
+endif()
- ############### INSTALL HEADERS & LIBRARY ################
- # Install Ruby bindings
- install(TARGETS ${SWIG_MODULE_rbopenshot_REAL_NAME}
- LIBRARY DESTINATION ${RUBY_VENDOR_ARCH_DIR} )
+message(STATUS "RUBY_MODULE_PATH: ${CMAKE_INSTALL_PREFIX}/${RUBY_MODULE_PATH}")
-ENDIF (RUBY_FOUND)
+############### INSTALL HEADERS & LIBRARY ################
+# Install Ruby bindings
+install(TARGETS ${SWIG_MODULE_rbopenshot_REAL_NAME}
+ DESTINATION ${RUBY_MODULE_PATH} )
diff --git a/src/bindings/ruby/openshot.i b/src/bindings/ruby/openshot.i
index a08ac9ae9..2f24d2200 100644
--- a/src/bindings/ruby/openshot.i
+++ b/src/bindings/ruby/openshot.i
@@ -70,42 +70,42 @@ namespace std {
#undef RSHIFT
#endif
#include "OpenShotVersion.h"
-#include "../../../include/ReaderBase.h"
-#include "../../../include/WriterBase.h"
-#include "../../../include/CacheBase.h"
-#include "../../../include/CacheDisk.h"
-#include "../../../include/CacheMemory.h"
-#include "../../../include/ChannelLayouts.h"
-#include "../../../include/ChunkReader.h"
-#include "../../../include/ChunkWriter.h"
-#include "../../../include/ClipBase.h"
-#include "../../../include/Clip.h"
-#include "../../../include/Coordinate.h"
-#include "../../../include/Color.h"
-#include "../../../include/DummyReader.h"
-#include "../../../include/EffectBase.h"
-#include "../../../include/Effects.h"
-#include "../../../include/EffectInfo.h"
-#include "../../../include/Enums.h"
-#include "../../../include/Exceptions.h"
-#include "../../../include/FFmpegReader.h"
-#include "../../../include/FFmpegWriter.h"
-#include "../../../include/Fraction.h"
-#include "../../../include/Frame.h"
-#include "../../../include/FrameMapper.h"
-#include "../../../include/PlayerBase.h"
-#include "../../../include/Point.h"
-#include "../../../include/Profiles.h"
-#include "../../../include/QtHtmlReader.h"
-#include "../../../include/QtImageReader.h"
-#include "../../../include/QtPlayer.h"
-#include "../../../include/QtTextReader.h"
-#include "../../../include/KeyFrame.h"
-#include "../../../include/RendererBase.h"
-#include "../../../include/Settings.h"
-#include "../../../include/Timeline.h"
-#include "../../../include/ZmqLogger.h"
-#include "../../../include/AudioDeviceInfo.h"
+#include "ReaderBase.h"
+#include "WriterBase.h"
+#include "CacheBase.h"
+#include "CacheDisk.h"
+#include "CacheMemory.h"
+#include "ChannelLayouts.h"
+#include "ChunkReader.h"
+#include "ChunkWriter.h"
+#include "ClipBase.h"
+#include "Clip.h"
+#include "Coordinate.h"
+#include "Color.h"
+#include "DummyReader.h"
+#include "EffectBase.h"
+#include "Effects.h"
+#include "EffectInfo.h"
+#include "Enums.h"
+#include "Exceptions.h"
+#include "FFmpegReader.h"
+#include "FFmpegWriter.h"
+#include "Fraction.h"
+#include "Frame.h"
+#include "FrameMapper.h"
+#include "PlayerBase.h"
+#include "Point.h"
+#include "Profiles.h"
+#include "QtHtmlReader.h"
+#include "QtImageReader.h"
+#include "QtPlayer.h"
+#include "QtTextReader.h"
+#include "KeyFrame.h"
+#include "RendererBase.h"
+#include "Settings.h"
+#include "Timeline.h"
+#include "ZmqLogger.h"
+#include "AudioDeviceInfo.h"
/* Move FFmpeg's RSHIFT to FF_RSHIFT, if present */
#ifdef RSHIFT
@@ -120,42 +120,42 @@ namespace std {
#ifdef USE_BLACKMAGIC
%{
- #include "../../../include/DecklinkReader.h"
- #include "../../../include/DecklinkWriter.h"
+ #include "DecklinkReader.h"
+ #include "DecklinkWriter.h"
%}
#endif
#ifdef USE_IMAGEMAGICK
%{
- #include "../../../include/ImageReader.h"
- #include "../../../include/ImageWriter.h"
- #include "../../../include/TextReader.h"
+ #include "ImageReader.h"
+ #include "ImageWriter.h"
+ #include "TextReader.h"
%}
#endif
%include "OpenShotVersion.h"
-%include "../../../include/ReaderBase.h"
-%include "../../../include/WriterBase.h"
-%include "../../../include/CacheBase.h"
-%include "../../../include/CacheDisk.h"
-%include "../../../include/CacheMemory.h"
-%include "../../../include/ChannelLayouts.h"
-%include "../../../include/ChunkReader.h"
-%include "../../../include/ChunkWriter.h"
-%include "../../../include/ClipBase.h"
-%include "../../../include/Clip.h"
-%include "../../../include/Coordinate.h"
-%include "../../../include/Color.h"
+%include "ReaderBase.h"
+%include "WriterBase.h"
+%include "CacheBase.h"
+%include "CacheDisk.h"
+%include "CacheMemory.h"
+%include "ChannelLayouts.h"
+%include "ChunkReader.h"
+%include "ChunkWriter.h"
+%include "ClipBase.h"
+%include "Clip.h"
+%include "Coordinate.h"
+%include "Color.h"
#ifdef USE_BLACKMAGIC
- %include "../../../include/DecklinkReader.h"
- %include "../../../include/DecklinkWriter.h"
+ %include "DecklinkReader.h"
+ %include "DecklinkWriter.h"
#endif
-%include "../../../include/DummyReader.h"
-%include "../../../include/EffectBase.h"
-%include "../../../include/Effects.h"
-%include "../../../include/EffectInfo.h"
-%include "../../../include/Enums.h"
-%include "../../../include/Exceptions.h"
+%include "DummyReader.h"
+%include "EffectBase.h"
+%include "Effects.h"
+%include "EffectInfo.h"
+%include "Enums.h"
+%include "Exceptions.h"
/* Ruby and FFmpeg define competing RSHIFT macros,
* so we move Ruby's out of the way for now. We'll
@@ -166,8 +166,8 @@ namespace std {
#undef RSHIFT
#endif
-%include "../../../include/FFmpegReader.h"
-%include "../../../include/FFmpegWriter.h"
+%include "FFmpegReader.h"
+%include "FFmpegWriter.h"
/* Move FFmpeg's RSHIFT to FF_RSHIFT, if present */
#ifdef RSHIFT
@@ -179,45 +179,45 @@ namespace std {
#define RSHIFT(a, b) RB_RSHIFT(a, b)
#endif
-%include "../../../include/Fraction.h"
-%include "../../../include/Frame.h"
-%include "../../../include/FrameMapper.h"
-%include "../../../include/PlayerBase.h"
-%include "../../../include/Point.h"
-%include "../../../include/Profiles.h"
-%include "../../../include/QtHtmlReader.h"
-%include "../../../include/QtImageReader.h"
-%include "../../../include/QtPlayer.h"
-%include "../../../include/QtTextReader.h"
-%include "../../../include/KeyFrame.h"
-%include "../../../include/RendererBase.h"
-%include "../../../include/Settings.h"
-%include "../../../include/Timeline.h"
-%include "../../../include/ZmqLogger.h"
-%include "../../../include/AudioDeviceInfo.h"
+%include "Fraction.h"
+%include "Frame.h"
+%include "FrameMapper.h"
+%include "PlayerBase.h"
+%include "Point.h"
+%include "Profiles.h"
+%include "QtHtmlReader.h"
+%include "QtImageReader.h"
+%include "QtPlayer.h"
+%include "QtTextReader.h"
+%include "KeyFrame.h"
+%include "RendererBase.h"
+%include "Settings.h"
+%include "Timeline.h"
+%include "ZmqLogger.h"
+%include "AudioDeviceInfo.h"
#ifdef USE_IMAGEMAGICK
- %include "../../../include/ImageReader.h"
- %include "../../../include/ImageWriter.h"
- %include "../../../include/TextReader.h"
+ %include "ImageReader.h"
+ %include "ImageWriter.h"
+ %include "TextReader.h"
#endif
/* Effects */
-%include "../../../include/effects/Bars.h"
-%include "../../../include/effects/Blur.h"
-%include "../../../include/effects/Brightness.h"
-%include "../../../include/effects/ChromaKey.h"
-%include "../../../include/effects/ColorShift.h"
-%include "../../../include/effects/Crop.h"
-%include "../../../include/effects/Deinterlace.h"
-%include "../../../include/effects/Hue.h"
-%include "../../../include/effects/Mask.h"
-%include "../../../include/effects/Negate.h"
-%include "../../../include/effects/Pixelate.h"
-%include "../../../include/effects/Saturation.h"
-%include "../../../include/effects/Shift.h"
-%include "../../../include/effects/Wave.h"
+%include "effects/Bars.h"
+%include "effects/Blur.h"
+%include "effects/Brightness.h"
+%include "effects/ChromaKey.h"
+%include "effects/ColorShift.h"
+%include "effects/Crop.h"
+%include "effects/Deinterlace.h"
+%include "effects/Hue.h"
+%include "effects/Mask.h"
+%include "effects/Negate.h"
+%include "effects/Pixelate.h"
+%include "effects/Saturation.h"
+%include "effects/Shift.h"
+%include "effects/Wave.h"
/* Wrap std templates (list, vector, etc...) */
diff --git a/src/effects/Bars.cpp b/src/effects/Bars.cpp
index fcb684e3f..3f9aac344 100644
--- a/src/effects/Bars.cpp
+++ b/src/effects/Bars.cpp
@@ -114,14 +114,14 @@ std::shared_ptr Bars::GetFrame(std::shared_ptr frame, int64_t fram
}
// Generate JSON string of this object
-std::string Bars::Json() {
+std::string Bars::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value Bars::JsonValue() {
+// Generate Json::Value for this object
+Json::Value Bars::JsonValue() const {
// Create root json object
Json::Value root = EffectBase::JsonValue(); // get parent properties
@@ -137,24 +137,12 @@ Json::Value Bars::JsonValue() {
}
// Load JSON string into this object
-void Bars::SetJson(std::string value) {
+void Bars::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -165,8 +153,8 @@ void Bars::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void Bars::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void Bars::SetJsonValue(const Json::Value root) {
// Set parent data
EffectBase::SetJsonValue(root);
@@ -185,7 +173,7 @@ void Bars::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
-std::string Bars::PropertiesJSON(int64_t requested_frame) {
+std::string Bars::PropertiesJSON(int64_t requested_frame) const {
// Generate JSON properties list
Json::Value root;
diff --git a/src/effects/Blur.cpp b/src/effects/Blur.cpp
index e0315fda4..6ddba88e6 100644
--- a/src/effects/Blur.cpp
+++ b/src/effects/Blur.cpp
@@ -74,192 +74,109 @@ std::shared_ptr Blur::GetFrame(std::shared_ptr frame, int64_t fram
float sigma_value = sigma.GetValue(frame_number);
int iteration_value = iterations.GetInt(frame_number);
+ int w = frame_image->width();
+ int h = frame_image->height();
- // Declare arrays for each color channel
- unsigned char *red = new unsigned char[frame_image->width() * frame_image->height()]();
- unsigned char *green = new unsigned char[frame_image->width() * frame_image->height()]();
- unsigned char *blue = new unsigned char[frame_image->width() * frame_image->height()]();
- unsigned char *alpha = new unsigned char[frame_image->width() * frame_image->height()]();
- // Create empty target RGBA arrays (for the results of our blur)
- unsigned char *blur_red = new unsigned char[frame_image->width() * frame_image->height()]();
- unsigned char *blur_green = new unsigned char[frame_image->width() * frame_image->height()]();
- unsigned char *blur_blue = new unsigned char[frame_image->width() * frame_image->height()]();
- unsigned char *blur_alpha = new unsigned char[frame_image->width() * frame_image->height()]();
-
- // Loop through pixels and split RGBA channels into separate arrays
- unsigned char *pixels = (unsigned char *) frame_image->bits();
- for (int pixel = 0, byte_index=0; pixel < frame_image->width() * frame_image->height(); pixel++, byte_index+=4)
- {
- // Get the RGBA values from each pixel
- unsigned char R = pixels[byte_index];
- unsigned char G = pixels[byte_index + 1];
- unsigned char B = pixels[byte_index + 2];
- unsigned char A = pixels[byte_index + 3];
-
- // Split channels into their own arrays
- red[pixel] = R;
- green[pixel] = G;
- blue[pixel] = B;
- alpha[pixel] = A;
- }
-
- // Init target RGBA arrays
- for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) blur_red[i] = red[i];
- for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) blur_green[i] = green[i];
- for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) blur_blue[i] = blue[i];
- for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) blur_alpha[i] = alpha[i];
+ // Grab two copies of the image pixel data
+ QImage image_copy = frame_image->copy();
+ std::shared_ptr frame_image_2 = std::make_shared(image_copy);
// Loop through each iteration
- for (int iteration = 0; iteration < iteration_value; iteration++)
+ for (int iteration = 0; iteration < iteration_value; ++iteration)
{
// HORIZONTAL BLUR (if any)
if (horizontal_radius_value > 0.0) {
- // Init boxes for computing blur
- int *bxs = initBoxes(sigma_value, horizontal_radius_value);
-
// Apply horizontal blur to target RGBA channels
- boxBlurH(red, blur_red, frame_image->width(), frame_image->height(), horizontal_radius_value);
- boxBlurH(green, blur_green, frame_image->width(), frame_image->height(), horizontal_radius_value);
- boxBlurH(blue, blur_blue, frame_image->width(), frame_image->height(), horizontal_radius_value);
- boxBlurH(alpha, blur_alpha, frame_image->width(), frame_image->height(), horizontal_radius_value);
-
- // Remove boxes
- delete[] bxs;
-
- // Copy blur_ back to for vertical blur or next iteration
- for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) red[i] = blur_red[i];
- for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) green[i] = blur_green[i];
- for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) blue[i] = blur_blue[i];
- for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) alpha[i] = blur_alpha[i];
+ boxBlurH(frame_image->bits(), frame_image_2->bits(), w, h, horizontal_radius_value);
+
+ // Swap output image back to input
+ frame_image.swap(frame_image_2);
}
// VERTICAL BLUR (if any)
if (vertical_radius_value > 0.0) {
- // Init boxes for computing blur
- int *bxs = initBoxes(sigma_value, vertical_radius_value);
-
// Apply vertical blur to target RGBA channels
- boxBlurT(red, blur_red, frame_image->width(), frame_image->height(), vertical_radius_value);
- boxBlurT(green, blur_green, frame_image->width(), frame_image->height(), vertical_radius_value);
- boxBlurT(blue, blur_blue, frame_image->width(), frame_image->height(), vertical_radius_value);
- boxBlurT(alpha, blur_alpha, frame_image->width(), frame_image->height(), vertical_radius_value);
-
- // Remove boxes
- delete[] bxs;
-
- // Copy blur_ back to for vertical blur or next iteration
- for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) red[i] = blur_red[i];
- for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) green[i] = blur_green[i];
- for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) blue[i] = blur_blue[i];
- for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) alpha[i] = blur_alpha[i];
- }
- }
+ boxBlurT(frame_image->bits(), frame_image_2->bits(), w, h, vertical_radius_value);
- // Copy RGBA channels back to original image
- for (int pixel = 0, byte_index=0; pixel < frame_image->width() * frame_image->height(); pixel++, byte_index+=4)
- {
- // Get the RGB values from the pixel
- unsigned char R = blur_red[pixel];
- unsigned char G = blur_green[pixel];
- unsigned char B = blur_blue[pixel];
- unsigned char A = blur_alpha[pixel];
-
- // Split channels into their own arrays
- pixels[byte_index] = R;
- pixels[byte_index + 1] = G;
- pixels[byte_index + 2] = B;
- pixels[byte_index + 3] = A;
+ // Swap output image back to input
+ frame_image.swap(frame_image_2);
+ }
}
- // Delete channel arrays
- delete[] red;
- delete[] green;
- delete[] blue;
- delete[] alpha;
- delete[] blur_red;
- delete[] blur_green;
- delete[] blur_blue;
- delete[] blur_alpha;
-
// return the modified frame
return frame;
}
// Credit: http://blog.ivank.net/fastest-gaussian-blur.html (MIT License)
-int* Blur::initBoxes(float sigma, int n) // standard deviation, number of boxes
-{
- float wIdeal = sqrt((12.0 * sigma * sigma / n) + 1.0); // Ideal averaging filter width
- int wl = floor(wIdeal);
- if (wl % 2 == 0) wl--;
- int wu = wl + 2;
-
- float mIdeal = (12.0 * sigma * sigma - n * wl * wl - 4 * n * wl - 3 * n) / (-4.0 * wl - 4);
- int m = round(mIdeal);
-
- int *sizes = new int[n]();
- for (int i = 0; i < n; i++) sizes[i] = i < m ? wl : wu;
- return sizes;
-}
-
-// Credit: http://blog.ivank.net/fastest-gaussian-blur.html (MIT License)
+// Modified to process all four channels in a pixel array
void Blur::boxBlurH(unsigned char *scl, unsigned char *tcl, int w, int h, int r) {
float iarr = 1.0 / (r + r + 1);
- for (int i = 0; i < h; i++) {
- int ti = i * w, li = ti, ri = ti + r;
- int fv = scl[ti], lv = scl[ti + w - 1], val = (r + 1) * fv;
- for (int j = 0; j < r; j++) val += scl[ti + j];
- for (int j = 0; j <= r; j++) {
- val += scl[ri++] - fv;
- tcl[ti++] = round(val * iarr);
- }
- for (int j = r + 1; j < w - r; j++) {
- val += scl[ri++] - scl[li++];
- tcl[ti++] = round(val * iarr);
- }
- for (int j = w - r; j < w; j++) {
- val += lv - scl[li++];
- tcl[ti++] = round(val * iarr);
+
+ #pragma omp parallel for shared (scl, tcl)
+ for (int i = 0; i < h; ++i) {
+ for (int ch = 0; ch < 4; ++ch) {
+ int ti = i * w, li = ti, ri = ti + r;
+ int fv = scl[ti * 4 + ch], lv = scl[(ti + w - 1) * 4 + ch], val = (r + 1) * fv;
+ for (int j = 0; j < r; ++j) {
+ val += scl[(ti + j) * 4 + ch];
+ }
+ for (int j = 0; j <= r; ++j) {
+ val += scl[ri++ * 4 + ch] - fv;
+ tcl[ti++ * 4 + ch] = round(val * iarr);
+ }
+ for (int j = r + 1; j < w - r; ++j) {
+ val += scl[ri++ * 4 + ch] - scl[li++ * 4 + ch];
+ tcl[ti++ * 4 + ch] = round(val * iarr);
+ }
+ for (int j = w - r; j < w; ++j) {
+ val += lv - scl[li++ * 4 + ch];
+ tcl[ti++ * 4 + ch] = round(val * iarr);
+ }
}
}
}
void Blur::boxBlurT(unsigned char *scl, unsigned char *tcl, int w, int h, int r) {
float iarr = 1.0 / (r + r + 1);
+
+ #pragma omp parallel for shared (scl, tcl)
for (int i = 0; i < w; i++) {
- int ti = i, li = ti, ri = ti + r * w;
- int fv = scl[ti], lv = scl[ti + w * (h - 1)], val = (r + 1) * fv;
- for (int j = 0; j < r; j++) val += scl[ti + j * w];
- for (int j = 0; j <= r; j++) {
- val += scl[ri] - fv;
- tcl[ti] = round(val * iarr);
- ri += w;
- ti += w;
- }
- for (int j = r + 1; j < h - r; j++) {
- val += scl[ri] - scl[li];
- tcl[ti] = round(val * iarr);
- li += w;
- ri += w;
- ti += w;
- }
- for (int j = h - r; j < h; j++) {
- val += lv - scl[li];
- tcl[ti] = round(val * iarr);
- li += w;
- ti += w;
+ for (int ch = 0; ch < 4; ++ch) {
+ int ti = i, li = ti, ri = ti + r * w;
+ int fv = scl[ti * 4 + ch], lv = scl[(ti + w * (h - 1)) * 4 + ch], val = (r + 1) * fv;
+ for (int j = 0; j < r; j++) val += scl[(ti + j * w) * 4 + ch];
+ for (int j = 0; j <= r; j++) {
+ val += scl[ri * 4 + ch] - fv;
+ tcl[ti * 4 + ch] = round(val * iarr);
+ ri += w;
+ ti += w;
+ }
+ for (int j = r + 1; j < h - r; j++) {
+ val += scl[ri * 4 + ch] - scl[li * 4 + ch];
+ tcl[ti * 4 + ch] = round(val * iarr);
+ li += w;
+ ri += w;
+ ti += w;
+ }
+ for (int j = h - r; j < h; j++) {
+ val += lv - scl[li * 4 + ch];
+ tcl[ti * 4 + ch] = round(val * iarr);
+ li += w;
+ ti += w;
+ }
}
}
}
// Generate JSON string of this object
-std::string Blur::Json() {
+std::string Blur::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value Blur::JsonValue() {
+// Generate Json::Value for this object
+Json::Value Blur::JsonValue() const {
// Create root json object
Json::Value root = EffectBase::JsonValue(); // get parent properties
@@ -274,24 +191,12 @@ Json::Value Blur::JsonValue() {
}
// Load JSON string into this object
-void Blur::SetJson(std::string value) {
+void Blur::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -302,8 +207,8 @@ void Blur::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void Blur::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void Blur::SetJsonValue(const Json::Value root) {
// Set parent data
EffectBase::SetJsonValue(root);
@@ -320,7 +225,7 @@ void Blur::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
-std::string Blur::PropertiesJSON(int64_t requested_frame) {
+std::string Blur::PropertiesJSON(int64_t requested_frame) const {
// Generate JSON properties list
Json::Value root;
diff --git a/src/effects/Brightness.cpp b/src/effects/Brightness.cpp
index b8113b876..321a19a78 100644
--- a/src/effects/Brightness.cpp
+++ b/src/effects/Brightness.cpp
@@ -72,35 +72,24 @@ std::shared_ptr Brightness::GetFrame(std::shared_ptr frame, int64_
// Loop through pixels
unsigned char *pixels = (unsigned char *) frame_image->bits();
- for (int pixel = 0, byte_index=0; pixel < frame_image->width() * frame_image->height(); pixel++, byte_index+=4)
- {
- // Get the RGB values from the pixel
- int R = pixels[byte_index];
- int G = pixels[byte_index + 1];
- int B = pixels[byte_index + 2];
- int A = pixels[byte_index + 3];
+ int pixel_count = frame_image->width() * frame_image->height();
- // Adjust the contrast
+ #pragma omp parallel for
+ for (int pixel = 0; pixel < pixel_count; ++pixel)
+ {
+ // Compute contrast adjustment factor
float factor = (259 * (contrast_value + 255)) / (255 * (259 - contrast_value));
- R = constrain((factor * (R - 128)) + 128);
- G = constrain((factor * (G - 128)) + 128);
- B = constrain((factor * (B - 128)) + 128);
-
- // Adjust the brightness
- R += (255 * brightness_value);
- G += (255 * brightness_value);
- B += (255 * brightness_value);
-
- // Constrain the value from 0 to 255
- R = constrain(R);
- G = constrain(G);
- B = constrain(B);
-
- // Set all pixels to new value
- pixels[byte_index] = R;
- pixels[byte_index + 1] = G;
- pixels[byte_index + 2] = B;
- pixels[byte_index + 3] = A; // leave the alpha value alone
+
+ // Get RGB pixels from image and apply constrained contrast adjustment
+ int R = constrain((factor * (pixels[pixel * 4] - 128)) + 128);
+ int G = constrain((factor * (pixels[pixel * 4 + 1] - 128)) + 128);
+ int B = constrain((factor * (pixels[pixel * 4 + 2] - 128)) + 128);
+ // (Don't modify Alpha value)
+
+ // Adjust brightness and write constrained values back to image
+ pixels[pixel * 4] = constrain(R + (255 * brightness_value));
+ pixels[pixel * 4 + 1] = constrain(G + (255 * brightness_value));
+ pixels[pixel * 4 + 2] = constrain(B + (255 * brightness_value));
}
// return the modified frame
@@ -108,14 +97,14 @@ std::shared_ptr Brightness::GetFrame(std::shared_ptr frame, int64_
}
// Generate JSON string of this object
-std::string Brightness::Json() {
+std::string Brightness::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value Brightness::JsonValue() {
+// Generate Json::Value for this object
+Json::Value Brightness::JsonValue() const {
// Create root json object
Json::Value root = EffectBase::JsonValue(); // get parent properties
@@ -128,24 +117,12 @@ Json::Value Brightness::JsonValue() {
}
// Load JSON string into this object
-void Brightness::SetJson(std::string value) {
+void Brightness::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -156,8 +133,8 @@ void Brightness::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void Brightness::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void Brightness::SetJsonValue(const Json::Value root) {
// Set parent data
EffectBase::SetJsonValue(root);
@@ -170,7 +147,7 @@ void Brightness::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
-std::string Brightness::PropertiesJSON(int64_t requested_frame) {
+std::string Brightness::PropertiesJSON(int64_t requested_frame) const {
// Generate JSON properties list
Json::Value root;
diff --git a/src/effects/ChromaKey.cpp b/src/effects/ChromaKey.cpp
index 30c4dfce8..dbb56a693 100644
--- a/src/effects/ChromaKey.cpp
+++ b/src/effects/ChromaKey.cpp
@@ -101,14 +101,14 @@ std::shared_ptr ChromaKey::GetFrame(std::shared_ptr frame, int64_t
}
// Generate JSON string of this object
-std::string ChromaKey::Json() {
+std::string ChromaKey::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value ChromaKey::JsonValue() {
+// Generate Json::Value for this object
+Json::Value ChromaKey::JsonValue() const {
// Create root json object
Json::Value root = EffectBase::JsonValue(); // get parent properties
@@ -121,24 +121,12 @@ Json::Value ChromaKey::JsonValue() {
}
// Load JSON string into this object
-void ChromaKey::SetJson(std::string value) {
+void ChromaKey::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -149,8 +137,8 @@ void ChromaKey::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void ChromaKey::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void ChromaKey::SetJsonValue(const Json::Value root) {
// Set parent data
EffectBase::SetJsonValue(root);
@@ -163,7 +151,7 @@ void ChromaKey::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
-std::string ChromaKey::PropertiesJSON(int64_t requested_frame) {
+std::string ChromaKey::PropertiesJSON(int64_t requested_frame) const {
// Generate JSON properties list
Json::Value root;
diff --git a/src/effects/ColorShift.cpp b/src/effects/ColorShift.cpp
index 4fc9c941c..7ec62e14c 100644
--- a/src/effects/ColorShift.cpp
+++ b/src/effects/ColorShift.cpp
@@ -33,7 +33,7 @@
using namespace openshot;
/// Blank constructor, useful when using Json to load the effect properties
-ColorShift::ColorShift() : red_x(-0.05), red_y(0.0), green_x(0.05), green_y(0.0), blue_x(0.0), blue_y(0.0), alpha_x(0.0), alpha_y(0.0) {
+ColorShift::ColorShift() : red_x(0.0), red_y(0.0), green_x(0.0), green_y(0.0), blue_x(0.0), blue_y(0.0), alpha_x(0.0), alpha_y(0.0) {
// Init effect properties
init_effect_details();
}
@@ -75,25 +75,24 @@ std::shared_ptr ColorShift::GetFrame(std::shared_ptr frame, int64_
// Get the current shift amount, and clamp to range (-1 to 1 range)
// Red Keyframes
float red_x_shift = red_x.GetValue(frame_number);
- int red_x_shift_limit = round(frame_image_width * fmod(abs(red_x_shift), 1.0));
+ int red_x_shift_limit = round(frame_image_width * fmod(fabs(red_x_shift), 1.0));
float red_y_shift = red_y.GetValue(frame_number);
- int red_y_shift_limit = round(frame_image_height * fmod(abs(red_y_shift), 1.0));
+ int red_y_shift_limit = round(frame_image_height * fmod(fabs(red_y_shift), 1.0));
// Green Keyframes
float green_x_shift = green_x.GetValue(frame_number);
- int green_x_shift_limit = round(frame_image_width * fmod(abs(green_x_shift), 1.0));
+ int green_x_shift_limit = round(frame_image_width * fmod(fabs(green_x_shift), 1.0));
float green_y_shift = green_y.GetValue(frame_number);
- int green_y_shift_limit = round(frame_image_height * fmod(abs(green_y_shift), 1.0));
+ int green_y_shift_limit = round(frame_image_height * fmod(fabs(green_y_shift), 1.0));
// Blue Keyframes
float blue_x_shift = blue_x.GetValue(frame_number);
- int blue_x_shift_limit = round(frame_image_width * fmod(abs(blue_x_shift), 1.0));
+ int blue_x_shift_limit = round(frame_image_width * fmod(fabs(blue_x_shift), 1.0));
float blue_y_shift = blue_y.GetValue(frame_number);
- int blue_y_shift_limit = round(frame_image_height * fmod(abs(blue_y_shift), 1.0));
+ int blue_y_shift_limit = round(frame_image_height * fmod(fabs(blue_y_shift), 1.0));
// Alpha Keyframes
float alpha_x_shift = alpha_x.GetValue(frame_number);
- int alpha_x_shift_limit = round(frame_image_width * fmod(abs(alpha_x_shift), 1.0));
+ int alpha_x_shift_limit = round(frame_image_width * fmod(fabs(alpha_x_shift), 1.0));
float alpha_y_shift = alpha_y.GetValue(frame_number);
- int alpha_y_shift_limit = round(frame_image_height * fmod(abs(alpha_y_shift), 1.0));
-
+ int alpha_y_shift_limit = round(frame_image_height * fmod(fabs(alpha_y_shift), 1.0));
// Make temp copy of pixels
unsigned char *temp_image = new unsigned char[frame_image_width * frame_image_height * 4]();
@@ -130,7 +129,6 @@ std::shared_ptr ColorShift::GetFrame(std::shared_ptr frame, int64_
blue_starting_row_index = starting_row_index;
alpha_starting_row_index = starting_row_index;
-
red_pixel_offset = 0;
green_pixel_offset = 0;
blue_pixel_offset = 0;
@@ -194,14 +192,14 @@ std::shared_ptr ColorShift::GetFrame(std::shared_ptr frame, int64_
}
// Generate JSON string of this object
-std::string ColorShift::Json() {
+std::string ColorShift::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value ColorShift::JsonValue() {
+// Generate Json::Value for this object
+Json::Value ColorShift::JsonValue() const {
// Create root json object
Json::Value root = EffectBase::JsonValue(); // get parent properties
@@ -220,24 +218,12 @@ Json::Value ColorShift::JsonValue() {
}
// Load JSON string into this object
-void ColorShift::SetJson(std::string value) {
+void ColorShift::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -248,8 +234,8 @@ void ColorShift::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void ColorShift::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void ColorShift::SetJsonValue(const Json::Value root) {
// Set parent data
EffectBase::SetJsonValue(root);
@@ -274,7 +260,7 @@ void ColorShift::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
-std::string ColorShift::PropertiesJSON(int64_t requested_frame) {
+std::string ColorShift::PropertiesJSON(int64_t requested_frame) const {
// Generate JSON properties list
Json::Value root;
diff --git a/src/effects/Crop.cpp b/src/effects/Crop.cpp
index 8a4afa5e1..b1c3d38d9 100644
--- a/src/effects/Crop.cpp
+++ b/src/effects/Crop.cpp
@@ -114,14 +114,14 @@ std::shared_ptr Crop::GetFrame(std::shared_ptr frame, int64_t fram
}
// Generate JSON string of this object
-std::string Crop::Json() {
+std::string Crop::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value Crop::JsonValue() {
+// Generate Json::Value for this object
+Json::Value Crop::JsonValue() const {
// Create root json object
Json::Value root = EffectBase::JsonValue(); // get parent properties
@@ -136,24 +136,12 @@ Json::Value Crop::JsonValue() {
}
// Load JSON string into this object
-void Crop::SetJson(std::string value) {
+void Crop::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -164,8 +152,8 @@ void Crop::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void Crop::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void Crop::SetJsonValue(const Json::Value root) {
// Set parent data
EffectBase::SetJsonValue(root);
@@ -182,7 +170,7 @@ void Crop::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
-std::string Crop::PropertiesJSON(int64_t requested_frame) {
+std::string Crop::PropertiesJSON(int64_t requested_frame) const {
// Generate JSON properties list
Json::Value root;
diff --git a/src/effects/Deinterlace.cpp b/src/effects/Deinterlace.cpp
index a78af9314..39b3316a5 100644
--- a/src/effects/Deinterlace.cpp
+++ b/src/effects/Deinterlace.cpp
@@ -96,14 +96,14 @@ std::shared_ptr Deinterlace::GetFrame(std::shared_ptr frame, int64
}
// Generate JSON string of this object
-std::string Deinterlace::Json() {
+std::string Deinterlace::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value Deinterlace::JsonValue() {
+// Generate Json::Value for this object
+Json::Value Deinterlace::JsonValue() const {
// Create root json object
Json::Value root = EffectBase::JsonValue(); // get parent properties
@@ -115,24 +115,12 @@ Json::Value Deinterlace::JsonValue() {
}
// Load JSON string into this object
-void Deinterlace::SetJson(std::string value) {
+void Deinterlace::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -143,8 +131,8 @@ void Deinterlace::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void Deinterlace::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void Deinterlace::SetJsonValue(const Json::Value root) {
// Set parent data
EffectBase::SetJsonValue(root);
@@ -155,7 +143,7 @@ void Deinterlace::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
-std::string Deinterlace::PropertiesJSON(int64_t requested_frame) {
+std::string Deinterlace::PropertiesJSON(int64_t requested_frame) const {
// Generate JSON properties list
Json::Value root;
diff --git a/src/effects/Hue.cpp b/src/effects/Hue.cpp
index 4083d0356..eb4808e31 100644
--- a/src/effects/Hue.cpp
+++ b/src/effects/Hue.cpp
@@ -66,36 +66,35 @@ std::shared_ptr Hue::GetFrame(std::shared_ptr frame, int64_t frame
// Get the frame's image
std::shared_ptr frame_image = frame->GetImage();
+ int pixel_count = frame_image->width() * frame_image->height();
+
// Get the current hue percentage shift amount, and convert to degrees
double degrees = 360.0 * hue.GetValue(frame_number);
float cosA = cos(degrees*3.14159265f/180);
float sinA = sin(degrees*3.14159265f/180);
// Calculate a rotation matrix for the RGB colorspace (based on the current hue shift keyframe value)
- float matrix[3][3] = {{cosA + (1.0f - cosA) / 3.0f, 1.0f/3.0f * (1.0f - cosA) - sqrtf(1.0f/3.0f) * sinA, 1.0f/3.0f * (1.0f - cosA) + sqrtf(1.0f/3.0f) * sinA},
- {1.0f/3.0f * (1.0f - cosA) + sqrtf(1.0f/3.0f) * sinA, cosA + 1.0f/3.0f*(1.0f - cosA), 1.0f/3.0f * (1.0f - cosA) - sqrtf(1.0f/3.0f) * sinA},
- {1.0f/3.0f * (1.0f - cosA) - sqrtf(1.0f/3.0f) * sinA, 1.0f/3.0f * (1.0f - cosA) + sqrtf(1.0f/3.0f) * sinA, cosA + 1.0f/3.0f * (1.0f - cosA)}};
+ float matrix[3] = {
+ cosA + (1.0f - cosA) / 3.0f,
+ 1.0f/3.0f * (1.0f - cosA) - sqrtf(1.0f/3.0f) * sinA,
+ 1.0f/3.0f * (1.0f - cosA) + sqrtf(1.0f/3.0f) * sinA
+ };
// Loop through pixels
unsigned char *pixels = (unsigned char *) frame_image->bits();
- for (int pixel = 0, byte_index=0; pixel < frame_image->width() * frame_image->height(); pixel++, byte_index+=4)
+
+ #pragma omp parallel for shared (pixels)
+ for (int pixel = 0; pixel < pixel_count; ++pixel)
{
- // Get the RGB values from the pixel
- int R = pixels[byte_index];
- int G = pixels[byte_index + 1];
- int B = pixels[byte_index + 2];
- int A = pixels[byte_index + 3];
+ // Get the RGB values from the pixel (ignore the alpha channel)
+ int R = pixels[pixel * 4];
+ int G = pixels[pixel * 4 + 1];
+ int B = pixels[pixel * 4 + 2];
// Multiply each color by the hue rotation matrix
- float rx = constrain(R * matrix[0][0] + G * matrix[0][1] + B * matrix[0][2]);
- float gx = constrain(R * matrix[1][0] + G * matrix[1][1] + B * matrix[1][2]);
- float bx = constrain(R * matrix[2][0] + G * matrix[2][1] + B * matrix[2][2]);
-
- // Set all pixels to new value
- pixels[byte_index] = rx;
- pixels[byte_index + 1] = gx;
- pixels[byte_index + 2] = bx;
- pixels[byte_index + 3] = A; // leave the alpha value alone
+ pixels[pixel * 4] = constrain(R * matrix[0] + G * matrix[1] + B * matrix[2]);
+ pixels[pixel * 4 + 1] = constrain(R * matrix[2] + G * matrix[0] + B * matrix[1]);
+ pixels[pixel * 4 + 2] = constrain(R * matrix[1] + G * matrix[2] + B * matrix[0]);
}
// return the modified frame
@@ -103,14 +102,14 @@ std::shared_ptr Hue::GetFrame(std::shared_ptr frame, int64_t frame
}
// Generate JSON string of this object
-std::string Hue::Json() {
+std::string Hue::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value Hue::JsonValue() {
+// Generate Json::Value for this object
+Json::Value Hue::JsonValue() const {
// Create root json object
Json::Value root = EffectBase::JsonValue(); // get parent properties
@@ -122,24 +121,12 @@ Json::Value Hue::JsonValue() {
}
// Load JSON string into this object
-void Hue::SetJson(std::string value) {
+void Hue::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -150,8 +137,8 @@ void Hue::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void Hue::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void Hue::SetJsonValue(const Json::Value root) {
// Set parent data
EffectBase::SetJsonValue(root);
@@ -162,7 +149,7 @@ void Hue::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
-std::string Hue::PropertiesJSON(int64_t requested_frame) {
+std::string Hue::PropertiesJSON(int64_t requested_frame) const {
// Generate JSON properties list
Json::Value root;
diff --git a/src/effects/Mask.cpp b/src/effects/Mask.cpp
index b804c2148..11c37f053 100644
--- a/src/effects/Mask.cpp
+++ b/src/effects/Mask.cpp
@@ -150,14 +150,14 @@ std::shared_ptr Mask::GetFrame(std::shared_ptr frame, int64_t fram
}
// Generate JSON string of this object
-std::string Mask::Json() {
+std::string Mask::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value Mask::JsonValue() {
+// Generate Json::Value for this object
+Json::Value Mask::JsonValue() const {
// Create root json object
Json::Value root = EffectBase::JsonValue(); // get parent properties
@@ -175,24 +175,12 @@ Json::Value Mask::JsonValue() {
}
// Load JSON string into this object
-void Mask::SetJson(std::string value) {
+void Mask::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -203,8 +191,8 @@ void Mask::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void Mask::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void Mask::SetJsonValue(const Json::Value root) {
// Set parent data
EffectBase::SetJsonValue(root);
@@ -271,7 +259,7 @@ void Mask::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
-std::string Mask::PropertiesJSON(int64_t requested_frame) {
+std::string Mask::PropertiesJSON(int64_t requested_frame) const {
// Generate JSON properties list
Json::Value root;
diff --git a/src/effects/Negate.cpp b/src/effects/Negate.cpp
index cce594984..18a5d194c 100644
--- a/src/effects/Negate.cpp
+++ b/src/effects/Negate.cpp
@@ -58,14 +58,14 @@ std::shared_ptr Negate::GetFrame(std::shared_ptr frame, int64_t fr
}
// Generate JSON string of this object
-std::string Negate::Json() {
+std::string Negate::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value Negate::JsonValue() {
+// Generate Json::Value for this object
+Json::Value Negate::JsonValue() const {
// Create root json object
Json::Value root = EffectBase::JsonValue(); // get parent properties
@@ -76,24 +76,12 @@ Json::Value Negate::JsonValue() {
}
// Load JSON string into this object
-void Negate::SetJson(std::string value) {
+void Negate::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -104,8 +92,8 @@ void Negate::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void Negate::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void Negate::SetJsonValue(const Json::Value root) {
// Set parent data
EffectBase::SetJsonValue(root);
@@ -113,7 +101,7 @@ void Negate::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
-std::string Negate::PropertiesJSON(int64_t requested_frame) {
+std::string Negate::PropertiesJSON(int64_t requested_frame) const {
// Generate JSON properties list
Json::Value root;
diff --git a/src/effects/Pixelate.cpp b/src/effects/Pixelate.cpp
index a57a186f1..c993915c5 100644
--- a/src/effects/Pixelate.cpp
+++ b/src/effects/Pixelate.cpp
@@ -75,34 +75,20 @@ std::shared_ptr Pixelate::GetFrame(std::shared_ptr frame, int64_t
double bottom_value = bottom.GetValue(frame_number);
if (pixelization_value > 0.0) {
- // Resize frame image smaller (based on pixelization value)
- std::shared_ptr smaller_frame_image = std::shared_ptr(new QImage(frame_image->scaledToWidth(std::max(frame_image->width() * pixelization_value, 2.0), Qt::SmoothTransformation)));
-
- // Resize image back to original size (with no smoothing to create pixelated image)
- std::shared_ptr pixelated_image = std::shared_ptr(new QImage(smaller_frame_image->scaledToWidth(frame_image->width(), Qt::FastTransformation).convertToFormat(QImage::Format_RGBA8888)));
-
- // Get pixel array pointer
- unsigned char *pixels = (unsigned char *) frame_image->bits();
- unsigned char *pixelated_pixels = (unsigned char *) pixelated_image->bits();
-
- // Get pixels sizes of all margins
- int top_bar_height = top_value * frame_image->height();
- int bottom_bar_height = bottom_value * frame_image->height();
- int left_bar_width = left_value * frame_image->width();
- int right_bar_width = right_value * frame_image->width();
-
- // Loop through rows
- for (int row = 0; row < frame_image->height(); row++) {
-
- // Copy pixelated pixels into original frame image (where needed)
- if ((row >= top_bar_height) && (row <= frame_image->height() - bottom_bar_height)) {
- memcpy(&pixels[(row * frame_image->width() + left_bar_width) * 4], &pixelated_pixels[(row * frame_image->width() + left_bar_width) * 4], sizeof(char) * (frame_image->width() - left_bar_width - right_bar_width) * 4);
- }
- }
-
- // Cleanup temp images
- smaller_frame_image.reset();
- pixelated_image.reset();
+ int w = frame_image->width();
+ int h = frame_image->height();
+
+ // Define area we're working on in terms of a QRect with QMargins applied
+ QRect area(QPoint(0,0), frame_image->size());
+ area = area.marginsRemoved({int(left_value * w), int(top_value * h), int(right_value * w), int(bottom_value * h)});
+
+ // Copy and scale pixels in area to be pixelated
+ auto frame_scaled = frame_image->copy(area).scaledToWidth(area.width() * pixelization_value, Qt::SmoothTransformation);
+
+ // Draw pixelated image back over original
+ QPainter painter(frame_image.get());
+ painter.drawImage(area, frame_scaled);
+ painter.end();
}
// return the modified frame
@@ -110,14 +96,14 @@ std::shared_ptr Pixelate::GetFrame(std::shared_ptr frame, int64_t
}
// Generate JSON string of this object
-std::string Pixelate::Json() {
+std::string Pixelate::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value Pixelate::JsonValue() {
+// Generate Json::Value for this object
+Json::Value Pixelate::JsonValue() const {
// Create root json object
Json::Value root = EffectBase::JsonValue(); // get parent properties
@@ -133,24 +119,12 @@ Json::Value Pixelate::JsonValue() {
}
// Load JSON string into this object
-void Pixelate::SetJson(std::string value) {
+void Pixelate::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -161,8 +135,8 @@ void Pixelate::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void Pixelate::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void Pixelate::SetJsonValue(const Json::Value root) {
// Set parent data
EffectBase::SetJsonValue(root);
@@ -181,7 +155,7 @@ void Pixelate::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
-std::string Pixelate::PropertiesJSON(int64_t requested_frame) {
+std::string Pixelate::PropertiesJSON(int64_t requested_frame) const {
// Generate JSON properties list
Json::Value root;
diff --git a/src/effects/Saturation.cpp b/src/effects/Saturation.cpp
index 06bcb02c2..d5c295eb2 100644
--- a/src/effects/Saturation.cpp
+++ b/src/effects/Saturation.cpp
@@ -69,44 +69,36 @@ std::shared_ptr Saturation::GetFrame(std::shared_ptr frame, int64_
if (!frame_image)
return frame;
+ int pixel_count = frame_image->width() * frame_image->height();
+
// Get keyframe values for this frame
float saturation_value = saturation.GetValue(frame_number);
// Constants used for color saturation formula
- double pR = .299;
- double pG = .587;
- double pB = .114;
+ const double pR = .299;
+ const double pG = .587;
+ const double pB = .114;
// Loop through pixels
unsigned char *pixels = (unsigned char *) frame_image->bits();
- for (int pixel = 0, byte_index=0; pixel < frame_image->width() * frame_image->height(); pixel++, byte_index+=4)
+
+ #pragma omp parallel for shared (pixels)
+ for (int pixel = 0; pixel < pixel_count; ++pixel)
{
// Get the RGB values from the pixel
- int R = pixels[byte_index];
- int G = pixels[byte_index + 1];
- int B = pixels[byte_index + 2];
- int A = pixels[byte_index + 3];
+ int R = pixels[pixel * 4];
+ int G = pixels[pixel * 4 + 1];
+ int B = pixels[pixel * 4 + 2];
// Calculate the saturation multiplier
double p = sqrt( (R * R * pR) +
- (G * G * pG) +
- (B * B * pB) );
-
- // Adjust the saturation
- R = p + (R - p) * saturation_value;
- G = p + (G - p) * saturation_value;
- B = p + (B - p) * saturation_value;
-
- // Constrain the value from 0 to 255
- R = constrain(R);
- G = constrain(G);
- B = constrain(B);
-
- // Set all pixels to new value
- pixels[byte_index] = R;
- pixels[byte_index + 1] = G;
- pixels[byte_index + 2] = B;
- pixels[byte_index + 3] = A; // leave the alpha value alone
+ (G * G * pG) +
+ (B * B * pB) );
+
+ // Apply adjusted and constrained saturation
+ pixels[pixel * 4] = constrain(p + (R - p) * saturation_value);
+ pixels[pixel * 4 + 1] = constrain(p + (G - p) * saturation_value);
+ pixels[pixel * 4 + 2] = constrain(p + (B - p) * saturation_value);
}
// return the modified frame
@@ -114,14 +106,14 @@ std::shared_ptr Saturation::GetFrame(std::shared_ptr frame, int64_
}
// Generate JSON string of this object
-std::string Saturation::Json() {
+std::string Saturation::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value Saturation::JsonValue() {
+// Generate Json::Value for this object
+Json::Value Saturation::JsonValue() const {
// Create root json object
Json::Value root = EffectBase::JsonValue(); // get parent properties
@@ -133,24 +125,12 @@ Json::Value Saturation::JsonValue() {
}
// Load JSON string into this object
-void Saturation::SetJson(std::string value) {
+void Saturation::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -161,8 +141,8 @@ void Saturation::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void Saturation::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void Saturation::SetJsonValue(const Json::Value root) {
// Set parent data
EffectBase::SetJsonValue(root);
@@ -173,7 +153,7 @@ void Saturation::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
-std::string Saturation::PropertiesJSON(int64_t requested_frame) {
+std::string Saturation::PropertiesJSON(int64_t requested_frame) const {
// Generate JSON properties list
Json::Value root;
diff --git a/src/effects/Shift.cpp b/src/effects/Shift.cpp
index d0908fd88..ee5815912 100644
--- a/src/effects/Shift.cpp
+++ b/src/effects/Shift.cpp
@@ -69,9 +69,9 @@ std::shared_ptr Shift::GetFrame(std::shared_ptr frame, int64_t fra
// Get the current shift amount, and clamp to range (-1 to 1 range)
double x_shift = x.GetValue(frame_number);
- double x_shift_limit = fmod(abs(x_shift), 1.0);
+ double x_shift_limit = fmod(fabs(x_shift), 1.0);
double y_shift = y.GetValue(frame_number);
- double y_shift_limit = fmod(abs(y_shift), 1.0);
+ double y_shift_limit = fmod(fabs(y_shift), 1.0);
// Declare temp arrays to hold pixels while we move things around
unsigned char *temp_row = new unsigned char[frame_image->width() * 4]();
@@ -133,14 +133,14 @@ std::shared_ptr Shift::GetFrame(std::shared_ptr frame, int64_t fra
}
// Generate JSON string of this object
-std::string Shift::Json() {
+std::string Shift::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value Shift::JsonValue() {
+// Generate Json::Value for this object
+Json::Value Shift::JsonValue() const {
// Create root json object
Json::Value root = EffectBase::JsonValue(); // get parent properties
@@ -153,24 +153,12 @@ Json::Value Shift::JsonValue() {
}
// Load JSON string into this object
-void Shift::SetJson(std::string value) {
+void Shift::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -181,8 +169,8 @@ void Shift::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void Shift::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void Shift::SetJsonValue(const Json::Value root) {
// Set parent data
EffectBase::SetJsonValue(root);
@@ -195,7 +183,7 @@ void Shift::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
-std::string Shift::PropertiesJSON(int64_t requested_frame) {
+std::string Shift::PropertiesJSON(int64_t requested_frame) const {
// Generate JSON properties list
Json::Value root;
diff --git a/src/effects/Wave.cpp b/src/effects/Wave.cpp
index 3b1cfb210..499fc9588 100644
--- a/src/effects/Wave.cpp
+++ b/src/effects/Wave.cpp
@@ -68,15 +68,13 @@ std::shared_ptr Wave::GetFrame(std::shared_ptr frame, int64_t fram
// Get the frame's image
std::shared_ptr frame_image = frame->GetImage();
- // Get pixels for frame image
+ // Get original pixels for frame image, and also make a copy for editing
+ const unsigned char *original_pixels = (unsigned char *) frame_image->constBits();
unsigned char *pixels = (unsigned char *) frame_image->bits();
-
- // Make temp copy of pixels before we start changing them
- unsigned char *temp_image = new unsigned char[frame_image->width() * frame_image->height() * 4]();
- memcpy(temp_image, pixels, sizeof(char) * frame_image->width() * frame_image->height() * 4);
+ int pixel_count = frame_image->width() * frame_image->height();
// Get current keyframe values
- double time = frame_number;//abs(((frame_number + 255) % 510) - 255);
+ double time = frame_number;
double wavelength_value = wavelength.GetValue(frame_number);
double amplitude_value = amplitude.GetValue(frame_number);
double multiplier_value = multiplier.GetValue(frame_number);
@@ -84,43 +82,41 @@ std::shared_ptr Wave::GetFrame(std::shared_ptr frame, int64_t fram
double speed_y_value = speed_y.GetValue(frame_number);
// Loop through pixels
- for (int pixel = 0, byte_index=0; pixel < frame_image->width() * frame_image->height(); pixel++, byte_index+=4)
+ #pragma omp parallel for
+ for (int pixel = 0; pixel < pixel_count; ++pixel)
{
- // Calculate X and Y pixel coordinates
+ // Calculate pixel Y value
int Y = pixel / frame_image->width();
// Calculate wave pixel offsets
- float noiseVal = (100 + Y * 0.001) * multiplier_value; // Time and time multiplier (to make the wave move)
- float noiseAmp = noiseVal * amplitude_value; // Apply amplitude / height of the wave
- float waveformVal = sin((Y * wavelength_value) + (time * speed_y_value)); // Waveform algorithm on y-axis
- float waveVal = (waveformVal + shift_x_value) * noiseAmp; // Shifts pixels on the x-axis
+ float noiseVal = (100 + Y * 0.001) * multiplier_value; // Time and time multiplier (to make the wave move)
+ float noiseAmp = noiseVal * amplitude_value; // Apply amplitude / height of the wave
+ float waveformVal = sin((Y * wavelength_value) + (time * speed_y_value)); // Waveform algorithm on y-axis
+ float waveVal = (waveformVal + shift_x_value) * noiseAmp; // Shifts pixels on the x-axis
- long unsigned int source_X = round(pixel + waveVal) * 4;
- if (source_X < 0)
- source_X = 0;
- if (source_X > frame_image->width() * frame_image->height() * 4 * sizeof(char))
- source_X = (frame_image->width() * frame_image->height() * 4 * sizeof(char)) - (sizeof(char) * 4);
+ long unsigned int source_px = round(pixel + waveVal);
+ if (source_px < 0)
+ source_px = 0;
+ if (source_px >= pixel_count)
+ source_px = pixel_count - 1;
// Calculate source array location, and target array location, and copy the 4 color values
- memcpy(&pixels[byte_index], &temp_image[source_X], sizeof(char) * 4);
+ memcpy(&pixels[pixel * 4], &original_pixels[source_px * 4], sizeof(char) * 4);
}
- // Delete arrays
- delete[] temp_image;
-
// return the modified frame
return frame;
}
// Generate JSON string of this object
-std::string Wave::Json() {
+std::string Wave::Json() const {
// Return formatted string
return JsonValue().toStyledString();
}
-// Generate Json::JsonValue for this object
-Json::Value Wave::JsonValue() {
+// Generate Json::Value for this object
+Json::Value Wave::JsonValue() const {
// Create root json object
Json::Value root = EffectBase::JsonValue(); // get parent properties
@@ -136,24 +132,12 @@ Json::Value Wave::JsonValue() {
}
// Load JSON string into this object
-void Wave::SetJson(std::string value) {
+void Wave::SetJson(const std::string value) {
// Parse JSON string into JSON objects
- Json::Value root;
- Json::CharReaderBuilder rbuilder;
- Json::CharReader* reader(rbuilder.newCharReader());
-
- std::string errors;
- bool success = reader->parse( value.c_str(),
- value.c_str() + value.size(), &root, &errors );
- delete reader;
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
try
{
+ const Json::Value root = openshot::stringToJson(value);
// Set all values that match
SetJsonValue(root);
}
@@ -164,8 +148,8 @@ void Wave::SetJson(std::string value) {
}
}
-// Load Json::JsonValue into this object
-void Wave::SetJsonValue(Json::Value root) {
+// Load Json::Value into this object
+void Wave::SetJsonValue(const Json::Value root) {
// Set parent data
EffectBase::SetJsonValue(root);
@@ -184,7 +168,7 @@ void Wave::SetJsonValue(Json::Value root) {
}
// Get all properties for a specific frame
-std::string Wave::PropertiesJSON(int64_t requested_frame) {
+std::string Wave::PropertiesJSON(int64_t requested_frame) const {
// Generate JSON properties list
Json::Value root;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4b2284f63..480dfb3d3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -24,108 +24,116 @@
# along with OpenShot Library. If not, see .
################################################################################
-SET(TEST_MEDIA_PATH "${PROJECT_SOURCE_DIR}/src/examples/")
+# Test media path, used by unit tests for input data
+file(TO_NATIVE_PATH "${PROJECT_SOURCE_DIR}/src/examples/" TEST_MEDIA_PATH)
+add_definitions( -DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" )
################ WINDOWS ##################
# Set some compiler options for Windows
# required for libopenshot-audio headers
-IF (WIN32)
- STRING(REPLACE "/" "\\\\" TEST_MEDIA_PATH TEST_MEDIA_PATH)
+if(WIN32)
add_definitions( -DIGNORE_JUCE_HYPOT=1 )
- SET(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -include cmath")
-ENDIF(WIN32)
-
-add_definitions( -DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" )
+ set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -include cmath")
+endif()
################### UNITTEST++ #####################
# Find UnitTest++ libraries (used for unit testing)
-FIND_PACKAGE(UnitTest++ REQUIRED)
+find_package(UnitTest++)
+
+if (NOT UnitTest++_FOUND)
+ set(TESTS_ENABLED OFF PARENT_SCOPE)
+ return()
+endif()
# Include UnitTest++ headers (needed for compile)
-include_directories(${UNITTEST++_INCLUDE_DIR})
+include_directories(${UnitTest++_INCLUDE_DIRS})
+
+set_package_properties(UnitTest++ PROPERTIES
+ TYPE RECOMMENDED
+ PURPOSE "Unit testing framework")
################ IMAGE MAGICK ##################
# Set the Quantum Depth that ImageMagick was built with (default to 16 bits)
-IF (MAGICKCORE_QUANTUM_DEPTH)
+if(MAGICKCORE_QUANTUM_DEPTH)
add_definitions( -DMAGICKCORE_QUANTUM_DEPTH=${MAGICKCORE_QUANTUM_DEPTH} )
-ELSE (MAGICKCORE_QUANTUM_DEPTH)
+else()
add_definitions( -DMAGICKCORE_QUANTUM_DEPTH=16 )
-ENDIF (MAGICKCORE_QUANTUM_DEPTH)
-IF (MAGICKCORE_HDRI_ENABLE)
+endif()
+
+if(MAGICKCORE_HDRI_ENABLE)
add_definitions( -DMAGICKCORE_HDRI_ENABLE=${MAGICKCORE_HDRI_ENABLE} )
-ELSE (MAGICKCORE_HDRI_ENABLE)
+else()
add_definitions( -DMAGICKCORE_HDRI_ENABLE=0 )
-ENDIF (MAGICKCORE_HDRI_ENABLE)
-IF (OPENSHOT_IMAGEMAGICK_COMPATIBILITY)
+endif()
+
+if(OPENSHOT_IMAGEMAGICK_COMPATIBILITY)
add_definitions( -DOPENSHOT_IMAGEMAGICK_COMPATIBILITY=${OPENSHOT_IMAGEMAGICK_COMPATIBILITY} )
-ELSE (OPENSHOT_IMAGEMAGICK_COMPATIBILITY)
+else()
add_definitions( -DOPENSHOT_IMAGEMAGICK_COMPATIBILITY=0 )
-ENDIF (OPENSHOT_IMAGEMAGICK_COMPATIBILITY)
+endif()
# Find the ImageMagick++ library
-FIND_PACKAGE(ImageMagick COMPONENTS Magick++ MagickWand MagickCore)
-IF (ImageMagick_FOUND)
+find_package(ImageMagick COMPONENTS Magick++ MagickWand MagickCore)
+if(ImageMagick_FOUND)
# Include ImageMagick++ headers (needed for compile)
include_directories(${ImageMagick_INCLUDE_DIRS})
# define a global var (used in the C++)
add_definitions( -DUSE_IMAGEMAGICK=1 )
- SET(CMAKE_SWIG_FLAGS "-DUSE_IMAGEMAGICK=1")
-
-ENDIF (ImageMagick_FOUND)
+ set(CMAKE_SWIG_FLAGS "-DUSE_IMAGEMAGICK=1")
+endif()
################# LIBOPENSHOT-AUDIO ###################
# Find JUCE-based openshot Audio libraries
-FIND_PACKAGE(OpenShotAudio 0.1.9 REQUIRED)
+find_package(OpenShotAudio 0.2.0 REQUIRED)
# Include Juce headers (needed for compile)
include_directories(${LIBOPENSHOT_AUDIO_INCLUDE_DIRS})
################# BLACKMAGIC DECKLINK ###################
-IF (ENABLE_BLACKMAGIC)
+if(ENABLE_BLACKMAGIC)
# Find BlackMagic DeckLinkAPI libraries
- FIND_PACKAGE(BlackMagic)
+ find_package(BlackMagic)
- IF (BLACKMAGIC_FOUND)
+ if(BLACKMAGIC_FOUND)
# Include Blackmagic headers (needed for compile)
include_directories(${BLACKMAGIC_INCLUDE_DIR})
- ENDIF (BLACKMAGIC_FOUND)
-ENDIF (ENABLE_BLACKMAGIC)
+ endif()
+endif()
############### SET TEST SOURCE FILES #################
-SET ( OPENSHOT_TEST_FILES
- Cache_Tests.cpp
- Clip_Tests.cpp
- Color_Tests.cpp
- Coordinate_Tests.cpp
- ReaderBase_Tests.cpp
- ImageWriter_Tests.cpp
- FFmpegReader_Tests.cpp
- FFmpegWriter_Tests.cpp
- Fraction_Tests.cpp
- Frame_Tests.cpp
- FrameMapper_Tests.cpp
- KeyFrame_Tests.cpp
- Point_Tests.cpp
- Settings_Tests.cpp
- Timeline_Tests.cpp )
+set(OPENSHOT_TEST_FILES
+ Cache_Tests.cpp
+ Clip_Tests.cpp
+ Color_Tests.cpp
+ Coordinate_Tests.cpp
+ ReaderBase_Tests.cpp
+ ImageWriter_Tests.cpp
+ FFmpegReader_Tests.cpp
+ FFmpegWriter_Tests.cpp
+ Fraction_Tests.cpp
+ Frame_Tests.cpp
+ FrameMapper_Tests.cpp
+ KeyFrame_Tests.cpp
+ Point_Tests.cpp
+ Settings_Tests.cpp
+ Timeline_Tests.cpp )
################ TESTER EXECUTABLE #################
# Create unit test executable (openshot-test)
message (STATUS "Tests enabled, test executable will be built as tests/openshot-test")
add_executable(openshot-test
- tests.cpp
- ${OPENSHOT_TEST_FILES} )
+ tests.cpp
+ ${OPENSHOT_TEST_FILES} )
# Link libraries to the new executable
-target_link_libraries(openshot-test openshot ${UNITTEST++_LIBRARY})
+target_link_libraries(openshot-test openshot ${UnitTest++_LIBRARIES})
##### RUNNING TESTS (make os_test / make test) #####
# Hook up the 'make os_test' target to the 'openshot-test' executable
-ADD_CUSTOM_TARGET(os_test COMMAND openshot-test)
-list(APPEND OS_TEST_CMDS "'make os_test'")
+add_custom_target(os_test COMMAND openshot-test)
# Also hook up 'make test', if possible
# This requires CMake 3.11+, where the CMP0037 policy
@@ -137,8 +145,8 @@ endif()
if (CMAKE_VERSION VERSION_GREATER 3.11)
message(STATUS "Cmake 3.11+ detected, enabling 'test' target")
add_custom_target(test COMMAND openshot-test)
- list(APPEND OS_TEST_CMDS " or " "'make test'")
+ set(TEST_TARGET_NAME "test")
+else()
+ set(TEST_TARGET_NAME "os_test")
endif()
-
-string(CONCAT t ${OS_TEST_CMDS})
-message("\nTo run unit tests, use: ${t}")
+add_feature_info("Testrunner" ENABLE_TESTS "Run unit tests with 'make ${TEST_TARGET_NAME}'")
diff --git a/tests/Clip_Tests.cpp b/tests/Clip_Tests.cpp
index c66cc9a48..f72d8b05e 100644
--- a/tests/Clip_Tests.cpp
+++ b/tests/Clip_Tests.cpp
@@ -29,14 +29,22 @@
*/
#include "UnitTest++.h"
+
+// Work around older versions of UnitTest++ without REQUIRE
+#ifndef REQUIRE
+ #define REQUIRE
+#endif
+
// Prevent name clashes with juce::UnitTest
#define DONT_SET_USING_JUCE_NAMESPACE 1
#include "../include/OpenShot.h"
-using namespace std;
using namespace openshot;
-TEST(Clip_Default_Constructor)
+SUITE(Clip)
+{
+
+TEST(Default_Constructor)
{
// Create a empty clip
Clip c1;
@@ -54,7 +62,7 @@ TEST(Clip_Default_Constructor)
TEST(Clip_Constructor)
{
// Create a empty clip
- stringstream path;
+ std::stringstream path;
path << TEST_MEDIA_PATH << "piano.wav";
Clip c1(path.str());
c1.Open();
@@ -69,7 +77,7 @@ TEST(Clip_Constructor)
CHECK_CLOSE(4.39937f, c1.End(), 0.00001);
}
-TEST(Clip_Basic_Gettings_and_Setters)
+TEST(Basic_Gettings_and_Setters)
{
// Create a empty clip
Clip c1;
@@ -96,7 +104,7 @@ TEST(Clip_Basic_Gettings_and_Setters)
CHECK_CLOSE(10.5f, c1.End(), 0.00001);
}
-TEST(Clip_Properties)
+TEST(Properties)
{
// Create a empty clip
Clip c1;
@@ -110,116 +118,75 @@ TEST(Clip_Properties)
c1.alpha.AddPoint(500, 0.0);
// Get properties JSON string at frame 1
- string properties = c1.PropertiesJSON(1);
+ std::string properties = c1.PropertiesJSON(1);
// Parse JSON string into JSON objects
Json::Value root;
Json::CharReaderBuilder rbuilder;
Json::CharReader* reader(rbuilder.newCharReader());
- string errors;
- bool success = reader->parse( properties.c_str(),
- properties.c_str() + properties.size(), &root, &errors );
-
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
- try
- {
- // Check for specific things
- CHECK_CLOSE(1.0f, root["alpha"]["value"].asDouble(), 0.01);
- CHECK_EQUAL(true, root["alpha"]["keyframe"].asBool());
-
- }
- catch (const std::exception& e)
- {
- // Error parsing JSON (or missing keys)
- throw InvalidJSON("JSON is invalid (missing keys or invalid data types)");
- }
+ std::string errors;
+ bool success = reader->parse(
+ properties.c_str(),
+ properties.c_str() + properties.size(),
+ &root, &errors );
+ CHECK_EQUAL(true, success);
+ // Check for specific things
+ CHECK_CLOSE(1.0f, root["alpha"]["value"].asDouble(), 0.01);
+ CHECK_EQUAL(true, root["alpha"]["keyframe"].asBool());
// Get properties JSON string at frame 250
properties = c1.PropertiesJSON(250);
// Parse JSON string into JSON objects
root.clear();
- success = reader->parse( properties.c_str(),
- properties.c_str() + properties.size(), &root, &errors );
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
- try
- {
- // Check for specific things
- CHECK_CLOSE(0.5f, root["alpha"]["value"].asDouble(), 0.01);
- CHECK_EQUAL(false, root["alpha"]["keyframe"].asBool());
-
- }
- catch (const std::exception& e)
- {
- // Error parsing JSON (or missing keys)
- throw InvalidJSON("JSON is invalid (missing keys or invalid data types)");
- }
+ success = reader->parse(
+ properties.c_str(),
+ properties.c_str() + properties.size(),
+ &root, &errors );
+ REQUIRE CHECK_EQUAL(true, success);
+ // Check for specific things
+ CHECK_CLOSE(0.5f, root["alpha"]["value"].asDouble(), 0.01);
+ CHECK_EQUAL(false, root["alpha"]["keyframe"].asBool());
// Get properties JSON string at frame 250 (again)
- properties = c1.PropertiesJSON(250); // again
+ properties = c1.PropertiesJSON(250);
// Parse JSON string into JSON objects
root.clear();
- success = reader->parse( properties.c_str(),
- properties.c_str() + properties.size(), &root, &errors );
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
- try
- {
- // Check for specific things
- CHECK_EQUAL(false, root["alpha"]["keyframe"].asBool());
-
- }
- catch (const std::exception& e)
- {
- // Error parsing JSON (or missing keys)
- throw InvalidJSON("JSON is invalid (missing keys or invalid data types)");
- }
+ success = reader->parse(
+ properties.c_str(),
+ properties.c_str() + properties.size(),
+ &root, &errors );
+ REQUIRE CHECK_EQUAL(true, success);
+ // Check for specific things
+ CHECK_EQUAL(false, root["alpha"]["keyframe"].asBool());
// Get properties JSON string at frame 500
properties = c1.PropertiesJSON(500);
// Parse JSON string into JSON objects
root.clear();
- success = reader->parse( properties.c_str(),
- properties.c_str() + properties.size(), &root, &errors );
- if (!success)
- // Raise exception
- throw InvalidJSON("JSON could not be parsed (or is invalid)");
-
- try
- {
- // Check for specific things
- CHECK_CLOSE(0.0f, root["alpha"]["value"].asDouble(), 0.00001);
- CHECK_EQUAL(true, root["alpha"]["keyframe"].asBool());
-
- }
- catch (const std::exception& e)
- {
- // Error parsing JSON (or missing keys)
- throw InvalidJSON("JSON is invalid (missing keys or invalid data types)");
- }
+ success = reader->parse(
+ properties.c_str(),
+ properties.c_str() + properties.size(),
+ &root, &errors );
+ REQUIRE CHECK_EQUAL(true, success);
+ // Check for specific things
+ CHECK_CLOSE(0.0f, root["alpha"]["value"].asDouble(), 0.00001);
+ CHECK_EQUAL(true, root["alpha"]["keyframe"].asBool());
// Free up the reader we allocated
delete reader;
}
-TEST(Clip_Effects)
+TEST(Effects)
{
// Load clip with video
- stringstream path;
+ std::stringstream path;
path << TEST_MEDIA_PATH << "sintel_trailer-720p.mp4";
Clip c10(path.str());
c10.Open();
@@ -264,3 +231,6 @@ TEST(Clip_Effects)
// Check the # of Effects
CHECK_EQUAL(2, (int)c10.Effects().size());
}
+
+} // SUITE
+
diff --git a/tests/FFmpegWriter_Tests.cpp b/tests/FFmpegWriter_Tests.cpp
index 21940b1b3..cb75a118a 100644
--- a/tests/FFmpegWriter_Tests.cpp
+++ b/tests/FFmpegWriter_Tests.cpp
@@ -36,7 +36,8 @@
using namespace std;
using namespace openshot;
-TEST(FFmpegWriter_Test_Webm)
+SUITE(FFMpegWriter) {
+TEST(Webm)
{
// Reader
stringstream path;
@@ -82,3 +83,46 @@ TEST(FFmpegWriter_Test_Webm)
CHECK_CLOSE(23, (int)pixels[pixel_index + 2], 5);
CHECK_CLOSE(255, (int)pixels[pixel_index + 3], 5);
}
+
+TEST(Options_Overloads)
+{
+ // Reader
+ stringstream path;
+ path << TEST_MEDIA_PATH << "sintel_trailer-720p.mp4";
+ FFmpegReader r(path.str());
+ r.Open();
+
+ /* WRITER ---------------- */
+ FFmpegWriter w("output1.mp4");
+
+ // Set options
+ w.SetAudioOptions("aac", 48000, 192000);
+ w.SetVideoOptions("libx264", 1280, 720, Fraction(30,1), 5000000);
+
+ // Open writer
+ w.Open();
+
+ // Write some frames
+ w.WriteFrame(&r, 24, 50);
+
+ // Close writer & reader
+ w.Close();
+ r.Close();
+
+ FFmpegReader r1("output1.mp4");
+ r1.Open();
+
+ // Verify implied settings
+ CHECK_EQUAL(true, r1.info.has_audio);
+ CHECK_EQUAL(true, r1.info.has_video);
+
+ CHECK_EQUAL(2, r1.GetFrame(1)->GetAudioChannelsCount());
+ CHECK_EQUAL(LAYOUT_STEREO, r1.info.channel_layout);
+
+ CHECK_EQUAL(1, r1.info.pixel_ratio.num);
+ CHECK_EQUAL(1, r1.info.pixel_ratio.den);
+ CHECK_EQUAL(false, r1.info.interlaced_frame);
+ CHECK_EQUAL(true, r1.info.top_field_first);
+}
+
+} // SUITE()
diff --git a/tests/ReaderBase_Tests.cpp b/tests/ReaderBase_Tests.cpp
index 8ac283218..776529d3c 100644
--- a/tests/ReaderBase_Tests.cpp
+++ b/tests/ReaderBase_Tests.cpp
@@ -49,9 +49,9 @@ TEST(ReaderBase_Derived_Class)
std::shared_ptr GetFrame(int64_t number) { std::shared_ptr f(new Frame()); return f; }
void Close() { };
void Open() { };
- string Json() { return NULL; };
+ string Json() const { return ""; };
void SetJson(string value) { };
- Json::Value JsonValue() { return (int) NULL; };
+ Json::Value JsonValue() const { return Json::Value("{}"); };
void SetJsonValue(Json::Value root) { };
bool IsOpen() { return true; };
string Name() { return "TestReader"; };
@@ -60,6 +60,23 @@ TEST(ReaderBase_Derived_Class)
// Create an instance of the derived class
TestReader t1;
+ // Validate the new class
+ CHECK_EQUAL("TestReader", t1.Name());
+
+ t1.Close();
+ t1.Open();
+ CHECK_EQUAL(true, t1.IsOpen());
+
+ CHECK_EQUAL(true, t1.GetCache() == NULL);
+
+ t1.SetJson("{ }");
+ t1.SetJsonValue(Json::Value("{}"));
+ CHECK_EQUAL("", t1.Json());
+ auto json = t1.JsonValue();
+ CHECK_EQUAL(json, Json::Value("{}"));
+
+ auto f = t1.GetFrame(1);
+
// Check some of the default values of the FileInfo struct on the base class
CHECK_EQUAL(false, t1.info.has_audio);
CHECK_EQUAL(false, t1.info.has_audio);