[patch] gpac-0.5.1-ffmpeg-2.5-compile-fix.patch

gpac-0.5.1-ffmpeg-2.5-compile-fix.patch (text/plain), 7.02 KB, created by Mark R. Pariente on 2015-02-12 03:07:42 UTC

From 9df6fe85aba08944ef03b610c4d5efe1aaaca578 Mon Sep 17 00:00:00 2001
From: Jean Le Feuvre <[e-mail]>
Date: Mon, 17 Nov 2014 14:29:20 +0000
Subject: [PATCH] fixed net logs and FFMPEG compil

git-svn-id: http://svn.code.sf.net/p/gpac/code/trunk/gpac@5512 63c20433-aa62-49bd-875c-5a186b69a8fb
---
 modules/ffmpeg_in/ffmpeg_demux.c |  8 ++++----
 src/utils/downloader.c           |  5 +++--
 src/utils/os_net.c               | 14 +++++++++++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/modules/ffmpeg_in/ffmpeg_demux.c b/modules/ffmpeg_in/ffmpeg_demux.c
index a5202ee..975a945 100644
--- a/modules/ffmpeg_in/ffmpeg_demux.c
+++ b/modules/ffmpeg_in/ffmpeg_demux.c
@@ -301,7 +301,7 @@ static Bool FFD_CanHandleURL(GF_InputService *plug, const char *url)
 	}
 
 exit:
-#ifndef FF_API_CLOSE_INPUT_FILE
+#if FF_API_CLOSE_INPUT_FILE
 	if (ctx) av_close_input_file(ctx);
 #else
 	if (ctx) avformat_close_input(&ctx);
@@ -680,7 +680,7 @@ static GF_Err FFD_ConnectService(GF_InputService *plug, GF_ClientService *serv,
 
 		ffd->seekable = (av_seek_frame(ffd->ctx, -1, 0, AVSEEK_FLAG_BACKWARD)<0) ? 0 : 1;
 		if (!ffd->seekable) {
-#ifndef FF_API_CLOSE_INPUT_FILE
+#if FF_API_CLOSE_INPUT_FILE
 			av_close_input_file(ffd->ctx);
 #else
 			avformat_close_input(&ffd->ctx);
@@ -699,7 +699,7 @@ static GF_Err FFD_ConnectService(GF_InputService *plug, GF_ClientService *serv,
 
 err_exit:
 	GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] Error opening file %s: %s\n", url, gf_error_to_string(e)));
-#ifndef FF_API_CLOSE_INPUT_FILE
+#if FF_API_CLOSE_INPUT_FILE
 	if (ffd->ctx) av_close_input_file(ffd->ctx);
 #else
 	if (ffd->ctx) avformat_close_input(&ffd->ctx);
@@ -757,7 +757,7 @@ static GF_Err FFD_CloseService(GF_InputService *plug)
 
 	ffd->is_running = 0;
 
-#ifndef FF_API_CLOSE_INPUT_FILE
+#if FF_API_CLOSE_INPUT_FILE
 	if (ffd->ctx) av_close_input_file(ffd->ctx);
 #else
 	if (ffd->ctx) avformat_close_input(&ffd->ctx);
diff --git a/src/utils/downloader.c b/src/utils/downloader.c
index 0495398..a266d79 100644
--- a/src/utils/downloader.c
+++ b/src/utils/downloader.c
@@ -1236,7 +1236,7 @@ static void gf_dm_connect(GF_DownloadSession *sess)
 	GF_Err e;
 	u16 proxy_port = 0;
 	const char *proxy, *ip;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("gf_dm_connect"":%d\n", __LINE__));
+
 	if (!sess->sock) {
 		sess->num_retry = 40;
 		sess->sock = gf_sk_new(GF_SOCK_TYPE_TCP);
@@ -1312,6 +1312,7 @@ static void gf_dm_connect(GF_DownloadSession *sess)
 		}
 
 		sess->status = GF_NETIO_CONNECTED;
+        GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Connected to %s:%d\n", proxy, proxy_port));
 		gf_dm_sess_notify_state(sess, GF_NETIO_CONNECTED, GF_OK);
 		gf_sk_set_buffer_size(sess->sock, 1, GF_DOWNLOAD_BUFFER_SIZE);
 		gf_sk_set_buffer_size(sess->sock, 0, GF_DOWNLOAD_BUFFER_SIZE);
@@ -1945,7 +1946,7 @@ static GFINLINE void gf_dm_data_received(GF_DownloadSession *sess, u8 *payload,
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK,
 			       ("[CACHE] url %s saved as %s\n", gf_cache_get_url(sess->cache_entry), gf_cache_get_cache_filename(sess->cache_entry)));
 		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] url %s downloaded in "LLU" us (%d kbps)\n", gf_cache_get_url(sess->cache_entry), gf_sys_clock() - sess->start_time, 8*sess->bytes_per_sec/1024 ));
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] url %s downloaded in "LLU" us (%d kbps)\n", gf_cache_get_url(sess->cache_entry), gf_sys_clock_high_res() - sess->start_time, 8*sess->bytes_per_sec/1024 ));
 	}
 
 	if (rewrite_size && sess->chunked) {
diff --git a/src/utils/os_net.c b/src/utils/os_net.c
index 4a5543d..3934f98 100644
--- a/src/utils/os_net.c
+++ b/src/utils/os_net.c
@@ -379,9 +379,9 @@ GF_Err gf_sk_set_buffer_size(GF_Socket *sock, Bool SendBuffer, u32 NewSize)
 		res = setsockopt(sock->socket, SOL_SOCKET, SO_RCVBUF, (char *) &NewSize, sizeof(u32) );
 	}
 	if (res<0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Core] Couldn't set socket %s buffer size: %d\n", SendBuffer ? "send" : "receive", res));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Socket] Couldn't set socket %s buffer size to %d: %d\n", SendBuffer ? "send" : "receive", NewSize, res));
 	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Core] Set socket %s buffer size\n", SendBuffer ? "send" : "receive"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Socket] Set socket %s buffer size to %d\n", SendBuffer ? "send" : "receive", NewSize));
 	}
 	return GF_OK;
 }
