[ffmpeg_consumer] Retired old implementation in favour of the now updated streaming_c...

[casparcg] / modules / ffmpeg / CMakeLists.txt

diff --git a/modules/ffmpeg/CMakeLists.txt b/modules/ffmpeg/CMakeLists.txt
index 9e338085d8faa7e6835a13b8df157068ac86113c..7c34f72f4378c768136447683919fd2673b50615 100644 (file)
--- a/modules/ffmpeg/CMakeLists.txt
+++ b/modules/ffmpeg/CMakeLists.txt
@@ -6,6 +6,7 @@ set(SOURCES
 
                producer/audio/audio_decoder.cpp
 
+               producer/filter/audio_filter.cpp
                producer/filter/filter.cpp
 
                producer/input/input.cpp
@@ -20,6 +21,7 @@ set(SOURCES
                producer/ffmpeg_producer.cpp
                producer/tbb_avcodec.cpp
 
+               audio_channel_remapper.cpp
                ffmpeg.cpp
                ffmpeg_error.cpp
                StdAfx.cpp
@@ -29,6 +31,7 @@ set(HEADERS
 
                producer/audio/audio_decoder.h
 
+               producer/filter/audio_filter.h
                producer/filter/filter.h
 
                producer/input/input.h
@@ -80,6 +83,7 @@ if (MSVC)
                        avcodec.lib
                        avutil.lib
                        avfilter.lib
+                       avdevice.lib
                        swscale.lib
                        swresample.lib
        )
@@ -93,26 +97,41 @@ else()
                        avcodec.so
                        avutil.so
                        avfilter.so
+                       avdevice.so
                        swscale.so
                        swresample.so
                        postproc.so
 
-                       bz2.a
-                       mp3lame.a
-                       opus.a
-                       png.a
-                       theora.a
-                       theoradec.a
-                       theoraenc.a
-                       vorbis.a
-                       vorbisenc.a
-                       vorbisfile.a
-                       ogg.a
-                       vpx.a
-                       x264.a
-                       xvidcore.a
-                       yasm.a
-                       z.a
+                       ass
+                       bluray
+                       crypto
+                       expat
+                       fontconfig
+                       fribidi
+                       gmp
+                       gnutls
+                       gsm
+                       hogweed
+                       ilbc
+                       modplug
+                       mp3lame
+                       nettle
+                       ogg
+                       opencore-amrnb
+                       opencore-amrwb
+                       opus
+                       rtmp
+                       ssl
+                       tasn1
+                       theoradec
+                       theoraenc
+                       vorbis
+                       vorbisenc
+                       vpx
+                       x264
+                       xavs
+                       xvidcore
+                       z
                        -Wl,--end-group
        )
 endif()
@@ -123,22 +142,83 @@ casparcg_add_uninit_statement("ffmpeg::uninit")
 casparcg_add_module_project("ffmpeg")
 
 if(MSVC)
-       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/avcodec-55.dll")
-       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/avdevice-55.dll")
-       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/avfilter-4.dll")
-       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/avformat-55.dll")
-       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/avutil-52.dll")
-       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/postproc-52.dll")
-       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/swresample-0.dll")
-       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/swscale-2.dll")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/avcodec-56.dll")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/avdevice-56.dll")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/avfilter-5.dll")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/avformat-56.dll")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/avutil-54.dll")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/postproc-53.dll")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/swresample-1.dll")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/swscale-3.dll")
 else()
-       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libavcodec.so.55")
-       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libavdevice.so.55")
-       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libavfilter.so.4")
-       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libavformat.so.55")
-       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libavutil.so.52")
-       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libpostproc.so.52")
-       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libswresample.so.0")
-       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libswscale.so.2")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libavcodec.so.56")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libavdevice.so.56")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libavfilter.so.5")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libavformat.so.56")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libavutil.so.54")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libpostproc.so.53")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libswresample.so.1")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libswscale.so.3")
+
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libass.so.5")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libbluray.so.1")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libcrypto.so.1.0.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libexpat.so.1")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libfontconfig.so.1")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libfreetype.so.6")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libfribidi.so.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libgme.so.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libgmp.so.10")
+#      casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libgnutls-openssl.so.27")
+#      casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libgnutls-xssl.so.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libgnutls.so.28")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libgsm.so.1")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libhogweed.so.2")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libilbc.so.2")
+#      casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/liblzma.so.5")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libmodplug.so.1")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libmp3lame.so.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libnettle.so.4")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libogg.so.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libopencore-amrnb.so.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libopencore-amrwb.so.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libopenjpeg.so.1")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libopus.so.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/liborc-0.4.so.0")
+#      casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/liborc-test-0.4.so.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libpcre.so.1")
+#      casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libpcrecpp.so.0")
+#      casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libpcreposix.so.0")
+#      casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libpng.so.3")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libpng12.so.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/librtmp.so.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libschroedinger-1.0.so.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libsoxr-lsr.so.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libsoxr.so.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libspeex.so.1")
+#      casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libspeexdsp.so.1")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libssl.so.1.0.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libtasn1.so.6")
+#      casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libtheora.so.1")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libtheoradec.so.1")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libtheoraenc.so.1")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libtwolame.so.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libva.so.1")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libvidstab.so.0.9")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libvo-aacenc.so.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libvo-amrwbenc.so.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libvorbis.so.0")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libvorbisenc.so.2")
+#      casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libvorbisfile.so.3")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libvpx.so.2")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libwavpack.so.1")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libwebp.so.5")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libx264.so.148")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libx265.so.59")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libxavs.so.1")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libxml2.so.2")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libxvidcore.so.4")
+       casparcg_add_runtime_dependency("${FFMPEG_BIN_PATH}/libz.so.1")
+
 endif()