update to 20120204

changes:
-added interface for anynchronous operation
-more feature additions
-bugfixes, cleanup

9 files changed, 90 insertions, 20 deletions

diff --git a/net/liblive/Makefile b/net/liblive/Makefile
index aa4c31022f0..cb60dc6da24 100644
--- a/net/liblive/Makefile
+++ b/net/liblive/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2008/07/26 14:44:34 tonio Exp $
+# $NetBSD: Makefile,v 1.18 2012/02/21 12:38:58 drochner Exp $
 #
 
-DISTNAME=	live.2008.07.25
+DISTNAME=	live.2012.02.04
 PKGNAME=	lib${DISTNAME:S/./-/:S/.//g}
 CATEGORIES=	net
 MASTER_SITES=	http://www.live555.com/liveMedia/public/
diff --git a/net/liblive/PLIST b/net/liblive/PLIST
index a170995a539..bf3f1e76ac1 100644
--- a/net/liblive/PLIST
+++ b/net/liblive/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:09:32 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/02/21 12:38:58 drochner Exp $
 include/BasicUsageEnvironment/BasicHashTable.hh
 include/BasicUsageEnvironment/BasicUsageEnvironment.hh
 include/BasicUsageEnvironment/BasicUsageEnvironment0.hh
@@ -19,6 +19,7 @@ include/groupsock/NetCommon.h
 include/groupsock/NetInterface.hh
 include/groupsock/TunnelEncaps.hh
 include/groupsock/groupsock_version.hh
+include/liveMedia/AC3AudioFileServerMediaSubsession.hh
 include/liveMedia/AC3AudioRTPSink.hh
 include/liveMedia/AC3AudioRTPSource.hh
 include/liveMedia/AC3AudioStreamFramer.hh
@@ -37,7 +38,12 @@ include/liveMedia/Base64.hh
 include/liveMedia/BasicUDPSink.hh
 include/liveMedia/BasicUDPSource.hh
 include/liveMedia/ByteStreamFileSource.hh
+include/liveMedia/ByteStreamMemoryBufferSource.hh
 include/liveMedia/ByteStreamMultiFileSource.hh
+include/liveMedia/DVVideoFileServerMediaSubsession.hh
+include/liveMedia/DVVideoRTPSink.hh
+include/liveMedia/DVVideoRTPSource.hh
+include/liveMedia/DVVideoStreamFramer.hh
 include/liveMedia/DarwinInjector.hh
 include/liveMedia/DeviceSource.hh
 include/liveMedia/DigestAuthentication.hh
@@ -52,11 +58,12 @@ include/liveMedia/H263plusVideoFileServerMediaSubsession.hh
 include/liveMedia/H263plusVideoRTPSink.hh
 include/liveMedia/H263plusVideoRTPSource.hh
 include/liveMedia/H263plusVideoStreamFramer.hh
+include/liveMedia/H264VideoFileServerMediaSubsession.hh
 include/liveMedia/H264VideoFileSink.hh
 include/liveMedia/H264VideoRTPSink.hh
 include/liveMedia/H264VideoRTPSource.hh
+include/liveMedia/H264VideoStreamDiscreteFramer.hh
 include/liveMedia/H264VideoStreamFramer.hh
-include/liveMedia/HTTPSink.hh
 include/liveMedia/InputFile.hh
 include/liveMedia/JPEGVideoRTPSink.hh
 include/liveMedia/JPEGVideoRTPSource.hh
@@ -79,7 +86,6 @@ include/liveMedia/MPEG1or2DemuxedElementaryStream.hh
 include/liveMedia/MPEG1or2DemuxedServerMediaSubsession.hh
 include/liveMedia/MPEG1or2FileServerDemux.hh
 include/liveMedia/MPEG1or2VideoFileServerMediaSubsession.hh
-include/liveMedia/MPEG1or2VideoHTTPSink.hh
 include/liveMedia/MPEG1or2VideoRTPSink.hh
 include/liveMedia/MPEG1or2VideoRTPSource.hh
 include/liveMedia/MPEG1or2VideoStreamDiscreteFramer.hh
@@ -92,6 +98,7 @@ include/liveMedia/MPEG2TransportStreamFromPESSource.hh
 include/liveMedia/MPEG2TransportStreamIndexFile.hh
 include/liveMedia/MPEG2TransportStreamMultiplexor.hh
 include/liveMedia/MPEG2TransportStreamTrickModeFilter.hh
+include/liveMedia/MPEG2TransportUDPServerMediaSubsession.hh
 include/liveMedia/MPEG4ESVideoRTPSink.hh
 include/liveMedia/MPEG4ESVideoRTPSource.hh
 include/liveMedia/MPEG4GenericRTPSink.hh
@@ -102,6 +109,8 @@ include/liveMedia/MPEG4VideoFileServerMediaSubsession.hh
 include/liveMedia/MPEG4VideoStreamDiscreteFramer.hh
 include/liveMedia/MPEG4VideoStreamFramer.hh
 include/liveMedia/MPEGVideoStreamFramer.hh
+include/liveMedia/MatroskaFile.hh
+include/liveMedia/MatroskaFileServerDemux.hh
 include/liveMedia/Media.hh
 include/liveMedia/MediaSession.hh
 include/liveMedia/MediaSink.hh
@@ -120,13 +129,21 @@ include/liveMedia/RTPSink.hh
 include/liveMedia/RTPSource.hh
 include/liveMedia/RTSPClient.hh
 include/liveMedia/RTSPCommon.hh
-include/liveMedia/RTSPOverHTTPServer.hh
 include/liveMedia/RTSPServer.hh
+include/liveMedia/RTSPServerSupportingHTTPStreaming.hh
 include/liveMedia/SIPClient.hh
 include/liveMedia/ServerMediaSession.hh
 include/liveMedia/SimpleRTPSink.hh
 include/liveMedia/SimpleRTPSource.hh
+include/liveMedia/StreamReplicator.hh
+include/liveMedia/T140TextRTPSink.hh
+include/liveMedia/TCPStreamSink.hh
+include/liveMedia/TextRTPSink.hh
+include/liveMedia/VP8VideoRTPSink.hh
+include/liveMedia/VP8VideoRTPSource.hh
 include/liveMedia/VideoRTPSink.hh
+include/liveMedia/VorbisAudioRTPSink.hh
+include/liveMedia/VorbisAudioRTPSource.hh
 include/liveMedia/WAVAudioFileServerMediaSubsession.hh
 include/liveMedia/WAVAudioFileSource.hh
 include/liveMedia/liveMedia.hh
diff --git a/net/liblive/distinfo b/net/liblive/distinfo
index ff6bfd93142..3526d3bdc35 100644
--- a/net/liblive/distinfo
+++ b/net/liblive/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.11 2010/05/10 08:18:38 tnn Exp $
+$NetBSD: distinfo,v 1.12 2012/02/21 12:38:58 drochner Exp $
 
-SHA1 (live.2008.07.25.tar.gz) = fbc84b2b16212a2891d587bff48bfb8822716a7c
-RMD160 (live.2008.07.25.tar.gz) = c3a7e8c79ca54753803389e2d0fc9d18fe8c27e6
-Size (live.2008.07.25.tar.gz) = 449624 bytes
-SHA1 (patch-aa) = 84872b1042c338e8e28a1ef75323f5a7550d9876
-SHA1 (patch-ba) = 78e4e13511e02d9f05a568281490d10ad5e6d1b3
+SHA1 (live.2012.02.04.tar.gz) = 26e06f8ec296c3494bc118b7ffde4ad7082e8f80
+RMD160 (live.2012.02.04.tar.gz) = 0ff1f656d7244b94820a7ee299d7c96003791b00
+Size (live.2012.02.04.tar.gz) = 541332 bytes
+SHA1 (patch-aa) = ecbf7f9a0d9835fbdb8208d296640570b8770e93
+SHA1 (patch-ba) = 0d977525350b4be3a564060a1d5a561c5564a768
+SHA1 (patch-ca) = 20d35409d7fe63e0088d3105d5cd54809da13097
+SHA1 (patch-cb) = ed98aa446cc4c6cf3c861101637e619d32cc9e95
+SHA1 (patch-cc) = 1e968b8742c913f67654d83612bafe4fe01364c0
diff --git a/net/liblive/files/config.netbsd b/net/liblive/files/config.netbsd
index 43a6cd9ee5f..561f579a674 100644
--- a/net/liblive/files/config.netbsd
+++ b/net/liblive/files/config.netbsd
@@ -1,5 +1,5 @@
 .SUFFIXES: .la .lo .cpp
-COMPILE_OPTS =		${INCLUDES} -I. ${CPPFLAGS} -DBSD=1 -DSOCKLEN_T=socklen_t
+COMPILE_OPTS =		${INCLUDES} -I. ${CPPFLAGS} -DBSD=1 -DXLOCALE_NOT_USED=1 -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1
 C =			c
 C_COMPILER =		${LIBTOOL} --tag=CC --mode=compile ${CC}
 C_FLAGS =		${COMPILE_OPTS}
diff --git a/net/liblive/patches/patch-aa b/net/liblive/patches/patch-aa
index 4536e9bee44..6dfc0677476 100644
--- a/net/liblive/patches/patch-aa
+++ b/net/liblive/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2010/05/10 08:18:38 tnn Exp $
+$NetBSD: patch-aa,v 1.5 2012/02/21 12:38:58 drochner Exp $
 
---- config.linux.orig	2008-07-25 00:40:05.000000000 +0000
+--- config.linux.orig	2012-02-04 11:01:47.000000000 +0000
 +++ config.linux
 @@ -1,17 +1,20 @@
 +.SUFFIXES: .la .lo .cpp
@@ -20,10 +20,10 @@ $NetBSD: patch-aa,v 1.4 2010/05/10 08:18:38 tnn Exp $
 +LINK+=			# this is needed to add a space!
  LINK_OPTS =		-L.
  CONSOLE_LINK_OPTS =	$(LINK_OPTS)
--LIBRARY_LINK =		ld -o
+-LIBRARY_LINK =		ar cr 
 +LIBRARY_LINK =		${LIBTOOL} --tag=CXX --mode=link c++ -rpath ${PREFIX}/lib -version-info 0:0 -o
 +LIBRARY_LINK+=		# this is needed to add a space!
- LIBRARY_LINK_OPTS =	$(LINK_OPTS) -r -Bstatic
+ LIBRARY_LINK_OPTS =	
 -LIB_SUFFIX =			a
 +LIB_SUFFIX =		la
  LIBS_FOR_CONSOLE_APPLICATION =
diff --git a/net/liblive/patches/patch-ba b/net/liblive/patches/patch-ba
index 79a571122b1..8b3124d30a2 100644
--- a/net/liblive/patches/patch-ba
+++ b/net/liblive/patches/patch-ba
@@ -1,7 +1,7 @@
-$NetBSD: patch-ba,v 1.1 2008/10/30 09:58:46 is Exp $
+$NetBSD: patch-ba,v 1.2 2012/02/21 12:38:58 drochner Exp $
 
---- config.solaris.orig	2008-07-25 02:40:05.000000000 +0200
-+++ config.solaris
+--- config.solaris-32bit.orig	2008-07-25 02:40:05.000000000 +0200
++++ config.solaris-32bit
 @@ -1,17 +1,20 @@
 -COMPILE_OPTS =		$(INCLUDES) -I. -O -DSOLARIS -DSOCKLEN_T=socklen_t
 +.SUFFIXES: .la .lo .cpp
diff --git a/net/liblive/patches/patch-ca b/net/liblive/patches/patch-ca
new file mode 100644
index 00000000000..2cd122781a2
--- /dev/null
+++ b/net/liblive/patches/patch-ca
@@ -0,0 +1,15 @@
+$NetBSD: patch-ca,v 1.1 2012/02/21 12:38:58 drochner Exp $
+
+--- liveMedia/FileSink.cpp.orig	2012-02-04 11:01:47.000000000 +0000
++++ liveMedia/FileSink.cpp
+@@ -92,8 +92,8 @@ void FileSink::addData(unsigned char con
+ 		       struct timeval presentationTime) {
+   if (fPerFrameFileNameBuffer != NULL) {
+     // Special case: Open a new file on-the-fly for this frame
+-    sprintf(fPerFrameFileNameBuffer, "%s-%lu.%06lu", fPerFrameFileNamePrefix,
+-	    presentationTime.tv_sec, presentationTime.tv_usec);
++    sprintf(fPerFrameFileNameBuffer, "%s-%llu.%06u", fPerFrameFileNamePrefix,
++	    (unsigned long long)presentationTime.tv_sec, presentationTime.tv_usec);
+     fOutFid = OpenOutputFile(envir(), fPerFrameFileNameBuffer);
+   }
+ 
diff --git a/net/liblive/patches/patch-cb b/net/liblive/patches/patch-cb
new file mode 100644
index 00000000000..99554b53d8a
--- /dev/null
+++ b/net/liblive/patches/patch-cb
@@ -0,0 +1,22 @@
+$NetBSD: patch-cb,v 1.1 2012/02/21 12:38:58 drochner Exp $
+
+--- liveMedia/ServerMediaSession.cpp.orig	2012-02-04 11:01:47.000000000 +0000
++++ liveMedia/ServerMediaSession.cpp
+@@ -231,7 +231,7 @@ char* ServerMediaSession::generateSDPDes
+ 
+     char const* const sdpPrefixFmt =
+       "v=0\r\n"
+-      "o=- %ld%06ld %d IN IP4 %s\r\n"
++      "o=- %lld%06d %d IN IP4 %s\r\n"
+       "s=%s\r\n"
+       "i=%s\r\n"
+       "t=0 0\r\n"
+@@ -258,7 +258,7 @@ char* ServerMediaSession::generateSDPDes
+ 
+     // Generate the SDP prefix (session-level lines):
+     sprintf(sdp, sdpPrefixFmt,
+-	    fCreationTime.tv_sec, fCreationTime.tv_usec, // o= <session id>
++	    (unsigned long long)fCreationTime.tv_sec, fCreationTime.tv_usec, // o= <session id>
+ 	    1, // o= <version> // (needs to change if params are modified)
+ 	    ipAddressStr.val(), // o= <address>
+ 	    fDescriptionSDPString, // s= <description>
diff --git a/net/liblive/patches/patch-cc b/net/liblive/patches/patch-cc
new file mode 100644
index 00000000000..b63e14da673
--- /dev/null
+++ b/net/liblive/patches/patch-cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-cc,v 1.1 2012/02/21 12:38:58 drochner Exp $
+
+--- testProgs/playCommon.cpp.orig	2012-02-04 11:01:47.000000000 +0000
++++ testProgs/playCommon.cpp
+@@ -1216,7 +1216,7 @@ void checkForPacketArrival(void* /*clien
+     struct timeval timeNow;
+     gettimeofday(&timeNow, NULL);
+ 	char timestampStr[100];
+-	sprintf(timestampStr, "%ld%03ld", timeNow.tv_sec, (long)(timeNow.tv_usec/1000));
++	sprintf(timestampStr, "%lld%03ld", (unsigned long long)timeNow.tv_sec, (long)(timeNow.tv_usec/1000));
+     *env << (syncStreams ? "Synchronized d" : "D")
+ 		<< "ata packets have begun arriving [" << timestampStr << "]\007\n";
+     return;