From cdb649653c5313db579e433989764d8b513539ef Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 16 Sep 2015 17:25:45 +0200 Subject: [PATCH] added VP9 --- matroska/matroskatrack.cpp | 10 ++++++++++ mediaformat.cpp | 2 ++ mediaformat.h | 1 + 3 files changed, 13 insertions(+) diff --git a/matroska/matroskatrack.cpp b/matroska/matroskatrack.cpp index 41fc903..8c69ebc 100644 --- a/matroska/matroskatrack.cpp +++ b/matroska/matroskatrack.cpp @@ -87,6 +87,8 @@ MediaFormat MatroskaTrack::codecIdToMediaFormat(const string &codecId) fmt.general = GeneralMediaFormat::ProRes; } else if(part1 == "V_VP8") { fmt.general = GeneralMediaFormat::Vp8; + } else if(part1 == "V_VP9") { + fmt.general = GeneralMediaFormat::Vp9; } else if(part1 == "A_MPEG") { fmt.general = GeneralMediaFormat::Mpeg1Audio; if(part2 == "L1") { @@ -408,6 +410,14 @@ void MatroskaTrack::internalParseHeader() default: ; } + if(m_format.general == GeneralMediaFormat::Unknown && m_formatName.empty()) { + if(startsWith(m_formatId, "V_") || startsWith(m_formatId, "A_") || startsWith(m_formatId, "S_")) { + m_formatName = m_formatId.substr(2); + } else { + m_formatName = m_formatId; + } + m_formatName.append(" (unknown)"); + } } } diff --git a/mediaformat.cpp b/mediaformat.cpp index 838d2db..accdc73 100644 --- a/mediaformat.cpp +++ b/mediaformat.cpp @@ -219,6 +219,7 @@ const char *MediaFormat::name() const case GeneralMediaFormat::VobSub: return "VobSub"; case GeneralMediaFormat::Vorbis: return "Vorbis"; case GeneralMediaFormat::Vp8: return "VP8"; + case GeneralMediaFormat::Vp9: return "VP9"; case GeneralMediaFormat::WavPack: return "WavPack"; case GeneralMediaFormat::WindowsMediaAudio: return "Windows Media Audio"; default: return "unknown"; @@ -379,6 +380,7 @@ const char *MediaFormat::abbreviation() const case GeneralMediaFormat::VobSub: return "VobSub"; case GeneralMediaFormat::Vorbis: return "Vorbis"; case GeneralMediaFormat::Vp8: return "VP8"; + case GeneralMediaFormat::Vp9: return "VP9"; case GeneralMediaFormat::WavPack: return "WavPack"; case GeneralMediaFormat::WindowsMediaAudio: return "WMA"; default: return ""; diff --git a/mediaformat.h b/mediaformat.h index 113df50..2ed6043 100644 --- a/mediaformat.h +++ b/mediaformat.h @@ -83,6 +83,7 @@ enum class GeneralMediaFormat VobSub, /**< VobSub */ Vorbis, /**< Vorbis */ Vp8, /** < VP8 */ + Vp9, /** < VP9 */ WavPack, /**< WavPack */ WindowsMediaAudio /**< Windows Media Audio */ };