Implemented aspect ratio and scale mode handling in Phonon MMF backend

- Replaced VolumeObserver and VideoOutputObserver interfaces with
signals.

- Added signals for propagating changes in aspect ratio and scale mode
from VideoOutput to VideoPlayer.

- Removed VideoPlayer::getNativeWindowSystemHandles.  Interaction with
window system is moved into VideoOutput, so that VideoPlayer is better
focussed on its main task: interacting with CVideoPlayerUtility.

- WId changes, resize and move events received by the VideoOutput
widget cause it to emit a videoWindowChanged signal.  This is received
by the VideoPlayer, which triggers a call to updateVideoRect.  The
main task of this function is to calculate the scale factors which are
provided to the MMF via CVideoPlayerUtility::SetScaleFactorL.  Note
that:
	i) This function must be called both before and after the call
	to SetDisplayWindowL.  For changes in aspect ratio or scale
	mode, setting the scale mode after updating the display window
	is sufficient.  However, testing showed that, when switching in
	or out of full-screen mode, two calls were necessary in order
	to preserve the correct aspect ratio.

	ii) The screen rectangle passed to the MMF is still the full
	window extent; it is not the region in which video will
	actually be rendered.  The post-processor will fill in the
	remainder of the window with a background colour (typically
	black).  If, on the other hand, we passed in the actual video
	display rectangle, we would need to do this background painting
	in the widget.  This in turn would require a change to QtGui:
	at present, we can only disable blitting on a per-widget basis
	(by setting QWExtra::disableBlit).  If we needed to paint the
	borders of the video window, disableBlit would need to contain
	the actual DSA region, rather than just a single boolean flag.

Task-number: QTBUG-5585
Reviewed-by: Frans Englich

1 files changed, 30 insertions, 9 deletions

diff --git a/src/3rdparty/phonon/mmf/videooutput.h b/src/3rdparty/phonon/mmf/videooutput.h
index db4d127..6dfe69d 100644
--- a/src/3rdparty/phonon/mmf/videooutput.h
+++ b/src/3rdparty/phonon/mmf/videooutput.h
@@ -24,6 +24,11 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include <QRect>
 #include "defs.h"
 
+#include <Phonon/VideoWidget>
+
+#include <e32std.h>
+class RWindowBase;
+
 QT_BEGIN_NAMESPACE
 
 namespace Phonon
@@ -31,7 +36,6 @@ namespace Phonon
 namespace MMF
 {
 class AncestorMoveMonitor;
-class VideoOutputObserver;
 
 class VideoOutput       :   public QWidget
 {
@@ -41,11 +45,29 @@ public:
     VideoOutput(AncestorMoveMonitor* ancestorMoveMonitor, QWidget* parent);
     ~VideoOutput();
 
-    void setFrameSize(const QSize& size);
-    void setObserver(VideoOutputObserver* observer);
+    // Set size of video frame.  Called by VideoPlayer.
+    void setVideoSize(const QSize& size);
+
+    RWindowBase* videoWindow();
+    const QRect& videoWindowRect() const;
 
+    Phonon::VideoWidget::AspectRatio aspectRatio() const;
+    void setAspectRatio(Phonon::VideoWidget::AspectRatio aspectRatio);
+
+    Phonon::VideoWidget::ScaleMode scaleMode() const;
+    void setScaleMode(Phonon::VideoWidget::ScaleMode scaleMode);
+
+    // Called by AncestorMoveMonitor
     void ancestorMoved();
 
+    // Debugging output
+    void dump() const;
+
+Q_SIGNALS:
+    void videoWindowChanged();
+    void aspectRatioChanged();
+    void scaleModeChanged();
+
 protected:
     // Override QWidget functions
     QSize sizeHint() const;
@@ -55,19 +77,18 @@ protected:
     bool event(QEvent* event);
 
 private:
-    void dump() const;
-    void videoOutputRegionChanged();
-
+    void getVideoWindowRect();
     void registerForAncestorMoved();
 
 private:
     // Not owned
     AncestorMoveMonitor*    m_ancestorMoveMonitor;
 
-    // Not owned
-    VideoOutputObserver*    m_observer;
+    QSize                   m_videoFrameSize;
+    QRect                   m_videoWindowRect;
 
-    QSize                   m_frameSize;
+    Phonon::VideoWidget::AspectRatio        m_aspectRatio;
+    Phonon::VideoWidget::ScaleMode          m_scaleMode;
 
 };
 }