December 2006 - Wine-commits

Alexandre Julliard : make_makefiles: List test directories explicitly in . gitignore.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: bb7f2f9cc63d1ef78206a3964a331d250197ee2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb7f2f9cc63d1ef78206a3964… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 29 14:21:17 2006 +0100 make_makefiles: List test directories explicitly in .gitignore. --- .gitignore | 112 +++++++++++++++++++++++++++++++++++++++++++++++++- tools/make_makefiles | 12 ++--- 2 files changed, 115 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb7f2f9cc63d1ef78206a…

1 0

Alexandre Julliard : joystick.drv: Renamed the dlls/winmm/ joystick directory to dlls/winejoystick.drv.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: f231a70f4cff47ca515d6e9fbfc08723d77ba13e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f231a70f4cff47ca515d6e9fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 29 14:29:20 2006 +0100 joystick.drv: Renamed the dlls/winmm/joystick directory to dlls/winejoystick.drv. --- Makefile.in | 4 +- configure | 4 +- configure.ac | 2 +- dlls/Makefile.in | 7 +---- .../joystick => winejoystick.drv}/Makefile.in | 4 +- .../joystick => winejoystick.drv}/joystick.c | 0 .../winejoystick.drv.spec} | 0 dlls/winmm/joystick.c | 2 +- programs/winecfg/libraries.c | 2 +- tools/winapi/win32.api | 26 ++++++++++---------- 10 files changed, 23 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f231a70f4cff47ca515d6…

1 0

