1 files changed, 36 insertions, 28 deletions

diff --git a/src/plugins/common/evr/evrvideowindowcontrol.cpp b/src/plugins/common/evr/evrvideowindowcontrol.cpp
index e83553fd9..cec263da9 100644
--- a/src/plugins/common/evr/evrvideowindowcontrol.cpp
+++ b/src/plugins/common/evr/evrvideowindowcontrol.cpp
@@ -1,12 +1,11 @@
 /****************************************************************************
 **
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:COMM$
-**
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
@@ -15,25 +14,26 @@
 ** and conditions see https://www.qt.io/terms-conditions. For further
 ** information use the contact form at https://www.qt.io/contact-us.
 **
-** $QT_END_LICENSE$
-**
-**
-**
-**
-**
-**
-**
-**
-**
-**
-**
-**
-**
-**
-**
-**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
+** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
@@ -134,26 +134,29 @@ void EvrVideoWindowControl::setDisplayRect(const QRect &rect)
 
     if (m_displayControl) {
         RECT displayRect = { rect.left(), rect.top(), rect.right() + 1, rect.bottom() + 1 };
-        QSize sourceSize = nativeSize();
+        QSize fullSize = nativeSize();
 
-        RECT sourceRect = { 0, 0, sourceSize.width(), sourceSize.height() };
+        RECT sourceRect;
+        if (m_cropRect.isValid())
+            sourceRect = { m_cropRect.x(), m_cropRect.y(), m_cropRect.right() + 1, m_cropRect.bottom() + 1 };
+        else
+            sourceRect = { 0, 0, fullSize.width(), fullSize.height() };
 
         if (m_aspectRatioMode == Qt::KeepAspectRatioByExpanding) {
             QSize clippedSize = rect.size();
             clippedSize.scale(sourceRect.right, sourceRect.bottom, Qt::KeepAspectRatio);
-
             sourceRect.left = (sourceRect.right - clippedSize.width()) / 2;
             sourceRect.top = (sourceRect.bottom - clippedSize.height()) / 2;
             sourceRect.right = sourceRect.left + clippedSize.width();
             sourceRect.bottom = sourceRect.top + clippedSize.height();
         }
 
-        if (sourceSize.width() > 0 && sourceSize.height() > 0) {
+        if (sourceRect.right - sourceRect.left > 0 && sourceRect.bottom - sourceRect.top > 0) {
             MFVideoNormalizedRect sourceNormRect;
-            sourceNormRect.left = float(sourceRect.left) / float(sourceRect.right);
-            sourceNormRect.top = float(sourceRect.top) / float(sourceRect.bottom);
-            sourceNormRect.right = float(sourceRect.right) / float(sourceRect.right);
-            sourceNormRect.bottom = float(sourceRect.bottom) / float(sourceRect.bottom);
+            sourceNormRect.left = float(sourceRect.left) / float(fullSize.width());
+            sourceNormRect.top = float(sourceRect.top) / float(fullSize.height());
+            sourceNormRect.right = float(sourceRect.right) / float(fullSize.width());
+            sourceNormRect.bottom = float(sourceRect.bottom) / float(fullSize.height());
             m_displayControl->SetVideoPosition(&sourceNormRect, &displayRect);
         } else {
             m_displayControl->SetVideoPosition(NULL, &displayRect);
@@ -164,6 +167,11 @@ void EvrVideoWindowControl::setDisplayRect(const QRect &rect)
     }
 }
 
+void EvrVideoWindowControl::setCropRect(QRect cropRect)
+{
+    m_cropRect = cropRect;
+}
+
 bool EvrVideoWindowControl::isFullScreen() const
 {
     return m_fullScreen;