diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-10-11 16:01:38 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-10-11 16:01:38 +0300 |
| commit | 5197ff9e91cabd90700cf0d36fb5e9e5793d7097 (patch) | |
| tree | a71216735b7bb482012d51eda9f6d0b26da54097 /src/plugins/common/evr/evrd3dpresentengine.cpp | |
| parent | b4d58d8921d6d1c937b5e708e257e2a07a0c5dc4 (diff) | |
| parent | 569d91d8560620d697dd8cc7c49581c7ff70b8ce (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.12' into tqtc/lts-5.15-opensourcev5.15.12-lts-lgpl
Change-Id: I6a330e383bb573bd7ba6cfea7e8bce3e88de2d7a
Diffstat (limited to 'src/plugins/common/evr/evrd3dpresentengine.cpp')
| -rw-r--r-- | src/plugins/common/evr/evrd3dpresentengine.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/common/evr/evrd3dpresentengine.cpp b/src/plugins/common/evr/evrd3dpresentengine.cpp index d8e2da6d3..0bf8a0506 100644 --- a/src/plugins/common/evr/evrd3dpresentengine.cpp +++ b/src/plugins/common/evr/evrd3dpresentengine.cpp @@ -520,7 +520,7 @@ void D3DPresentEngine::setHint(Hint hint, bool enable) m_useTextureRendering = enable && supportsTextureRendering(); } -HRESULT D3DPresentEngine::createVideoSamples(IMFMediaType *format, QList<IMFSample*> &videoSampleQueue) +HRESULT D3DPresentEngine::createVideoSamples(IMFMediaType *format, QList<IMFSample*> &videoSampleQueue, QSize frameSize) { if (!format) return MF_E_UNEXPECTED; @@ -537,6 +537,11 @@ HRESULT D3DPresentEngine::createVideoSamples(IMFMediaType *format, QList<IMFSamp if (FAILED(hr)) return hr; + if (frameSize.isValid() && !frameSize.isEmpty()) { + width = frameSize.width(); + height = frameSize.height(); + } + DWORD d3dFormat = 0; hr = qt_evr_getFourCC(format, &d3dFormat); if (FAILED(hr)) |