Alexandre Julliard : server: Split get_thread_from_pid to allow lookups by tid or pid only.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 48b74b32379847584294bed4ec66eb759e200f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48b74b32379847584294bed4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 29 16:53:33 2006 +0100 server: Split get_thread_from_pid to allow lookups by tid or pid only. --- server/ptrace.c | 7 ++++++- server/thread.c | 14 +++++++++++--- server/thread.h | 1 + 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 26a4042..c7aa088 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -144,7 +144,12 @@ void sigchld_callback(void) for (;;) { if (!(pid = wait4_wrapper( -1, &status, WUNTRACED | WNOHANG, NULL ))) break; - if (pid != -1) handle_child_status( get_thread_from_pid(pid), pid, status, -1 ); + if (pid != -1) + { + struct thread *thread = get_thread_from_tid( pid ); + if (!thread) thread = get_thread_from_pid( pid ); + handle_child_status( thread, pid, status, -1 ); + } else break; } } diff --git a/server/thread.c b/server/thread.c index 05cf3cd..47367d3 100644 --- a/server/thread.c +++ b/server/thread.c @@ -297,15 +297,23 @@ struct thread *get_thread_from_handle( o access, &thread_ops ); } -/* find a thread from a Unix pid */ -struct thread *get_thread_from_pid( int pid ) +/* find a thread from a Unix tid */ +struct thread *get_thread_from_tid( int tid ) { struct thread *thread; LIST_FOR_EACH_ENTRY( thread, &thread_list, struct thread, entry ) { - if (thread->unix_tid == pid) return thread; + if (thread->unix_tid == tid) return thread; } + return NULL; +} + +/* find a thread from a Unix pid */ +struct thread *get_thread_from_pid( int pid ) +{ + struct thread *thread; + LIST_FOR_EACH_ENTRY( thread, &thread_list, struct thread, entry ) { if (thread->unix_pid == pid) return thread; diff --git a/server/thread.h b/server/thread.h index 61911cd..0fc162f 100644 --- a/server/thread.h +++ b/server/thread.h @@ -103,6 +103,7 @@ extern struct thread *current; extern struct thread *create_thread( int fd, struct process *process ); extern struct thread *get_thread_from_id( thread_id_t id ); extern struct thread *get_thread_from_handle( obj_handle_t handle, unsigned int access ); +extern struct thread *get_thread_from_tid( int tid ); extern struct thread *get_thread_from_pid( int pid ); extern void stop_thread( struct thread *thread ); extern int wake_thread( struct thread *thread );

1 0

Alexandre Julliard : server: Add hooks to support process tracing mechanisms other than ptrace.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: cd1c7fc056decda40f62d99438dda69d005fd7ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd1c7fc056decda40f62d9943… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 29 16:56:11 2006 +0100 server: Add hooks to support process tracing mechanisms other than ptrace. --- server/process.c | 3 +++ server/process.h | 5 +++++ server/ptrace.c | 17 +++++++++++++++++ server/request.c | 3 +++ 4 files changed, 28 insertions(+), 0 deletions(-) diff --git a/server/process.c b/server/process.c index 217710a..001afcb 100644 --- a/server/process.c +++ b/server/process.c @@ -284,6 +284,7 @@ struct thread *create_process( int fd, s process->winstation = 0; process->desktop = 0; process->token = token_create_admin(); + process->trace_data = 0; list_init( &process->thread_list ); list_init( &process->locks ); list_init( &process->classes ); @@ -343,6 +344,7 @@ data_size_t init_process( struct thread struct process *process = thread->process; struct startup_info *info = process->startup_info; + init_process_tracing( process ); if (!info) return 0; return info->data_size; } @@ -599,6 +601,7 @@ static void process_killed( struct proce destroy_process_classes( process ); remove_process_locks( process ); set_process_startup_state( process, STARTUP_ABORTED ); + finish_process_tracing( process ); start_sigkill_timer( process ); wake_up( &process->obj, 0 ); } diff --git a/server/process.h b/server/process.h index af84719..6d5d676 100644 --- a/server/process.h +++ b/server/process.h @@ -80,6 +80,7 @@ struct process struct list dlls; /* list of loaded dlls */ void *peb; /* PEB address in client address space */ void *ldt_copy; /* pointer to LDT copy in client addr space */ + unsigned int trace_data; /* opaque data used by the process tracing mechanism */ }; struct process_snapshot @@ -128,6 +129,10 @@ extern void detach_debugged_processes( s extern struct process_snapshot *process_snap( int *count ); extern struct module_snapshot *module_snap( struct process *process, int *count ); extern void enum_processes( int (*cb)(struct process*, void*), void *user); + +extern void init_tracing_mechanism(void); +extern void init_process_tracing( struct process *process ); +extern void finish_process_tracing( struct process *process ); extern int read_process_memory( struct process *process, const void *ptr, data_size_t size, char *dest ); extern int write_process_memory( struct process *process, void *ptr, data_size_t size, const char *src ); diff --git a/server/ptrace.c b/server/ptrace.c index c7aa088..7b0bfa0 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -223,6 +223,23 @@ static inline int tkill( int tgid, int p return -1; } +/* initialize the process tracing mechanism */ +void init_tracing_mechanism(void) +{ + /* no initialization needed for ptrace */ +} + +/* initialize the per-process tracing mechanism */ +void init_process_tracing( struct process *process ) +{ + /* ptrace setup is done on-demand */ +} + +/* terminate the per-process tracing mechanism */ +void finish_process_tracing( struct process *process ) +{ +} + /* send a Unix signal to a specific thread */ int send_thread_signal( struct thread *thread, int sig ) { diff --git a/server/request.c b/server/request.c index 07cc5fb..c01a70e 100644 --- a/server/request.c +++ b/server/request.c @@ -800,6 +800,9 @@ void open_master_socket(void) /* init startup time */ gettimeofday( &server_start_time, NULL ); + + /* init the process tracing mechanism */ + init_tracing_mechanism(); } /* master socket timer expiration handler */

1 0

Alexandre Julliard : make_makefiles: In .gitignore, explicitly list files that we know are generated instead of using wildcards .
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 5eb38cf9328d0d33d6678a6c7913616e77b2dafc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eb38cf9328d0d33d6678a6c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 29 12:49:26 2006 +0100 make_makefiles: In .gitignore, explicitly list files that we know are generated instead of using wildcards. --- .gitignore | 354 ++++++++++++++++++++++++++++++++++++++++++++++++-- tools/make_makefiles | 105 ++++++++++----- 2 files changed, 413 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5eb38cf9328d0d33d6678…

1 0

Alexandre Julliard : Make.rules: Be more specific in make clean, only clean targets that we have created.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: ce25156e48f051d9c88d4c6c0083344a1e7d67de URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce25156e48f051d9c88d4c6c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 29 12:42:25 2006 +0100 Make.rules: Be more specific in make clean, only clean targets that we have created. --- Make.rules.in | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 86a40ba..2a6f80c 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -108,10 +108,15 @@ dlldir = @libdir@/wine prog_manext = 1 api_manext = 3w conf_manext = 5 -CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \ - *.flc *.res *.mc.rc *.tab.[ch] *.yy.c core +CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej *.flc core + +IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ + $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) + +CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) \ + $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) \ + $(MC_SRCS:.mc=.mc.rc) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) -IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(EXTRA_OBJS) RCOBJS = $(RC_SRCS:.rc=.res.o) @@ -235,7 +240,7 @@ $(EXTRASUBDIRS:%=%/__clean__): dummy -cd `dirname $@` && $(RM) $(CLEAN_FILES) clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) - $(RM) $(CLEAN_FILES) $(IDL_H_SRCS:.idl=.h) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) $(PROGRAMS) $(RC_BINARIES) $(MANPAGES) + $(RM) $(CLEAN_FILES) $(CLEAN_TARGETS) $(PROGRAMS) $(RC_BINARIES) $(MANPAGES) .PHONY: clean $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__)

