Prevent decklink audio buffer overflow.

[mlt] / src / modules / decklink / consumer_decklink.cpp

diff --git a/src/modules/decklink/consumer_decklink.cpp b/src/modules/decklink/consumer_decklink.cpp
index 0fb23619393e19ed92e923057a09e0eba888b080..df9e89ae60f971b6a757509d8d3edba8b980915d 100644 (file)
--- a/src/modules/decklink/consumer_decklink.cpp
+++ b/src/modules/decklink/consumer_decklink.cpp
@@ -54,6 +54,7 @@ private:
        int                         m_isKeyer;
        IDeckLinkKeyer*             m_deckLinkKeyer;
        bool                        m_terminate_on_pause;
+       uint32_t                    m_preroll;
 
        IDeckLinkDisplayMode* getDisplayMode()
        {
@@ -233,6 +234,8 @@ public:
                        return false;
                }
 
+               m_preroll = preroll;
+
                // preroll frames
                for( i = 0; i < preroll; i++ )
                        ScheduleNextFrame( true );
@@ -280,11 +283,17 @@ public:
                if ( !mlt_frame_get_audio( frame, (void**) &pcm, &format, &frequency, &m_channels, &samples ) )
                {
                        uint32_t written = 0;
-
+                       BMDTimeValue streamTime = m_count * frequency * m_duration / m_timescale;
+                       m_deckLinkOutput->GetBufferedAudioSampleFrameCount(&written);
+                       if ( written > (m_preroll + 1) * samples )
+                       {
+                               mlt_log_verbose( getConsumer(), "renderAudio: will flush %d audiosamples\n", written);
+                               m_deckLinkOutput->FlushBufferedAudioSamples();
+                       };
 #ifdef WIN32
-                       m_deckLinkOutput->ScheduleAudioSamples( pcm, samples, m_count * frequency / m_fps, frequency, (unsigned long*) &written );
+                       m_deckLinkOutput->ScheduleAudioSamples( pcm, samples, streamTime, frequency, (unsigned long*) &written );
 #else
-                       m_deckLinkOutput->ScheduleAudioSamples( pcm, samples, m_count * frequency / m_fps, frequency, &written );
+                       m_deckLinkOutput->ScheduleAudioSamples( pcm, samples, streamTime, frequency, &written );
 #endif
 
                        if ( written != (uint32_t) samples )
@@ -443,6 +452,11 @@ public:
                        mlt_log_verbose( getConsumer(), "ScheduledFrameCompleted: bmdOutputFrameDisplayedLate == completed\n");
                        m_count++;
                }
+               if(bmdOutputFrameDropped == completed)
+               {
+                       mlt_log_verbose( getConsumer(), "ScheduledFrameCompleted: bmdOutputFrameDropped == completed\n");
+                       m_count++;
+               }
 
                return S_OK;
        }