1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,18 +126,18 @@
#FFMPEG_FIND(LIBAVUTIL avutil avutil.h)
#FFMPEG_FIND(LIBSWSCALE swscale swscale.h)
-SET(FFMPEG_FOUND "NO")
-IF (FFMPEG_LIBAVFORMAT_FOUND AND
-FFMPEG_LIBAVDEVICE_FOUND AND
-FFMPEG_LIBAVCODEC_FOUND AND
-FFMPEG_LIBAVUTIL_FOUND AND
-FFMPEG_LIBSWSCALE_FOUND
-)
-ELSE ()
+#SET(FFMPEG_FOUND "NO")
+#IF (FFMPEG_LIBAVFORMAT_FOUND AND
+#FFMPEG_LIBAVDEVICE_FOUND AND
+#FFMPEG_LIBAVCODEC_FOUND AND
+#FFMPEG_LIBAVUTIL_FOUND AND
+#FFMPEG_LIBSWSCALE_FOUND
+#)
+#ELSE ()
-MESSAGE(STATUS "Could not find FFMPEG")
+#MESSAGE(STATUS "Could not find FFMPEG")
-ENDIF()
+#ENDIF()
# We need add -DQT_WIDGETS_LIB when using QtWidgets in Qt 5.
add_definitions(${Qt5Widgets_DEFINITIONS})
@@ -149,19 +149,19 @@
#find_library(AVCODEC_LIBRARY avcodec PATHS /usr/local/lib /usr/lib /usr/lib64 DOC "avcodec library" REQUIRED)
#find_library(AVUTIL_LIBRARY avutil PATHS /usr/local/lib /usr/lib /usr/lib64 DOC "avutil library" REQUIRED)
-message(STATUS "Found AVFORMAT: " ${AVFORMAT_LIBRARY}
-" Found AVCODEC: " ${AVCODEC_LIBRARY}
-" Found AVUTIL: " ${AVUTIL_LIBRARY}
-${FFMPEG_LIBRARIES} ${FFMPEG_LIBAVFORMAT_LIBRARIES})
+#message(STATUS "Found AVFORMAT: " ${AVFORMAT_LIBRARY}
+#" Found AVCODEC: " ${AVCODEC_LIBRARY}
+#" Found AVUTIL: " ${AVUTIL_LIBRARY}
+#${FFMPEG_LIBRARIES} ${FFMPEG_LIBAVFORMAT_LIBRARIES})
#link_directories(${AVFORMAT_LIBRARY} ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY})
#find_path(FFMPEG_INCLUDE libavformat/avformat.h PATHS /usr/local/include /usr/include DOC "avformat include path" REQUIRED)
-message(STATUS "Found FFMPEG: " ${FFMPEG_INCLUDE})
+#message(STATUS "Found FFMPEG: " ${FFMPEG_INCLUDE})
#include_directories(${FFMPEG_INCLUDE})
-
+#[[
SET (FFMPEG_DIRS
${FFMPEG_INCLUDE}
${FFMPEG_INCLUDE}/libavcodec
@@ -171,7 +171,7 @@
${FFMPEG_INCLUDE}/libavutil
${FFMPEG_INCLUDE}/libavswresample
${FFMPEG_INCLUDE}/libswscale
- )
+ )]]
SET (xine_libs
xine
@@ -179,7 +179,7 @@
#link_directories(${FFMPEG_DIRS})
-message(STATUS "Found FFMPEG_DIRS: " ${FFMPEG_DIRS})
+#message(STATUS "Found FFMPEG_DIRS: " ${FFMPEG_DIRS})
#add_library(
#SDL_ffmpeg
@@ -193,11 +193,11 @@
# PATH_SUFFIXES ffmpeg libavcodec
# )
-find_path(FFMPEG_AVCODEC_INCLUDE_DIR
- NAMES "libavcodec/avcodec.h"
- PATHS /usr/local/include /usr/include
- PATH_SUFFIXES "ffmpeg063"
- )
+#find_path(FFMPEG_AVCODEC_INCLUDE_DIR
+# NAMES "libavcodec/avcodec.h"
+# PATHS /usr/local/include /usr/include
+# PATH_SUFFIXES "ffmpeg063"
+# )
#find_path(FFMPEG_AVFORMAT_INCLUDE_DIR
# NAMES avformat.h
@@ -216,66 +216,77 @@
# PATHS ${_FFMPEG_AVCODEC_LIBRARY_DIRS} /usr/lib /usr/local/lib /opt/local/lib /sw/lib /usr/lib64
# )
-find_library(FFMPEG_AVCODEC_LIBRARY
- NAMES avcodec
- PATHS /usr/local/lib /usr/local/lib64
- )
+#find_library(FFMPEG_AVCODEC_LIBRARY
+# NAMES avcodec
+# PATHS /usr/local/lib /usr/local/lib64
+# )
#find_library(FFMPEG_AVFORMAT_LIBRARY
# NAMES avformat
# PATHS ${_FFMPEG_AVFORMAT_LIBRARY_DIRS} /usr/lib /usr/local/lib /opt/local/lib /sw/lib /usr/lib64
# )
-find_library(FFMPEG_AVFORMAT_LIBRARY
- NAMES avformat
- PATHS /usr/local/lib /usr/local/lib64
- )
+#find_library(FFMPEG_AVFORMAT_LIBRARY
+# NAMES avformat
+# PATHS /usr/local/lib /usr/local/lib64
+# )
-find_library(FFMPEG_AVUTIL_LIBRARY
- NAMES avutil
- PATHS /usr/local/lib /usr/local/lib64
- )
+#find_library(FFMPEG_AVUTIL_LIBRARY
+# NAMES avutil
+# PATHS /usr/local/lib /usr/local/lib64
+# )
#find_library(FFMPEG_SWSCALE_LIBRARY
# NAMES swscale
# PATHS ${_FFMPEG_SWSCALE_LIBRARY_DIRS} /usr/lib /usr/local/lib /opt/local/lib /sw/lib /usr/lib64
# )
-find_library(FFMPEG_SWSCALE_LIBRARY
- NAMES swscale
- PATHS /usr/local/lib /usr/local/lib64
- )
-
+#find_library(FFMPEG_SWSCALE_LIBRARY
+# NAMES swscale
+# PATHS /usr/local/lib /usr/local/lib64
+# )
+
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(FFMPEG REQUIRED IMPORTED_TARGET
+ # libavdevice
+ # libavfilter
+ libavformat
+ libavcodec
+ # libswresample
+ libswscale
+ libavutil
+)
-message(STATUS "Found FFMPEG_AVCODEC_LIBRARY: " ${FFMPEG_AVCODEC_LIBRARY})
+#message(STATUS "Found FFMPEG_AVCODEC_LIBRARY: " ${FFMPEG_AVCODEC_LIBRARY})
#message(STATUS "Found FFMPEG_AVFORMAT_LIBRARY: " ${FFMPEG_AVFORMAT_LIBRARY})
#message(STATUS "Found FFMPEG_SWSCALE_LIBRARY: " ${FFMPEG_SWSCALE_LIBRARY})
-if (FFMPEG_AVCODEC_LIBRARY AND FFMPEG_AVFORMAT_LIBRARY AND FFMPEG_SWSCALE_LIBRARY)
- set(FFMPEG_FOUND TRUE)
-endif (FFMPEG_AVCODEC_LIBRARY AND FFMPEG_AVFORMAT_LIBRARY AND FFMPEG_SWSCALE_LIBRARY)
+#if (FFMPEG_AVCODEC_LIBRARY AND FFMPEG_AVFORMAT_LIBRARY AND FFMPEG_SWSCALE_LIBRARY)
+# set(FFMPEG_FOUND TRUE)
+#endif (FFMPEG_AVCODEC_LIBRARY AND FFMPEG_AVFORMAT_LIBRARY AND FFMPEG_SWSCALE_LIBRARY)
-message(STATUS "FFMPEG_FOUND: " ${FFMPEG_FOUND})
+#message(STATUS "FFMPEG_FOUND: " ${FFMPEG_FOUND})
#if (FFMPEG_FOUND)
set(FFMPEG_INCLUDE_DIRS
- #${FFMPEG_AVCODEC_INCLUDE_DIR}
- #${FFMPEG_AVFORMAT_INCLUDE_DIR}
- #${FFMPEG_SWSCALE_INCLUDE_DIR}
- ${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/include
+ ${FFMPEG_AVCODEC_INCLUDE_DIR}
+ ${FFMPEG_AVFORMAT_INCLUDE_DIR}
+ ${FFMPEG_AVUTIL_INCLUDE_DIR}
+ ${FFMPEG_SWSCALE_INCLUDE_DIR}
+ #${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/include
#/usr/local/include
#/usr/local/include/ffmpeg063
#/usr/include/ffmpeg063
)
set(FFMPEG_LIBRARIES
- #${FFMPEG_AVCODEC_LIBRARY}
- #${FFMPEG_AVFORMAT_LIBRARY}
- #${FFMPEG_AVUTIL_LIBRARY}
- #${FFMPEG_SWSCALE_LIBRARY}
- ${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/lib/libavcodec.so
- ${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/lib/libavformat.so
- ${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/lib/libavutil.so
- ${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/lib/libswscale.so
+ ${FFMPEG_AVCODEC_LIBRARY}
+ ${FFMPEG_AVFORMAT_LIBRARY}
+ ${FFMPEG_AVUTIL_LIBRARY}
+ ${FFMPEG_SWSCALE_LIBRARY}
+ #${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/lib/libavcodec.so
+ #${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/lib/libavformat.so
+ #${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/lib/libavutil.so
+ #${CMAKE_SOURCE_DIR}/qrender/ffmpeg-0.6.3/lib/libswscale.so
#/usr/local/lib64/libavcodec.so
#/usr/local/lib64/libavformat.so
#/usr/local/lib64/libavutil.so
@@ -291,8 +302,8 @@
)
#endif (FFMPEG_FOUND)
-message(STATUS "FFMPEG_INCLUDE_DIRS: " ${FFMPEG_INCLUDE_DIRS})
-message(STATUS "FFMPEG_LIBRARIES: " ${FFMPEG_LIBRARIES})
+#message(STATUS "FFMPEG_INCLUDE_DIRS: " ${FFMPEG_INCLUDE_DIRS})
+#message(STATUS "FFMPEG_LIBRARIES: " ${FFMPEG_LIBRARIES})
if (FFMPEG_FOUND)
if (NOT FFMPEG_FIND_QUIETLY)
diff --git a/qrender/CMakeLists.txt b/qrender/CMakeLists.txt
--- a/qrender/CMakeLists.txt
+++ b/qrender/CMakeLists.txt
@@ -1,7 +1,7 @@
project(qrender)
add_subdirectory(engine)
-add_subdirectory(ffmpeg-0.6.3)
+#add_subdirectory(ffmpeg-0.6.3)
SET(qrender_engine_SOURCES
${CMAKE_SOURCE_DIR}/qrender/engine/ffmpeg_enc.cpp
@@ -55,7 +55,7 @@
#TARGET_LINK_LIBRARIES(qrender ${QT_QTCORE_LIBS}) #ooo
#TARGET_LINK_LIBRARIES(qrender ${QT_LIBRARIES})
#TARGET_LINK_LIBRARIES(qrender ${QT_LIBRARIES} ${FFMPEG_LIBRARIES} ${CMAKE_DL_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${xine_libs} X11)
-TARGET_LINK_LIBRARIES(qrender Qt5::Widgets Qt5::Xml xine X11 Qt5::Network ${FFMPEG_LIBRARIES})
+TARGET_LINK_LIBRARIES(qrender Qt5::Widgets Qt5::Xml xine X11 Qt5::Network PkgConfig::FFMPEG)
#link_directories(${FFMPEG_LIBRARIES})
message(STATUS "Found qrender*:")
|