Adopted codebase to recent version of ffmpeg

martinrunge · May 16, 2021 · 0729941 · 0729941
1 parent 588a9d2
commit 0729941
Show file tree

Hide file tree

Showing 17 changed files with 108 additions and 100 deletions.
diff --git a/.cproject b/.cproject
@@ -14,7 +14,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.base.1720311213" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
+				<configuration buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.base.1720311213" name="Default" optionalBuildProperties="" parent="org.eclipse.cdt.build.core.emptycfg">
 					<folderInfo id="cdt.managedbuild.toolchain.gnu.base.1720311213.1793277265" name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.base.555172591" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF" id="cdt.managedbuild.target.gnu.platform.base.934042772" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
@@ -55,5 +55,12 @@
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.1720311213;cdt.managedbuild.toolchain.gnu.base.1720311213.1793277265;cdt.managedbuild.tool.gnu.cpp.compiler.base.470079098;cdt.managedbuild.tool.gnu.cpp.compiler.input.1788839682">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.1720311213;cdt.managedbuild.toolchain.gnu.base.1720311213.1793277265;cdt.managedbuild.tool.gnu.c.compiler.base.561609744;cdt.managedbuild.tool.gnu.c.compiler.input.1958747181">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
 	</storageModule>
-</cproject>
+	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
+</cproject>
diff --git a/.project b/.project
@@ -5,11 +5,6 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.cmake.CMakeProjectBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
 			<triggers>clean,full,incremental,</triggers>

diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
@@ -1,28 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project>
-
-    <configuration id="cdt.managedbuild.toolchain.gnu.base.1720311213" name="Default">
-
-        <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-
-            <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
-
-            <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
-
-            <provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-
-            <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-515930535791310214" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
-
-                <language-scope id="org.eclipse.cdt.core.gcc"/>
-
-                <language-scope id="org.eclipse.cdt.core.g++"/>
-
-            </provider>
-
-            <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-
-        </extension>
-
-    </configuration>
-
-</project>
+	<configuration id="cdt.managedbuild.toolchain.gnu.base.1720311213" name="Default">
+		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
+			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
+			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
+			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-593221119478997774" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+				<language-scope id="org.eclipse.cdt.core.gcc"/>
+				<language-scope id="org.eclipse.cdt.core.g++"/>
+			</provider>
+			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
+			<provider build-parser-id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" cdb-modified-time="1621172231902" cdb-path="/home/martin/muroa/debug/compile_commands.json" class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.CompilationDatabaseParser" id="org.eclipse.cdt.managedbuilder.core.CompilationDatabaseParser" name="Compilation Database Parser" prefer-non-shared="true"/>
+		</extension>
+	</configuration>
+</project>
diff --git a/aux/cmake/Modules/Findlibswresample.cmake b/aux/cmake/Modules/Findlibswresample.cmake
@@ -0,0 +1,30 @@
+# - Try to find libswresample library
+# Once done, this will define
+#
+#  libswresample_FOUND - system has libavformat libs
+#  libswresample_INCLUDE_DIRS - the libavformat include directories
+#  libswresample_LIBRARIES - link these to use libavformat
+
+# include(LibFindMacros)
+find_package( PkgConfig )
+
+# Use pkg-config to get hints about paths
+pkg_check_modules(libswresample_PKGCONF  QUIET libswresample)
+
+find_path(libswresample_INCLUDE_DIR libswresample/swresample.h
+          HINTS ${libswresample_PKGCONF_INCLUDEDIR} ${libswresample_PKGCONF_INCLUDE_DIRS}
+          PATH_SUFFIXES libswresample )
+
+find_library(libswresample_LIBRARY NAMES libswresample swresample
+             HINTS ${libswresample_PKGCONF__LIBDIR} ${libswresample_PKGCONF_LIBRARY_DIRS} )
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(libswresample  DEFAULT_MSG
+                                  libswresample_LIBRARY libswresample_INCLUDE_DIR)
+
+# MESSAGE( libswresample: "${libswresample_LIBRARY}")
+
+mark_as_advanced(libswresample_INCLUDE_DIR libswresample_LIBRARY )
+
diff --git a/libmstream/CStreamCtrlConnection.cpp b/libmstream/CStreamCtrlConnection.cpp
@@ -24,14 +24,15 @@
 
 namespace muroa {
 
-CStreamCtrlConnection::CStreamCtrlConnection(std::string serviceName, muroa::CStreamServer* stream_server, boost::asio::io_service& io_service)
-                      : bip::tcp::socket(io_service),
+CStreamCtrlConnection::CStreamCtrlConnection(std::string serviceName, muroa::CStreamServer* stream_server, boost::asio::io_context& io_context)
+                      : bip::tcp::socket(io_context),
                         m_stream_connection(0),
 					    m_stream_server(stream_server),
 						m_serviceName(serviceName),
 						m_srv_sm(this),
 						m_RTP_port(0),
-						m_use_multicast_rtp(false)
+						m_use_multicast_rtp(false),
+						m_io_context(io_context)
 {
 
 }
@@ -214,7 +215,7 @@ void CStreamCtrlConnection::handle_read(const boost::system::error_code& error,
             // ask io_service to delete this instance of CStreamCtrlConnection later. It might have bee deleted by then triggered
             // by onClientDisappeared called by avahi. To avoid double deletion pass the connection name instead of the pointer
             // and search for a ctrl connection with that name later. If it has already been deleted, no pointer will be found.
-            get_io_service().post(boost::bind(&CStreamServer::disconnectFromClient, m_stream_server, m_serviceName ));
+            m_io_context.post(boost::bind(&CStreamServer::disconnectFromClient, m_stream_server, m_serviceName ));
     	}
     	// LOG4CPLUS_ERROR(CApp::logger(), "error in handle_read:  " << error.message());
     	// delete this;

diff --git a/libmstream/CStreamCtrlConnection.h b/libmstream/CStreamCtrlConnection.h
@@ -43,7 +43,7 @@ class CStreamServer;
 
 class CStreamCtrlConnection : public bip::tcp::socket, public muroa::CStreamCtrlXml, public muroa::ISrvSMActions {
 public:
-	CStreamCtrlConnection(std::string serviceName, muroa::CStreamServer* stream_server, boost::asio::io_service& io_service);
+	CStreamCtrlConnection(std::string serviceName, muroa::CStreamServer* stream_server, boost::asio::io_context& io_context);
 	virtual ~CStreamCtrlConnection();
 
 	void connect(const endpoint_type & peer_endpoint, boost::system::error_code & ec);
@@ -119,6 +119,7 @@ class CStreamCtrlConnection : public bip::tcp::socket, public muroa::CStreamCtrl
 	/// Buffer for incoming data.
 	boost::array<char, 8192> m_buffer;
 
+	boost::asio::io_context& m_io_context;
 };
 
 } /* namespace muroa */

diff --git a/libmstream/CTimeService.cpp b/libmstream/CTimeService.cpp
@@ -30,15 +30,16 @@ using namespace boost;
 using namespace boost::asio::ip;
 
 // c-tor for server mode
-CTimeService::CTimeService(boost::asio::io_service& io_serv, CTimeServiceCtrl* const tsctrl, int portNr, udp protocol)
+CTimeService::CTimeService(boost::asio::io_context& io_context, CTimeServiceCtrl* const tsctrl, int portNr, udp protocol)
                            :
                            m_server_role(true),
 						   m_ts_ctrl(tsctrl),
 		                   m_port_nr(portNr),
-		                   m_socket(io_serv),
-		                   m_timer(io_serv),
+		                   m_socket(io_context),
+		                   m_timer(io_context),
 						   m_awaiting_response(false),
