Archives/v4l2rtspserver
2
0
Fork 0
mirror of https://github.com/mpromonet/v4l2rtspserver synced 2024-11-02 03:40:13 +00:00
Code Issues Projects Releases Wiki Activity

for #51: fix ALSA buffer size and increase OutPacketBuffer::maxSize is needed

Browse Source
This commit is contained in:
Michel Promonet 2017-05-14 19:08:49 +02:00
parent 7a2eb4237d
commit ccb7c3adba
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
inc/ALSACapture.h
View File

@ -103,7 +103,7 @@ class ALSACapture
LOG(ERROR) << "cannot start audio interface for use device: " << params.m_devName << " error:" << snd_strerror (err);
}
LOG(NOTICE) << "ALSA device: \"" << params.m_devName << "\" buffer size:" << m_bufferSize;
LOG(NOTICE) << "ALSA device: \"" << params.m_devName << "\" buffer_size:" << m_bufferSize << " period_size:" << m_periodSize;
}
public:
@ -111,12 +111,16 @@ class ALSACapture
{
size_t size = snd_pcm_readi (m_pcm, buffer, m_periodSize);
LOG(DEBUG) << "ALSA buffer size:" << m_bufferSize << " " << m_periodSize*m_params.m_channels << " " << size;
// swap if capture in not in network order
if (!snd_pcm_format_big_endian(m_params.m_fmt)) {
int fmt_phys_width_bits = snd_pcm_format_physical_width(m_params.m_fmt);
int fmt_phys_width_bytes = fmt_phys_width_bits / 8;
for(unsigned int i = 0; i < m_periodSize; i++){
for(unsigned int i = 0; i < size; i++){
char * ptr = &buffer[i * fmt_phys_width_bytes * m_params.m_channels];
for(unsigned int j = 0; j < m_params.m_channels; j++){
@ -129,7 +133,7 @@ class ALSACapture
}
}
}
return size;
return size*m_params.m_channels;
}
virtual int getFd()

18
src/main.cpp
View File

@ -267,12 +267,12 @@ int main(int argc, char** argv)
const char* realm = NULL;
std::list<std::string> userPasswordList;
int audioFreq = 44100;
int audioNbCahnnels = 2;
int audioNbChannels = 2;
snd_pcm_format_t audioFmt = SND_PCM_FORMAT_S16_BE;
// decode parameters
int c = 0;
while ((c = getopt (argc, argv, "v::Q:O:" "I:P:p:m:u:M:ct:TS::R:U:" "rwsf::F:W:H:" "A:C:a:" "Vh")) != -1)
while ((c = getopt (argc, argv, "v::Q:O:" "I:P:p:m:u:M:ct:TS::" "R:U:" "rwsf::F:W:H:" "A:C:a:" "Vh")) != -1)
{
switch (c)
{
@ -291,6 +291,8 @@ int main(int argc, char** argv)
case 't': timeout = atoi(optarg); break;
case 'T': muxTS = true; break;
case 'S': hlsSegment = optarg ? atoi(optarg) : 5; muxTS=true; break;
// users
case 'R': realm = optarg; break;
case 'U': userPasswordList.push_back(optarg); break;
@ -305,7 +307,7 @@ int main(int argc, char** argv)
// ALSA
case 'A': audioFreq = atoi(optarg); break;
case 'C': audioNbCahnnels = atoi(optarg); break;
case 'C': audioNbChannels = atoi(optarg); break;
case 'a': audioFmt = decodeAudioFormat(optarg); break;
// version
@ -352,7 +354,7 @@ int main(int argc, char** argv)
std::cout << "\t ALSA options :" << std::endl;
std::cout << "\t -A freq : ALSA capture frequency and channel (default " << audioFreq << ")" << std::endl;
std::cout << "\t -C channels: ALSA capture channels (default " << audioNbCahnnels << ")" << std::endl;
std::cout << "\t -C channels: ALSA capture channels (default " << audioNbChannels << ")" << std::endl;
std::cout << "\t -a fmt : ALSA capture audio format (default S16_BE)" << std::endl;
std::cout << "\t Devices :" << std::endl;
@ -458,7 +460,7 @@ int main(int argc, char** argv)
StreamReplicator* audioReplicator = NULL;
if (!audioDev.empty())
{
ALSACaptureParameters param(audioDev.c_str(), audioFmt, audioFreq, audioNbCahnnels, verbose);
ALSACaptureParameters param(audioDev.c_str(), audioFmt, audioFreq, audioNbChannels, verbose);
ALSACapture* audioCapture = ALSACapture::createNew(param);
if (audioCapture)
{
@ -470,6 +472,12 @@ int main(int argc, char** argv)
}
else
{
// extend buffer size if needed
if (audioCapture->getBufferSize() > OutPacketBuffer::maxSize)
{
OutPacketBuffer::maxSize = audioCapture->getBufferSize();
}
audioReplicator = StreamReplicator::createNew(*env, audioSource, false);
}
}