mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 18:01:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

driver/audiodec: Switch to ffmpeg, drop custom decoder implementations, drop libvorbis/libmad/libid3/libogg/libflac. Not fully regression tested.

Browse Source 
Conflicts:
	configure.ac
	src/Makefile.am
	src/driver/audiodec/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: d5ea074457
Author: martii <m4rtii@gmx.de>
Date: 2013-10-19 (Sat, 19 Oct 2013)



------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-10-19 20:50:23 +02:00
committed by [CST] Focus
parent 68f05c8d01
commit f7d8a89dd4
7 changed files with 333 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/driver/audiodec/ffmpegdec.h
View File

@@ -40,11 +40,15 @@
extern "C" {
#include <libavformat/avformat.h>
}
#include <OpenThreads/Thread>
#include <OpenThreads/Condition>
class CFfmpegDec : public CBaseDec
{
private:
bool meta_data_valid;
bool is_stream;
int mChannels;
int mSampleRate;
size_t buffer_size;
@@ -53,19 +57,29 @@ private:
AVCodec *codec;
int best_stream;
void *in;
bool Init(void);
bool Init(void *_in, const CFile::FileType ft);
void DeInit(void);
std::string title;
std::string artist;
std::string date;
std::string album;
std::string genre;
std::string type_info;
time_t total_time;
int bitrate;
int samplerate;
public:
static CFfmpegDec* getInstance();
virtual RetCode Decoder(FILE *, int, State*, CAudioMetaData* m, time_t* t, unsigned int* secondsToSkip);
bool GetMetaData(FILE *in, const bool nice, CAudioMetaData* m);
virtual RetCode Decoder(FILE *, const CFile::FileType ft, int, State*, CAudioMetaData* m, time_t* t, unsigned int* secondsToSkip);
bool GetMetaData(FILE *in, const CFile::FileType ft, const bool nice, CAudioMetaData* m);
CFfmpegDec();
~CFfmpegDec();
int Read(void *buf, size_t buf_size);
int64_t Seek(int64_t offset, int whence);
protected:
virtual bool SetMetaData(FILE* in, CAudioMetaData* m);
virtual bool SetMetaData(FILE* in, const CFile::FileType ft, CAudioMetaData* m);
};
#endif