Commit b30e7e47491bd33b31ee2dc5b4a69981f1212f09

Andrew den Exter
Wed Mar 17 03:00:49 CET 2010

Tree SHA1: 59b3f98
Parent SHA1: f303706 (Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration)
raw diff | raw patch

Pause the direct show graph when the playback rate is 0.0.

Reviewed-by: Justin McPherson

Diff rendering mode:
inline
side by side


87	87	, m_muteVolume(-1)
88	88	, m_position(0)
89	89	, m_duration(0)
90		, m_playbackRate(0)
	90	, m_playbackRate(1.0)
91	91	, m_seekable(false)
92	92	{
93	93	}


274	274	}
275	275
276	276	if (SUCCEEDED(hr)) {
277		m_executedTasks = SetSource;
	277	m_executedTasks \|= SetSource;
278	278	m_pendingTasks \|= Render;
279	279
280	280	if (m_audioOutput)
…	…
282	282	if (m_videoOutput)
283	283	m_pendingTasks \|= SetVideoOutput;
284	284
285		if (m_rate != 1.0)
	285	if (m_rate != 1.0 && m_rate != 0.0)
286	286	m_pendingTasks \|= SetRate;
287	287
288	288	m_source = source;
…	…
319	319	source->setDevice(m_stream);
320	320
321	321	if (SUCCEEDED(m_graph->AddFilter(source, L"Source"))) {
322		m_executedTasks = SetSource;
	322	m_executedTasks \|= SetSource;
323	323	m_pendingTasks \|= Render;
324	324
325	325	if (m_audioOutput)
…	…
327	327	if (m_videoOutput)
328	328	m_pendingTasks \|= SetVideoOutput;
329	329
330		if (m_rate != 1.0)
	330	if (m_rate != 1.0 && m_rate != 0.0)
331	331	m_pendingTasks \|= SetRate;
332	332
333	333	m_source = source;
…	…
346	346
347	347	void DirectShowPlayerService::doRender(QMutexLocker *locker)
348	348	{
349		m_pendingTasks \|= m_executedTasks & (Play \| Pause);
	349	if (m_executedTasks & Pause)
	350	m_pendingTasks \|= Pause;
	351	else if (m_executedTasks & Play && m_rate != 0.0)
	352	m_pendingTasks \|= Play;
350	353
351	354	if (IMediaControl *control = com_cast<IMediaControl>(m_graph, IID_IMediaControl)) {
352	355	control->Stop();
…	…
627	627	{
628	628	QMutexLocker locker(&m_mutex);
629	629
630		m_pendingTasks &= ~Pause;
631		m_pendingTasks \|= Play;
	630	if (m_rate != 0.0) {
	631	m_pendingTasks &= ~Pause;
	632	m_pendingTasks \|= Play;
	633	} else {
	634	m_pendingTasks \|= Pause;
	635	m_executedTasks \|= Play;
	636	}
632	637
633	638	if (m_executedTasks & Render) {
634	639	if (m_executedTasks & Stop) {
…	…
658	658
659	659	if (SUCCEEDED(hr)) {
660	660	m_executedTasks \|= Play;
	661	m_executedTasks &= ~Pause;
661	662
662	663	QCoreApplication::postEvent(this, new QEvent(QEvent::Type(StatusChange)));
663	664	} else {
…	…
713	713
714	714	m_executedTasks \|= Pause;
715	715
	716	if (m_rate != 0.0)
	717	m_executedTasks &= ~Play;
	718
716	719	QCoreApplication::postEvent(this, new QEvent(QEvent::Type(StatusChange)));
717	720	} else {
718	721	m_error = QMediaPlayer::ResourceError;
…	…
776	776	{
777	777	QMutexLocker locker(&m_mutex);
778	778
779		m_rate = rate;
	779	if (m_rate == rate)
	780	return;
780	781
781		m_pendingTasks \|= SetRate;
	782	if (rate == 0.0) {
	783	if (m_pendingTasks & Play) {
	784	m_executedTasks \|= Play;
	785	m_pendingTasks &= ~(Play \| SetRate);
782	786
	787	if (!((m_executingTask \| m_executedTasks) & Pause))
	788	m_pendingTasks \|= Pause;
	789	} else if ((m_executingTask \| m_executedTasks) & Play) {
	790	m_pendingTasks \|= Pause;
	791	}
	792	} else {
	793	m_pendingTasks \|= SetRate;
	794
	795	if (m_rate == 0.0 && (m_executedTasks & Play) && !(m_executingTask & Play))
	796	m_pendingTasks \|= Play;
	797	}
	798
	799	m_rate = rate;
	800
783	801	if (m_executedTasks & FinalizeLoad)
784	802	::SetEvent(m_taskHandle);
785	803	}
…	…
830	830
831	831	seeking->Release();
832	832	} else if (m_rate != 1.0) {
833		m_rate = 1.0;
	833	m_rate = 1.0;
834	834	}
	835
835	836	QCoreApplication::postEvent(this, new QEvent(QEvent::Type(RateChange)));
836	837	}
837	838
…	…
1375	1375	m_executingTask = Stop;
1376	1376
1377	1377	doStop(&locker);
1378		} else if (m_pendingTasks & SetRate) {
1379		m_pendingTasks ^= SetRate;
1380		m_executingTask = SetRate;
1381
1382		doSetRate(&locker);
1383	1378	} else if (m_pendingTasks & Pause) {
1384	1379	m_pendingTasks ^= Pause;
1385	1380	m_executingTask = Pause;
1386	1381
1387	1382	doPause(&locker);
	1383	} else if (m_pendingTasks & SetRate) {
	1384	m_pendingTasks ^= SetRate;
	1385	m_executingTask = SetRate;
	1386
	1387	doSetRate(&locker);
1388	1388	} else if (m_pendingTasks & Seek) {
1389	1389	m_pendingTasks ^= Seek;
1390	1390	m_executingTask = Seek;

Commit b30e7e47491bd33b31ee2dc5b4a69981f1212f09

Gitorious