Skip to content

Commit

Permalink
OMXPlayer: Fixup after DVDMessage changes
Browse files Browse the repository at this point in the history
  • Loading branch information
popcornmix committed Feb 12, 2017
1 parent 0e64fd7 commit 0ffe036
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 19 deletions.
1 change: 0 additions & 1 deletion xbmc/cores/VideoPlayer/VideoPlayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1426,7 +1426,6 @@ void CVideoPlayer::Process()
CDVDMsgPlayerSeek::CMode mode;
mode.time = (int)GetTime();
mode.backward = true;
mode.flush = true;
mode.accurate = true;
mode.sync = true;
m_messenger.Put(new CDVDMsgPlayerSeek(mode));
Expand Down
18 changes: 0 additions & 18 deletions xbmc/cores/omxplayer/OMXPlayerAudio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ OMXPlayerAudio::OMXPlayerAudio(OMXClock *av_clock, CDVDMessageQueue& parent, CPr

m_messageQueue.SetMaxTimeSize(8.0);
m_passthrough = false;
m_silence = false;
m_flush = false;
}

Expand Down Expand Up @@ -134,7 +133,6 @@ void OMXPlayerAudio::OpenStream(CDVDStreamInfo &hints, COMXAudioCodecOMX *codec)

m_speed = DVD_PLAYSPEED_NORMAL;
m_audioClock = DVD_NOPTS_VALUE;
m_silence = false;
m_syncState = IDVDStreamPlayer::SYNC_STARTING;
m_flush = false;
m_stalled = m_messageQueue.GetPacketCount(CDVDMsg::DEMUXER_PACKET) == 0;
Expand Down Expand Up @@ -277,12 +275,7 @@ bool OMXPlayerAudio::Decode(DemuxPacket *pkt, bool bDropPacket, bool bTrickPlay)

if(!bDropPacket)
{
// Zero out the frame data if we are supposed to silence the audio
if(m_silence)
memset(decoded, 0x0, decoded_size);

ret = m_omxAudio.AddPackets(decoded, decoded_size, dts, pts, m_pAudioCodec->GetFrameSize(), settings_changed);

if(ret != decoded_size)
{
CLog::Log(LOGERROR, "error ret %d decoded_size %d\n", ret, decoded_size);
Expand Down Expand Up @@ -316,9 +309,6 @@ bool OMXPlayerAudio::Decode(DemuxPacket *pkt, bool bDropPacket, bool bTrickPlay)

if(!bDropPacket)
{
if(m_silence)
memset(pkt->pData, 0x0, pkt->iSize);

m_omxAudio.AddPackets(pkt->pData, pkt->iSize, m_audioClock, m_audioClock, 0, settings_changed);
}

Expand Down Expand Up @@ -456,14 +446,6 @@ void OMXPlayerAudio::Process()
CLog::Log(LOGDEBUG, "COMXPlayerAudio - CDVDMsg::PLAYER_SETSPEED %d", m_speed);
}
}
else if (pMsg->IsType(CDVDMsg::AUDIO_SILENCE))
{
m_silence = static_cast<CDVDMsgBool*>(pMsg)->m_value;
if (m_silence)
CLog::Log(LOGDEBUG, "COMXPlayerAudio - CDVDMsg::AUDIO_SILENCE(%f, 1)", m_audioClock);
else
CLog::Log(LOGDEBUG, "COMXPlayerAudio - CDVDMsg::AUDIO_SILENCE(%f, 0)", m_audioClock);
}
else if (pMsg->IsType(CDVDMsg::GENERAL_STREAMCHANGE))
{
COMXMsgAudioCodecChange* msg(static_cast<COMXMsgAudioCodecChange*>(pMsg));
Expand Down

0 comments on commit 0ffe036

Please sign in to comment.