1 0

Alexandre Julliard : d3d9/tests: Avoid sizeof in traces.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 7d1f36aa1c6b2f3612a8fa848698bc57e75f9d9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1f36aa1c6b2f3612a8fa848… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 29 12:41:36 2006 +0100 d3d9/tests: Avoid sizeof in traces. --- dlls/d3d9/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index c82f65b..d0347ca 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -469,7 +469,7 @@ static void test_refcount(void) hr = IDirect3DDevice9_GetStreamSource(pDevice, 0, &pVBuf, &offset, &stride); ok(SUCCEEDED(hr), "GetStreamSource did not succeed with NULL stream!\n"); ok(pVBuf==NULL, "pVBuf not NULL (%p)!\n", pVBuf); - ok(stride==3*sizeof(float), "stride not %u (got %u)!\n", 3*sizeof(float), stride); + ok(stride==3*sizeof(float), "stride not 3 floats (got %u)!\n", stride); ok(offset==0, "offset not 0 (got %u)!\n", offset); } /* Shaders */

1 0

Alexandre Julliard : d3d8/tests: Avoid sizeof in traces.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 005efa740bc52530e047284834652fddfd26d18a URL: http://source.winehq.org/git/wine.git/?a=commit;h=005efa740bc52530e04728483… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 29 12:41:32 2006 +0100 d3d8/tests: Avoid sizeof in traces. --- dlls/d3d8/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b3c4c64..96f3a39 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -420,7 +420,7 @@ static void test_refcount(void) hr = IDirect3DDevice8_GetStreamSource(pDevice, 0, &pVBuf, &stride); ok(SUCCEEDED(hr), "GetStreamSource did not succeed with NULL stream!\n"); ok(pVBuf==NULL, "pVBuf not NULL (%p)!\n", pVBuf); - ok(stride==3*sizeof(float), "stride not %u (got %u)!\n", 3*sizeof(float), stride); + ok(stride==3*sizeof(float), "stride not 3 floats (got %u)!\n", stride); } /* Shaders */

1 0

