many many small changes

switched to the new logging here and there
some cleanups
worked  on i2S
base class for files
id3 parsing
This commit is contained in:
2021-02-28 20:44:01 +01:00
parent df77490622
commit 422610c21c
18 changed files with 307 additions and 197 deletions

View File

@@ -20,9 +20,9 @@ namespace AVI {
NextChunk(NextChunkType type, uint32_t size) : type(type), size(size) {}
};
template <typename Source> class Demuxer {
template <typename DataSource> class Demuxer {
Source& src;
DataSource& src;
bool valid = true;
//AVITypeHeader riff;
@@ -52,7 +52,7 @@ namespace AVI {
public:
Demuxer(Source& src) : src(src) {
Demuxer(DataSource& src) : src(src) {
RIFFHeader riff;
read(riff);
@@ -180,8 +180,8 @@ namespace AVI {
void dumpState() {
std::cout << "video @" << state.video.streamID << ": " << state.video.fmt.bmi_header.biWidth << "x" << state.video.fmt.bmi_header.biHeight << " Format: " << state.streamHeaders[state.video.streamID].fccHandler.chars << std::endl;
std::cout << "audio @" << state.audio.streamID << ": " << state.audio.fmt.channels << " channels @ " << state.audio.fmt.samples_per_sec << " Hz" << " Format: " << state.audio.fmt.format_tag << std::endl;
//std::cout << "video @" << state.video.streamID << ": " << state.video.fmt.bmi_header.biWidth << "x" << state.video.fmt.bmi_header.biHeight << " Format: " << state.streamHeaders[state.video.streamID].fccHandler.chars << std::endl;
//std::cout << "audio @" << state.audio.streamID << ": " << state.audio.fmt.channels << " channels @ " << state.audio.fmt.samples_per_sec << " Hz" << " Format: " << state.audio.fmt.format_tag << std::endl;
}
AVIList readUntilList(const char* content) {

View File

@@ -14,7 +14,7 @@ union FOURCC {
bool operator == (const FOURCC other) const {return u32 == other.u32;}
bool operator != (const FOURCC other) const {return u32 != other.u32;}
};
} __attribute__((__packed__));
//struct AVICommonHeader {