Compare commits

..

2 Commits

Author SHA1 Message Date
matthewjheaney
6623441ee8 changed version to 1.0.0.10
Change-Id: Ib5acbe084dce95b1bb520731015ff345390acad8
2010-12-16 15:13:41 -05:00
matthewjheaney
3ba8df9a64 return invisible flag setting
Change-Id: I1953b0a590813302054245b8ceb5430aa1d9d09b
2010-12-14 15:05:35 -05:00
2 changed files with 6 additions and 31 deletions

View File

@@ -21,7 +21,7 @@ void mkvparser::GetVersion(int& major, int& minor, int& build, int& revision)
major = 1;
minor = 0;
build = 0;
revision = 9;
revision = 10;
}
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);
assert(status == 0);
#if 0
const int invisible = int(m_flags & 0x08) >> 3;
invisible;
assert(!invisible); //TODO
#endif
const int lacing = int(m_flags & 0x06) >> 1;
@@ -5135,28 +5137,12 @@ void Block::SetKey(bool bKey)
}
#if 0
long long Block::GetOffset() const
bool Block::IsInvisible() 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
{
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);
return status;
}
#endif
} //end namespace mkvparser

View File

@@ -80,6 +80,7 @@ public:
long long GetTime(const Cluster*) const; //absolute, and scaled (ns)
bool IsKey() const;
void SetKey(bool);
bool IsInvisible() const;
int GetFrameCount() const; //to index frames: [0, count)
@@ -91,26 +92,15 @@ public:
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;
#endif
private:
long long m_track; //Track::Number()
short m_timecode; //relative to cluster
unsigned char m_flags;
#if 0
long long m_frameOff;
long m_frameSize;
#else
Frame* m_frames;
int m_frame_count;
#endif
};