driver/audiodec: get back old audio decoders code, use configure option ENABLE_FFMPEGDEC

to switch between old code and ffmpegdec
This commit is contained in:
[CST] Focus
2013-12-15 14:31:39 +04:00
parent 64e2a0c2ad
commit 0cb07d75d9
8 changed files with 177 additions and 85 deletions

View File

@@ -45,8 +45,8 @@ public:
// the follwing two methods have to be implemented for new decoders
//@param secondsToSkip: a value of 0 indicates that normal FF/REV operation was requested
// a value > 0 indicates that *one* jump forwards (FF) or backwards (REV) was requested
virtual RetCode Decoder(FILE *, const CFile::FileType ft, const int, State* const, CAudioMetaData*, time_t* const, unsigned int* const)=0;
virtual bool GetMetaData(FILE *in, const CFile::FileType ft, const bool nice, CAudioMetaData* m)=0;
virtual RetCode Decoder(FILE *, const int, State* const, CAudioMetaData*, time_t* const, unsigned int* const)=0;
virtual bool GetMetaData(FILE *in, const bool nice, CAudioMetaData* m)=0;
static RetCode DecoderBase(CAudiofile* const in, const int OutputFd,
State* const state, time_t* const t,
@@ -55,7 +55,6 @@ public:
static void Init();
CBaseDec() {};
static bool SetDSP(int soundfd, int fmt, unsigned int dsp_speed, unsigned int channels);
static OpenThreads::Mutex metaDataMutex;
static std::map<const std::string,CAudiofile> metaDataCache;
@@ -63,7 +62,6 @@ public:
static bool LookupMetaData(CAudiofile* const in);
static void ClearMetaData();
private:
static bool avs_mute(bool mute);
unsigned static int mSamplerate;
};