September 2011 - Wine-commits

Erich Hoover : hhctrl.ocx: Use a modified (two color) refresh icon for the 'Sync' toolbar button.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 54bb7bc51dd77d37d95967d063f738d80bd5ed76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54bb7bc51dd77d37d95967d06… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Sep 27 08:11:05 2011 -0600 hhctrl.ocx: Use a modified (two color) refresh icon for the 'Sync' toolbar button. --- dlls/hhctrl.ocx/help.c | 11 +++--- dlls/hhctrl.ocx/hhtoolbar.bmp | Bin 7034 -> 9338 bytes dlls/hhctrl.ocx/hhtoolbar.svg | 75 ++++++++++++++++++++++++++++++---------- dlls/hhctrl.ocx/resource.h | 8 +++-- 4 files changed, 66 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=54bb7bc51dd77d37d9596…

1 0

Erich Hoover : hhctrl.ocx: Use separate icons for 'Hide' and 'Show' toolbar buttons based on the HIST_VIEWTREE icon.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 442343a3db26a31ff12918dc42191abe85bcb120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=442343a3db26a31ff12918dc4… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Sep 27 08:11:36 2011 -0600 hhctrl.ocx: Use separate icons for 'Hide' and 'Show' toolbar buttons based on the HIST_VIEWTREE icon. --- dlls/hhctrl.ocx/help.c | 4 +- dlls/hhctrl.ocx/hhtoolbar.bmp | Bin 9338 -> 13946 bytes dlls/hhctrl.ocx/hhtoolbar.svg | 230 +++++++++++++++++++++++++---------------- dlls/hhctrl.ocx/resource.h | 4 +- 4 files changed, 146 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=442343a3db26a31ff1291…

1 0

Huw Davies : gdi32: Make clip_line external.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: c6e483cbd1ad5bc848cd38411ebba9eef7401425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6e483cbd1ad5bc848cd38411… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 27 16:13:36 2011 +0100 gdi32: Make clip_line external. --- dlls/gdi32/dibdrv/dibdrv.h | 24 ++++++++++++++++++------ dlls/gdi32/dibdrv/objects.c | 11 ++--------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 3c17841..e580ba5 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -124,12 +124,15 @@ static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) typedef struct primitive_funcs { - void (* solid_rects)(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor); - void (* pattern_rects)(const dib_info *dib, int num, const RECT *rc, const POINT *orign, const dib_info *brush, void *and_bits, void *xor_bits); - void (* copy_rect)(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, int rop2, int overlap); - DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); - BOOL (* convert_to)(dib_info *dst, const dib_info *src, const RECT *src_rect); - BOOL (* create_rop_masks)(const dib_info *dib, const dib_info *hatch, const rop_mask *fg, const rop_mask *bg, rop_mask_bits *bits); + void (* solid_rects)(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor); + void (* pattern_rects)(const dib_info *dib, int num, const RECT *rc, const POINT *orign, + const dib_info *brush, void *and_bits, void *xor_bits); + void (* copy_rect)(const dib_info *dst, const RECT *rc, const dib_info *src, + const POINT *origin, int rop2, int overlap); + DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); + BOOL (* convert_to)(dib_info *dst, const dib_info *src, const RECT *src_rect); + BOOL (* create_rop_masks)(const dib_info *dib, const dib_info *hatch, + const rop_mask *fg, const rop_mask *bg, rop_mask_bits *bits); } primitive_funcs; extern const primitive_funcs funcs_8888 DECLSPEC_HIDDEN; @@ -152,6 +155,13 @@ struct rop_codes #define OVERLAP_ABOVE 0x04 /* dest starts above source */ #define OVERLAP_BELOW 0x08 /* dest starts below source */ +typedef struct +{ + unsigned int dx, dy; + int bias; + DWORD octant; +} bres_params; + extern void get_rop_codes(INT rop, struct rop_codes *codes); extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; extern void update_brush_rop( dibdrv_physdev *pdev, INT rop ) DECLSPEC_HIDDEN; @@ -171,6 +181,8 @@ extern DWORD get_fg_color(dibdrv_physdev *pdev, COLORREF color) DECLSPEC_HIDDEN; extern BOOL brush_rects( dibdrv_physdev *pdev, int num, const RECT *rects ) DECLSPEC_HIDDEN; extern HRGN add_extra_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) DECLSPEC_HIDDEN; extern void restore_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) DECLSPEC_HIDDEN; +extern int clip_line(const POINT *start, const POINT *end, const RECT *clip, + const bres_params *params, POINT *pt1, POINT *pt2) DECLSPEC_HIDDEN; static inline BOOL defer_pen(dibdrv_physdev *pdev) { diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 4833600..2dcd33a 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -288,13 +288,6 @@ static inline DWORD calc_outcode(const POINT *pt, const RECT *clip) return out; } -typedef struct -{ - unsigned int dx, dy; - int bias; - DWORD octant; -} bres_params; - /****************************************************************************** * clip_line * @@ -365,8 +358,8 @@ typedef struct * Moving end point from x2 to x2 - m find y2 - n * n = (2mdy + bias - dy - 1) / 2dx + 1 */ -static int clip_line(const POINT *start, const POINT *end, const RECT *clip, - const bres_params *params, POINT *pt1, POINT *pt2) +int clip_line(const POINT *start, const POINT *end, const RECT *clip, + const bres_params *params, POINT *pt1, POINT *pt2) { int m, n; BOOL clipped = FALSE;

