added VP9
This commit is contained in:
parent
aa50c2d8b3
commit
cdb649653c
|
@ -87,6 +87,8 @@ MediaFormat MatroskaTrack::codecIdToMediaFormat(const string &codecId)
|
||||||
fmt.general = GeneralMediaFormat::ProRes;
|
fmt.general = GeneralMediaFormat::ProRes;
|
||||||
} else if(part1 == "V_VP8") {
|
} else if(part1 == "V_VP8") {
|
||||||
fmt.general = GeneralMediaFormat::Vp8;
|
fmt.general = GeneralMediaFormat::Vp8;
|
||||||
|
} else if(part1 == "V_VP9") {
|
||||||
|
fmt.general = GeneralMediaFormat::Vp9;
|
||||||
} else if(part1 == "A_MPEG") {
|
} else if(part1 == "A_MPEG") {
|
||||||
fmt.general = GeneralMediaFormat::Mpeg1Audio;
|
fmt.general = GeneralMediaFormat::Mpeg1Audio;
|
||||||
if(part2 == "L1") {
|
if(part2 == "L1") {
|
||||||
|
@ -408,6 +410,14 @@ void MatroskaTrack::internalParseHeader()
|
||||||
default:
|
default:
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
if(m_format.general == GeneralMediaFormat::Unknown && m_formatName.empty()) {
|
||||||
|
if(startsWith<string>(m_formatId, "V_") || startsWith<string>(m_formatId, "A_") || startsWith<string>(m_formatId, "S_")) {
|
||||||
|
m_formatName = m_formatId.substr(2);
|
||||||
|
} else {
|
||||||
|
m_formatName = m_formatId;
|
||||||
|
}
|
||||||
|
m_formatName.append(" (unknown)");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -219,6 +219,7 @@ const char *MediaFormat::name() const
|
||||||
case GeneralMediaFormat::VobSub: return "VobSub";
|
case GeneralMediaFormat::VobSub: return "VobSub";
|
||||||
case GeneralMediaFormat::Vorbis: return "Vorbis";
|
case GeneralMediaFormat::Vorbis: return "Vorbis";
|
||||||
case GeneralMediaFormat::Vp8: return "VP8";
|
case GeneralMediaFormat::Vp8: return "VP8";
|
||||||
|
case GeneralMediaFormat::Vp9: return "VP9";
|
||||||
case GeneralMediaFormat::WavPack: return "WavPack";
|
case GeneralMediaFormat::WavPack: return "WavPack";
|
||||||
case GeneralMediaFormat::WindowsMediaAudio: return "Windows Media Audio";
|
case GeneralMediaFormat::WindowsMediaAudio: return "Windows Media Audio";
|
||||||
default: return "unknown";
|
default: return "unknown";
|
||||||
|
@ -379,6 +380,7 @@ const char *MediaFormat::abbreviation() const
|
||||||
case GeneralMediaFormat::VobSub: return "VobSub";
|
case GeneralMediaFormat::VobSub: return "VobSub";
|
||||||
case GeneralMediaFormat::Vorbis: return "Vorbis";
|
case GeneralMediaFormat::Vorbis: return "Vorbis";
|
||||||
case GeneralMediaFormat::Vp8: return "VP8";
|
case GeneralMediaFormat::Vp8: return "VP8";
|
||||||
|
case GeneralMediaFormat::Vp9: return "VP9";
|
||||||
case GeneralMediaFormat::WavPack: return "WavPack";
|
case GeneralMediaFormat::WavPack: return "WavPack";
|
||||||
case GeneralMediaFormat::WindowsMediaAudio: return "WMA";
|
case GeneralMediaFormat::WindowsMediaAudio: return "WMA";
|
||||||
default: return "";
|
default: return "";
|
||||||
|
|
|
@ -83,6 +83,7 @@ enum class GeneralMediaFormat
|
||||||
VobSub, /**< VobSub */
|
VobSub, /**< VobSub */
|
||||||
Vorbis, /**< Vorbis */
|
Vorbis, /**< Vorbis */
|
||||||
Vp8, /** < VP8 */
|
Vp8, /** < VP8 */
|
||||||
|
Vp9, /** < VP9 */
|
||||||
WavPack, /**< WavPack */
|
WavPack, /**< WavPack */
|
||||||
WindowsMediaAudio /**< Windows Media Audio */
|
WindowsMediaAudio /**< Windows Media Audio */
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue