Martchus
/
tagparser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle invalid language for MP4 track better

This commit is contained in:
Martchus 2017-06-17 00:32:38 +02:00
parent f323061767
commit 99b177a9ff
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mp4/mp4track.cpp
View File

@ -1115,8 +1115,8 @@ void Mp4Track::makeMedia()
writer().writeUInt64BE(static_cast<uint64>(m_duration.totalSeconds() * m_timeScale));
// convert and write language
uint16 language = 0;
for(size_t charIndex = 0; charIndex < m_language.size() && charIndex != 3; ++charIndex) {
const char langChar = m_language[charIndex];
for(size_t charIndex = 0; charIndex != 3; ++charIndex) {
const char langChar = charIndex < m_language.size() ? m_language[charIndex] : 0;
if(langChar >= 'a' && langChar <= 'z') {
language |= static_cast<uint16>(langChar - 0x60) << (0xA - charIndex * 0x5);
} else { // invalid character
@ -1125,6 +1125,9 @@ void Mp4Track::makeMedia()
break;
}
}
if(m_language.size() > 3) {
addNotification(NotificationType::Warning, "Assigned language \"" % m_language + "\" is longer than 3 byte and hence will be truncated.", "making mdhd atom");
}
writer().writeUInt16BE(language);
writer().writeUInt16BE(0); // pre defined
// write hdlr atom