system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

quartz: Don't redundantly set waveparser output pin data before it's created.

Browse source
This commit is contained in:
Chris Robinson 2007-03-20 10:31:14 -07:00 committed by Alexandre Julliard
parent e3d7274727
commit ef5de5c120
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/quartz/waveparser.c
View file

@ -265,13 +265,6 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin)
hr = IAsyncReader_SyncRead(This->pReader, pos, amt.cbFormat, amt.pbFormat); hr = IAsyncReader_SyncRead(This->pReader, pos, amt.cbFormat, amt.pbFormat);
memcpy(&amt.subtype, &MEDIATYPE_Audio, sizeof(GUID)); memcpy(&amt.subtype, &MEDIATYPE_Audio, sizeof(GUID));
amt.subtype.Data1 = ((WAVEFORMATEX*)amt.pbFormat)->wFormatTag; amt.subtype.Data1 = ((WAVEFORMATEX*)amt.pbFormat)->wFormatTag;
/* CopyMediaType(&((OutputPin*)pWAVEParser->ppPins[1])->pin.mtCurrent, &amt); */
((Parser_OutputPin*)pWAVEParser->Parser.ppPins[1])->pmt = (AM_MEDIA_TYPE*) CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE));
CopyMediaType(((Parser_OutputPin*)pWAVEParser->Parser.ppPins[1])->pmt, &amt);
/* Update buffer alignment of media samples in output */
((Parser_OutputPin*)pWAVEParser->Parser.ppPins[1])->pin.allocProps.cbAlign = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign;
pos += chunk.cb; pos += chunk.cb;
hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(chunk), (BYTE *)&chunk); hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(chunk), (BYTE *)&chunk);
@ -296,7 +289,7 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin)
if (hr != S_OK) if (hr != S_OK)
return E_FAIL; return E_FAIL;
props.cbAlign = 1; props.cbAlign = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign;
props.cbPrefix = 0; props.cbPrefix = 0;
props.cbBuffer = 4096; props.cbBuffer = 4096;
props.cBuffers = 2; props.cBuffers = 2;