initialized AudioTrack and fixed indentation in Linux
Change-Id: I7ca148256f695b053318e962b06e34034b6c7cd4
This commit is contained in:
@@ -799,7 +799,6 @@ Segment::Segment(
|
||||
m_pInfo(NULL),
|
||||
m_pTracks(NULL),
|
||||
m_clusterCount(0)
|
||||
//m_clusterNumber(0)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -1235,9 +1234,7 @@ long Segment::Load()
|
||||
m_clusters = new Cluster*[m_clusterCount];
|
||||
|
||||
for (int i = 0; i < m_clusterCount; ++i)
|
||||
{
|
||||
m_clusters[i] = Cluster::Parse(this, i, fileposition_of_clusters[i]);
|
||||
}
|
||||
|
||||
delete [] fileposition_of_clusters;
|
||||
|
||||
@@ -1680,7 +1677,6 @@ SegmentInfo::SegmentInfo(Segment* pSegment, long long start, long long size_) :
|
||||
|
||||
else if (Match(pReader, pos, 0x3BA9, m_pTitleAsUTF8)) //[7B][A9]
|
||||
assert(m_pTitleAsUTF8);
|
||||
|
||||
else
|
||||
{
|
||||
long len;
|
||||
@@ -2092,7 +2088,6 @@ bool VideoTrack::VetEntry(const BlockEntry* pBlockEntry) const
|
||||
}
|
||||
|
||||
|
||||
|
||||
long long VideoTrack::GetWidth() const
|
||||
{
|
||||
return m_width;
|
||||
@@ -2112,7 +2107,10 @@ double VideoTrack::GetFrameRate() const
|
||||
|
||||
|
||||
AudioTrack::AudioTrack(Segment* pSegment, const Info& i) :
|
||||
Track(pSegment, i)
|
||||
Track(pSegment, i),
|
||||
m_rate(0.0),
|
||||
m_channels(0),
|
||||
m_bitDepth(-1)
|
||||
{
|
||||
assert(i.type == 2);
|
||||
assert(i.number > 0);
|
||||
@@ -2265,6 +2263,7 @@ Tracks::Tracks(Segment* pSegment, long long start, long long size_) :
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
unsigned long Tracks::GetTracksCount() const
|
||||
{
|
||||
const ptrdiff_t result = m_trackEntriesEnd - m_trackEntries;
|
||||
@@ -2302,25 +2301,18 @@ void Tracks::ParseTrackEntry(
|
||||
#endif
|
||||
if (Match(pReader, pos, 0x57, i.number))
|
||||
assert(i.number > 0);
|
||||
|
||||
else if (Match(pReader, pos, 0x33C5, i.uid))
|
||||
;
|
||||
|
||||
else if (Match(pReader, pos, 0x03, i.type))
|
||||
;
|
||||
|
||||
else if (Match(pReader, pos, 0x136E, i.nameAsUTF8))
|
||||
assert(i.nameAsUTF8);
|
||||
|
||||
else if (Match(pReader, pos, 0x06, i.codecId))
|
||||
;
|
||||
|
||||
else if (Match(pReader, pos, 0x23A2, i.codecPrivate, i.codecPrivateSize))
|
||||
;
|
||||
|
||||
else if (Match(pReader, pos, 0x058688, i.codecNameAsUTF8))
|
||||
assert(i.codecNameAsUTF8);
|
||||
|
||||
else
|
||||
{
|
||||
long len;
|
||||
|
||||
Reference in New Issue
Block a user