Compare commits
2 Commits
libwebm-1.
...
libwebm-1.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6623441ee8 | ||
|
|
3ba8df9a64 |
@@ -21,7 +21,7 @@ void mkvparser::GetVersion(int& major, int& minor, int& build, int& revision)
|
|||||||
major = 1;
|
major = 1;
|
||||||
minor = 0;
|
minor = 0;
|
||||||
build = 0;
|
build = 0;
|
||||||
revision = 9;
|
revision = 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
long long mkvparser::ReadUInt(IMkvReader* pReader, long long pos, long& len)
|
long long mkvparser::ReadUInt(IMkvReader* pReader, long long pos, long& len)
|
||||||
@@ -4853,9 +4853,11 @@ Block::Block(long long start, long long size_, IMkvReader* pReader) :
|
|||||||
long status = pReader->Read(pos, 1, &m_flags);
|
long status = pReader->Read(pos, 1, &m_flags);
|
||||||
assert(status == 0);
|
assert(status == 0);
|
||||||
|
|
||||||
|
#if 0
|
||||||
const int invisible = int(m_flags & 0x08) >> 3;
|
const int invisible = int(m_flags & 0x08) >> 3;
|
||||||
invisible;
|
invisible;
|
||||||
assert(!invisible); //TODO
|
assert(!invisible); //TODO
|
||||||
|
#endif
|
||||||
|
|
||||||
const int lacing = int(m_flags & 0x06) >> 1;
|
const int lacing = int(m_flags & 0x06) >> 1;
|
||||||
|
|
||||||
@@ -5135,28 +5137,12 @@ void Block::SetKey(bool bKey)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#if 0
|
bool Block::IsInvisible() const
|
||||||
long long Block::GetOffset() const
|
|
||||||
{
|
{
|
||||||
return m_frameOff;
|
return bool(int(m_flags & 0x08) != 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
long Block::GetSize() const
|
|
||||||
{
|
|
||||||
return m_frameSize;
|
|
||||||
}
|
|
||||||
|
|
||||||
long Block::Read(IMkvReader* pReader, unsigned char* buf) const
|
|
||||||
{
|
|
||||||
assert(pReader);
|
|
||||||
assert(buf);
|
|
||||||
|
|
||||||
const long hr = pReader->Read(m_frameOff, m_frameSize, buf);
|
|
||||||
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
int Block::GetFrameCount() const
|
int Block::GetFrameCount() const
|
||||||
{
|
{
|
||||||
return m_frame_count;
|
return m_frame_count;
|
||||||
@@ -5184,7 +5170,6 @@ long Block::Frame::Read(IMkvReader* pReader, unsigned char* buf) const
|
|||||||
const long status = pReader->Read(pos, len, buf);
|
const long status = pReader->Read(pos, len, buf);
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
} //end namespace mkvparser
|
} //end namespace mkvparser
|
||||||
|
|||||||
@@ -80,6 +80,7 @@ public:
|
|||||||
long long GetTime(const Cluster*) const; //absolute, and scaled (ns)
|
long long GetTime(const Cluster*) const; //absolute, and scaled (ns)
|
||||||
bool IsKey() const;
|
bool IsKey() const;
|
||||||
void SetKey(bool);
|
void SetKey(bool);
|
||||||
|
bool IsInvisible() const;
|
||||||
|
|
||||||
int GetFrameCount() const; //to index frames: [0, count)
|
int GetFrameCount() const; //to index frames: [0, count)
|
||||||
|
|
||||||
@@ -91,26 +92,15 @@ public:
|
|||||||
long Read(IMkvReader*, unsigned char*) const;
|
long Read(IMkvReader*, unsigned char*) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
#if 0
|
|
||||||
long long GetOffset() const;
|
|
||||||
long GetSize() const;
|
|
||||||
long Read(IMkvReader*, unsigned char*) const;
|
|
||||||
#else
|
|
||||||
const Frame& GetFrame(int frame_index) const;
|
const Frame& GetFrame(int frame_index) const;
|
||||||
#endif
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
long long m_track; //Track::Number()
|
long long m_track; //Track::Number()
|
||||||
short m_timecode; //relative to cluster
|
short m_timecode; //relative to cluster
|
||||||
unsigned char m_flags;
|
unsigned char m_flags;
|
||||||
|
|
||||||
#if 0
|
|
||||||
long long m_frameOff;
|
|
||||||
long m_frameSize;
|
|
||||||
#else
|
|
||||||
Frame* m_frames;
|
Frame* m_frames;
|
||||||
int m_frame_count;
|
int m_frame_count;
|
||||||
#endif
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user