Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
stitchEm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Franco (nextime) Lanza
stitchEm
Commits
ae2aee72
Commit
ae2aee72
authored
Nov 09, 2019
by
Jeremy Tellaa
Committed by
jeremad
Dec 05, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(rtmp): fix rtmp plugin compilation on windows
parent
e1e316df
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
65 additions
and
22 deletions
+65
-22
CMakeLists.txt
IO/CMakeLists.txt
+4
-2
baseAllocator.hpp
IO/src/av/include/baseAllocator.hpp
+1
-1
hwDevice.hpp
IO/src/av/include/hwDevice.hpp
+1
-1
export.cpp
IO/src/exr/src/export.cpp
+2
-2
CMakeLists.txt
IO/src/rtmp/CMakeLists.txt
+46
-6
baseAllocator.hpp
IO/src/rtmp/Intel/include/baseAllocator.hpp
+1
-1
buffering.hpp
IO/src/rtmp/Intel/include/buffering.hpp
+1
-1
hwDevice.hpp
IO/src/rtmp/Intel/include/hwDevice.hpp
+1
-1
d3dDevice.cpp
IO/src/rtmp/Intel/src/d3dDevice.cpp
+1
-1
aacDecoder.hpp
IO/src/rtmp/include/aacDecoder.hpp
+1
-1
aacEncoder.hpp
IO/src/rtmp/include/aacEncoder.hpp
+1
-1
qsvEncoder.hpp
IO/src/rtmp/include/qsvEncoder.hpp
+1
-1
nvenc.cpp
IO/src/rtmp/src/nvenc.cpp
+1
-1
qsvDecoder.cpp
IO/src/rtmp/src/qsvDecoder.cpp
+1
-1
CUDA.cmake
cmake/CUDA.cmake
+2
-1
No files found.
IO/CMakeLists.txt
View file @
ae2aee72
...
@@ -103,7 +103,6 @@ endforeach(OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES)
...
@@ -103,7 +103,6 @@ endforeach(OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES)
option
(
DISABLE_RTMP
"Create RTMP I/O plugin"
OFF
)
option
(
DISABLE_RTMP
"Create RTMP I/O plugin"
OFF
)
option
(
DISABLE_PORTAUDIO
"Create Portaudio I/O plugin"
${
CMAKE_CROSSCOMPILING
}
)
option
(
DISABLE_PORTAUDIO
"Create Portaudio I/O plugin"
${
CMAKE_CROSSCOMPILING
}
)
#add_subdirectory(src/rtmp)
if
(
LINUX OR ANDROID
)
if
(
LINUX OR ANDROID
)
add_subdirectory
(
src/v4l2
)
add_subdirectory
(
src/v4l2
)
endif
(
LINUX OR ANDROID
)
endif
(
LINUX OR ANDROID
)
...
@@ -113,13 +112,16 @@ if(LINUX OR WINDOWS)
...
@@ -113,13 +112,16 @@ if(LINUX OR WINDOWS)
endif
(
LINUX OR WINDOWS
)
endif
(
LINUX OR WINDOWS
)
if
(
WINDOWS
)
if
(
WINDOWS
)
find_library
(
libmfxhw64 libmfx HINTS
"
${
INTEL_MEDIA_SDK_PATH
}
\\
lib
\\
x64"
REQUIRED
)
find_library
(
libmfxhw64 libmfx_vs2015 HINTS
"
${
INTEL_MEDIA_SDK_PATH
}
\\
lib
\\
x64"
REQUIRED
)
include_directories
(
"
${
INTEL_MEDIA_SDK_PATH
}
\\
include"
)
include_directories
(
"
${
INTEL_MEDIA_SDK_PATH
}
\\
igfx_s3dcontrol
\\
include"
)
#add_subdirectory(src/aja)
#add_subdirectory(src/aja)
add_subdirectory
(
src/decklink
)
add_subdirectory
(
src/decklink
)
add_subdirectory
(
src/magewell
)
add_subdirectory
(
src/magewell
)
add_subdirectory
(
src/magewellpro
)
add_subdirectory
(
src/magewellpro
)
add_subdirectory
(
src/ximea_2
)
add_subdirectory
(
src/ximea_2
)
endif
(
WINDOWS
)
endif
(
WINDOWS
)
add_subdirectory
(
src/rtmp
)
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
...
...
IO/src/av/include/baseAllocator.hpp
View file @
ae2aee72
...
@@ -29,7 +29,7 @@ Copyright(c) 2008-2013 Intel Corporation. All Rights Reserved.
...
@@ -29,7 +29,7 @@ Copyright(c) 2008-2013 Intel Corporation. All Rights Reserved.
#include <string.h>
#include <string.h>
#include <functional>
#include <functional>
#include "mfx
/mfx
video.h"
#include "mfxvideo.h"
struct
mfxAllocatorParams
{
struct
mfxAllocatorParams
{
virtual
~
mfxAllocatorParams
(){};
virtual
~
mfxAllocatorParams
(){};
...
...
IO/src/av/include/hwDevice.hpp
View file @
ae2aee72
...
@@ -10,7 +10,7 @@ Copyright(c) 2013 Intel Corporation. All Rights Reserved.
...
@@ -10,7 +10,7 @@ Copyright(c) 2013 Intel Corporation. All Rights Reserved.
#pragma once
#pragma once
#include "mfx
/mfx
video.h"
#include "mfxvideo.h"
#if defined(WIN32) || defined(WIN64)
#if defined(WIN32) || defined(WIN64)
#ifndef D3D_SURFACES_SUPPORT
#ifndef D3D_SURFACES_SUPPORT
...
...
IO/src/exr/src/export.cpp
View file @
ae2aee72
...
@@ -15,9 +15,9 @@
...
@@ -15,9 +15,9 @@
#include "libvideostitch/ptv.hpp"
#include "libvideostitch/ptv.hpp"
#include <ostream>
#include <ostream>
#ifdef
_MSC_VER
#ifdef
DELAY_LOAD_ENABLED
SET_DELAY_LOAD_HOOK
SET_DELAY_LOAD_HOOK
#endif //
_MSC_VER
#endif //
DELAY_LOAD_ENABLED
/** \name Services for reader plugin. */
/** \name Services for reader plugin. */
//\{
//\{
...
...
IO/src/rtmp/CMakeLists.txt
View file @
ae2aee72
...
@@ -227,12 +227,10 @@ endif(USE_AVFORMAT)
...
@@ -227,12 +227,10 @@ endif(USE_AVFORMAT)
set_property
(
TARGET
${
PLUGIN_NAME
}
PROPERTY CXX_STANDARD 14
)
set_property
(
TARGET
${
PLUGIN_NAME
}
PROPERTY CXX_STANDARD 14
)
if
(
WINDOWS
)
if
(
WINDOWS
)
find_library
(
libx264 libx264 REQUIRED
)
find_library
(
librtmp librtmp REQUIRED
)
find_library
(
librtmp librtmp REQUIRED
)
find_package
(
mp3lame CONFIG REQUIRED
)
find_package
(
mp3lame CONFIG REQUIRED
)
find_library
(
libmpghip libmpghip-static HINTS
"
${
CMAKE_EXTERNAL_LIB
}
/lame"
REQUIRED NO_DEFAULT_PATH
)
find_library
(
libmpghip libmpghip-static HINTS
"
${
CMAKE_EXTERNAL_LIB
}
/lame"
REQUIRED NO_DEFAULT_PATH
)
find_library
(
libfaac libfaac HINTS
"
${
CMAKE_EXTERNAL_LIB
}
/faac"
REQUIRED NO_DEFAULT_PATH
)
find_library
(
libmfxhw64 libmfx HINTS
"
${
CMAKE_EXTERNAL_LIB
}
/Intel_Media_SDK"
REQUIRED NO_DEFAULT_PATH
)
find_library
(
libvfaad libfaad2 HINTS
"
${
CMAKE_EXTERNAL_LIB
}
/faad"
REQUIRED NO_DEFAULT_PATH
)
set
(
DirectX_LIB
set
(
DirectX_LIB
dxva2
dxva2
d3d9
d3d9
...
@@ -240,8 +238,50 @@ if(WINDOWS)
...
@@ -240,8 +238,50 @@ if(WINDOWS)
d3d11
d3d11
Ws2_32
Ws2_32
Winmm
)
Winmm
)
target_link_libraries
(
${
PLUGIN_NAME
}
PRIVATE
${
librtmp
}
${
libx264
}
mp3lame:mp3lame
${
libmfxhw64
}
${
DirectX_LIB
}
)
target_link_libraries
(
${
PLUGIN_NAME
}
PRIVATE
${
librtmp
}
${
libx264
}
mp3lame:
:
mp3lame
${
libmfxhw64
}
${
DirectX_LIB
}
)
set_property
(
TARGET
${
PLUGIN_NAME
}
APPEND_STRING PROPERTY LINK_FLAGS
"/NODEFAULTLIB:libcmt /NODEFAULTLIB:libcmtd"
)
set_property
(
TARGET
${
PLUGIN_NAME
}
APPEND_STRING PROPERTY LINK_FLAGS
"/NODEFAULTLIB:libcmt /NODEFAULTLIB:libcmtd"
)
find_package
(
Git
)
include
(
ExternalProject
)
############################################################
## Build FAAC
############################################################
ExternalProject_Add
(
faac
GIT_REPOSITORY https://github.com/stitchEm/faac.git
GIT_TAG master
PATCH_COMMAND
""
CONFIGURE_COMMAND echo
"Configure faac..."
BUILD_COMMAND msbuild
/p:Configuration=Release,Platform=x64
/m <SOURCE_DIR>/libfaac/libfaac_dll.sln
INSTALL_COMMAND echo
"..."
LICENSE_FILES COPYING
)
ExternalProject_Get_Property
(
faac SOURCE_DIR
)
target_include_directories
(
${
PLUGIN_NAME
}
PRIVATE
${
SOURCE_DIR
}
/include
)
set
(
Faac_LIBRARY
${
SOURCE_DIR
}
/libfaac/ReleaseDLL/libfaac.lib
)
############################################################
## Build FAAD2
############################################################
ExternalProject_Add
(
faad2
GIT_REPOSITORY https://github.com/stitchEm/faad2.git
GIT_TAG xmms2
PATCH_COMMAND
""
CONFIGURE_COMMAND echo
"Configure faad2..."
BUILD_COMMAND msbuild
/p:Configuration=Release,Platform=x64
/m <SOURCE_DIR>/libfaad/libfaad2_dll.sln
INSTALL_COMMAND echo
"..."
LICENSE_FILES COPYING
)
ExternalProject_Get_Property
(
faad2 SOURCE_DIR
)
add_dependencies
(
${
PLUGIN_NAME
}
faad2 faac
)
set
(
libfaad
${
SOURCE_DIR
}
/libfaad/ReleaseDLL/libfaad2.lib
)
target_include_directories
(
${
PLUGIN_NAME
}
PRIVATE
${
SOURCE_DIR
}
/include
)
target_link_libraries
(
${
PLUGIN_NAME
}
PRIVATE
${
Faac_LIBRARY
}
${
libfaad
}
${
CUVID
}
)
endif
()
endif
()
if
(
LINUX OR ANDROID
)
if
(
LINUX OR ANDROID
)
...
@@ -267,10 +307,10 @@ if(LINUX OR ANDROID)
...
@@ -267,10 +307,10 @@ if(LINUX OR ANDROID)
endif
()
endif
()
target_link_libraries
(
${
PLUGIN_NAME
}
PRIVATE
${
librtmp
}
${
libx264
}
${
libmp3lame
}
${
libfaac
}
${
libvfaad
}
)
target_link_libraries
(
${
PLUGIN_NAME
}
PRIVATE
${
librtmp
}
${
libx264
}
${
libmp3lame
}
${
libfaac
}
${
libvfaad
}
)
if
(
RTMP_QUICKSYNC
)
if
(
RTMP_QUICKSYNC
)
find_library
(
libmfxhw64 mfxhw64 HINTS
${
CMAKE_EXTERNAL_LIB
}
REQUIRED NO_DEFAULT_PATH
)
find_library
(
igfx_s3dcontrol igfx_s3dcontrol PATH
"
${
INTEL_MEDIA_SDK_PATH
}
\\
igfx_s3dcontrol
\\
lib
\\
x64"
REQUIRED
)
find_library
(
libva va HINTS
${
CMAKE_EXTERNAL_LIB
}
REQUIRED NO_SYSTEM_ENVIRONMENT_PATH
)
find_library
(
libva va HINTS
${
CMAKE_EXTERNAL_LIB
}
REQUIRED NO_SYSTEM_ENVIRONMENT_PATH
)
find_library
(
libva_drm va-drm HINTS
${
CMAKE_EXTERNAL_LIB
}
REQUIRED NO_SYSTEM_ENVIRONMENT_PATH
)
find_library
(
libva_drm va-drm HINTS
${
CMAKE_EXTERNAL_LIB
}
REQUIRED NO_SYSTEM_ENVIRONMENT_PATH
)
target_link_libraries
(
${
PLUGIN_NAME
}
PRIVATE
${
libmfxhw64
}
${
libva
}
${
libva_drm
}
)
target_link_libraries
(
${
PLUGIN_NAME
}
PRIVATE
${
libmfxhw64
}
${
libva
}
${
libva_drm
}
${
igfx_s3dcontrol
}
)
endif
()
endif
()
endif
()
endif
()
...
...
IO/src/rtmp/Intel/include/baseAllocator.hpp
View file @
ae2aee72
...
@@ -29,7 +29,7 @@ Copyright(c) 2008-2013 Intel Corporation. All Rights Reserved.
...
@@ -29,7 +29,7 @@ Copyright(c) 2008-2013 Intel Corporation. All Rights Reserved.
#include <string.h>
#include <string.h>
#include <functional>
#include <functional>
#include "mfx
/mfx
video++.h"
#include "mfxvideo++.h"
struct
mfxAllocatorParams
{
struct
mfxAllocatorParams
{
virtual
~
mfxAllocatorParams
(){};
virtual
~
mfxAllocatorParams
(){};
...
...
IO/src/rtmp/Intel/include/buffering.hpp
View file @
ae2aee72
...
@@ -13,7 +13,7 @@ Copyright(c) 2014 Intel Corporation. All Rights Reserved.
...
@@ -13,7 +13,7 @@ Copyright(c) 2014 Intel Corporation. All Rights Reserved.
#include <stdio.h>
#include <stdio.h>
#include "mfx
/mfx
structures.h"
#include "mfxstructures.h"
#include <atomic>
#include <atomic>
#include <mutex>
#include <mutex>
...
...
IO/src/rtmp/Intel/include/hwDevice.hpp
View file @
ae2aee72
...
@@ -10,7 +10,7 @@ Copyright(c) 2013 Intel Corporation. All Rights Reserved.
...
@@ -10,7 +10,7 @@ Copyright(c) 2013 Intel Corporation. All Rights Reserved.
#pragma once
#pragma once
#include "mfx
/mfx
video++.h"
#include "mfxvideo++.h"
#if defined(WIN32) || defined(WIN64)
#if defined(WIN32) || defined(WIN64)
#ifndef D3D_SURFACES_SUPPORT
#ifndef D3D_SURFACES_SUPPORT
...
...
IO/src/rtmp/Intel/src/d3dDevice.cpp
View file @
ae2aee72
...
@@ -22,7 +22,7 @@ Copyright(c) 2011-2015 Intel Corporation. All Rights Reserved.
...
@@ -22,7 +22,7 @@ Copyright(c) 2011-2015 Intel Corporation. All Rights Reserved.
#include "d3dDevice.hpp"
#include "d3dDevice.hpp"
#include "d3dAllocator.hpp"
#include "d3dAllocator.hpp"
#include "
mfx/
igfx_s3dcontrol.h"
#include "igfx_s3dcontrol.h"
#include "atlbase.h"
#include "atlbase.h"
...
...
IO/src/rtmp/include/aacDecoder.hpp
View file @
ae2aee72
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
#include "audioDecoder.hpp"
#include "audioDecoder.hpp"
#if defined(_WIN32)
#if defined(_WIN32)
#include "faad
/faad
.h"
#include "faad.h"
#else
#else
#include <neaacdec.h>
#include <neaacdec.h>
#endif
#endif
...
...
IO/src/rtmp/include/aacEncoder.hpp
View file @
ae2aee72
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
#include "librtmpIncludes.hpp"
#include "librtmpIncludes.hpp"
#if defined(_WIN32)
#if defined(_WIN32)
#include "faac
/faac
.h"
#include "faac.h"
#else
#else
#include <faac.h>
#include <faac.h>
#endif
#endif
...
...
IO/src/rtmp/include/qsvEncoder.hpp
View file @
ae2aee72
...
@@ -22,7 +22,7 @@ extern "C" {
...
@@ -22,7 +22,7 @@ extern "C" {
#endif
#endif
}
}
#include "mfx
/mfx
video++.h"
#include "mfxvideo++.h"
#define MFX_IMPL_VIA_MASK(x) (0x0f00 & (x))
#define MFX_IMPL_VIA_MASK(x) (0x0f00 & (x))
#define MSDK_ALIGN16(value) (((value + 15) >> 4) << 4) // round up to a multiple of 16
#define MSDK_ALIGN16(value) (((value + 15) >> 4) << 4) // round up to a multiple of 16
...
...
IO/src/rtmp/src/nvenc.cpp
View file @
ae2aee72
...
@@ -421,7 +421,7 @@ char* NvEncoder::metadata(char* enc, char* pend) {
...
@@ -421,7 +421,7 @@ char* NvEncoder::metadata(char* enc, char* pend) {
extern
"C"
{
extern
"C"
{
#if defined(_WIN32)
#if defined(_WIN32)
#include "x264
/x264
.h"
#include "x264.h"
#else
#else
#include <unistd.h>
#include <unistd.h>
#include <inttypes.h>
#include <inttypes.h>
...
...
IO/src/rtmp/src/qsvDecoder.cpp
View file @
ae2aee72
...
@@ -20,7 +20,7 @@ extern "C" {
...
@@ -20,7 +20,7 @@ extern "C" {
#endif
#endif
}
}
#include "mfx
/mfx
video++.h"
#include "mfxvideo++.h"
#include <thread>
#include <thread>
...
...
cmake/CUDA.cmake
View file @
ae2aee72
...
@@ -24,9 +24,10 @@ if (WINDOWS)
...
@@ -24,9 +24,10 @@ if (WINDOWS)
include_directories
(
"
${
VCPKG_PATH
}
\\
${
VCPKG_TARGET_TRIPLET
}
-static
\\
include"
)
include_directories
(
"
${
VCPKG_PATH
}
\\
${
VCPKG_TARGET_TRIPLET
}
-static
\\
include"
)
include_directories
(
${
OPENGL_INCLUDE_DIRS
}
)
include_directories
(
${
OPENGL_INCLUDE_DIRS
}
)
include_directories
(
${
OPENCV_INCLUDE_DIRS
}
)
include_directories
(
${
OPENCV_INCLUDE_DIRS
}
)
include_directories
(
"
${
NVIDIA_VIDEO_CODEC
}
\\
include"
)
find_library
(
CUDA cuda PATHS
"
${
CUDA_TOOLKIT_ROOT_DIR
}
/lib/x64"
NO_DEFAULT_PATH
)
find_library
(
CUDA cuda PATHS
"
${
CUDA_TOOLKIT_ROOT_DIR
}
/lib/x64"
NO_DEFAULT_PATH
)
find_library
(
CUDART cudart PATHS
"
${
CUDA_TOOLKIT_ROOT_DIR
}
/lib/x64"
NO_DEFAULT_PATH
)
find_library
(
CUDART cudart PATHS
"
${
CUDA_TOOLKIT_ROOT_DIR
}
/lib/x64"
NO_DEFAULT_PATH
)
find_library
(
CUVID nvcuvid PATHS
"
${
CUDA_TOOLKIT_ROOT_DIR
}
/lib/x64"
NO_DEFAULT_PATH
)
find_library
(
CUVID nvcuvid PATHS
"
${
NVIDIA_VIDEO_CODEC
}
\\
Lib
\\
Win32"
)
find_library
(
NVML nvml PATHS
"
${
CUDA_TOOLKIT_ROOT_DIR
}
/lib/x64"
NO_DEFAULT_PATH
)
find_library
(
NVML nvml PATHS
"
${
CUDA_TOOLKIT_ROOT_DIR
}
/lib/x64"
NO_DEFAULT_PATH
)
endif
(
WINDOWS
)
endif
(
WINDOWS
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment