mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 02:11:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Wav play added - not ok, have bugs; Fixes for webif radio streaming bouquets/channels lists; Mute after standby fix; Hack to read 2x sdp on cable, for testing; Restore analog audio stereo/mono mode on zap

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@238 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-01-31 16:27:23 +00:00
parent 6843cdf969
commit 529b5dce7c
6 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/driver/audiodec/wavdec.cpp
View File

@@ -37,6 +37,9 @@
#include <sstream>
#include <driver/audioplay.h>
#include <linux/soundcard.h>
#include <audio_cs.h>
extern cAudio * audioDecoder;
#define ProgName "WavDec"
// nr of msecs to skip in ff/rev mode
@@ -47,7 +50,7 @@
struct WavHeader
{
char ChunkID[4];
int ChunkSize;
int ChunkSize;
char Format[4];
char Subchunk1ID[4];
int Subchunk1Size;
@@ -73,7 +76,7 @@ int endianTest=1;
((((l) & 0xff00) >> 8) | \
(((l) & 0x00ff) << 8)))
#define MAX_OUTPUT_SAMPLES 1022 /* AVIA_GT_PCM_MAX_SAMPLES-1 */
#define MAX_OUTPUT_SAMPLES 2048 /* AVIA_GT_PCM_MAX_SAMPLES-1 */
CBaseDec::RetCode CWavDec::Decoder(FILE *in, int OutputFd, State* state, CAudioMetaData* meta_data, time_t* time_played, unsigned int* secondsToSkip)
{
@@ -98,12 +101,15 @@ CBaseDec::RetCode CWavDec::Decoder(FILE *in, int OutputFd, State* state, CAudioM
Status=DATA_ERR;
return Status;
}
#if 0
if (SetDSP(OutputFd, fmt, meta_data->samplerate , mChannels))
{
Status=DSPSET_ERR;
return Status;
}
#endif
audioDecoder->PrepareClipPlay(mChannels, meta_data->samplerate, mBitsPerSample, fmt == AFMT_S16_LE ? 1 : 0);
int actSecsToSkip = (*secondsToSkip != 0) ? *secondsToSkip : MSECS_TO_SKIP / 1000;
unsigned int oldSecsToSkip = *secondsToSkip;
int jumppos=0;
@@ -154,13 +160,15 @@ CBaseDec::RetCode CWavDec::Decoder(FILE *in, int OutputFd, State* state, CAudioM
}
bytes = fread(buffer, 1, buffersize, in);
if (write(OutputFd, buffer, bytes) != bytes)
//if (write(OutputFd, buffer, bytes) != bytes)
if(audioDecoder->WriteClip((unsigned char*) buffer, bytes) != bytes)
{
fprintf(stderr,"%s: PCM write error (%s).\n", ProgName, strerror(errno));
Status=WRITE_ERR;
}
*time_played = (meta_data->bitrate!=0) ? (ftell(in)-header_size)*8/meta_data->bitrate : 0;
} while (bytes > 0 && *state!=STOP_REQ && Status==OK);
audioDecoder->StopClip();
free(buffer);
return Status;
}