-						   m_shutting_down(false)
+						   m_shutting_down(false),
+						   m_io_context(io_context)
 {
 	try {
 		m_socket.open(protocol);
@@ -65,14 +66,15 @@ CTimeService::CTimeService(boost::asio::io_service& io_serv, CTimeServiceCtrl* c
 }
 
 // c-tor for client mode
-CTimeService::CTimeService(boost::asio::io_service& io_serv, CTimeServiceCtrl* const tsctrl, boost::asio::ip::udp::endpoint timesrv_endpoint)
+CTimeService::CTimeService(boost::asio::io_context& io_context, CTimeServiceCtrl* const tsctrl, boost::asio::ip::udp::endpoint timesrv_endpoint)
                            :
                            m_server_role(false),
 						   m_ts_ctrl(tsctrl),
-		                   m_socket(io_serv),
-		                   m_timer(io_serv),
+		                   m_socket(io_context),
+		                   m_timer(io_context),
 						   m_awaiting_response(false),
-						   m_shutting_down(false)
+						   m_shutting_down(false),
+						   m_io_context(io_context)
 {
 	try {
 
@@ -163,7 +165,7 @@ void CTimeService::createResponse(size_t bytes_transferred) {
 
 void CTimeService::stop() {
 	m_shutting_down = true;
-	m_socket.get_io_service().stop();
+	m_io_context.stop();
 	m_socket.cancel();
 	m_timer.cancel();
 }

diff --git a/libmstream/CTimeService.h b/libmstream/CTimeService.h
@@ -34,8 +34,8 @@ class CTimeServiceCtrl;
 
 class CTimeService : public boost::enable_shared_from_this<CTimeService>{
 public:
-	CTimeService(boost::asio::io_service& io_service, CTimeServiceCtrl* const tsctrl, int portNr, boost::asio::ip::udp protocol = boost::asio::ip::udp::v4());
-	CTimeService(boost::asio::io_service& io_service, CTimeServiceCtrl* const tsctrl, boost::asio::ip::udp::endpoint timesrv_endpoint);
+	CTimeService(boost::asio::io_context& io_context, CTimeServiceCtrl* const tsctrl, int portNr, boost::asio::ip::udp protocol = boost::asio::ip::udp::v4());
+	CTimeService(boost::asio::io_context& io_context, CTimeServiceCtrl* const tsctrl, boost::asio::ip::udp::endpoint timesrv_endpoint);
 	virtual ~CTimeService();
 
 	int getUsedPort() { return m_port_nr; };
@@ -67,6 +67,7 @@ class CTimeService : public boost::enable_shared_from_this<CTimeService>{
 
 	  /// Buffer for incoming data.
 	boost::array<char, 8192> m_buffer;
+	boost::asio::io_context& m_io_context;
 };
 
 } /* namespace muroa */

diff --git a/libmuroadaemon/CApp.cpp b/libmuroadaemon/CApp.cpp
@@ -118,11 +118,11 @@ void CApp::initLog() {
     bool logfile_accessible = CSettings::accessible(m_settings.logfile());
     if( logfile_accessible ) {
         appender = new FileAppender(m_settings.logfile());
-        appender->setErrorHandler(m_error_handler_ptr);
+        appender->setErrorHandler(std::move(m_error_handler_ptr));
     }
     else {
     	appender = new ConsoleAppender();
-    	appender->setErrorHandler(m_error_handler_ptr);
+    	appender->setErrorHandler(std::move(m_error_handler_ptr));
         //SharedAppenderPtr log_appender(console_appender);
 
     }
@@ -132,11 +132,11 @@ void CApp::initLog() {
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"   // to get rid of warning "auto_ptr is deprecated"
 
-	std::auto_ptr<Layout> myLayout = std::auto_ptr<Layout>(new log4cplus::PatternLayout("%d{%H:%M:%S,%q} [ %t: %-5p ] %m%n"));
+	std::unique_ptr<Layout> myLayout = std::auto_ptr<Layout>(new log4cplus::PatternLayout("%d{%H:%M:%S,%q} [ %t: %-5p ] %m%n"));
 
 #pragma GCC diagnostic pop
 
-	log_appender->setLayout(myLayout);
+	log_appender->setLayout(std::move(myLayout));
 
 	m_logger.addAppender(log_appender);
     // logger.setLogLevel ( DEBUG_LOG_LEVEL );

diff --git a/libmuroadaemon/CApp.h b/libmuroadaemon/CApp.h
@@ -58,7 +58,7 @@ class CApp {
 // to get rid of warning "auto_ptr is deprecated"
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-	std::auto_ptr<log4cplus::ErrorHandler> m_error_handler_ptr;
+	std::unique_ptr<log4cplus::ErrorHandler> m_error_handler_ptr;
 #pragma GCC diagnostic pop
 
     boost::filesystem::path m_abs_prog_dir;

diff --git a/libmuroadaemon/CTcpConnection.h b/libmuroadaemon/CTcpConnection.h
@@ -67,7 +67,7 @@ class CTcpConnection
 
   void writeData( const char* buffer, int length );
 
-  inline boost::asio::io_service& getIoService() { return m_socket.get_io_service(); };
+  //inline boost::asio::io_context getIoService() { return m_socket.get_executor(); };
 
 protected:
   virtual void dataReceived( boost::array<char, 8192> buffer, int length);

diff --git a/libmuroadaemon/CTcpServer.cpp b/libmuroadaemon/CTcpServer.cpp
@@ -35,7 +35,8 @@ CTcpServer::CTcpServer(boost::asio::io_service& io_service, IConnectionManager*
 
                      : m_acceptor(io_service),
                        m_connectionManager(cm),
- 	                   m_connection_factory(connection_factory)
+ 	                   m_connection_factory(connection_factory),
+					   m_io_service(io_service)
 
 
 {
@@ -77,7 +78,7 @@ IConnectionManager* CTcpServer::getConnctionManager() {
 }
 
 void CTcpServer::start_accept() {
-  CTcpConnection* new_connection = m_connection_factory(m_acceptor.get_io_service());
+  CTcpConnection* new_connection = m_connection_factory(m_io_service);
 
   m_acceptor.async_accept(new_connection->socket(),
                          boost::bind(&CTcpServer::handle_accept, this, new_connection, boost::asio::placeholders::error));

diff --git a/libmuroadaemon/CTcpServer.h b/libmuroadaemon/CTcpServer.h
@@ -64,6 +64,7 @@ class CTcpServer : private boost::noncopyable
   IConnectionManager* m_connectionManager;
   factory_ptr_t m_connection_factory;
 
+  boost::asio::io_service& m_io_service;
 };
 
 }

diff --git a/mqtclient/.settings/language.settings.xml b/mqtclient/.settings/language.settings.xml
@@ -5,11 +5,11 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1797144474778974186" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-994705901600919224" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 		</extension>
 	</configuration>
-</project>
+</project>
diff --git a/wssrv/CMakeLists.txt b/wssrv/CMakeLists.txt
@@ -13,6 +13,7 @@ find_package( libavcodec REQUIRED )
 find_package( libavformat REQUIRED )
 find_package( libavdevice REQUIRED )
 find_package( libavutil REQUIRED )
+find_package( libswresample REQUIRED )
 find_package( OpenSSL REQUIRED)
 
 
@@ -60,6 +61,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${libavformat_INCLUDE_DIR}
                     ${libavdevice_INCLUDE_DIR}
                     ${libavutil_INCLUDE_DIR}
+                    ${libswresample_INCLUDE_DIR}
                     ${OPENSSL_INCLUDE_DIR}
 ) 
 
@@ -77,6 +79,7 @@ TARGET_LINK_LIBRARIES( wssrv          mstream
                                       ${libavcodec_LIBRARY}
                                       ${libavdevice_LIBRARY}
                                       ${libavutil_LIBRARY}
+                                      ${libswresample_LIBRARY}
                                       ${OPENSSL_LIBRARIES}
 )