edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix the problem of audio when video fps is low

Browse source
This commit is contained in:
sirius 2020-01-06 11:57:24 +08:00
parent 779afcb771
commit 3baba93ed2
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/client/client.cpp
View file

@ -2520,8 +2520,8 @@ void CClient::Update()
if (IVideo::Current()->frameRendered())
{
IVideo::Current()->nextVideoFrame();
IVideo::Current()->nextAudioFrame_timeline();
}
IVideo::Current()->nextAudioFrame_timeline();
}
else if(m_ButtonRender)
Disconnect();

11
src/engine/client/video.cpp
View file

@ -202,24 +202,24 @@ void CVideo::stop()
void CVideo::nextVideoFrame_thread()
{
if (m_NextFrame && m_Recording)
if (m_NextFrame && m_Recording && !m_ProcessingAudioFrame)
{
m_ProcessingVideoFrame = true;
// #ifdef CONF_PLATFORM_MACOSX
// CAutoreleasePool AutoreleasePool;
// #endif
m_vseq += 1;
if(m_vseq >= 2)
{
m_ProcessingVideoFrame = true;
m_VideoStream.frame->pts = (int64_t)m_VideoStream.enc->frame_number;
dbg_msg("video_recorder", "vframe: %d", m_VideoStream.enc->frame_number);
read_rgb_from_gl();
fill_video_frame();
write_frame(&m_VideoStream);
m_ProcessingVideoFrame = false;
}
m_ProcessingVideoFrame = false;
m_NextFrame = false;
// sync_barrier();
// m_Semaphore.signal();
@ -252,7 +252,8 @@ void CVideo::nextAudioFrame_timeline()
{
if (m_Recording && m_HasAudio && !m_NextaFrame)
{
if ((double)(m_vframe/m_FPS) >= m_AudioStream.enc->frame_number*m_AudioStream.enc->frame_size/m_AudioStream.enc->sample_rate)
//if (m_vframe * m_AudioStream.enc->sample_rate / m_FPS >= m_AudioStream.enc->frame_number*m_AudioStream.enc->frame_size)
if (m_VideoStream.enc->frame_number * (double)m_AudioStream.enc->sample_rate / m_FPS >= (double)m_AudioStream.enc->frame_number*m_AudioStream.enc->frame_size)
{
m_NextaFrame = true;
}
@ -261,7 +262,7 @@ void CVideo::nextAudioFrame_timeline()
void CVideo::nextAudioFrame(void (*Mix)(short *pFinalOut, unsigned Frames))
{
if (m_NextaFrame && m_Recording && m_HasAudio)
if (m_NextaFrame && m_Recording && m_HasAudio && !m_ProcessingVideoFrame)
{
m_ProcessingAudioFrame = true;
//dbg_msg("video recorder", "video_frame: %lf", (double)(m_vframe/m_FPS));