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

ESDS box add start

Browse source
This commit is contained in:
Oswald Auguste de Bruin 2013-07-03 16:18:17 +02:00 • committed by Erik Zandvliet
parent d2e66088af
commit 41219a8a42
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/converters/dtsc2mp4.cpp
View file

@ -122,8 +122,12 @@ namespace Converters {
ase.setCodec("mp4a"); ase.setCodec("mp4a");
} }
ase.setSampleRate(it->second["rate"].asInt()); ase.setSampleRate(it->second["rate"].asInt());
ase.setChannelCount(it->second["channels"].asInt()); //ase.setChannelCount(it->second["channels"].asInt());
ase.setSampleSize(it->second["length"].asInt()); ase.setChannelCount(2);
ase.setSampleSize(it->second["size"].asInt());
MP4::ESDS esdsBox;
esdsBox.setPayload(it->second["init"].asString());
ase.setCLAP(esdsBox);
stsdBox.setEntry(ase,0); stsdBox.setEntry(ase,0);
} }
stblBox.setContent(stsdBox,0); stblBox.setContent(stsdBox,0);
@ -133,7 +137,7 @@ namespace Converters {
for (int i = 0; i < it->second["keys"].size(); i++){ for (int i = 0; i < it->second["keys"].size(); i++){
MP4::STTSEntry newEntry; MP4::STTSEntry newEntry;
newEntry.sampleCount = it->second["keys"][i]["parts"].size(); newEntry.sampleCount = it->second["keys"][i]["parts"].size();
newEntry.sampleDelta = it->second["keys"][i]["len"].asInt() / it->second["keys"][i]["parts"].size(); newEntry.sampleDelta = it->second["keys"][i]["len"].asInt(); // it->second["keys"][i]["parts"].size();
sttsBox.setSTTSEntry(newEntry, i); sttsBox.setSTTSEntry(newEntry, i);
} }
stblBox.setContent(sttsBox,1); stblBox.setContent(sttsBox,1);
@ -141,17 +145,26 @@ namespace Converters {
//STSS Box here //STSS Box here
MP4::STSC stscBox;//probably wrong MP4::STSC stscBox;//probably wrong
uint32_t total = 0;
for (int i = 0; i < it->second["keys"].size(); i++){ for (int i = 0; i < it->second["keys"].size(); i++){
MP4::STSCEntry newEntry; /*MP4::STSCEntry newEntry;
newEntry.firstChunk = it->second["keys"][i]["num"].asInt(); newEntry.firstChunk = it->second["keys"][i]["num"].asInt();
newEntry.samplesPerChunk = it->second["keys"][i]["parts"].size(); newEntry.samplesPerChunk = it->second["keys"][i]["parts"].size();
newEntry.sampleDescriptionIndex = 1; newEntry.sampleDescriptionIndex = 1;
stscBox.setSTSCEntry(newEntry, i); stscBox.setSTSCEntry(newEntry, i);*/
for (int o = 0; o < it->second["keys"][i]["parts"].size(); o++){
MP4::STSCEntry newEntry;
newEntry.firstChunk = total+1;
newEntry.samplesPerChunk = 1;
newEntry.sampleDescriptionIndex = 1;
stscBox.setSTSCEntry(newEntry, total);
total++;
}
} }
stblBox.setContent(stscBox,2); stblBox.setContent(stscBox,2);
MP4::STSZ stszBox; MP4::STSZ stszBox;
uint32_t total = 0; total = 0;
for (int i = 0; i < it->second["keys"].size(); i++){ for (int i = 0; i < it->second["keys"].size(); i++){
for (int o = 0; o < it->second["keys"][i]["parts"].size(); o++){ for (int o = 0; o < it->second["keys"][i]["parts"].size(); o++){
stszBox.setEntrySize(it->second["keys"][i]["parts"][o].asInt(), total);//in bytes in file stszBox.setEntrySize(it->second["keys"][i]["parts"][o].asInt(), total);//in bytes in file