Ken Thomases : winecoreaudio: Implement CoreAudio_wiAudioUnitIOProc, the input callback.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: fa84451647902e00894126638ec2a01d8f047436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa84451647902e00894126638… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 28 11:07:16 2006 -0600 winecoreaudio: Implement CoreAudio_wiAudioUnitIOProc, the input callback. --- dlls/winmm/winecoreaudio/audio.c | 74 +++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index ee1a62f..7e39ba9 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -68,6 +68,15 @@ enum }; typedef UInt32 AudioUnitRenderActionFlags; +typedef long ComponentResult; +extern ComponentResult +AudioUnitRender( AudioUnit ci, + AudioUnitRenderActionFlags * ioActionFlags, + const AudioTimeStamp * inTimeStamp, + UInt32 inOutputBusNumber, + UInt32 inNumberFrames, + AudioBufferList * ioData) AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER; + /* only allow 10 output devices through this driver, this ought to be adequate */ #define MAX_WAVEOUTDRV (1) #define MAX_WAVEINDRV (1) @@ -2118,7 +2127,70 @@ OSStatus CoreAudio_wiAudioUnitIOProc(voi UInt32 inNumberFrames, AudioBufferList *ioData) { - return noErr; + WINE_WAVEIN* wwi = (WINE_WAVEIN*)inRefCon; + OSStatus err = noErr; + BOOL needNotify = FALSE; + WAVEHDR* lpStorePtr; + unsigned int dataToStore; + unsigned int dataStored = 0; + + + if (wwi->trace_on) + fprintf(stderr, "trace:wave:CoreAudio_wiAudioUnitIOProc (ioActionFlags = %08lx, inTimeStamp = { %f, %llu, %f, %llu, %08lx }, inBusNumber = %lu, inNumberFrames = %lu)\n", + *ioActionFlags, inTimeStamp->mSampleTime, inTimeStamp->mHostTime, inTimeStamp->mRateScalar, inTimeStamp->mWordClockTime, inTimeStamp->mFlags, inBusNumber, inNumberFrames); + + /* Render into audio buffer */ + err = AudioUnitRender(wwi->audioUnit, ioActionFlags, inTimeStamp, inBusNumber, inNumberFrames, wwi->bufferList); + if (err) + { + if (wwi->err_on) + fprintf(stderr, "err:wave:CoreAudio_wiAudioUnitIOProc AudioUnitRender failed with error %li\n", err); + return err; + } + + /* Copy from audio buffer to the wavehdrs */ + dataToStore = wwi->bufferList->mBuffers[0].mDataByteSize; + + OSSpinLockLock(&wwi->lock); + + lpStorePtr = wwi->lpQueuePtr; + + while (dataToStore > 0 && wwi->state == WINE_WS_PLAYING && lpStorePtr) + { + unsigned int room = lpStorePtr->dwBufferLength - lpStorePtr->dwBytesRecorded; + unsigned int toCopy; + + if (wwi->trace_on) + fprintf(stderr, "trace:wave:CoreAudio_wiAudioUnitIOProc Looking to store %u bytes to wavehdr %p, which has room for %u\n", + dataToStore, lpStorePtr, room); + + if (room >= dataToStore) + toCopy = dataToStore; + else + toCopy = room; + + if (toCopy > 0) + { + memcpy(lpStorePtr->lpData + lpStorePtr->dwBytesRecorded, + (char*)wwi->bufferList->mBuffers[0].mData + dataStored, toCopy); + lpStorePtr->dwBytesRecorded += toCopy; + wwi->dwTotalRecorded += toCopy; + dataStored += toCopy; + dataToStore -= toCopy; + room -= toCopy; + } + + if (room == 0) + { + lpStorePtr = lpStorePtr->lpNext; + needNotify = TRUE; + } + } + + OSSpinLockUnlock(&wwi->lock); + + if (needNotify) wodSendNotifyInputCompletionsMessage(wwi); + return err; } #else

1 0

