MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-20 02:37:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add wmav back in, make wma transocing for non-standard bitrates and samplerates.

Browse Source
This commit is contained in:
Ron Pedde 2006-06-07 05:43:15 +00:00
parent 606858a02f
commit c6075137bf
1 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/plugins/ssc-wma.cpp
View File

@ -37,6 +37,10 @@ typedef struct tag_ssc_handle {
BYTE *pdata; BYTE *pdata;
DWORD data_len; DWORD data_len;
int offset; int offset;
DWORD channels;
DWORD sample_rate;
WORD bits_per_sample;
} SSCHANDLE; } SSCHANDLE;
#define STATE_DONE 0 #define STATE_DONE 0
@ -90,7 +94,7 @@ PLUGIN_INFO _pi = {
NULL, /* event fns */ NULL, /* event fns */
&_ptfn, /* fns */ &_ptfn, /* fns */
NULL, /* rend info */ NULL, /* rend info */
"wma,wmal,wmap" /* codeclist */ "wma,wmal,wmap,wmav" /* codeclist */
}; };
/** /**
@ -141,12 +145,14 @@ int ssc_wma_open(void *vp, char *file, char *codec, int duration) {
SSCHANDLE *handle = (SSCHANDLE*)vp; SSCHANDLE *handle = (SSCHANDLE*)vp;
HRESULT hr = S_OK; HRESULT hr = S_OK;
WCHAR fname[PATH_MAX]; WCHAR fname[PATH_MAX];
DWORD byte_count;
if(!handle) if(!handle)
return FALSE; return FALSE;
handle->state = STATE_DONE; handle->state = STATE_DONE;
handle->duration = duration; handle->duration = duration;
handle->errnum = SSC_WMA_E_OPEN;
hr = WMCreateSyncReader(NULL,0,&handle->pReader); hr = WMCreateSyncReader(NULL,0,&handle->pReader);
if(FAILED(hr)) { if(FAILED(hr)) {
@ -161,7 +167,6 @@ int ssc_wma_open(void *vp, char *file, char *codec, int duration) {
hr = handle->pReader->Open(fname); hr = handle->pReader->Open(fname);
if(FAILED(hr)) { if(FAILED(hr)) {
_ppi->log(E_INF,"Could not open file. Error code: 0x%08X\n",hr); _ppi->log(E_INF,"Could not open file. Error code: 0x%08X\n",hr);
handle->errnum = SSC_WMA_E_OPEN;
return FALSE; return FALSE;
} }
handle->state=STATE_OPEN; handle->state=STATE_OPEN;
@ -169,17 +174,52 @@ int ssc_wma_open(void *vp, char *file, char *codec, int duration) {
hr = handle->pReader->SetRange(0,0); hr = handle->pReader->SetRange(0,0);
if(FAILED(hr)) { if(FAILED(hr)) {
_ppi->log(E_INF,"Could not set range. Error code: 0x%08X\n",hr); _ppi->log(E_INF,"Could not set range. Error code: 0x%08X\n",hr);
handle->errnum = SSC_WMA_E_OPEN;
return FALSE; return FALSE;
} }
hr = handle->pReader->SetReadStreamSamples(1,0); hr = handle->pReader->SetReadStreamSamples(1,0);
if(FAILED(hr)) { if(FAILED(hr)) {
_ppi->log(E_INF,"Could not stream samples. Error code: 0x%08X\n",hr); _ppi->log(E_INF,"Could not stream samples. Error code: 0x%08X\n",hr);
handle->errnum = SSC_WMA_E_OPEN;
return FALSE; return FALSE;
} }
handle->channels = 2;
handle->bits_per_sample = 16;
handle->sample_rate = 44100;
IWMOutputMediaProps *pprops;
hr = handle->pReader->GetOutputFormat(0,0,&pprops);
if(FAILED(hr)) {
_ppi->log(E_LOG,"Could not get output format for %s\n",file);
return TRUE; /* we'll assume 44100/16/2 */
}
hr = pprops->GetMediaType(NULL,&byte_count);
if(FAILED(hr)) {
_ppi->log(E_LOG,"Could not get media type for %s\n",file);
return TRUE;
}
WM_MEDIA_TYPE *ptype = (WM_MEDIA_TYPE*)calloc(byte_count,1);
if(!ptype) {
_ppi->log(E_FATAL,"ssc_wma_open: malloc\n");
}
hr = pprops->GetMediaType(ptype, &byte_count);
if(FAILED(hr)) {
free(ptype);
return TRUE;
}
/* now get sample info */
if(ptype->formattype == WMFORMAT_WaveFormatEx) {
WAVEFORMATEX *pformat = (WAVEFORMATEX*)ptype->pbFormat;
handle->channels = pformat->nChannels;
handle->sample_rate = pformat->nSamplesPerSec;
handle->bits_per_sample = pformat->wBitsPerSample;
}
free(ptype);
return TRUE; return TRUE;
} }
@ -221,9 +261,9 @@ int ssc_wma_read(void *vp, char *buffer, int len) {
/* still have some to send */ /* still have some to send */
if(!handle->wav_offset) { if(!handle->wav_offset) {
/* Should pull this from format info in the wma file */ /* Should pull this from format info in the wma file */
channels = 2; channels = handle->channels;
sample_rate = 44100; sample_rate = handle->sample_rate;
bits_per_sample = 16; bits_per_sample = handle->bits_per_sample;
if(handle->duration) if(handle->duration)
duration = handle->duration; duration = handle->duration;