1 0

Huw Davies : gdi32: stretch_bitmapinfo may need to adjust the dst visrect.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 15c4754e803bcd9e1ed5e5cb3154862b0fc41031 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15c4754e803bcd9e1ed5e5cb3… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 27 16:13:37 2011 +0100 gdi32: stretch_bitmapinfo may need to adjust the dst visrect. --- dlls/gdi32/dibdrv/bitblt.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 01dfc3c..918e09c 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -885,7 +885,7 @@ done: } DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, - const BITMAPINFO *dst_info, void *dst_bits, const struct bitblt_coords *dst, + const BITMAPINFO *dst_info, void *dst_bits, struct bitblt_coords *dst, INT mode ) { FIXME( "should stretch %dx%d -> %dx%d\n", src->width, src->height, dst->width, dst->height ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 6cb8693..b3d027a 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -255,7 +255,7 @@ extern DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, str const BITMAPINFO *dst_info, void *dst_bits ) DECLSPEC_HIDDEN; extern DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, - const BITMAPINFO *dst_info, void *dst_bits, const struct bitblt_coords *dst, + const BITMAPINFO *dst_info, void *dst_bits, struct bitblt_coords *dst, INT mode ) DECLSPEC_HIDDEN; /* driver.c */

1 0

Andrew Eikum : winecfg: Replace DirectSound settings with Driver Diagnostics.
by Alexandre Julliard 27 Sep '11

27 Sep '11

1 0

Andrew Eikum : dsound: Reimplement rendering devices on mmdevapi.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: e786998daff4ad49521a4c9c39c172ddcdcad82a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e786998daff4ad49521a4c9c3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 27 08:51:07 2011 -0500 dsound: Reimplement rendering devices on mmdevapi. --- dlls/dsound/Makefile.in | 2 +- dlls/dsound/dsound.c | 225 ++++++++++-------- dlls/dsound/dsound_main.c | 369 +++++++++++++++++++++++----- dlls/dsound/dsound_private.h | 25 ++- dlls/dsound/mixer.c | 140 ++++++----- dlls/dsound/primary.c | 494 ++++++++++++++++++++++++++----------- dlls/mmdevapi/tests/dependency.c | 2 +- 7 files changed, 875 insertions(+), 382 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e786998daff4ad49521a4…

1 0

