slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a playback bug for mediaplayer windows media foundation backend

Browse Source 
Task-number:QTMOBILITY-1606

Reviewed-by:Jonas Rabbe
(cherry picked from commit d5426bf52e19c9c6a52837b423f48024979ea076)

Change-Id: Ie7c1c90a8f5a64e77c435ffc1917d8f9638dfff3
Reviewed-on: http://codereview.qt-project.org/5499
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Ling Hu
2011-08-15 11:17:23 +10:00
committed by Qt by Nokia
parent 9cb61ab778
commit 589b2e3adf
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/wmf/player/mfplayercontrol.cpp
View File

@@ -72,7 +72,12 @@ MFPlayerControl::~MFPlayerControl()
void MFPlayerControl::setMedia(const QMediaContent &media, QIODevice *stream) void MFPlayerControl::setMedia(const QMediaContent &media, QIODevice *stream)
{ {
stop(); if (m_state != QMediaPlayer::StoppedState) {
changeState(QMediaPlayer::StoppedState);
m_session->stop(true);
refreshState();
}
m_media = media; m_media = media;
m_stream = stream; m_stream = stream;
resetAudioVideoAvailable(); resetAudioVideoAvailable();

8
src/plugins/wmf/player/mfplayersession.cpp
View File

@@ -681,12 +681,12 @@ IMFTopologyNode* MFPlayerSession::addOutputNode(IMFStreamDescriptor *streamDesc,
return NULL; return NULL;
} }
void MFPlayerSession::stop() void MFPlayerSession::stop(bool immediate)
{ {
#ifdef DEBUG_MEDIAFOUNDATION #ifdef DEBUG_MEDIAFOUNDATION
qDebug() << "stop"; qDebug() << "stop";
#endif #endif
if (m_pendingState != NoPending) { if (!immediate && m_pendingState != NoPending) {
m_request.setCommand(CmdStop); m_request.setCommand(CmdStop);
} else { } else {
if (m_state.command == CmdStop) if (m_state.command == CmdStop)
@@ -1186,8 +1186,12 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent)
if (m_status != QMediaPlayer::EndOfMedia) { if (m_status != QMediaPlayer::EndOfMedia) {
m_varStart.vt = VT_I8; m_varStart.vt = VT_I8;
m_varStart.hVal.QuadPart = 0; m_varStart.hVal.QuadPart = 0;
//only change to loadedMedia when not loading a new media source
if (m_status != QMediaPlayer::LoadingMedia) {
changeStatus(QMediaPlayer::LoadedMedia); changeStatus(QMediaPlayer::LoadedMedia);
} }
}
updatePendingCommands(CmdStop); updatePendingCommands(CmdStop);
break; break;
case MESessionPaused: case MESessionPaused:

2
src/plugins/wmf/player/mfplayersession.h
View File

@@ -94,7 +94,7 @@ public:
} }
void load(const QMediaContent &media, QIODevice *stream); void load(const QMediaContent &media, QIODevice *stream);
void stop(); void stop(bool immediate = false);
void start(); void start();
void pause(); void pause();