hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/output/output_progressive_mp4.cpp
This commit is contained in:
Thulinma 2016-07-18 10:43:38 +02:00
commit 4bcfb5191a
9 changed files with 205 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

35
lib/mp4_generic.cpp
View file

@ -2476,20 +2476,43 @@ namespace MP4 {
void MDHD::setLanguage(uint16_t newLanguage) {
if (getVersion() == 0) {
setInt16(newLanguage & 0x7F, 20);
setInt16(newLanguage & 0x7FFF, 20);
} else {
setInt16(newLanguage & 0x7F, 32);
setInt16(newLanguage & 0x7FFF, 32);
}
}
uint16_t MDHD::getLanguage() {
uint16_t MDHD::getLanguageInt() {
if (getVersion() == 0) {
return getInt16(20) & 0x7F;
return getInt16(20) & 0x7FFF;
} else {
return getInt16(32) & 0x7F;
return getInt16(32) & 0x7FFF;
}
}
void MDHD::setLanguage(const std::string & newLanguage) {
if (newLanguage.size() != 3){
setLanguage("und");
return;
}
uint16_t newLang = 0;
newLang += (newLanguage[0] - 0x60) & 0x1F;
newLang <<= 5;
newLang += (newLanguage[1] - 0x60) & 0x1F;
newLang <<= 5;
newLang += (newLanguage[2] - 0x60) & 0x1F;
setLanguage(newLang);
}
std::string MDHD::getLanguage() {
uint16_t lInt = getLanguageInt();
std::string ret;
ret += (char)(((lInt & 0x7C00) >> 10) + 0x60);
ret += (char)(((lInt & 0x3E0) >> 5) + 0x60);
ret += (char)((lInt & 0x1F) + 0x60);
return ret;
}
std::string MDHD::toPrettyString(uint32_t indent) {
std::stringstream r;
r << std::string(indent, ' ') << "[mdhd] Media Header Box (" << boxedSize() << ")" << std::endl;
@ -2498,7 +2521,7 @@ namespace MP4 {
r << std::string(indent + 1, ' ') << "ModificationTime: " << getModificationTime() << std::endl;
r << std::string(indent + 1, ' ') << "TimeScale: " << getTimeScale() << std::endl;
r << std::string(indent + 1, ' ') << "Duration: " << getDuration() << std::endl;
r << std::string(indent + 1, ' ') << "Language: 0x" << std::hex << getLanguage() << std::dec << std::endl;
r << std::string(indent + 1, ' ') << "Language: " << getLanguage() << std::endl;
return r.str();
}