Andrew Eikum : dsound: Reimplement capturing devices on mmdevapi.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 3735ecac219ab0560e0b1141e0b6bf745e62fa13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3735ecac219ab0560e0b1141e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 27 08:51:22 2011 -0500 dsound: Reimplement capturing devices on mmdevapi. --- dlls/dsound/capture.c | 465 +++++++++++++++++++++++------------------- dlls/dsound/dsound.c | 4 +- dlls/dsound/dsound_main.c | 62 +----- dlls/dsound/dsound_private.h | 23 ++- 4 files changed, 282 insertions(+), 272 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3735ecac219ab0560e0b1…

1 0

Andrew Eikum : dsound: Reimplement PropertySet on mmdevapi.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 8856ea79f3468d6f532f5f20e9b28c295d6e1db1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8856ea79f3468d6f532f5f20e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 27 08:51:33 2011 -0500 dsound: Reimplement PropertySet on mmdevapi. --- dlls/dsound/dsound_main.c | 20 +++- dlls/dsound/dsound_private.h | 4 + dlls/dsound/propset.c | 262 ++++++++++++++++++++---------------------- 3 files changed, 141 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8856ea79f3468d6f532f5…

1 0

Maarten Lankhorst : quartz: Fix support for mpeg layer 1 and 2.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 12e132e9be304dbdcfea153af03c66c19cf9f7aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=12e132e9be304dbdcfea153af… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Sep 26 17:34:44 2011 +0200 quartz: Fix support for mpeg layer 1 and 2. --- dlls/quartz/mpegsplit.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 6043f69..059a854 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -128,12 +128,14 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) LONGLONG duration; int bitrate_index, freq_index, lsf = 1, mpeg1, layer, padding, bitrate, length; + if (header[0] != 0xff) + return E_INVALIDARG; - if (!(header[0] == 0xff && ((header[1]>>5)&0x7) == 0x7 && + if (!(((header[1]>>5)&0x7) == 0x7 && ((header[1]>>1)&0x3) != 0 && ((header[2]>>4)&0xf) != 0xf && ((header[2]>>2)&0x3) != 0x3)) { - FIXME("Not a valid header: %02x:%02x\n", header[0], header[1]); + FIXME("Not a valid header: %02x:%02x\n", header[1], header[2]); return E_INVALIDARG; } @@ -147,7 +149,7 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) padding = ((header[2]>>1)&0x1); bitrate = tabsel_123[lsf][layer-1][bitrate_index] * 1000; - if (!bitrate || layer != 3) + if (!bitrate) { FIXME("Not a valid header: %02x:%02x:%02x:%02x\n", header[0], header[1], header[2], header[3]); return E_INVALIDARG; @@ -353,6 +355,7 @@ static HRESULT MPEGSplitter_query_accept(LPVOID iface, const AM_MEDIA_TYPE *pmt) FIXME("MPEG-1 system streams not yet supported.\n"); else if (IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_MPEG1VideoCD)) FIXME("MPEG-1 VideoCD streams not yet supported.\n"); + else FIXME("%s\n", debugstr_guid(&pmt->subtype)); return S_FALSE; }

1 0

