diff --git a/media-video/live555/live555-2016.06.22.recipe b/media-plugins/live555/live555-2023.10.30.recipe similarity index 69% rename from media-video/live555/live555-2016.06.22.recipe rename to media-plugins/live555/live555-2023.10.30.recipe index 38c74aa95..580b3a686 100644 --- a/media-video/live555/live555-2016.06.22.recipe +++ b/media-plugins/live555/live555-2023.10.30.recipe @@ -4,20 +4,23 @@ using open standard protocols. The library can be used to build streaming \ applications using various audio and video codecs." HOMEPAGE="http://www.live555.com/liveMedia/" COPYRIGHT="Live Networks, Inc." -LICENSE="GNU LGPL v2.1" -REVISION="5" -SOURCE_URI="https://github.com/xanview/live555/archive/eda27a2d0fbf8ad25d7222f48154f62d72932962.tar.gz" -CHECKSUM_SHA256="bca897eb4d48957ed030ea3ffe42c0fd2d01b105d3ce8f61b5fbb79e1f3e1529" -SOURCE_DIR="live555-eda27a2d0fbf8ad25d7222f48154f62d72932962" -PATCHES="live555-2016.01.29.patchset" +LICENSE="GNU GPL v3 + GNU LGPL v3" +REVISION="1" +SOURCE_URI="http://www.live555.com/liveMedia/public/live.$portVersion.tar.gz" +CHECKSUM_SHA256="f51e5f2d6ae01bc09616b5dc39464e28b2adfb3832f46fa2a0b021c5ab4ec0eb" +SOURCE_DIR="live" +PATCHES="live555-$portVersion.patchset" -ARCHITECTURES="all" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" live555$secondaryArchSuffix = $portVersion + cmd:live555HLSProxy cmd:live555MediaServer cmd:live555ProxyServer + cmd:mikeyparse cmd:MPEG2TransportStreamIndexer cmd:openRTSP cmd:playSIP @@ -26,9 +29,11 @@ PROVIDES=" cmd:testAMRAudioStreamer cmd:testDVVideoStreamer cmd:testH264VideoStreamer + cmd:testH264VideoToHLSSegments cmd:testH264VideoToTransportStream cmd:testH265VideoStreamer cmd:testH265VideoToTransportStream + cmd:testMKVSplitter cmd:testMKVStreamer cmd:testMP3Receiver cmd:testMP3Streamer @@ -39,6 +44,7 @@ PROVIDES=" cmd:testMPEG1or2VideoStreamer cmd:testMPEG2TransportReceiver cmd:testMPEG2TransportStreamer + cmd:testMPEG2TransportStreamSplitter cmd:testMPEG2TransportStreamTrickPlay cmd:testMPEG4VideoStreamer cmd:testOggStreamer @@ -51,15 +57,16 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libssl$secondaryArchSuffix " PROVIDES_devel=" live555${secondaryArchSuffix}_devel = $portVersion - devel:libBasicUsageEnvironment = $portVersion - devel:libgroupsock = $portVersion - devel:libliveMedia = $portVersion - devel:libUsageEnvironment = $portVersion - devel:live555$secondaryArchSuffix = $portVersion + devel:libBasicUsageEnvironment$secondaryArchSuffix = $portVersion + devel:libgroupsock$secondaryArchSuffix = $portVersion + devel:libliveMedia$secondaryArchSuffix = $portVersion + devel:libUsageEnvironment$secondaryArchSuffix = $portVersion " REQUIRES_devel=" live555$secondaryArchSuffix == $portVersion base @@ -67,6 +74,8 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + devel:libcrypto$secondaryArchSuffix + devel:libssl$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:ar @@ -83,17 +92,12 @@ BUILD() INSTALL() { - make install PREFIX=$prefix INSTALLDIR=$prefix/bin LIBDIR=$developLibDir \ - MANDIR=$manDir/man1 BINDIR=$binDir DESTDIR=${DESTDIR} + make install PREFIX=$prefix \ + INCLUDEDIR=$includeDir \ + LIBDIR=$developLibDir mkdir -p $includeDir - # fixes hardcoded paths in makefile - mv $prefix/include/* $includeDir - rm $prefix/include -r - - # No need to call prepareInstalledDevelLibs - mkdir -p $developLibDir/pkgconfig cat > $developLibDir/pkgconfig/live555.pc << EOF prefix=${prefix} @@ -109,5 +113,6 @@ Cflags: -I${includeDir}/liveMedia -I${includeDir}/groupsock -I${includeDir}/Basi EOF # devel package - packageEntries devel $developDir + packageEntries devel \ + $developDir } diff --git a/media-plugins/live555/patches/live555-2023.10.30.patchset b/media-plugins/live555/patches/live555-2023.10.30.patchset new file mode 100644 index 000000000..6b941f891 --- /dev/null +++ b/media-plugins/live555/patches/live555-2023.10.30.patchset @@ -0,0 +1,142 @@ +From 35a94c5c7789a0b258eecfc9ab5691b0decdad00 Mon Sep 17 00:00:00 2001 +From: Dario Casalinuovo +Date: Wed, 23 Mar 2016 19:21:17 +0000 +Subject: Add Haiku support + + +diff --git a/config.haiku b/config.haiku +new file mode 100644 +index 0000000..8c610cf +--- /dev/null ++++ b/config.haiku +@@ -0,0 +1,17 @@ ++COMPILE_OPTS = $(INCLUDES) -I. -O -DBSD=1 -DXLOCALE_NOT_USED=1 -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -DNO_STD_LIB ++C = c ++C_COMPILER = cc ++C_FLAGS = $(COMPILE_OPTS) ++CPP = cpp ++CPLUSPLUS_COMPILER = c++ ++CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall ++OBJ = o ++LINK = c++ -o ++LINK_OPTS = -lnetwork -L. $(LDFLAGS) ++CONSOLE_LINK_OPTS = $(LINK_OPTS) ++LIBRARY_LINK = ar cr ++LIBRARY_LINK_OPTS = ++LIB_SUFFIX = a ++LIBS_FOR_CONSOLE_APPLICATION = -lssl -lcrypto ++LIBS_FOR_GUI_APPLICATION = ++EXE = +-- +2.42.0 + + +From 1e8e7819ea76ad0d6315e66f61698d29254d5187 Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Mon, 30 Oct 2023 11:33:10 +0100 +Subject: Fix include dir path for Haiku + + +diff --git a/BasicUsageEnvironment/Makefile.head b/BasicUsageEnvironment/Makefile.head +index f4e4414..7fd9122 100644 +--- a/BasicUsageEnvironment/Makefile.head ++++ b/BasicUsageEnvironment/Makefile.head +@@ -1,4 +1,5 @@ + INCLUDES = -Iinclude -I../UsageEnvironment/include -I../groupsock/include + PREFIX = /usr/local + LIBDIR = $(PREFIX)/lib ++INCLUDEDIR = $(PREFIX)/include + ##### Change the following for your environment: +diff --git a/BasicUsageEnvironment/Makefile.tail b/BasicUsageEnvironment/Makefile.tail +index 5d04179..138c7fe 100644 +--- a/BasicUsageEnvironment/Makefile.tail ++++ b/BasicUsageEnvironment/Makefile.tail +@@ -33,8 +33,8 @@ clean: + + install: install1 $(INSTALL2) + install1: libBasicUsageEnvironment.$(LIB_SUFFIX) +- install -d $(DESTDIR)$(PREFIX)/include/BasicUsageEnvironment $(DESTDIR)$(LIBDIR) +- install -m 644 include/*.hh $(DESTDIR)$(PREFIX)/include/BasicUsageEnvironment ++ install -d $(DESTDIR)$(INCLUDEDIR)/BasicUsageEnvironment $(DESTDIR)$(LIBDIR) ++ install -m 644 include/*.hh $(DESTDIR)$(INCLUDEDIR)/BasicUsageEnvironment + install -m 644 libBasicUsageEnvironment.$(LIB_SUFFIX) $(DESTDIR)$(LIBDIR) + install_shared_libraries: libBasicUsageEnvironment.$(LIB_SUFFIX) + ln -fs $(NAME).$(LIB_SUFFIX) $(DESTDIR)$(LIBDIR)/$(NAME).$(SHORT_LIB_SUFFIX) +diff --git a/UsageEnvironment/Makefile.head b/UsageEnvironment/Makefile.head +index 48b0268..dd45299 100644 +--- a/UsageEnvironment/Makefile.head ++++ b/UsageEnvironment/Makefile.head +@@ -1,4 +1,5 @@ + INCLUDES = -Iinclude -I../groupsock/include + PREFIX = /usr/local + LIBDIR = $(PREFIX)/lib ++INCLUDEDIR = $(PREFIX)/include + ##### Change the following for your environment: +diff --git a/UsageEnvironment/Makefile.tail b/UsageEnvironment/Makefile.tail +index a7c23df..4c0a665 100644 +--- a/UsageEnvironment/Makefile.tail ++++ b/UsageEnvironment/Makefile.tail +@@ -27,8 +27,8 @@ clean: + + install: install1 $(INSTALL2) + install1: $(USAGE_ENVIRONMENT_LIB) +- install -d $(DESTDIR)$(PREFIX)/include/UsageEnvironment $(DESTDIR)$(LIBDIR) +- install -m 644 include/*.hh $(DESTDIR)$(PREFIX)/include/UsageEnvironment ++ install -d $(DESTDIR)$(INCLUDEDIR)/UsageEnvironment $(DESTDIR)$(LIBDIR) ++ install -m 644 include/*.hh $(DESTDIR)$(INCLUDEDIR)/UsageEnvironment + install -m 644 $(USAGE_ENVIRONMENT_LIB) $(DESTDIR)$(LIBDIR) + install_shared_libraries: $(USAGE_ENVIRONMENT_LIB) + ln -fs $(NAME).$(LIB_SUFFIX) $(DESTDIR)$(LIBDIR)/$(NAME).$(SHORT_LIB_SUFFIX) +diff --git a/groupsock/Makefile.head b/groupsock/Makefile.head +index 219f685..3cf953e 100644 +--- a/groupsock/Makefile.head ++++ b/groupsock/Makefile.head +@@ -1,4 +1,5 @@ + INCLUDES = -Iinclude -I../UsageEnvironment/include + PREFIX = /usr/local + LIBDIR = $(PREFIX)/lib ++INCLUDEDIR = $(PREFIX)/include + ##### Change the following for your environment: +diff --git a/groupsock/Makefile.tail b/groupsock/Makefile.tail +index ab8266e..ac5846f 100644 +--- a/groupsock/Makefile.tail ++++ b/groupsock/Makefile.tail +@@ -34,8 +34,8 @@ clean: + + install: install1 $(INSTALL2) + install1: libgroupsock.$(LIB_SUFFIX) +- install -d $(DESTDIR)$(PREFIX)/include/groupsock $(DESTDIR)$(LIBDIR) +- install -m 644 include/*.hh include/*.h $(DESTDIR)$(PREFIX)/include/groupsock ++ install -d $(DESTDIR)$(INCLUDEDIR)/groupsock $(DESTDIR)$(LIBDIR) ++ install -m 644 include/*.hh include/*.h $(DESTDIR)$(INCLUDEDIR)/groupsock + install -m 644 libgroupsock.$(LIB_SUFFIX) $(DESTDIR)$(LIBDIR) + install_shared_libraries: libgroupsock.$(LIB_SUFFIX) + ln -fs libgroupsock.$(LIB_SUFFIX) $(DESTDIR)$(LIBDIR)/libgroupsock.$(SHORT_LIB_SUFFIX) +diff --git a/liveMedia/Makefile.head b/liveMedia/Makefile.head +index f4e4414..7fd9122 100644 +--- a/liveMedia/Makefile.head ++++ b/liveMedia/Makefile.head +@@ -1,4 +1,5 @@ + INCLUDES = -Iinclude -I../UsageEnvironment/include -I../groupsock/include + PREFIX = /usr/local + LIBDIR = $(PREFIX)/lib ++INCLUDEDIR = $(PREFIX)/include + ##### Change the following for your environment: +diff --git a/liveMedia/Makefile.tail b/liveMedia/Makefile.tail +index 1be45f6..acb0a8a 100644 +--- a/liveMedia/Makefile.tail ++++ b/liveMedia/Makefile.tail +@@ -435,8 +435,8 @@ clean: + + install: install1 $(INSTALL2) + install1: $(LIVEMEDIA_LIB) +- install -d $(DESTDIR)$(PREFIX)/include/liveMedia $(DESTDIR)$(LIBDIR) +- install -m 644 include/*.hh $(DESTDIR)$(PREFIX)/include/liveMedia ++ install -d $(DESTDIR)$(INCLUDEDIR)/liveMedia $(DESTDIR)$(LIBDIR) ++ install -m 644 include/*.hh $(DESTDIR)$(INCLUDEDIR)/liveMedia + install -m 644 $(LIVEMEDIA_LIB) $(DESTDIR)$(LIBDIR) + install_shared_libraries: $(LIVEMEDIA_LIB) + ln -fs $(NAME).$(LIB_SUFFIX) $(DESTDIR)$(LIBDIR)/$(NAME).$(SHORT_LIB_SUFFIX) +-- +2.42.0 + diff --git a/media-video/live555/live555-2016.01.29.recipe b/media-video/live555/live555-2016.01.29.recipe deleted file mode 100644 index 488278fd8..000000000 --- a/media-video/live555/live555-2016.01.29.recipe +++ /dev/null @@ -1,99 +0,0 @@ -SUMMARY="C++ libraries for multimedia streaming" -DESCRIPTION="live555 forms a set of C++ libraries for multimedia streaming \ -using open standard protocols. The library can be used to build streaming \ -applications using various audio and video codecs." -HOMEPAGE="http://www.live555.com/liveMedia/" -COPYRIGHT="Live Networks, Inc." -LICENSE="GNU LGPL v2.1" -REVISION="3" -SOURCE_URI="https://github.com/xanview/live555/archive/d9e97d7953d531a243a8372870bdb6c7a9bb80cb.tar.gz" -CHECKSUM_SHA256="c6cb4a6ad32a329b95cc16fa97b6c3ac43c70ac27c97bf1b2f56dc4a474759d7" -SOURCE_DIR="live555-d9e97d7953d531a243a8372870bdb6c7a9bb80cb" -PATCHES="live555-2016.01.29.patchset" - -ARCHITECTURES="all" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PROVIDES=" - live555$secondaryArchSuffix = $portVersion - cmd:live555MediaServer - cmd:live555ProxyServer - cmd:MPEG2TransportStreamIndexer - cmd:openRTSP - cmd:playSIP - cmd:registerRTSPStream - cmd:sapWatch - cmd:testAMRAudioStreamer - cmd:testDVVideoStreamer - cmd:testH264VideoStreamer - cmd:testH264VideoToTransportStream - cmd:testH265VideoStreamer - cmd:testH265VideoToTransportStream - cmd:testMKVStreamer - cmd:testMP3Receiver - cmd:testMP3Streamer - cmd:testMPEG1or2AudioVideoStreamer - cmd:testMPEG1or2ProgramToTransportStream - cmd:testMPEG1or2Splitter - cmd:testMPEG1or2VideoReceiver - cmd:testMPEG1or2VideoStreamer - cmd:testMPEG2TransportReceiver - cmd:testMPEG2TransportStreamer - cmd:testMPEG2TransportStreamTrickPlay - cmd:testMPEG4VideoStreamer - cmd:testOggStreamer - cmd:testOnDemandRTSPServer - cmd:testRelay - cmd:testReplicator - cmd:testRTSPClient - cmd:testWAVAudioStreamer - cmd:vobStreamer - " -REQUIRES=" - haiku$secondaryArchSuffix - " - -PROVIDES_devel=" - live555${secondaryArchSuffix}_devel = $portVersion - devel:libBasicUsageEnvironment$secondaryArchSuffix = $portVersion - devel:libgroupsock$secondaryArchSuffix = $portVersion - devel:libliveMedia$secondaryArchSuffix = $portVersion - devel:libUsageEnvironment$secondaryArchSuffix = $portVersion - devel:live555$secondaryArchSuffix = $portVersion - " -REQUIRES_devel=" - live555$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - " -BUILD_PREREQUIRES=" - cmd:ar - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - " - -BUILD() -{ - ./genMakefiles haiku - make $jobArgs -} - -INSTALL() -{ - make install PREFIX=$prefix INSTALLDIR=$prefix/bin LIBDIR=$developLibDir \ - MANDIR=$manDir/man1 BINDIR=$binDir DESTDIR=${DESTDIR} - - mkdir -p $includeDir - - # fixes hardcoded paths in makefile - mv $prefix/include/* $includeDir - rm $prefix/include -r - - # No need to call prepareInstalledDevelLibs - - # devel package - packageEntries devel $developDir -} diff --git a/media-video/live555/patches/live555-2016.01.29.patchset b/media-video/live555/patches/live555-2016.01.29.patchset deleted file mode 100644 index 8c0f41719..000000000 --- a/media-video/live555/patches/live555-2016.01.29.patchset +++ /dev/null @@ -1,361 +0,0 @@ -From 60acc27ccb584315299e57d4a1a46ce1e7ccb98e Mon Sep 17 00:00:00 2001 -From: Dario Casalinuovo -Date: Wed, 23 Mar 2016 19:21:17 +0000 -Subject: [PATCH 1/2] Add Haiku support - ---- - config.haiku | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - create mode 100644 config.haiku - -diff --git a/config.haiku b/config.haiku -new file mode 100644 -index 0000000..6c12e2c ---- /dev/null -+++ b/config.haiku -@@ -0,0 +1,17 @@ -+COMPILE_OPTS = $(INCLUDES) -I. -O -DBSD=1 -DXLOCALE_NOT_USED=1 -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -+C = c -+C_COMPILER = cc -+C_FLAGS = $(COMPILE_OPTS) -+CPP = cpp -+CPLUSPLUS_COMPILER = c++ -+CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -+OBJ = o -+LINK = c++ -o -+LINK_OPTS = -lnetwork -L. -+CONSOLE_LINK_OPTS = $(LINK_OPTS) -+LIBRARY_LINK = ar cr -+LIBRARY_LINK_OPTS = -+LIB_SUFFIX = a -+LIBS_FOR_CONSOLE_APPLICATION = -+LIBS_FOR_GUI_APPLICATION = -+EXE = --- -2.7.0 - - -From 09f3dc767c6b7eeafc880690d191304785ed611b Mon Sep 17 00:00:00 2001 -From: Dario Casalinuovo -Date: Wed, 23 Mar 2016 19:23:03 +0000 -Subject: [PATCH 2/2] gcc2 fixes for Haiku - ---- - liveMedia/AC3AudioStreamFramer.cpp | 2 +- - liveMedia/AMRAudioRTPSource.cpp | 2 +- - liveMedia/DVVideoStreamFramer.cpp | 4 ++-- - liveMedia/H263plusVideoStreamParser.cpp | 2 +- - liveMedia/H264or5VideoRTPSink.cpp | 2 +- - liveMedia/H264or5VideoStreamDiscreteFramer.cpp | 2 +- - liveMedia/MP3ADU.cpp | 2 +- - liveMedia/MPEG1or2AudioStreamFramer.cpp | 2 +- - liveMedia/MPEG1or2VideoStreamDiscreteFramer.cpp | 2 +- - liveMedia/MPEG2TransportStreamFramer.cpp | 4 ++-- - liveMedia/MPEG2TransportStreamFromESSource.cpp | 2 +- - liveMedia/MPEG2TransportStreamFromPESSource.cpp | 2 +- - liveMedia/MPEG4VideoStreamDiscreteFramer.cpp | 2 +- - liveMedia/MPEGVideoStreamParser.cpp | 2 +- - liveMedia/OggFileSink.cpp | 2 +- - liveMedia/ProxyServerMediaSession.cpp | 2 +- - liveMedia/QCELPAudioRTPSource.cpp | 2 +- - liveMedia/uLawAudioFilter.cpp | 12 ++++++------ - 18 files changed, 25 insertions(+), 25 deletions(-) - -diff --git a/liveMedia/AC3AudioStreamFramer.cpp b/liveMedia/AC3AudioStreamFramer.cpp -index 5800040..16036a6 100644 ---- a/liveMedia/AC3AudioStreamFramer.cpp -+++ b/liveMedia/AC3AudioStreamFramer.cpp -@@ -217,7 +217,7 @@ void AC3FrameParams::setParamsFromHeader() { - AC3AudioStreamParser - ::AC3AudioStreamParser(AC3AudioStreamFramer* usingSource, - FramedSource* inputSource) -- : StreamParser(inputSource, FramedSource::handleClosure, usingSource, -+ : StreamParser(inputSource, &FramedSource::handleClosure, usingSource, - &AC3AudioStreamFramer::handleNewData, usingSource), - fUsingSource(usingSource), fHaveParsedAFrame(False), - fSavedFrame(NULL), fSavedFrameSize(0) { -diff --git a/liveMedia/AMRAudioRTPSource.cpp b/liveMedia/AMRAudioRTPSource.cpp -index 0f49d89..a00e6fc 100644 ---- a/liveMedia/AMRAudioRTPSource.cpp -+++ b/liveMedia/AMRAudioRTPSource.cpp -@@ -474,7 +474,7 @@ void AMRDeinterleaver::doGetNextFrame() { - fInputSource->getNextFrame(fDeinterleavingBuffer->inputBuffer(), - fDeinterleavingBuffer->inputBufferSize(), - afterGettingFrame, this, -- FramedSource::handleClosure, this); -+ &FramedSource::handleClosure, this); - } - } - -diff --git a/liveMedia/DVVideoStreamFramer.cpp b/liveMedia/DVVideoStreamFramer.cpp -index 53a0b74..1bacf84 100644 ---- a/liveMedia/DVVideoStreamFramer.cpp -+++ b/liveMedia/DVVideoStreamFramer.cpp -@@ -87,7 +87,7 @@ Boolean DVVideoStreamFramer::getFrameParameters(unsigned& frameSize, double& fra - void DVVideoStreamFramer::getProfile() { - // To determine the stream's profile, we need to first read a chunk of data that we can parse: - fInputSource->getNextFrame(fSavedInitialBlocks, DV_SAVED_INITIAL_BLOCKS_SIZE, -- afterGettingFrame, this, FramedSource::handleClosure, this); -+ afterGettingFrame, this, &FramedSource::handleClosure, this); - - // Handle events until the requested data arrives: - envir().taskScheduler().doEventLoop(&fInitialBlocksPresent); -@@ -129,7 +129,7 @@ void DVVideoStreamFramer::getAndDeliverData() { - unsigned totBytesToDeliver = totFrameSize < fMaxSize ? totFrameSize : fMaxSize; - unsigned numBytesToRead = totBytesToDeliver - fFrameSize; - -- fInputSource->getNextFrame(fTo, numBytesToRead, afterGettingFrame, this, FramedSource::handleClosure, this); -+ fInputSource->getNextFrame(fTo, numBytesToRead, afterGettingFrame, this, &FramedSource::handleClosure, this); - } - - void DVVideoStreamFramer::afterGettingFrame(void* clientData, unsigned frameSize, -diff --git a/liveMedia/H263plusVideoStreamParser.cpp b/liveMedia/H263plusVideoStreamParser.cpp -index e59539f..e8fe1c2 100644 ---- a/liveMedia/H263plusVideoStreamParser.cpp -+++ b/liveMedia/H263plusVideoStreamParser.cpp -@@ -29,7 +29,7 @@ H263plusVideoStreamParser::H263plusVideoStreamParser( - H263plusVideoStreamFramer* usingSource, - FramedSource* inputSource) - : StreamParser(inputSource, -- FramedSource::handleClosure, -+ &FramedSource::handleClosure, - usingSource, - &H263plusVideoStreamFramer::continueReadProcessing, - usingSource), -diff --git a/liveMedia/H264or5VideoRTPSink.cpp b/liveMedia/H264or5VideoRTPSink.cpp -index b8c16d3..5ff8e2c 100644 ---- a/liveMedia/H264or5VideoRTPSink.cpp -+++ b/liveMedia/H264or5VideoRTPSink.cpp -@@ -178,7 +178,7 @@ void H264or5Fragmenter::doGetNextFrame() { - // We have no NAL unit data currently in the buffer. Read a new one: - fInputSource->getNextFrame(&fInputBuffer[1], fInputBufferSize - 1, - afterGettingFrame, this, -- FramedSource::handleClosure, this); -+ &FramedSource::handleClosure, this); - } else { - // We have NAL unit data in the buffer. There are three cases to consider: - // 1. There is a new NAL unit in the buffer, and it's small enough to deliver -diff --git a/liveMedia/H264or5VideoStreamDiscreteFramer.cpp b/liveMedia/H264or5VideoStreamDiscreteFramer.cpp -index dae5368..cadc3ac 100644 ---- a/liveMedia/H264or5VideoStreamDiscreteFramer.cpp -+++ b/liveMedia/H264or5VideoStreamDiscreteFramer.cpp -@@ -37,7 +37,7 @@ void H264or5VideoStreamDiscreteFramer::doGetNextFrame() { - // After reading this, we'll do some parsing on the frame. - fInputSource->getNextFrame(fTo, fMaxSize, - afterGettingFrame, this, -- FramedSource::handleClosure, this); -+ &FramedSource::handleClosure, this); - } - - void H264or5VideoStreamDiscreteFramer -diff --git a/liveMedia/MP3ADU.cpp b/liveMedia/MP3ADU.cpp -index 14c6605..86565de 100644 ---- a/liveMedia/MP3ADU.cpp -+++ b/liveMedia/MP3ADU.cpp -@@ -521,7 +521,7 @@ void SegmentQueue::enqueueNewSegment(FramedSource* inputSource, - Segment& seg = nextFreeSegment(); - inputSource->getNextFrame(seg.buf, sizeof seg.buf, - sqAfterGettingSegment, this, -- FramedSource::handleClosure, usingSource); -+ &FramedSource::handleClosure, usingSource); - } - - void SegmentQueue::sqAfterGettingSegment(void* clientData, -diff --git a/liveMedia/MPEG1or2AudioStreamFramer.cpp b/liveMedia/MPEG1or2AudioStreamFramer.cpp -index e7539f9..61b9800 100644 ---- a/liveMedia/MPEG1or2AudioStreamFramer.cpp -+++ b/liveMedia/MPEG1or2AudioStreamFramer.cpp -@@ -163,7 +163,7 @@ void MPEG1or2AudioStreamFramer::continueReadProcessing() { - MPEG1or2AudioStreamParser - ::MPEG1or2AudioStreamParser(MPEG1or2AudioStreamFramer* usingSource, - FramedSource* inputSource) -- : StreamParser(inputSource, FramedSource::handleClosure, usingSource, -+ : StreamParser(inputSource, &FramedSource::handleClosure, usingSource, - &MPEG1or2AudioStreamFramer::continueReadProcessing, usingSource) { - } - -diff --git a/liveMedia/MPEG1or2VideoStreamDiscreteFramer.cpp b/liveMedia/MPEG1or2VideoStreamDiscreteFramer.cpp -index 62b80ab..0a4590e 100644 ---- a/liveMedia/MPEG1or2VideoStreamDiscreteFramer.cpp -+++ b/liveMedia/MPEG1or2VideoStreamDiscreteFramer.cpp -@@ -57,7 +57,7 @@ void MPEG1or2VideoStreamDiscreteFramer::doGetNextFrame() { - // After reading this, we'll do some parsing on the frame. - fInputSource->getNextFrame(fTo, fMaxSize, - afterGettingFrame, this, -- FramedSource::handleClosure, this); -+ &FramedSource::handleClosure, this); - } - - void MPEG1or2VideoStreamDiscreteFramer -diff --git a/liveMedia/MPEG2TransportStreamFramer.cpp b/liveMedia/MPEG2TransportStreamFramer.cpp -index 18c7fb1..09fc35a 100644 ---- a/liveMedia/MPEG2TransportStreamFramer.cpp -+++ b/liveMedia/MPEG2TransportStreamFramer.cpp -@@ -116,7 +116,7 @@ void MPEG2TransportStreamFramer::doGetNextFrame() { - fFrameSize = 0; - fInputSource->getNextFrame(fTo, fMaxSize, - afterGettingFrame, this, -- FramedSource::handleClosure, this); -+ &FramedSource::handleClosure, this); - } - - void MPEG2TransportStreamFramer::doStopGettingFrames() { -@@ -166,7 +166,7 @@ void MPEG2TransportStreamFramer::afterGettingFrame1(unsigned frameSize, - fFrameSize -= syncBytePosition; - fInputSource->getNextFrame(&fTo[fFrameSize], syncBytePosition, - afterGettingFrame, this, -- FramedSource::handleClosure, this); -+ &FramedSource::handleClosure, this); - return; - } // else normal case: the data begins with a sync byte - -diff --git a/liveMedia/MPEG2TransportStreamFromESSource.cpp b/liveMedia/MPEG2TransportStreamFromESSource.cpp -index 4008e8b..a0ed86e 100644 ---- a/liveMedia/MPEG2TransportStreamFromESSource.cpp -+++ b/liveMedia/MPEG2TransportStreamFromESSource.cpp -@@ -192,7 +192,7 @@ void InputESSourceRecord::askForNewData() { - fInputSource->getNextFrame(&fInputBuffer[fInputBufferBytesAvailable], - INPUT_BUFFER_SIZE-fInputBufferBytesAvailable, - afterGettingFrame, this, -- FramedSource::handleClosure, &fParent); -+ &FramedSource::handleClosure, &fParent); - } - } - -diff --git a/liveMedia/MPEG2TransportStreamFromPESSource.cpp b/liveMedia/MPEG2TransportStreamFromPESSource.cpp -index a936800..7101a04 100644 ---- a/liveMedia/MPEG2TransportStreamFromPESSource.cpp -+++ b/liveMedia/MPEG2TransportStreamFromPESSource.cpp -@@ -48,7 +48,7 @@ void MPEG2TransportStreamFromPESSource - ::awaitNewBuffer(unsigned char* /*oldBuffer*/) { - fInputSource->getNextFrame(fInputBuffer, MAX_PES_PACKET_SIZE, - afterGettingFrame, this, -- FramedSource::handleClosure, this); -+ &FramedSource::handleClosure, this); - } - - void MPEG2TransportStreamFromPESSource -diff --git a/liveMedia/MPEG4VideoStreamDiscreteFramer.cpp b/liveMedia/MPEG4VideoStreamDiscreteFramer.cpp -index 7e9b97a..457ae3b 100644 ---- a/liveMedia/MPEG4VideoStreamDiscreteFramer.cpp -+++ b/liveMedia/MPEG4VideoStreamDiscreteFramer.cpp -@@ -49,7 +49,7 @@ void MPEG4VideoStreamDiscreteFramer::doGetNextFrame() { - // After reading this, we'll do some parsing on the frame. - fInputSource->getNextFrame(fTo, fMaxSize, - afterGettingFrame, this, -- FramedSource::handleClosure, this); -+ &FramedSource::handleClosure, this); - } - - void MPEG4VideoStreamDiscreteFramer -diff --git a/liveMedia/MPEGVideoStreamParser.cpp b/liveMedia/MPEGVideoStreamParser.cpp -index 15c7d7d..380ea34 100644 ---- a/liveMedia/MPEGVideoStreamParser.cpp -+++ b/liveMedia/MPEGVideoStreamParser.cpp -@@ -23,7 +23,7 @@ along with this library; if not, write to the Free Software Foundation, Inc., - MPEGVideoStreamParser - ::MPEGVideoStreamParser(MPEGVideoStreamFramer* usingSource, - FramedSource* inputSource) -- : StreamParser(inputSource, FramedSource::handleClosure, usingSource, -+ : StreamParser(inputSource, &FramedSource::handleClosure, usingSource, - &MPEGVideoStreamFramer::continueReadProcessing, usingSource), - fUsingSource(usingSource) { - } -diff --git a/liveMedia/OggFileSink.cpp b/liveMedia/OggFileSink.cpp -index 61e29e5..7010ae7 100644 ---- a/liveMedia/OggFileSink.cpp -+++ b/liveMedia/OggFileSink.cpp -@@ -86,7 +86,7 @@ Boolean OggFileSink::continuePlaying() { - if (fSource == NULL) return False; - - fSource->getNextFrame(fBuffer, fBufferSize, -- FileSink::afterGettingFrame, this, -+ &FileSink::afterGettingFrame, this, - ourOnSourceClosure, this); - return True; - } -diff --git a/liveMedia/ProxyServerMediaSession.cpp b/liveMedia/ProxyServerMediaSession.cpp -index daa3a35..a2f4e3c 100644 ---- a/liveMedia/ProxyServerMediaSession.cpp -+++ b/liveMedia/ProxyServerMediaSession.cpp -@@ -882,5 +882,5 @@ void PresentationTimeSubsessionNormalizer::afterGettingFrame(unsigned frameSize, - } - - void PresentationTimeSubsessionNormalizer::doGetNextFrame() { -- fInputSource->getNextFrame(fTo, fMaxSize, afterGettingFrame, this, FramedSource::handleClosure, this); -+ fInputSource->getNextFrame(fTo, fMaxSize, afterGettingFrame, this, &FramedSource::handleClosure, this); - } -diff --git a/liveMedia/QCELPAudioRTPSource.cpp b/liveMedia/QCELPAudioRTPSource.cpp -index b99cff9..84d58b2 100644 ---- a/liveMedia/QCELPAudioRTPSource.cpp -+++ b/liveMedia/QCELPAudioRTPSource.cpp -@@ -346,7 +346,7 @@ void QCELPDeinterleaver::doGetNextFrame() { - fInputSource->getNextFrame(fDeinterleavingBuffer->inputBuffer(), - fDeinterleavingBuffer->inputBufferSize(), - afterGettingFrame, this, -- FramedSource::handleClosure, this); -+ &FramedSource::handleClosure, this); - } - } - -diff --git a/liveMedia/uLawAudioFilter.cpp b/liveMedia/uLawAudioFilter.cpp -index 041e67e..8100732 100644 ---- a/liveMedia/uLawAudioFilter.cpp -+++ b/liveMedia/uLawAudioFilter.cpp -@@ -55,7 +55,7 @@ void uLawFromPCMAudioSource::doGetNextFrame() { - // Arrange to read samples into the input buffer: - fInputSource->getNextFrame(fInputBuffer, bytesToRead, - afterGettingFrame, this, -- FramedSource::handleClosure, this); -+ &FramedSource::handleClosure, this); - } - - void uLawFromPCMAudioSource -@@ -172,7 +172,7 @@ void PCMFromuLawAudioSource::doGetNextFrame() { - // Arrange to read samples into the input buffer: - fInputSource->getNextFrame(fInputBuffer, bytesToRead, - afterGettingFrame, this, -- FramedSource::handleClosure, this); -+ &FramedSource::handleClosure, this); - } - - void PCMFromuLawAudioSource -@@ -239,7 +239,7 @@ void NetworkFromHostOrder16::doGetNextFrame() { - // Arrange to read data directly into the client's buffer: - fInputSource->getNextFrame(fTo, fMaxSize, - afterGettingFrame, this, -- FramedSource::handleClosure, this); -+ &FramedSource::handleClosure, this); - } - - void NetworkFromHostOrder16 -@@ -293,7 +293,7 @@ void HostFromNetworkOrder16::doGetNextFrame() { - // Arrange to read data directly into the client's buffer: - fInputSource->getNextFrame(fTo, fMaxSize, - afterGettingFrame, this, -- FramedSource::handleClosure, this); -+ &FramedSource::handleClosure, this); - } - - void HostFromNetworkOrder16 -@@ -346,7 +346,7 @@ void EndianSwap16::doGetNextFrame() { - // Arrange to read data directly into the client's buffer: - fInputSource->getNextFrame(fTo, fMaxSize, - afterGettingFrame, this, -- FramedSource::handleClosure, this); -+ &FramedSource::handleClosure, this); - } - - void EndianSwap16::afterGettingFrame(void* clientData, unsigned frameSize, -@@ -397,7 +397,7 @@ void EndianSwap24::doGetNextFrame() { - // Arrange to read data directly into the client's buffer: - fInputSource->getNextFrame(fTo, fMaxSize, - afterGettingFrame, this, -- FramedSource::handleClosure, this); -+ &FramedSource::handleClosure, this); - } - - void EndianSwap24::afterGettingFrame(void* clientData, unsigned frameSize, --- -2.7.0 -