Files
live555/testProgs/testDVVideoStreamer.cpp
Roman Gaufman f4a4e8fb05 Add inter-packet gap monitoring and fix RTCP CPU spinning
## Key Changes

### 1. Inter-packet Gap Monitoring for Proxy Server
- Added -D option with 10-second default timeout for dead stream detection
- Implemented ProxyRTSPClient::checkInterPacketGaps_() functionality
- Automatic stream reset when no packets received within timeout period
- Enhanced proxy server reliability for network interruptions and camera reboots
- Updated method signatures across ProxyServerMediaSession components

### 2. RTCP CPU Spinning Fix
- Fixed infinite loop in RTCPInstance::incomingReportHandler1()
- Added buffer state reset and graceful return instead of break
- Enhanced logging for troubleshooting malformed RTCP packets
- Prevents 100% CPU usage with buggy RTP/RTCP-over-TCP implementations

### 3. Enhanced Documentation
- Updated README.md with comprehensive feature documentation
- Added usage examples for new -D option with different timeout values
- Documented all production reliability improvements
- Updated modifications.patch with proper file exclusions

### 4. Minor Improvements
- Updated copyright years to 2025 across multiple files
- Enhanced TLS state management with setupContinue() method
- Fixed SRTP initialization and ROC handling
- Improved BufferedPacket destructor to prevent stack overflow
- Updated task scheduler for better event loop handling

## Technical Details
- Added fTotNumPacketsReceived and fInterPacketGapMaxTime tracking
- Implemented packet counting across all media subsessions
- Enhanced ProxyRTSPClient constructor with interPacketGapMaxTime parameter
- Added proper task cleanup and delayed task scheduling
- Fixed method signature propagation throughout proxy subsystem

These changes significantly improve live555's production reliability,
particularly for deployment with buggy IP cameras and unstable networks,
while maintaining complete backward compatibility.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-08-13 12:26:14 +10:00

129 lines
4.6 KiB
C++

/**********
This library is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the
Free Software Foundation; either version 3 of the License, or (at your
option) any later version. (See <http://www.gnu.org/copyleft/lesser.html>.)
This library is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
more details.
You should have received a copy of the GNU Lesser General Public License
along with this library; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
**********/
// Copyright (c) 1996-2025, Live Networks, Inc. All rights reserved
// A test program that reads a DV Video Elementary Stream file,
// and streams it using RTP
// main program
#include "liveMedia.hh"
#include "BasicUsageEnvironment.hh"
#include "announceURL.hh"
#include "GroupsockHelper.hh"
UsageEnvironment* env;
char const* inputFileName = "test.dv";
DVVideoStreamFramer* videoSource;
RTPSink* videoSink;
void play(); // forward
int main(int argc, char** argv) {
// Begin by setting up our usage environment:
TaskScheduler* scheduler = BasicTaskScheduler::createNew();
env = BasicUsageEnvironment::createNew(*scheduler);
// Create 'groupsocks' for RTP and RTCP:
struct sockaddr_storage destinationAddress;
destinationAddress.ss_family = AF_INET;
((struct sockaddr_in&)destinationAddress).sin_addr.s_addr = chooseRandomIPv4SSMAddress(*env);
// Note: This is a multicast address. If you wish instead to stream
// using unicast, then you should use the "testOnDemandRTSPServer"
// test program - not this test program - as a model.
const unsigned short rtpPortNum = 18888;
const unsigned short rtcpPortNum = rtpPortNum+1;
const unsigned char ttl = 255;
const Port rtpPort(rtpPortNum);
const Port rtcpPort(rtcpPortNum);
Groupsock rtpGroupsock(*env, destinationAddress, rtpPort, ttl);
rtpGroupsock.multicastSendOnly(); // we're a SSM source
Groupsock rtcpGroupsock(*env, destinationAddress, rtcpPort, ttl);
rtcpGroupsock.multicastSendOnly(); // we're a SSM source
// Create a 'DV Video RTP' sink from the RTP 'groupsock':
// (But first, make sure that its buffers will be large enough to handle the huge size of DV frames (as big as 288000).)
OutPacketBuffer::maxSize = 2000000;
videoSink = DVVideoRTPSink::createNew(*env, &rtpGroupsock, 96);
// Create (and start) a 'RTCP instance' for this RTP sink:
const unsigned estimatedSessionBandwidth = 50000; // in kbps; for RTCP b/w share
const unsigned maxCNAMElen = 100;
unsigned char CNAME[maxCNAMElen+1];
gethostname((char*)CNAME, maxCNAMElen);
CNAME[maxCNAMElen] = '\0'; // just in case
RTCPInstance* rtcp
= RTCPInstance::createNew(*env, &rtcpGroupsock,
estimatedSessionBandwidth, CNAME,
videoSink, NULL /* we're a server */,
True /* we're a SSM source */);
// Note: This starts RTCP running automatically
RTSPServer* rtspServer = RTSPServer::createNew(*env, 8554);
if (rtspServer == NULL) {
*env << "Failed to create RTSP server: " << env->getResultMsg() << "\n";
exit(1);
}
ServerMediaSession* sms
= ServerMediaSession::createNew(*env, "testStream", inputFileName,
"Session streamed by \"testDVVideoStreamer\"",
True /*SSM*/);
sms->addSubsession(PassiveServerMediaSubsession::createNew(*videoSink, rtcp));
rtspServer->addServerMediaSession(sms);
announceURL(rtspServer, sms);
// Start the streaming:
*env << "Beginning streaming...\n";
play();
env->taskScheduler().doEventLoop(); // does not return
return 0; // only to prevent compiler warning
}
void afterPlaying(void* /*clientData*/) {
*env << "...done reading from file\n";
videoSink->stopPlaying();
Medium::close(videoSource);
// Note that this also closes the input file that this source read from.
// Start playing once again:
play();
}
void play() {
// Open the input file as a 'byte-stream file source':
ByteStreamFileSource* fileSource
= ByteStreamFileSource::createNew(*env, inputFileName);
if (fileSource == NULL) {
*env << "Unable to open file \"" << inputFileName
<< "\" as a byte-stream file source\n";
exit(1);
}
FramedSource* videoES = fileSource;
// Create a framer for the Video Elementary Stream:
videoSource = DVVideoStreamFramer::createNew(*env, videoES);
// Finally, start playing:
*env << "Beginning to read from file...\n";
videoSink->startPlaying(*videoSource, afterPlaying, videoSink);
}