Bump to version 2013.01.25

.gitignore

@@ -0,0 +1 @@
+.DS_Store

BasicUsageEnvironment/BasicTaskScheduler.cpp

@@ -99,6 +99,20 @@ void BasicTaskScheduler::SingleStep(unsigned maxDelayTime) {
 	// Unexpected error - treat this as fatal:
 #if !defined(_WIN32_WCE)
 	perror("BasicTaskScheduler::SingleStep(): select() fails");
+	// Because this failure is often "Bad file descriptor" - which is caused by an invalid socket number (i.e., a socket number
+	// that had already been closed) being used in "select()" - we print out the sockets that were being used in "select()",
+	// to assist in debugging:
+	fprintf(stderr, "socket numbers used in the select() call:");
+	for (int i = 0; i < 100; ++i) {
+	  if (FD_ISSET(i, &fReadSet) || FD_ISSET(i, &fWriteSet) || FD_ISSET(i, &fExceptionSet)) {
+	    fprintf(stderr, " %d(", i);
+	    if (FD_ISSET(i, &fReadSet)) fprintf(stderr, "r");
+	    if (FD_ISSET(i, &fWriteSet)) fprintf(stderr, "w");
+	    if (FD_ISSET(i, &fExceptionSet)) fprintf(stderr, "e");
+	    fprintf(stderr, ")");
+	  }
+	}
+	fprintf(stderr, "\n");
 #endif
 	internalError();
       }

BasicUsageEnvironment/Makefile

@@ -1,17 +1,17 @@
 INCLUDES = -Iinclude -I../UsageEnvironment/include -I../groupsock/include
 ##### Change the following for your environment: 
-COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+COMPILE_OPTS =		$(INCLUDES) -I. $(EXTRA_LDFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -DTIME_BASE=int
 C =			c
 C_COMPILER =		cc
 C_FLAGS =		$(COMPILE_OPTS)
 CPP =			cpp
 CPLUSPLUS_COMPILER =	c++
-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall -DBSD=1
+CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall
 OBJ =			o
-LINK =			c++ -o
+LINK =			c++ -o 
 LINK_OPTS =		-L.
 CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		ar cr 
+LIBRARY_LINK =		libtool -s -o 
 LIBRARY_LINK_OPTS =	
 LIB_SUFFIX =			a
 LIBS_FOR_CONSOLE_APPLICATION =

BasicUsageEnvironment/Makefile.head

@@ -1,2 +1,4 @@
 INCLUDES = -Iinclude -I../UsageEnvironment/include -I../groupsock/include
-##### Change the following for your environment: 
+PREFIX = /usr/local
+LIBDIR = $(PREFIX)/lib
+##### Change the following for your environment:

BasicUsageEnvironment/Makefile.tail

@@ -2,8 +2,6 @@
 
 NAME = libBasicUsageEnvironment
 LIB = $(NAME).$(LIB_SUFFIX)
-PREFIX ?= /usr/local
-LIBDIR ?= $(PREFIX)/lib
 ALL = $(LIB)
 all:	$(ALL)
 

BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh

@@ -1,10 +1,10 @@
 // Version information for the "BasicUsageEnvironment" library
-// Copyright (c) 1996-2012 Live Networks, Inc.  All rights reserved.
+// Copyright (c) 1996-2013 Live Networks, Inc.  All rights reserved.
 
 #ifndef _BASICUSAGEENVIRONMENT_VERSION_HH
 #define _BASICUSAGEENVIRONMENT_VERSION_HH
 
-#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING	"2012.12.24"
-#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT		1356307200
+#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING	"2013.01.25"
+#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT		1359072000
 
 #endif

Makefile

@@ -1,15 +1,15 @@
-COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+COMPILE_OPTS =		$(INCLUDES) -I. $(EXTRA_LDFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -DTIME_BASE=int
 C =			c
 C_COMPILER =		cc
 C_FLAGS =		$(COMPILE_OPTS)
 CPP =			cpp
 CPLUSPLUS_COMPILER =	c++
-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall -DBSD=1
+CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall
 OBJ =			o
-LINK =			c++ -o
+LINK =			c++ -o 
 LINK_OPTS =		-L.
 CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		ar cr 
+LIBRARY_LINK =		libtool -s -o 
 LIBRARY_LINK_OPTS =	
 LIB_SUFFIX =			a
 LIBS_FOR_CONSOLE_APPLICATION =

Makefile.head

@@ -0,0 +1 @@
+##### Change the following for your environment:

UsageEnvironment/Makefile

@@ -1,17 +1,17 @@
 INCLUDES = -Iinclude -I../groupsock/include
 ##### Change the following for your environment: 
-COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+COMPILE_OPTS =		$(INCLUDES) -I. $(EXTRA_LDFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -DTIME_BASE=int
 C =			c
 C_COMPILER =		cc
 C_FLAGS =		$(COMPILE_OPTS)
 CPP =			cpp
 CPLUSPLUS_COMPILER =	c++
-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall -DBSD=1
+CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall
 OBJ =			o
-LINK =			c++ -o
+LINK =			c++ -o 
 LINK_OPTS =		-L.
 CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		ar cr 
+LIBRARY_LINK =		libtool -s -o 
 LIBRARY_LINK_OPTS =	
 LIB_SUFFIX =			a
 LIBS_FOR_CONSOLE_APPLICATION =

UsageEnvironment/Makefile.head

@@ -1,2 +1,4 @@
 INCLUDES = -Iinclude -I../groupsock/include
-##### Change the following for your environment: 
+PREFIX = /usr/local
+LIBDIR = $(PREFIX)/lib
+##### Change the following for your environment:

UsageEnvironment/Makefile.tail

@@ -2,8 +2,6 @@
 
 NAME = libUsageEnvironment
 USAGE_ENVIRONMENT_LIB = $(NAME).$(LIB_SUFFIX)
-PREFIX ?= /usr/local
-LIBDIR ?= $(PREFIX)/lib
 ALL = $(USAGE_ENVIRONMENT_LIB)
 all:	$(ALL)
 

UsageEnvironment/include/UsageEnvironment_version.hh

@@ -1,10 +1,10 @@
 // Version information for the "UsageEnvironment" library
-// Copyright (c) 1996-2012 Live Networks, Inc.  All rights reserved.
+// Copyright (c) 1996-2013 Live Networks, Inc.  All rights reserved.
 
 #ifndef _USAGEENVIRONMENT_VERSION_HH
 #define _USAGEENVIRONMENT_VERSION_HH
 
-#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING	"2012.12.24"
-#define USAGEENVIRONMENT_LIBRARY_VERSION_INT		1356307200
+#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING	"2013.01.25"
+#define USAGEENVIRONMENT_LIBRARY_VERSION_INT		1359072000
 
 #endif

add_port_argument.patch

@@ -0,0 +1,56 @@
+--- proxyServer/live555ProxyServer.cpp	2013-01-25 18:47:20.000000000 +0000
++++ ../Github/live555/proxyServer/live555ProxyServer.cpp	2013-01-30 15:20:07.000000000 +0000
+@@ -27,6 +27,7 @@
+ int verbosityLevel = 0;
+ Boolean streamRTPOverTCP = False;
+ portNumBits tunnelOverHTTPPortNum = 0;
++portNumBits rtspServerPortNum = 554;
+ char* username = NULL;
+ char* password = NULL;
+
+@@ -34,6 +35,7 @@
+   *env << "Usage: " << progName
+        << " [-v|-V]"
+        << " [-t|-T <http-port>]"
++       << " [-p <rtsp-port>]"
+        << " [-u <username> <password>]"
+        << " <rtsp-url-1> ... <rtsp-url-n>\n";
+   exit(1);
+@@ -90,6 +92,22 @@
+       break;
+     }
+
++    case 'p': {
++      // set port
++      if (argc > 3 && argv[2][0] != '-') {
++	// The next argument is the RTSP server port number:                                                                       
++	if (sscanf(argv[2], "%hu", &rtspServerPortNum) == 1
++	    && rtspServerPortNum > 0) {
++	  ++argv; --argc;
++	  break;
++	}
++      }
++
++      // If we get here, the option was specified incorrectly:
++      usage();
++      break;
++    }
++
+     case 'u': { // specify a username and password (to be used if the 'back end' (i.e., proxied) stream requires authentication)
+       if (argc < 4) usage(); // there's no argv[3] (for the "password")
+       username = argv[2];
+@@ -131,12 +149,11 @@
+   // access to the server.
+ #endif
+
+-  // Create the RTSP server.  Try first with the default port number (554),
++  // Create the RTSP server.  Try first with the default port number (554) or the one set by the caller,
+   // and then with the alternative port number (8554):
+   RTSPServer* rtspServer;
+-  portNumBits rtspServerPortNum = 554;
+   rtspServer = RTSPServer::createNew(*env, rtspServerPortNum, authDB);
+-  if (rtspServer == NULL) {
++  if (rtspServer == NULL && rtspServerPortNum == 554) {
+     rtspServerPortNum = 8554;
+     rtspServer = RTSPServer::createNew(*env, rtspServerPortNum, authDB);
+   }

config.linux-with-shared-libraries

@@ -1,10 +1,15 @@
-libliveMedia_VERSION_CURRENT=0
-libliveMedia_VERSION_REVISION=0
-libliveMedia_VERSION_AGE=0
+# 'CURRENT':'REVISION':'AGE' are updated - whenever a library changes - as follows:
+# The library code changes, but without any changes to the API (i.e., interfaces) => increment REVISION
+# At least one interface changes, or is removed => CURRENT += 1; REVISION = 0; AGE = 0
+# One or more interfaces were added, but no existing interfaces were changed or removed => CURRENT += 1; REVISION = 0; AGE += 1
+
+libliveMedia_VERSION_CURRENT=2
+libliveMedia_VERSION_REVISION=4
+libliveMedia_VERSION_AGE=1
 libliveMedia_LIB_SUFFIX=so.$(shell expr $(libliveMedia_VERSION_CURRENT) - $(libliveMedia_VERSION_AGE)).$(libliveMedia_VERSION_AGE).$(libliveMedia_VERSION_REVISION)
 
 libBasicUsageEnvironment_VERSION_CURRENT=0
-libBasicUsageEnvironment_VERSION_REVISION=0
+libBasicUsageEnvironment_VERSION_REVISION=1
 libBasicUsageEnvironment_VERSION_AGE=0
 libBasicUsageEnvironment_LIB_SUFFIX=so.$(shell expr $(libBasicUsageEnvironment_VERSION_CURRENT) - $(libBasicUsageEnvironment_VERSION_AGE)).$(libBasicUsageEnvironment_VERSION_AGE).$(libBasicUsageEnvironment_VERSION_REVISION)
 
@@ -17,6 +22,7 @@ libgroupsock_VERSION_CURRENT=0
 libgroupsock_VERSION_REVISION=0
 libgroupsock_VERSION_AGE=0
 libgroupsock_LIB_SUFFIX=so.$(shell expr $(libgroupsock_VERSION_CURRENT) - $(libgroupsock_VERSION_AGE)).$(libgroupsock_VERSION_AGE).$(libgroupsock_VERSION_REVISION)
+#####
 
 COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -fPIC
 C =			c
@@ -32,7 +38,7 @@ CONSOLE_LINK_OPTS =	$(LINK_OPTS)
 LIBRARY_LINK =		gcc -o 
 SHORT_LIB_SUFFIX =	so.$(shell expr $($(NAME)_VERSION_CURRENT) - $($(NAME)_VERSION_AGE))
 LIB_SUFFIX =	 	$(SHORT_LIB_SUFFIX).$($(NAME)_VERSION_AGE).$($(NAME)_VERSION_REVISION)
-LIBRARY_LINK_OPTS =	-shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX)
+LIBRARY_LINK_OPTS =	-shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX) $(LDFLAGS)
 LIBS_FOR_CONSOLE_APPLICATION =
 LIBS_FOR_GUI_APPLICATION =
 EXE =

groupsock/Makefile

@@ -1,17 +1,17 @@
 INCLUDES = -Iinclude -I../UsageEnvironment/include
 ##### Change the following for your environment: 
-COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+COMPILE_OPTS =		$(INCLUDES) -I. $(EXTRA_LDFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -DTIME_BASE=int
 C =			c
 C_COMPILER =		cc
 C_FLAGS =		$(COMPILE_OPTS)
 CPP =			cpp
 CPLUSPLUS_COMPILER =	c++
-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall -DBSD=1
+CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall
 OBJ =			o
-LINK =			c++ -o
+LINK =			c++ -o 
 LINK_OPTS =		-L.
 CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		ar cr 
+LIBRARY_LINK =		libtool -s -o 
 LIBRARY_LINK_OPTS =	
 LIB_SUFFIX =			a
 LIBS_FOR_CONSOLE_APPLICATION =

groupsock/Makefile.head

@@ -1,2 +1,4 @@
 INCLUDES = -Iinclude -I../UsageEnvironment/include
-##### Change the following for your environment: 
+PREFIX = /usr/local
+LIBDIR = $(PREFIX)/lib
+##### Change the following for your environment:

groupsock/Makefile.tail

@@ -1,14 +1,11 @@
 ##### End of variables to change
 
 NAME = libgroupsock
-PREFIX ?= /usr/local
-LIBDIR ?= $(PREFIX)/lib
 ALL = $(NAME).$(LIB_SUFFIX)
 all:	$(ALL)
 
 .$(C).$(OBJ):
-	$(C_COMPILER) -c $(C_FLAGS) $<       
-
+	$(C_COMPILER) -c $(C_FLAGS) $<
 .$(CPP).$(OBJ):
 	$(CPLUSPLUS_COMPILER) -c $(CPLUSPLUS_FLAGS) $<
 

groupsock/include/groupsock_version.hh

@@ -1,10 +1,10 @@
 // Version information for the "groupsock" library
-// Copyright (c) 1996-2012 Live Networks, Inc.  All rights reserved.
+// Copyright (c) 1996-2013 Live Networks, Inc.  All rights reserved.
 
 #ifndef _GROUPSOCK_VERSION_HH
 #define _GROUPSOCK_VERSION_HH
 
-#define GROUPSOCK_LIBRARY_VERSION_STRING	"2012.12.24"
-#define GROUPSOCK_LIBRARY_VERSION_INT		1356307200
+#define GROUPSOCK_LIBRARY_VERSION_STRING	"2013.01.25"
+#define GROUPSOCK_LIBRARY_VERSION_INT		1359072000
 
 #endif

liveMedia/FileSink.cpp

@@ -125,11 +125,9 @@ void FileSink::afterGettingFrame(unsigned frameSize,
   addData(fBuffer, frameSize, presentationTime);
 
   if (fOutFid == NULL || fflush(fOutFid) == EOF) {
-    // The output file has closed.  Handle this the same way as if the
-    // input source had closed:
+    // The output file has closed.  Handle this the same way as if the input source had closed:
+    if (fSource != NULL) fSource->stopGettingFrames();
     onSourceClosure(this);
-
-    stopPlaying();
     return;
   }
 

liveMedia/Makefile

@@ -1,17 +1,17 @@
 INCLUDES = -Iinclude -I../UsageEnvironment/include -I../groupsock/include
 ##### Change the following for your environment: 
-COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
+COMPILE_OPTS =		$(INCLUDES) -I. $(EXTRA_LDFLAGS) -DBSD=1 -O -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -DTIME_BASE=int
 C =			c
 C_COMPILER =		cc
 C_FLAGS =		$(COMPILE_OPTS)
 CPP =			cpp
 CPLUSPLUS_COMPILER =	c++
-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall -DBSD=1
+CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall
 OBJ =			o
-LINK =			c++ -o
+LINK =			c++ -o 
 LINK_OPTS =		-L.
 CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		ar cr 
+LIBRARY_LINK =		libtool -s -o 
 LIBRARY_LINK_OPTS =	
 LIB_SUFFIX =			a
 LIBS_FOR_CONSOLE_APPLICATION =

liveMedia/Makefile.head

@@ -1,2 +1,4 @@
 INCLUDES = -Iinclude -I../UsageEnvironment/include -I../groupsock/include
-##### Change the following for your environment: 
+PREFIX = /usr/local
+LIBDIR = $(PREFIX)/lib
+##### Change the following for your environment:

liveMedia/Makefile.tail

@@ -2,14 +2,11 @@
 
 NAME = libliveMedia
 LIVEMEDIA_LIB = $(NAME).$(LIB_SUFFIX)
-PREFIX ?= /usr/local
-LIBDIR ?= $(PREFIX)/lib
 ALL = $(LIVEMEDIA_LIB)
 all:	$(ALL)
 
 .$(C).$(OBJ):
-	$(C_COMPILER) -c $(C_FLAGS) $<       
-
+	$(C_COMPILER) -c $(C_FLAGS) $<
 .$(CPP).$(OBJ):
 	$(CPLUSPLUS_COMPILER) -c $(CPLUSPLUS_FLAGS) $<
 
@@ -307,7 +304,7 @@ AC3AudioFileServerMediaSubsession.$(CPP):	include/AC3AudioFileServerMediaSubsess
 include/AC3AudioFileServerMediaSubsession.hh:	include/FileServerMediaSubsession.hh
 MPEG2TransportUDPServerMediaSubsession.$(CPP):	include/MPEG2TransportUDPServerMediaSubsession.hh include/BasicUDPSource.hh include/SimpleRTPSource.hh include/MPEG2TransportStreamFramer.hh include/SimpleRTPSink.hh
 include/MPEG2TransportUDPServerMediaSubsession.hh:	include/OnDemandServerMediaSubsession.hh
-ProxyServerMediaSession.$(CPP):		include/liveMedia.hh
+ProxyServerMediaSession.$(CPP):		include/liveMedia.hh include/RTSPCommon.hh
 QuickTimeFileSink.$(CPP):	include/QuickTimeFileSink.hh include/InputFile.hh include/OutputFile.hh include/QuickTimeGenericRTPSource.hh include/H263plusVideoRTPSource.hh include/MPEG4GenericRTPSource.hh include/MPEG4LATMAudioRTPSource.hh
 include/QuickTimeFileSink.hh:	include/MediaSession.hh
 QuickTimeGenericRTPSource.$(CPP):	include/QuickTimeGenericRTPSource.hh