@@ -483,8 +483,10 @@ GF_Err gf_sk_connect(GF_Socket *sock, const char *PeerName, u16 PortNumber, cons
 
 	gf_sk_free(sock);
 
+	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Solving %s address\n", PeerName));
 	res = gf_sk_get_ipv6_addr(PeerName, PortNumber, AF_UNSPEC, AI_PASSIVE, type);
 	if (!res) return GF_IP_CONNECTION_FAILURE;
+	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Host %s found\n", PeerName));
 
 	/*turn on MobileIP*/
 	if (local_ip && MobileIPAdd && !strcmp(MobileIPAdd, local_ip) ) {
@@ -525,12 +527,14 @@ GF_Err gf_sk_connect(GF_Socket *sock, const char *PeerName, u16 PortNumber, cons
 			}
 		}
 
+        GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Connecting to %s:%d\n", PeerName, PortNumber));
 		ret = connect(sock->socket, aip->ai_addr, (int) aip->ai_addrlen);
 		if (ret == SOCKET_ERROR) {
 			closesocket(sock->socket);
 			sock->socket = NULL_SOCKET;
 			continue;
 		}
+        GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Connected to %s:%d\n", PeerName, PortNumber));
 
 		memcpy(&sock->dest_addr, aip->ai_addr, aip->ai_addrlen);
 		sock->dest_addr_len = (u32) aip->ai_addrlen;
@@ -562,6 +566,7 @@ GF_Err gf_sk_connect(GF_Socket *sock, const char *PeerName, u16 PortNumber, cons
 	/*get the server IP*/
 	sock->dest_addr.sin_addr.s_addr = inet_addr(PeerName);
 	if (sock->dest_addr.sin_addr.s_addr==INADDR_NONE) {
+        GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Solving %s address\n", PeerName));
 		Host = gethostbyname(PeerName);
 		if (Host == NULL) {
 			switch (LASTSOCKERROR) {
@@ -574,14 +579,16 @@ GF_Err gf_sk_connect(GF_Socket *sock, const char *PeerName, u16 PortNumber, cons
 				return GF_IP_NETWORK_FAILURE;
 			}
 		}
+        GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Host %s found\n", PeerName));
 		memcpy((char *) &sock->dest_addr.sin_addr, Host->h_addr_list[0], sizeof(u32));
 	}
 
 	if (sock->flags & GF_SOCK_IS_TCP) {
+        GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Connecting to %s:%d\n", PeerName, PortNumber));
 		ret = connect(sock->socket, (struct sockaddr *) &sock->dest_addr, sizeof(struct sockaddr));
 		if (ret == SOCKET_ERROR) {
 			u32 res = LASTSOCKERROR;
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Core] Couldn't connect socket - last sock error %d\n", res));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Sock_IPV4] Couldn't connect socket - last sock error %d\n", res));
 			switch (res) {
 			case EAGAIN:
 				return GF_IP_SOCK_WOULD_BLOCK;
@@ -606,6 +613,7 @@ GF_Err gf_sk_connect(GF_Socket *sock, const char *PeerName, u16 PortNumber, cons
 				return GF_IP_CONNECTION_FAILURE;
 			}
 		}
+        GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Connected to %s:%d\n", PeerName, PortNumber));
 	}
 #endif
 	return GF_OK;