mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-03 20:46:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix indentation and add UNICODE when not defined.

Browse source 
git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@439 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
This commit is contained in:
aymeric 2009-04-24 13:42:36 +00:00
parent 18757f457a
commit 3ee8c2c00e
1 changed files with 112 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

223
linphone/mediastreamer2/src/winsnd2.c
View file

@ -16,7 +16,8 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#if !defined(_WIN32_WCE) /* Allready defined for wince */
#ifndef UNICODE
#define UNICODE #define UNICODE
#endif #endif
@ -60,20 +61,20 @@ static void winsndcard_set_level(MSSndCard *card, MSSndCardMixerElem e, int perc
MIXERLINE Line; MIXERLINE Line;
UINT uLineIndex; UINT uLineIndex;
MMRESULT mr = MMSYSERR_NOERROR; MMRESULT mr = MMSYSERR_NOERROR;
DWORD dwVolume = 0xFFFF; DWORD dwVolume = 0xFFFF;
dwVolume = ((0xFFFF) * percent) / 100; dwVolume = ((0xFFFF) * percent) / 100;
switch(e){ switch(e){
case MS_SND_CARD_MASTER: case MS_SND_CARD_MASTER:
mr = waveOutSetVolume((HWAVEOUT)d->out_devid, dwVolume); mr = waveOutSetVolume((HWAVEOUT)d->out_devid, dwVolume);
if (mr != MMSYSERR_NOERROR) if (mr != MMSYSERR_NOERROR)
{ {
ms_warning("Failed to set master volume. (waveOutSetVolume:0x%i)", mr); ms_warning("Failed to set master volume. (waveOutSetVolume:0x%i)", mr);
return; return;
} }
break; break;
case MS_SND_CARD_CAPTURE: case MS_SND_CARD_CAPTURE:
mr = mixerGetID( (HMIXEROBJ)d->in_devid, &uMixerID, MIXER_OBJECTF_WAVEIN ); mr = mixerGetID( (HMIXEROBJ)d->in_devid, &uMixerID, MIXER_OBJECTF_WAVEIN );
if ( mr != MMSYSERR_NOERROR ) if ( mr != MMSYSERR_NOERROR )
{ {
@ -212,12 +213,12 @@ static void winsndcard_set_level(MSSndCard *card, MSSndCardMixerElem e, int perc
} }
} }
mixerClose( (HMIXER)dwMixerHandle ); mixerClose( (HMIXER)dwMixerHandle );
if (mr != MMSYSERR_NOERROR) if (mr != MMSYSERR_NOERROR)
{ {
ms_warning("Failed to set capture volume. (waveInSetVolume:0x%i)", mr); ms_warning("Failed to set capture volume. (waveInSetVolume:0x%i)", mr);
return; return;
} }
break; break;
case MS_SND_CARD_PLAYBACK: case MS_SND_CARD_PLAYBACK:
{ {
MIXERLINECONTROLS mlc = {0}; MIXERLINECONTROLS mlc = {0};
@ -279,8 +280,8 @@ static void winsndcard_set_level(MSSndCard *card, MSSndCardMixerElem e, int perc
return; return;
} }
} }
break; break;
default: default:
ms_warning("winsnd_card_set_level: unsupported command."); ms_warning("winsnd_card_set_level: unsupported command.");
} }
} }
@ -288,15 +289,15 @@ static void winsndcard_set_level(MSSndCard *card, MSSndCardMixerElem e, int perc
static int winsndcard_get_level(MSSndCard *card, MSSndCardMixerElem e){ static int winsndcard_get_level(MSSndCard *card, MSSndCardMixerElem e){
switch(e){ switch(e){
case MS_SND_CARD_MASTER: case MS_SND_CARD_MASTER:
/*mr=waveOutGetVolume(d->waveoutdev, &dwVolume);*/ /*mr=waveOutGetVolume(d->waveoutdev, &dwVolume);*/
/* Transform to 0 to 100 scale*/ /* Transform to 0 to 100 scale*/
/*dwVolume = (dwVolume *100) / (0xFFFF);*/ /*dwVolume = (dwVolume *100) / (0xFFFF);*/
return 60; return 60;
break; break;
case MS_SND_CARD_CAPTURE: case MS_SND_CARD_CAPTURE:
break; break;
case MS_SND_CARD_PLAYBACK: case MS_SND_CARD_PLAYBACK:
break; break;
default: default:
ms_warning("winsnd_card_get_level: unsupported command."); ms_warning("winsnd_card_get_level: unsupported command.");
return -1; return -1;
@ -308,9 +309,9 @@ static void winsndcard_set_source(MSSndCard *card, MSSndCardCapture source){
switch(source){ switch(source){
case MS_SND_CARD_MIC: case MS_SND_CARD_MIC:
break; break;
case MS_SND_CARD_LINE: case MS_SND_CARD_LINE:
break; break;
} }
} }
@ -370,7 +371,7 @@ static void add_or_update_card(MSSndCardManager *m, const char *name, int indev,
d->in_devid=indev; d->in_devid=indev;
if (outdev!=-1) if (outdev!=-1)
d->out_devid=outdev; d->out_devid=outdev;
return; return;
} }
} }
@ -379,20 +380,20 @@ static void add_or_update_card(MSSndCardManager *m, const char *name, int indev,
} }
static void winsndcard_detect(MSSndCardManager *m){ static void winsndcard_detect(MSSndCardManager *m){
MMRESULT mr = NOERROR; MMRESULT mr = NOERROR;
unsigned int nOutDevices = waveOutGetNumDevs (); unsigned int nOutDevices = waveOutGetNumDevs ();
unsigned int nInDevices = waveInGetNumDevs (); unsigned int nInDevices = waveInGetNumDevs ();
unsigned int item; unsigned int item;
if (nOutDevices>nInDevices) if (nOutDevices>nInDevices)
nInDevices = nOutDevices; nInDevices = nOutDevices;
for (item = 0; item < nInDevices; item++){ for (item = 0; item < nInDevices; item++){
WAVEINCAPS incaps; WAVEINCAPS incaps;
WAVEOUTCAPS outcaps; WAVEOUTCAPS outcaps;
mr = waveInGetDevCaps (item, &incaps, sizeof (WAVEINCAPS)); mr = waveInGetDevCaps (item, &incaps, sizeof (WAVEINCAPS));
if (mr == MMSYSERR_NOERROR) if (mr == MMSYSERR_NOERROR)
{ {
#if defined(_WIN32_WCE) #if defined(_WIN32_WCE)
char card[256]; char card[256];
@ -405,21 +406,21 @@ static void winsndcard_detect(MSSndCardManager *m){
add_or_update_card(m,szName,item,-1,MS_SND_CARD_CAP_CAPTURE); add_or_update_card(m,szName,item,-1,MS_SND_CARD_CAP_CAPTURE);
#endif #endif
} }
mr = waveOutGetDevCaps (item, &outcaps, sizeof (WAVEOUTCAPS)); mr = waveOutGetDevCaps (item, &outcaps, sizeof (WAVEOUTCAPS));
if (mr == MMSYSERR_NOERROR) if (mr == MMSYSERR_NOERROR)
{ {
#if defined(_WIN32_WCE) #if defined(_WIN32_WCE)
char card[256]; char card[256];
snprintf(card, sizeof(card), "Output card %i", item); snprintf(card, sizeof(card), "Output card %i", item);
add_or_update_card(m,card,-1,item,MS_SND_CARD_CAP_PLAYBACK); add_or_update_card(m,card,-1,item,MS_SND_CARD_CAP_PLAYBACK);
/* _tprintf(L"new card: %s", outcaps.szPname); */ /* _tprintf(L"new card: %s", outcaps.szPname); */
#else #else
char szName[256]; char szName[256];
WideCharToMultiByte(CP_UTF8,0,outcaps.szPname,-1,szName,256,0,0); WideCharToMultiByte(CP_UTF8,0,outcaps.szPname,-1,szName,256,0,0);
add_or_update_card(m,szName,-1,item,MS_SND_CARD_CAP_PLAYBACK); add_or_update_card(m,szName,-1,item,MS_SND_CARD_CAP_PLAYBACK);
#endif #endif
} }
} }
} }
@ -500,7 +501,7 @@ static void winsnd_uninit(MSFilter *f){
flushq(&d->write_rq,0); flushq(&d->write_rq,0);
#ifndef DISABLE_SPEEX #ifndef DISABLE_SPEEX
if (d->pst!=NULL) if (d->pst!=NULL)
speex_preprocess_state_destroy(d->pst); speex_preprocess_state_destroy(d->pst);
d->pst=NULL; d->pst=NULL;
d->pst_frame_size=0; d->pst_frame_size=0;
#endif #endif
@ -533,7 +534,7 @@ static void add_input_buffer(WinSnd *d, WAVEHDR *hdr, int buflen){
static void CALLBACK static void CALLBACK
read_callback (HWAVEIN waveindev, UINT uMsg, DWORD dwInstance, DWORD dwParam1, read_callback (HWAVEIN waveindev, UINT uMsg, DWORD dwInstance, DWORD dwParam1,
DWORD dwParam2) DWORD dwParam2)
{ {
WAVEHDR *wHdr=(WAVEHDR *) dwParam1; WAVEHDR *wHdr=(WAVEHDR *) dwParam1;
MSFilter *f=(MSFilter *)dwInstance; MSFilter *f=(MSFilter *)dwInstance;
@ -543,10 +544,10 @@ read_callback (HWAVEIN waveindev, UINT uMsg, DWORD dwInstance, DWORD dwParam1,
switch (uMsg){ switch (uMsg){
case WIM_OPEN: case WIM_OPEN:
ms_debug("read_callback : WIM_OPEN"); ms_debug("read_callback : WIM_OPEN");
break; break;
case WIM_CLOSE: case WIM_CLOSE:
ms_debug("read_callback : WIM_CLOSE"); ms_debug("read_callback : WIM_CLOSE");
break; break;
case WIM_DATA: case WIM_DATA:
bsize=wHdr->dwBytesRecorded; bsize=wHdr->dwBytesRecorded;
if (bsize<=0) { if (bsize<=0) {
@ -582,7 +583,7 @@ read_callback (HWAVEIN waveindev, UINT uMsg, DWORD dwInstance, DWORD dwParam1,
if (f->ticker->TimeEvent!=NULL) if (f->ticker->TimeEvent!=NULL)
SetEvent(f->ticker->TimeEvent); SetEvent(f->ticker->TimeEvent);
#endif #endif
break; break;
} }
} }
@ -601,27 +602,27 @@ static void winsnd_read_preprocess(MSFilter *f){
winsnd_apply_settings(d); winsnd_apply_settings(d);
/* Init Microphone device */ /* Init Microphone device */
dwFlag = CALLBACK_FUNCTION | WAVE_FORMAT_DIRECT; dwFlag = CALLBACK_FUNCTION | WAVE_FORMAT_DIRECT;
mr = waveInOpen (&d->indev, d->dev_id, &d->wfx, mr = waveInOpen (&d->indev, d->dev_id, &d->wfx,
(DWORD) read_callback, (DWORD)f, dwFlag); (DWORD) read_callback, (DWORD)f, dwFlag);
if (mr != MMSYSERR_NOERROR) if (mr != MMSYSERR_NOERROR)
{ {
ms_error("Failed to prepare windows sound device. (waveInOpen:0x%i)", mr); ms_error("Failed to prepare windows sound device. (waveInOpen:0x%i)", mr);
if (d->dev_id != WAVE_MAPPER) if (d->dev_id != WAVE_MAPPER)
dwFlag = WAVE_MAPPED | CALLBACK_FUNCTION; dwFlag = WAVE_MAPPED | CALLBACK_FUNCTION;
mr = waveInOpen (&d->indev, d->dev_id, &d->wfx, mr = waveInOpen (&d->indev, d->dev_id, &d->wfx,
(DWORD) read_callback, (DWORD)f, dwFlag); (DWORD) read_callback, (DWORD)f, dwFlag);
} }
if (mr != MMSYSERR_NOERROR) if (mr != MMSYSERR_NOERROR)
{ {
ms_error("Failed to prepare windows sound device. (waveInOpen:0x%i)", mr); ms_error("Failed to prepare windows sound device. (waveInOpen:0x%i)", mr);
mr = waveInOpen (&d->indev, WAVE_MAPPER, &d->wfx, mr = waveInOpen (&d->indev, WAVE_MAPPER, &d->wfx,
(DWORD) read_callback, (DWORD)f, CALLBACK_FUNCTION); (DWORD) read_callback, (DWORD)f, CALLBACK_FUNCTION);
if (mr != MMSYSERR_NOERROR) if (mr != MMSYSERR_NOERROR)
{ {
d->indev=NULL; d->indev=NULL;
ms_error("Failed to prepare windows sound device. (waveInOpen:0x%i)", mr); ms_error("Failed to prepare windows sound device. (waveInOpen:0x%i)", mr);
return ; return ;
} }
} }
bsize=WINSND_NSAMPLES*d->wfx.nAvgBytesPerSec/8000; bsize=WINSND_NSAMPLES*d->wfx.nAvgBytesPerSec/8000;
@ -702,11 +703,11 @@ static void winsnd_read_process(MSFilter *f){
static void CALLBACK static void CALLBACK
write_callback(HWAVEOUT outdev, UINT uMsg, DWORD dwInstance, write_callback(HWAVEOUT outdev, UINT uMsg, DWORD dwInstance,
DWORD dwParam1, DWORD dwParam2) DWORD dwParam1, DWORD dwParam2)
{ {
WAVEHDR *hdr=(WAVEHDR *) dwParam1; WAVEHDR *hdr=(WAVEHDR *) dwParam1;
WinSnd *d=(WinSnd*)dwInstance; WinSnd *d=(WinSnd*)dwInstance;
switch (uMsg){ switch (uMsg){
case WOM_OPEN: case WOM_OPEN:
break; break;
@ -721,7 +722,7 @@ write_callback(HWAVEOUT outdev, UINT uMsg, DWORD dwInstance,
d->stat_notplayed=0; d->stat_notplayed=0;
} }
d->stat_output++; d->stat_output++;
break; break;
} }
} }
@ -740,20 +741,20 @@ static void winsnd_write_preprocess(MSFilter *f){
/* Init Microphone device */ /* Init Microphone device */
dwFlag = CALLBACK_FUNCTION | WAVE_FORMAT_DIRECT; dwFlag = CALLBACK_FUNCTION | WAVE_FORMAT_DIRECT;
mr = waveOutOpen (&d->outdev, d->dev_id, &d->wfx, mr = waveOutOpen (&d->outdev, d->dev_id, &d->wfx,
(DWORD) write_callback, (DWORD)d, dwFlag); (DWORD) write_callback, (DWORD)d, dwFlag);
if (mr != MMSYSERR_NOERROR) if (mr != MMSYSERR_NOERROR)
{ {
ms_error("Failed to open windows sound device %i. (waveOutOpen:0x%i)",d->dev_id, mr); ms_error("Failed to open windows sound device %i. (waveOutOpen:0x%i)",d->dev_id, mr);
if (d->dev_id != WAVE_MAPPER) if (d->dev_id != WAVE_MAPPER)
dwFlag = WAVE_MAPPED | CALLBACK_FUNCTION; dwFlag = WAVE_MAPPED | CALLBACK_FUNCTION;
mr = waveOutOpen (&d->outdev, d->dev_id, &d->wfx, mr = waveOutOpen (&d->outdev, d->dev_id, &d->wfx,
(DWORD) write_callback, (DWORD)d, dwFlag); (DWORD) write_callback, (DWORD)d, dwFlag);
} }
if (mr != MMSYSERR_NOERROR) if (mr != MMSYSERR_NOERROR)
{ {
ms_error("Failed to open windows sound device %i. (waveOutOpen:0x%i)",d->dev_id, mr); ms_error("Failed to open windows sound device %i. (waveOutOpen:0x%i)",d->dev_id, mr);
mr = waveOutOpen (&d->outdev, WAVE_MAPPER, &d->wfx, mr = waveOutOpen (&d->outdev, WAVE_MAPPER, &d->wfx,
(DWORD) write_callback, (DWORD)d, CALLBACK_FUNCTION); (DWORD) write_callback, (DWORD)d, CALLBACK_FUNCTION);
if (mr != MMSYSERR_NOERROR) if (mr != MMSYSERR_NOERROR)
{ {
ms_error("Failed to open windows sound device %i. (waveOutOpen:0x%i)",d->dev_id, mr); ms_error("Failed to open windows sound device %i. (waveOutOpen:0x%i)",d->dev_id, mr);
@ -803,7 +804,7 @@ static void winsnd_write_postprocess(MSFilter *f){
#ifndef DISABLE_SPEEX #ifndef DISABLE_SPEEX
if (d->pst!=NULL) if (d->pst!=NULL)
speex_preprocess_state_destroy(d->pst); speex_preprocess_state_destroy(d->pst);
d->pst=NULL; d->pst=NULL;
d->pst_frame_size=0; d->pst_frame_size=0;
#endif #endif
@ -852,24 +853,24 @@ static void winsnd_write_process(MSFilter *f){
#ifdef AMD_HACK #ifdef AMD_HACK
/* too many sound card are crappy on windows... */ /* too many sound card are crappy on windows... */
d->stat_minimumbuffer=15; d->stat_minimumbuffer=15;
if (d->wfx.nSamplesPerSec>=32000) /* better results for high rates */ if (d->wfx.nSamplesPerSec>=32000) /* better results for high rates */
d->stat_minimumbuffer=8; d->stat_minimumbuffer=8;
#endif #endif
if (d->wfx.nSamplesPerSec>=32000) /* better results for high rates */ if (d->wfx.nSamplesPerSec>=32000) /* better results for high rates */
{ {
if (d->nbufs_playing+d->write_rq.q_mcount<4) if (d->nbufs_playing+d->write_rq.q_mcount<4)
{ {
d->ready=0; d->ready=0;
} }
} }
else else
{ {
if (d->nbufs_playing+d->write_rq.q_mcount<7) if (d->nbufs_playing+d->write_rq.q_mcount<7)
{ {
d->ready=0; d->ready=0;
} }
} }
#if defined(WCE_OPTICON_WORKAROUND) #if defined(WCE_OPTICON_WORKAROUND)
if (d->workaround==0) if (d->workaround==0)
{ {
@ -893,11 +894,11 @@ static void winsnd_write_process(MSFilter *f){
if (vad==0) if (vad==0)
{ {
int missing; int missing;
missing = 10 - d->write_rq.q_mcount - d->nbufs_playing; missing = 10 - d->write_rq.q_mcount - d->nbufs_playing;
if (d->wfx.nSamplesPerSec>=32000) /* better results for high rates */ if (d->wfx.nSamplesPerSec>=32000) /* better results for high rates */
missing = 6 - d->write_rq.q_mcount - d->nbufs_playing; missing = 6 - d->write_rq.q_mcount - d->nbufs_playing;
ms_message("WINSND trouble: inserting %i silence", missing); ms_message("WINSND trouble: inserting %i silence", missing);
while(missing>0) while(missing>0)
{ {
old=dupb(m); old=dupb(m);
@ -911,10 +912,10 @@ static void winsnd_write_process(MSFilter *f){
#else #else
if (d->ready==0) if (d->ready==0)
{ {
int missing; int missing;
missing = 10 - d->write_rq.q_mcount - d->nbufs_playing; missing = 10 - d->write_rq.q_mcount - d->nbufs_playing;
if (d->wfx.nSamplesPerSec>=32000) /* better results for high rates */ if (d->wfx.nSamplesPerSec>=32000) /* better results for high rates */
missing = 6 - d->write_rq.q_mcount - d->nbufs_playing; missing = 6 - d->write_rq.q_mcount - d->nbufs_playing;
ms_message("WINSND trouble: inserting %i silence", missing); ms_message("WINSND trouble: inserting %i silence", missing);
while(missing>0) while(missing>0)
{ {
@ -941,9 +942,9 @@ static void winsnd_write_process(MSFilter *f){
hdr->lpData=(LPSTR)m->b_rptr; hdr->lpData=(LPSTR)m->b_rptr;
hdr->dwBufferLength=msgdsize(m); hdr->dwBufferLength=msgdsize(m);
hdr->dwFlags = 0; hdr->dwFlags = 0;
hdr->dwUser = (DWORD)m; hdr->dwUser = (DWORD)m;
mr = waveOutPrepareHeader(d->outdev,hdr,sizeof(*hdr)); mr = waveOutPrepareHeader(d->outdev,hdr,sizeof(*hdr));
if (mr != MMSYSERR_NOERROR){ if (mr != MMSYSERR_NOERROR){
ms_error("waveOutPrepareHeader() error"); ms_error("waveOutPrepareHeader() error");
getq(&d->write_rq); getq(&d->write_rq);
freemsg(m); freemsg(m);
@ -975,8 +976,8 @@ static void winsnd_write_process(MSFilter *f){
/* initial behavior (detection in process?) */ /* initial behavior (detection in process?) */
getq(&d->write_rq); getq(&d->write_rq);
freemsg(m); freemsg(m);
discarded++; discarded++;
d->stat_notplayed++; d->stat_notplayed++;
} }
else else
{ {
@ -984,9 +985,9 @@ static void winsnd_write_process(MSFilter *f){
{ {
getq(&d->write_rq); getq(&d->write_rq);
freemsg(m); freemsg(m);
ms_message("WINSND trouble: silence removed"); ms_message("WINSND trouble: silence removed");
discarded++; discarded++;
d->stat_notplayed++; d->stat_notplayed++;
} }
} }
#else #else
@ -1052,13 +1053,13 @@ MSFilterDesc winsnd_read_desc={
"Sound capture filter for Windows Sound drivers", "Sound capture filter for Windows Sound drivers",
MS_FILTER_OTHER, MS_FILTER_OTHER,
NULL, NULL,
0, 0,
1, 1,
winsnd_init, winsnd_init,
winsnd_read_preprocess, winsnd_read_preprocess,
winsnd_read_process, winsnd_read_process,
winsnd_read_postprocess, winsnd_read_postprocess,
winsnd_uninit, winsnd_uninit,
winsnd_methods winsnd_methods
}; };
@ -1069,14 +1070,14 @@ MSFilterDesc winsnd_write_desc={
"Sound playback filter for Windows Sound drivers", "Sound playback filter for Windows Sound drivers",
MS_FILTER_OTHER, MS_FILTER_OTHER,
NULL, NULL,
1, 1,
0, 0,
winsnd_init, winsnd_init,
winsnd_write_preprocess, winsnd_write_preprocess,
winsnd_write_process, winsnd_write_process,
winsnd_write_postprocess, winsnd_write_postprocess,
winsnd_uninit, winsnd_uninit,
winsnd_methods winsnd_methods
}; };
MSFilter *ms_winsnd_read_new(MSSndCard *card){ MSFilter *ms_winsnd_read_new(MSSndCard *card){