ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

quartz: Implement stop position in the mpeg splitter.

Browse Source
This commit is contained in:
Maarten Lankhorst 2008-04-09 12:07:14 -07:00 committed by Alexandre Julliard
parent 43f9fff0a0
commit 2734e6332c
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/quartz/mpegsplit.c
View File

@ -4,6 +4,7 @@
* Copyright 2003 Robert Shearman * Copyright 2003 Robert Shearman
* Copyright 2004-2005 Christian Costa * Copyright 2004-2005 Christian Costa
* Copyright 2007 Chris Robinson * Copyright 2007 Chris Robinson
* Copyright 2008 Maarten Lankhorst
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -426,16 +427,22 @@ fail:
This->remaining_bytes = 0; This->remaining_bytes = 0;
This->Parser.pInputPin->rtCurrent = MEDIATIME_FROM_BYTES(BYTES_FROM_MEDIATIME(tStop) - cbSrcStream); This->Parser.pInputPin->rtCurrent = MEDIATIME_FROM_BYTES(BYTES_FROM_MEDIATIME(tStop) - cbSrcStream);
if (This->pCurrentSample)
/* If set to S_FALSE we keep the sample, to transmit it next time */
if (hr != S_FALSE && This->pCurrentSample)
{ {
IMediaSample_SetActualDataLength(This->pCurrentSample, 0); IMediaSample_SetActualDataLength(This->pCurrentSample, 0);
IMediaSample_Release(This->pCurrentSample); IMediaSample_Release(This->pCurrentSample);
This->pCurrentSample = NULL; This->pCurrentSample = NULL;
} }
/* Sample was rejected because of whatever reason (paused/flushing/etc), no need to terminate the processing */
if (hr == S_FALSE)
hr = S_OK;
break; break;
} }
if (BYTES_FROM_MEDIATIME(tStop) >= This->EndOfFile) if (BYTES_FROM_MEDIATIME(tStop) >= This->EndOfFile || This->position >= This->Parser.mediaSeeking.llStop)
{ {
int i; int i;
@ -742,6 +749,10 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin)
TRACE("Duration: %d seconds\n", (DWORD)(duration / 10000000)); TRACE("Duration: %d seconds\n", (DWORD)(duration / 10000000));
TRACE("Parsing took %u ms\n", GetTickCount() - ticks); TRACE("Parsing took %u ms\n", GetTickCount() - ticks);
This->duration = duration; This->duration = duration;
This->Parser.mediaSeeking.llCurrent = 0;
This->Parser.mediaSeeking.llDuration = duration;
This->Parser.mediaSeeking.llStop = duration;
break; break;
} }
case MPEG_VIDEO_HEADER: case MPEG_VIDEO_HEADER:
@ -829,6 +840,7 @@ static HRESULT MPEGSplitter_seek(IBaseFilter *iface)
TRACE("Moving sound to %08u bytes!\n", (DWORD)bytepos); TRACE("Moving sound to %08u bytes!\n", (DWORD)bytepos);
EnterCriticalSection(&pin->thread_lock);
IPin_BeginFlush((IPin *)pin); IPin_BeginFlush((IPin *)pin);
/* Make sure this is done while stopped, BeginFlush takes care of this */ /* Make sure this is done while stopped, BeginFlush takes care of this */
@ -848,6 +860,7 @@ static HRESULT MPEGSplitter_seek(IBaseFilter *iface)
TRACE("Done flushing\n"); TRACE("Done flushing\n");
IPin_EndFlush((IPin *)pin); IPin_EndFlush((IPin *)pin);
LeaveCriticalSection(&pin->thread_lock);
} }
return hr; return hr;
} }