Ken Thomases : winecoreaudio: Report actual supported input wave formats.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 0e52c42aa6aa39cafacd97ce5466437e66c063a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e52c42aa6aa39cafacd97ce5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 28 11:07:24 2006 -0600 winecoreaudio: Report actual supported input wave formats. Also, added some output formats that Core Audio ought to be able to handle. --- dlls/winmm/winecoreaudio/audio.c | 64 +++++++++++++++++++++++++++------ dlls/winmm/winecoreaudio/audiounit.c | 32 +++++++++++++++++ 2 files changed, 84 insertions(+), 12 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 7e39ba9..455a365 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -224,6 +224,8 @@ extern OSStatus AudioUnitUninitialize(Au extern int AudioUnit_SetVolume(AudioUnit au, float left, float right); extern int AudioUnit_GetVolume(AudioUnit au, float *left, float *right); +extern int AudioUnit_GetInputDeviceSampleRate(void); + extern int AudioUnit_CreateInputUnit(void* wwi, AudioUnit* out_au, WORD nChannels, DWORD nSamplesPerSec, WORD wBitsPerSample, UInt32* outFrameCount); @@ -500,6 +502,7 @@ LONG CoreAudio_WaveInit(void) HANDLE hThread; CFStringRef messageThreadPortName; CFMessagePortRef port_ReceiveInMessageThread; + int inputSampleRate; TRACE("()\n"); @@ -550,6 +553,14 @@ LONG CoreAudio_WaveInit(void) WOutDev[i].caps.wChannels = 2; /* WOutDev[i].caps.dwSupport |= WAVECAPS_LRVOLUME; */ /* FIXME */ + WOutDev[i].caps.dwFormats |= WAVE_FORMAT_96M08; + WOutDev[i].caps.dwFormats |= WAVE_FORMAT_96S08; + WOutDev[i].caps.dwFormats |= WAVE_FORMAT_96M16; + WOutDev[i].caps.dwFormats |= WAVE_FORMAT_96S16; + WOutDev[i].caps.dwFormats |= WAVE_FORMAT_48M08; + WOutDev[i].caps.dwFormats |= WAVE_FORMAT_48S08; + WOutDev[i].caps.dwFormats |= WAVE_FORMAT_48M16; + WOutDev[i].caps.dwFormats |= WAVE_FORMAT_48S16; WOutDev[i].caps.dwFormats |= WAVE_FORMAT_4M08; WOutDev[i].caps.dwFormats |= WAVE_FORMAT_4S08; WOutDev[i].caps.dwFormats |= WAVE_FORMAT_4S16; @@ -566,6 +577,9 @@ LONG CoreAudio_WaveInit(void) WOutDev[i].lock = 0; /* initialize the mutex */ } + /* FIXME: implement sample rate conversion on input */ + inputSampleRate = AudioUnit_GetInputDeviceSampleRate(); + for (i = 0; i < MAX_WAVEINDRV; ++i) { memset(&WInDev[i], 0, sizeof(WInDev[i])); @@ -584,18 +598,41 @@ LONG CoreAudio_WaveInit(void) MultiByteToWideChar(CP_ACP, 0, szPname, -1, WInDev[i].caps.szPname, sizeof(WInDev[i].caps.szPname)/sizeof(WCHAR)); snprintf(WInDev[i].interface_name, sizeof(WInDev[i].interface_name), "winecoreaudio in: %d", i); - WInDev[i].caps.dwFormats |= WAVE_FORMAT_4M08; - WInDev[i].caps.dwFormats |= WAVE_FORMAT_4S08; - WInDev[i].caps.dwFormats |= WAVE_FORMAT_4S16; - WInDev[i].caps.dwFormats |= WAVE_FORMAT_4M16; - WInDev[i].caps.dwFormats |= WAVE_FORMAT_2M08; - WInDev[i].caps.dwFormats |= WAVE_FORMAT_2S08; - WInDev[i].caps.dwFormats |= WAVE_FORMAT_2M16; - WInDev[i].caps.dwFormats |= WAVE_FORMAT_2S16; - WInDev[i].caps.dwFormats |= WAVE_FORMAT_1M08; - WInDev[i].caps.dwFormats |= WAVE_FORMAT_1S08; - WInDev[i].caps.dwFormats |= WAVE_FORMAT_1M16; - WInDev[i].caps.dwFormats |= WAVE_FORMAT_1S16; + if (inputSampleRate == 96000) + { + WInDev[i].caps.dwFormats |= WAVE_FORMAT_96M08; + WInDev[i].caps.dwFormats |= WAVE_FORMAT_96S08; + WInDev[i].caps.dwFormats |= WAVE_FORMAT_96M16; + WInDev[i].caps.dwFormats |= WAVE_FORMAT_96S16; + } + if (inputSampleRate == 48000) + { + WInDev[i].caps.dwFormats |= WAVE_FORMAT_48M08; + WInDev[i].caps.dwFormats |= WAVE_FORMAT_48S08; + WInDev[i].caps.dwFormats |= WAVE_FORMAT_48M16; + WInDev[i].caps.dwFormats |= WAVE_FORMAT_48S16; + } + if (inputSampleRate == 44100) + { + WInDev[i].caps.dwFormats |= WAVE_FORMAT_4M08; + WInDev[i].caps.dwFormats |= WAVE_FORMAT_4S08; + WInDev[i].caps.dwFormats |= WAVE_FORMAT_4M16; + WInDev[i].caps.dwFormats |= WAVE_FORMAT_4S16; + } + if (inputSampleRate == 22050) + { + WInDev[i].caps.dwFormats |= WAVE_FORMAT_2M08; + WInDev[i].caps.dwFormats |= WAVE_FORMAT_2S08; + WInDev[i].caps.dwFormats |= WAVE_FORMAT_2M16; + WInDev[i].caps.dwFormats |= WAVE_FORMAT_2S16; + } + if (inputSampleRate == 11025) + { + WInDev[i].caps.dwFormats |= WAVE_FORMAT_1M08; + WInDev[i].caps.dwFormats |= WAVE_FORMAT_1S08; + WInDev[i].caps.dwFormats |= WAVE_FORMAT_1M16; + WInDev[i].caps.dwFormats |= WAVE_FORMAT_1S16; + } WInDev[i].caps.wChannels = 2; } @@ -2140,6 +2177,9 @@ OSStatus CoreAudio_wiAudioUnitIOProc(voi *ioActionFlags, inTimeStamp->mSampleTime, inTimeStamp->mHostTime, inTimeStamp->mRateScalar, inTimeStamp->mWordClockTime, inTimeStamp->mFlags, inBusNumber, inNumberFrames); /* Render into audio buffer */ + /* FIXME: implement sample rate conversion on input. This will require + * a different render strategy. We'll need to buffer the sound data + * received here and pass it off to an AUConverter in another thread. */ err = AudioUnitRender(wwi->audioUnit, ioActionFlags, inTimeStamp, inBusNumber, inNumberFrames, wwi->bufferList); if (err) { diff --git a/dlls/winmm/winecoreaudio/audiounit.c b/dlls/winmm/winecoreaudio/audiounit.c index 433cab1..b6da953 100644 --- a/dlls/winmm/winecoreaudio/audiounit.c +++ b/dlls/winmm/winecoreaudio/audiounit.c @@ -130,6 +130,34 @@ int AudioUnit_GetVolume(AudioUnit au, fl } +/* FIXME: implement sample rate conversion on input */ +int AudioUnit_GetInputDeviceSampleRate(void) +{ + AudioDeviceID defaultInputDevice; + UInt32 param; + Float64 sampleRate; + OSStatus err; + + param = sizeof(defaultInputDevice); + err = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultInputDevice, &param, &defaultInputDevice); + if (err != noErr || defaultInputDevice == kAudioDeviceUnknown) + { + ERR("Couldn't get the default audio input device ID: %08lx\n", err); + return 0; + } + + param = sizeof(sampleRate); + err = AudioDeviceGetProperty(defaultInputDevice, 0, 1, kAudioDevicePropertyNominalSampleRate, &param, &sampleRate); + if (err != noErr) + { + ERR("Couldn't get the device sample rate: %08lx\n", err); + return 0; + } + + return sampleRate; +} + + int AudioUnit_CreateInputUnit(void* wwi, AudioUnit* out_au, WORD nChannels, DWORD nSamplesPerSec, WORD wBitsPerSample, UInt32* outFrameCount) @@ -232,6 +260,10 @@ int AudioUnit_CreateInputUnit(void* wwi, } /* Setup the desired data format. */ + /* FIXME: implement sample rate conversion on input. We shouldn't set + * the mSampleRate of this to the desired sample rate. We need to query + * the input device and use that. If they don't match, we need to set up + * an AUConverter to do the sample rate conversion on a separate thread. */ desiredFormat.mFormatID = kAudioFormatLinearPCM; desiredFormat.mFormatFlags = kLinearPCMFormatFlagIsPacked; if (wBitsPerSample != 8)

1 0