Maarten Lankhorst : winemp3: Add support for WAVE_FORMAT_MPEG.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 557deb0a197a095f93727e1c8004567758100e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=557deb0a197a095f93727e1c8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Sep 26 17:36:49 2011 +0200 winemp3: Add support for WAVE_FORMAT_MPEG. --- dlls/winemp3.acm/mpegl3.c | 65 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 53 insertions(+), 12 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 548483a..21962b4 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -106,6 +106,7 @@ static DWORD MPEG3_GetFormatIndex(LPWAVEFORMATEX wfx) hi = NUM_PCM_FORMATS; fmts = PCM_Formats; break; + case WAVE_FORMAT_MPEG: case WAVE_FORMAT_MPEGLAYER3: hi = NUM_MPEG3_FORMATS; fmts = MPEG3_Formats; @@ -233,7 +234,8 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) { goto theEnd; } - else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 && + else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || + adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEG) && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { /* resampling or mono <=> stereo not available @@ -583,7 +585,8 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) adsi->dwDriver = (DWORD_PTR)aad; - if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 && + if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || + adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEG) && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { OSStatus err; @@ -660,7 +663,7 @@ static LRESULT MPEG3_DriverDetails(PACMDRIVERDETAILSW add) add->vdwACM = 0x01000000; add->vdwDriver = 0x01000000; add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; - add->cFormatTags = 2; /* PCM, MPEG3 */ + add->cFormatTags = 3; /* PCM, MPEG3 */ add->cFilterTags = 0; add->hicon = NULL; MultiByteToWideChar( CP_ACP, 0, "WINE-MPEG3", -1, @@ -684,16 +687,17 @@ static LRESULT MPEG3_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) { static const WCHAR szPcm[]={'P','C','M',0}; static const WCHAR szMpeg3[]={'M','P','e','g','3',0}; + static const WCHAR szMpeg[]={'M','P','e','g',0}; switch (dwQuery) { case ACM_FORMATTAGDETAILSF_INDEX: - if (aftd->dwFormatTagIndex >= 2) return ACMERR_NOTPOSSIBLE; + if (aftd->dwFormatTagIndex > 2) return ACMERR_NOTPOSSIBLE; break; case ACM_FORMATTAGDETAILSF_LARGESTSIZE: if (aftd->dwFormatTag == WAVE_FORMAT_UNKNOWN) { - aftd->dwFormatTagIndex = 1; /* WAVE_FORMAT_MPEGLAYER3 is bigger than PCM */ + aftd->dwFormatTagIndex = 2; /* WAVE_FORMAT_MPEG is biggest */ break; } /* fall thru */ @@ -702,6 +706,7 @@ static LRESULT MPEG3_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) { case WAVE_FORMAT_PCM: aftd->dwFormatTagIndex = 0; break; case WAVE_FORMAT_MPEGLAYER3: aftd->dwFormatTagIndex = 1; break; + case WAVE_FORMAT_MPEG: aftd->dwFormatTagIndex = 2; break; default: return ACMERR_NOTPOSSIBLE; } break; @@ -725,11 +730,17 @@ static LRESULT MPEG3_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) aftd->cStandardFormats = NUM_MPEG3_FORMATS; lstrcpyW(aftd->szFormatTag, szMpeg3); break; + case 2: + aftd->dwFormatTag = WAVE_FORMAT_MPEG; + aftd->cbFormatSize = sizeof(MPEG1WAVEFORMAT); + aftd->cStandardFormats = NUM_MPEG3_FORMATS; + lstrcpyW(aftd->szFormatTag, szMpeg); + break; } return MMSYSERR_NOERROR; } -static void fill_in_wfx(unsigned cbwfx, WAVEFORMATEX* wfx, unsigned bit_rate) +static void fill_in_mp3(unsigned cbwfx, WAVEFORMATEX* wfx, unsigned bit_rate) { MPEGLAYER3WAVEFORMAT* mp3wfx = (MPEGLAYER3WAVEFORMAT*)wfx; @@ -746,6 +757,24 @@ static void fill_in_wfx(unsigned cbwfx, WAVEFORMATEX* wfx, unsigned bit_rate) } } +static void fill_in_mpeg(unsigned cbwfx, WAVEFORMATEX* wfx, unsigned bit_rate) +{ + MPEG1WAVEFORMAT* mp3wfx = (MPEG1WAVEFORMAT*)wfx; + + wfx->nAvgBytesPerSec = bit_rate / 8; + if (cbwfx >= sizeof(WAVEFORMATEX)) + wfx->cbSize = sizeof(MPEG1WAVEFORMAT) - sizeof(WAVEFORMATEX); + if (cbwfx >= sizeof(MPEG1WAVEFORMAT)) + { + mp3wfx->fwHeadLayer = ACM_MPEG_LAYER3; + mp3wfx->dwHeadBitrate = wfx->nAvgBytesPerSec * 8; + mp3wfx->fwHeadMode = ACM_MPEG_JOINTSTEREO; + mp3wfx->fwHeadModeExt = 0xf; + mp3wfx->wHeadEmphasis = 1; + mp3wfx->fwHeadFlags = ACM_MPEG_ID_MPEG1; + } +} + /*********************************************************************** * MPEG3_FormatDetails * @@ -775,12 +804,16 @@ static LRESULT MPEG3_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign; break; case WAVE_FORMAT_MPEGLAYER3: + case WAVE_FORMAT_MPEG: if (afd->dwFormatIndex >= NUM_MPEG3_FORMATS) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = MPEG3_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = MPEG3_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = MPEG3_Formats[afd->dwFormatIndex].nBits; afd->pwfx->nBlockAlign = 1; - fill_in_wfx(afd->cbwfx, afd->pwfx, 192000); + if (afd->dwFormatTag == WAVE_FORMAT_MPEGLAYER3) + fill_in_mp3(afd->cbwfx, afd->pwfx, 192000); + else + fill_in_mpeg(afd->cbwfx, afd->pwfx, 192000); break; default: WARN("Unsupported tag %08x\n", afd->dwFormatTag); @@ -840,9 +873,13 @@ static LRESULT MPEG3_FormatSuggest(PACMDRVFORMATSUGGEST adfs) adfs->pwfxDst->nBlockAlign = (adfs->pwfxDst->nChannels * adfs->pwfxDst->wBitsPerSample) / 8; adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxDst->nBlockAlign; break; + case WAVE_FORMAT_MPEG: + adfs->pwfxDst->nBlockAlign = 1; + fill_in_mpeg(adfs->cbwfxDst, adfs->pwfxDst, 192000); + break; case WAVE_FORMAT_MPEGLAYER3: adfs->pwfxDst->nBlockAlign = 1; - fill_in_wfx(adfs->cbwfxDst, adfs->pwfxDst, 192000); + fill_in_mp3(adfs->cbwfxDst, adfs->pwfxDst, 192000); break; default: FIXME("\n"); @@ -865,14 +902,16 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad case ACM_STREAMSIZEF_DESTINATION: /* cbDstLength => cbSrcLength */ if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && - adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEGLAYER3) + (adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || + adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEG)) { nblocks = (adss->cbDstLength - 3000) / (DWORD)(adsi->pwfxDst->nAvgBytesPerSec * 1152 / adsi->pwfxDst->nSamplesPerSec + 0.5); if (nblocks == 0) return ACMERR_NOTPOSSIBLE; adss->cbSrcLength = nblocks * 1152 * adsi->pwfxSrc->nBlockAlign; } - else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 && + else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || + adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEG) && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { nblocks = adss->cbDstLength / (adsi->pwfxDst->nBlockAlign * 1152); @@ -888,7 +927,8 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad case ACM_STREAMSIZEF_SOURCE: /* cbSrcLength => cbDstLength */ if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && - adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEGLAYER3) + (adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || + adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEG)) { nblocks = adss->cbSrcLength / (adsi->pwfxSrc->nBlockAlign * 1152); if (nblocks == 0) @@ -898,7 +938,8 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad nblocks++; adss->cbDstLength = 3000 + nblocks * (DWORD)(adsi->pwfxDst->nAvgBytesPerSec * 1152 / adsi->pwfxDst->nSamplesPerSec + 0.5); } - else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 && + else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || + adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEG) && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { nblocks = adss->cbSrcLength / (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 1152 / adsi->pwfxSrc->nSamplesPerSec);

1 0