Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 16:35:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINEMP3.ACM] Sync with Wine Staging 1.9.23. CORE-12409

Browse source 
svn path=/trunk/; revision=73305
This commit is contained in:
Amine Khaldi 2016-11-17 23:24:47 +00:00
parent b81dc9c21f
commit 0f78def92f
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
reactos/dll/win32/winemp3.acm/mpegl3.c
View file

@ -215,6 +215,7 @@ static void MPEG3_Reset(PACMDRVSTREAMINSTANCE adsi, AcmMpeg3Data* aad)
*/ */
static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi)
{ {
LRESULT error = MMSYSERR_NOTSUPPORTED;
AcmMpeg3Data* aad; AcmMpeg3Data* aad;
int err; int err;
@ -238,6 +239,18 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi)
adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEG) && adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEG) &&
adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM)
{ {
if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3)
{
MPEGLAYER3WAVEFORMAT *formatmp3 = (MPEGLAYER3WAVEFORMAT *)adsi->pwfxSrc;
if (adsi->pwfxSrc->cbSize < MPEGLAYER3_WFX_EXTRA_BYTES ||
formatmp3->wID != MPEGLAYER3_ID_MPEG)
{
error = ACMERR_NOTPOSSIBLE;
goto theEnd;
}
}
/* resampling or mono <=> stereo not available /* resampling or mono <=> stereo not available
* MPEG3 algo only define 16 bit per sample output * MPEG3 algo only define 16 bit per sample output
*/ */
@ -261,7 +274,7 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi)
theEnd: theEnd:
HeapFree(GetProcessHeap(), 0, aad); HeapFree(GetProcessHeap(), 0, aad);
adsi->dwDriver = 0L; adsi->dwDriver = 0L;
return MMSYSERR_NOTSUPPORTED; return error;
} }
/*********************************************************************** /***********************************************************************

2
reactos/media/doc/README.WINE
View file

@ -198,7 +198,7 @@ reactos/dll/win32/wbemdisp # Synced to WineStaging-1.9.16
reactos/dll/win32/wbemprox # Synced to WineStaging-1.9.23 reactos/dll/win32/wbemprox # Synced to WineStaging-1.9.23
reactos/dll/win32/windowscodecs # Synced to WineStaging-1.9.23 reactos/dll/win32/windowscodecs # Synced to WineStaging-1.9.23
reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.9.11 reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.9.11
reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.9.11 reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.9.23
reactos/dll/win32/wing32 # Synced to WineStaging-1.9.11 reactos/dll/win32/wing32 # Synced to WineStaging-1.9.11
reactos/dll/win32/winhttp # Synced to WineStaging-1.9.16 reactos/dll/win32/winhttp # Synced to WineStaging-1.9.16
reactos/dll/win32/wininet # Synced to WineStaging-1.9.16 reactos/dll/win32/wininet # Synced to WineStaging-1.9.16