diff options
| -rw-r--r-- | dxr3audiodecoder.c | 4 | ||||
| -rw-r--r-- | dxr3interface.c | 2 | ||||
| -rw-r--r-- | dxr3syncbuffer.c | 9 | ||||
| -rw-r--r-- | dxr3syncbuffer.h | 40 |
4 files changed, 13 insertions, 42 deletions
diff --git a/dxr3audiodecoder.c b/dxr3audiodecoder.c index 1b33ed1..03d113b 100644 --- a/dxr3audiodecoder.c +++ b/dxr3audiodecoder.c @@ -162,7 +162,7 @@ void cDxr3AudioDecoder::Decode(const uint8_t* buf, int length, uint32_t pts, { // TODO: should we break out of the loop on push timeout? pTempFrame->SetChannelCount(channels); - pTempFrame->SetDataRate(rate); + pTempFrame->SetSampleRate(rate); } } length -= len; @@ -240,7 +240,7 @@ void cDxr3AudioDecoder::DecodeLpcm(const uint8_t* buf, int length, if (pTempFrame) { pTempFrame->SetChannelCount(1); - pTempFrame->SetDataRate(speed); + pTempFrame->SetSampleRate(speed); } delete[] pFrame; } diff --git a/dxr3interface.c b/dxr3interface.c index 8a9a523..df8518a 100644 --- a/dxr3interface.c +++ b/dxr3interface.c @@ -564,7 +564,7 @@ void cDxr3Interface::PlayAudioFrame(cFixedLengthFrame* pFrame) if (m_AudioActive && !m_ExternalReleased) { Lock(); - SetAudioSpeed(pFrame->GetDataRate()); + SetAudioSpeed(pFrame->GetSampleRate()); SetChannelCount(pFrame->GetChannelCount()); int written = write(m_fdAudio, pFrame->GetData(), pFrame->GetCount()); diff --git a/dxr3syncbuffer.c b/dxr3syncbuffer.c index d5c5ce2..fc454da 100644 --- a/dxr3syncbuffer.c +++ b/dxr3syncbuffer.c @@ -38,7 +38,7 @@ cFixedLengthFrame::cFixedLengthFrame() : { m_audioChannelCount = UNKNOWN_CHANNEL_COUNT; - m_audioDataRate = UNKNOWN_DATA_RATE; + m_audioSampleRate = UNKNOWN_DATA_RATE; m_videoAspectRatio = UNKNOWN_ASPECT_RATIO; } @@ -107,10 +107,6 @@ void cFixedLengthFrame::SetPts(uint32_t pts) } // ================================== -uint32_t cFixedLengthFrame::m_staticAudioDataRate = 0; - - -// ================================== //! constructor cDxr3SyncBuffer::cDxr3SyncBuffer(int frameCount, int frameLength, cDxr3Interface& dxr3Device) : @@ -252,7 +248,7 @@ cFixedLengthFrame* cDxr3SyncBuffer::Push(const uint8_t* pStart, int length, uint lastIndex = m_nextFree; m_pBuffer[m_nextFree].CopyFrame(pStart, length, pts, type); m_pBuffer[m_nextFree].SetChannelCount(UNKNOWN_CHANNEL_COUNT); - m_pBuffer[m_nextFree].SetDataRate(UNKNOWN_DATA_RATE); + m_pBuffer[m_nextFree].SetSampleRate(UNKNOWN_DATA_RATE); m_pBuffer[m_nextFree].SetAspectRatio(UNKNOWN_ASPECT_RATIO); m_nextFree++; m_count++; @@ -342,7 +338,6 @@ void cDxr3SyncBuffer::Clear(void) EnablePut(); m_bPutBlock = false; } - cFixedLengthFrame::Clear(); } // ================================== diff --git a/dxr3syncbuffer.h b/dxr3syncbuffer.h index f72b121..1cfe07d 100644 --- a/dxr3syncbuffer.h +++ b/dxr3syncbuffer.h @@ -52,40 +52,18 @@ public: { m_audioChannelCount = channelCount; } - void SetDataRate(uint32_t dataRate) + void SetSampleRate(uint32_t sampleRate) { - if (m_audioDataRate != UNKNOWN_DATA_RATE) - m_staticAudioDataRate = m_audioDataRate = dataRate; - else - m_audioDataRate = m_staticAudioDataRate; - }; + m_audioSampleRate = sampleRate; + } void SetAspectRatio(uint32_t aspectRatio) { m_videoAspectRatio = aspectRatio; }; - uint32_t GetChannelCount(void) - { - return m_audioChannelCount; - } - uint32_t GetDataRate(void) - { - return ((m_audioDataRate == m_staticAudioDataRate || - !m_staticAudioDataRate) ? - m_audioDataRate : m_staticAudioDataRate); - }; - uint32_t GetAspectRatio(void) - { - return m_videoAspectRatio; - }; - eFrameType GetFrameType(void) - { - return m_type; - } - - static void Clear(void) - { - m_staticAudioDataRate = 0; - }; + uint32_t GetChannelCount() { return m_audioChannelCount; } + uint32_t GetSampleRate() { return m_audioSampleRate; } + uint32_t GetAspectRatio() { return m_videoAspectRatio; } + eFrameType GetFrameType() { return m_type; } protected: uint8_t* m_pData; @@ -95,10 +73,8 @@ protected: eFrameType m_type; uint32_t m_audioChannelCount; - uint32_t m_audioDataRate; + uint32_t m_audioSampleRate; uint32_t m_videoAspectRatio; - - static uint32_t m_staticAudioDataRate; }; // ================================== |