diff options
| author | huceke <ebsi4711@gmail.com> | 2013-11-28 20:48:18 -0800 |
|---|---|---|
| committer | huceke <ebsi4711@gmail.com> | 2013-11-28 20:48:18 -0800 |
| commit | 30e62ace654c3540d2ea09f5e4dfb12fe5c1a51a (patch) | |
| tree | feb934599230b340b6c52a7b9391521411a92191 | |
| parent | 59d73c31b3e50ce89a800f72d50cad5ab382795a (diff) | |
| parent | 1da0ceea18162daa43b0f495d590c6b776f7c4ee (diff) | |
Merge pull request #3728 from popcornmix/unknown_start
[rbp/omxplayer] Avoid setting TIME_UNKNOWN on packet with STARTTIME set
| -rw-r--r-- | xbmc/cores/omxplayer/OMXAudio.cpp | 3 | ||||
| -rw-r--r-- | xbmc/cores/omxplayer/OMXVideo.cpp | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp index 04749a8b64..5f0ccc193f 100644 --- a/xbmc/cores/omxplayer/OMXAudio.cpp +++ b/xbmc/cores/omxplayer/OMXAudio.cpp @@ -1018,9 +1018,6 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dt if(m_setStartTime) { omx_buffer->nFlags = OMX_BUFFERFLAG_STARTTIME; - if(pts == DVD_NOPTS_VALUE) - omx_buffer->nFlags |= OMX_BUFFERFLAG_TIME_UNKNOWN; - m_last_pts = pts; CLog::Log(LOGDEBUG, "COMXAudio::Decode ADec : setStartTime %f\n", (float)val / DVD_TIME_BASE); diff --git a/xbmc/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp index 487907487c..03ffb948d3 100644 --- a/xbmc/cores/omxplayer/OMXVideo.cpp +++ b/xbmc/cores/omxplayer/OMXVideo.cpp @@ -756,7 +756,7 @@ int COMXVideo::Decode(uint8_t *pData, int iSize, double pts) CLog::Log(LOGDEBUG, "OMXVideo::Decode VDec : setStartTime %f\n", (pts == DVD_NOPTS_VALUE ? 0.0 : pts) / DVD_TIME_BASE); m_setStartTime = false; } - if(pts == DVD_NOPTS_VALUE) + else if(pts == DVD_NOPTS_VALUE) omx_buffer->nFlags |= OMX_BUFFERFLAG_TIME_UNKNOWN; omx_buffer->nTimeStamp = ToOMXTime((uint64_t)(pts == DVD_NOPTS_VALUE) ? 0 : pts); |