ua1zbe
/
PiScan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stablility fixes for RTSP server

This commit is contained in:
Ezra Taimuty-Loomis 2020-05-31 14:33:56 -04:00
parent 835723d83c
commit 8f8f0003e5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/server/LocalPCMSource.cpp
View File

@ -63,10 +63,12 @@ LocalPCMSource::LocalPCMSource(UsageEnvironment& env, AudioThread* audioControll
unsigned desiredSamplesPerFrame = (unsigned)(0.02*fSamplingFrequency);
unsigned samplesPerFrame = desiredSamplesPerFrame < maxSamplesPerFrame ? desiredSamplesPerFrame : maxSamplesPerFrame;
fPreferredFrameSize = (samplesPerFrame*fNumChannels*fBitsPerSample)/8;
LOG_F(2, "Starting audio stream");
}
LocalPCMSource::~LocalPCMSource() {
LOG_F(3, "Stream destroy");
}
void LocalPCMSource::doGetNextFrame() {
@ -117,8 +119,11 @@ void LocalPCMSource::doGetNextFrame() {
fFrameSize = numBytesRead;
if (samplesRead == 0)
LOG_F(WARNING, "Audio stream underrun");
if (samplesRead == 0){
LOG_F(2, "Audio buffer underrun, closing stream");
handleClosure();
return;
}
// Set the 'presentation time' and 'duration' of this frame:
if (fPresentationTime.tv_sec == 0 && fPresentationTime.tv_usec == 0) {
@ -136,7 +141,7 @@ void LocalPCMSource::doGetNextFrame() {
* fFrameSize) / bytesPerSample);
// Inform the downstream object that it has data:
FramedSource::afterGetting(this);
nextTask() = envir().taskScheduler().scheduleDelayedTask(0, (TaskFunc*)FramedSource::afterGetting, this);
}
void LocalPCMSource::doStopGettingFrames() {