diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-03 11:18:47 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-03 11:18:47 +0200 |
| commit | dfc0ee4975958f7144f04957b6d5856a28e99361 (patch) | |
| tree | 249cc992e09e208c29369830af8cce6b0456a9bf /src/plugins/common | |
| parent | 7ef21f7ed206749252fbd03f673a8588890828b1 (diff) | |
| parent | 3bbeae539854c1474844c65025d40b813cec286c (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/plugins/directshow/player/directshowplayerservice.cpp
Change-Id: I6b7edc312ecfadf84653ce24321ec55da41e131a
Diffstat (limited to 'src/plugins/common')
| -rw-r--r-- | src/plugins/common/evr/evrd3dpresentengine.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/plugins/common/evr/evrd3dpresentengine.cpp b/src/plugins/common/evr/evrd3dpresentengine.cpp index ab694b795..4ce5a99d7 100644 --- a/src/plugins/common/evr/evrd3dpresentengine.cpp +++ b/src/plugins/common/evr/evrd3dpresentengine.cpp @@ -593,16 +593,6 @@ QVideoFrame D3DPresentEngine::makeVideoFrame(IMFSample *sample) m_surfaceFormat.frameSize(), m_surfaceFormat.pixelFormat()); - // WMF uses 100-nanosecond units, Qt uses microseconds - LONGLONG startTime = -1; - if (SUCCEEDED(sample->GetSampleTime(&startTime))) { - frame.setStartTime(startTime * 0.1); - - LONGLONG duration = -1; - if (SUCCEEDED(sample->GetSampleDuration(&duration))) - frame.setEndTime((startTime + duration) * 0.1); - } - return frame; } |