generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support to parse stereo mode, display width and display height in mkvparser

Browse Source 
Change-Id: I7ff99275b70e96b84601c32836f1b79f95fcf0d4
This commit is contained in:
Sasi Inguva
2015-03-12 00:09:02 -07:00
parent a4b68f825e
commit e3616a6614
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mkvparser.cpp
View File

@@ -5352,6 +5352,10 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
long long width = 0;
long long height = 0;
long long display_width = 0;
long long display_height = 0;
long long stereo_mode = 0;
double rate = 0.0;
IMkvReader* const pReader = pSegment->m_pReader;
@@ -5383,6 +5387,21 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
if (height <= 0)
return E_FILE_FORMAT_INVALID;
} else if (id == 0x14B0) { // display width
display_width = UnserializeUInt(pReader, pos, size);
if (display_width <= 0)
return E_FILE_FORMAT_INVALID;
} else if (id == 0x14BA) { // display height
display_height = UnserializeUInt(pReader, pos, size);
if (display_height <= 0)
return E_FILE_FORMAT_INVALID;
} else if (id == 0x13B8) { // stereo mode
stereo_mode = UnserializeUInt(pReader, pos, size);
if (stereo_mode < 0)
return E_FILE_FORMAT_INVALID;
} else if (id == 0x0383E3) { // frame rate
const long status = UnserializeFloat(pReader, pos, size, rate);
@@ -5414,6 +5433,9 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
pTrack->m_width = width;
pTrack->m_height = height;
pTrack->m_display_width = display_width;
pTrack->m_display_height = display_height;
pTrack->m_stereo_mode = stereo_mode;
pTrack->m_rate = rate;
pResult = pTrack;
@@ -5526,6 +5548,16 @@ long long VideoTrack::GetWidth() const { return m_width; }
long long VideoTrack::GetHeight() const { return m_height; }
long long VideoTrack::GetDisplayWidth() const {
return m_display_width > 0 ? m_display_width : GetWidth();
}
long long VideoTrack::GetDisplayHeight() const {
return m_display_height > 0 ? m_display_height : GetHeight();
}
long long VideoTrack::GetStereoMode() const { return m_stereo_mode; }
double VideoTrack::GetFrameRate() const { return m_rate; }
AudioTrack::AudioTrack(Segment* pSegment, long long element_start,

7
mkvparser.hpp
View File

@@ -398,6 +398,9 @@ class VideoTrack : public Track {
long long GetWidth() const;
long long GetHeight() const;
long long GetDisplayWidth() const;
long long GetDisplayHeight() const;
long long GetStereoMode() const;
double GetFrameRate() const;
bool VetEntry(const BlockEntry*) const;
@@ -406,6 +409,10 @@ class VideoTrack : public Track {
private:
long long m_width;
long long m_height;
long long m_display_width;
long long m_display_height;
long long m_stereo_mode;
double m_rate;
};