libmist backport from new metadata branch with improved typing and styling

src/output/output_dash_mp4.cpp

@@ -217,7 +217,7 @@ namespace Mist{
         trunBox.setSampleInformation(trunEntry, j);
         ++j;
       }
-      trunBox.setDataOffset(88 + (12 * j) + 8);
+      trunBox.setDataOffset(92 + (12 * j) + 8);
     }
     if (Trk.type == "audio"){
       trunBox.setFlags(MP4::trundataOffset | MP4::trunsampleSize | MP4::trunsampleDuration);
@@ -230,7 +230,7 @@ namespace Mist{
         trunBox.setSampleInformation(trunEntry, j);
         ++j;
       }
-      trunBox.setDataOffset(88 + (8 * j) + 8);
+      trunBox.setDataOffset(92 + (8 * j) + 8);
     }
     trafBox.setContent(trunBox, 2);
     moofBox.setContent(trafBox, 1);
@@ -316,7 +316,7 @@ namespace Mist{
       return;
     }
     char *  data;
-    unsigned int dataLen;
+    size_t dataLen;
     thisPacket.getString("data", data, dataLen);
     H.Chunkify(data, dataLen, myConn);
   }

src/output/output_h264.cpp

@@ -50,7 +50,7 @@ namespace Mist{
   void OutH264::sendNext(){
     if (keysOnly && !thisPacket.getFlag("keyframe")){return;}
     char *dataPointer = 0;
-    unsigned int len = 0;
+    size_t len = 0;
     thisPacket.getString("data", dataPointer, len);
 
     unsigned int i = 0;

src/output/output_hss.cpp

@@ -74,7 +74,7 @@ namespace Mist {
       return;
     }
     char * dataPointer = 0;
-    unsigned int len = 0;
+    size_t len = 0;
     thisPacket.getString("data", dataPointer, len);
     H.Chunkify(dataPointer, len, myConn);
   }

src/output/output_json.cpp

@@ -37,7 +37,7 @@ namespace Mist {
     JSON::Value jPack;
     if (myMeta.tracks[thisPacket.getTrackId()].codec == "JSON"){
       char * dPtr;
-      unsigned int dLen;
+      size_t dLen;
       thisPacket.getString("data", dPtr, dLen);
       jPack["data"] = JSON::fromString(dPtr, dLen);
       jPack["time"] = (long long)thisPacket.getTime();

src/output/output_progressive_mp3.cpp

@@ -28,7 +28,7 @@ namespace Mist {
   
   void OutProgressiveMP3::sendNext(){
     char * dataPointer = 0;
-    unsigned int len = 0;
+    size_t len = 0;
     thisPacket.getString("data", dataPointer, len);
     myConn.SendNow(dataPointer, len);
   }

src/output/output_progressive_mp4.cpp

@@ -66,7 +66,7 @@ namespace Mist{
         + 32 //MDHD Box
         + 33 + thisTrack.getIdentifier().size() // HDLR Box
         + 8 //MINF Box
-        + 36 //DINF Box
+        + 44 //DINF Box
         + 8; // STBL Box
       if (myMeta.vod && thisTrack.firstms != firstms){
         tmpRes += 12;// EDTS entry extra
@@ -82,6 +82,7 @@ namespace Mist{
         tmpRes += 20//VMHD Box 
           + 16 //STSD
           + 86 //AVC1
+          + 16 //PASP
           + 8 + thisTrack.init.size();//avcC
         if (!fragmented){
           tmpRes += 16 + (thisTrack.keys.size() * 4);//STSS
@@ -917,7 +918,7 @@ namespace Mist{
     
     //Obtain a pointer to the data of this packet
     char * dataPointer = 0;
-    unsigned int len = 0;
+    size_t len = 0;
     thisPacket.getString("data", dataPointer, len);
     std::string subtitle;
 

src/output/output_rtmp.cpp

@@ -264,7 +264,7 @@ namespace Mist{
     unsigned int dheader_len = 1;
     static Util::ResizeablePointer swappy;
     char * tmpData = 0;//pointer to raw media data
-    unsigned int data_len = 0;//length of processed media data
+    size_t data_len = 0;//length of processed media data
     thisPacket.getString("data", tmpData, data_len);
     DTSC::Track & track = myMeta.tracks[thisPacket.getTrackId()];
     

src/output/output_rtsp.cpp

@@ -32,7 +32,7 @@ namespace Mist{
     /// \TODO Make this less inefficient. Seriously. Maybe use DTSC::RetimedPacket by extending with bmo functionality...?
     static DTSC::Packet newPkt;
     char * pktData;
-    unsigned int pktDataLen;
+    size_t pktDataLen;
     pkt.getString("data", pktData, pktDataLen);
     newPkt.genericFill(pkt.getTime() + packetOffset, pkt.getInt("offset"), pkt.getTrackId(), pktData, pktDataLen, 0, pkt.getFlag("keyframe"), bootMsOffset);
     bufferLivePacket(newPkt);
@@ -122,7 +122,7 @@ namespace Mist{
 
   void OutRTSP::sendNext(){
     char *dataPointer = 0;
-    unsigned int dataLen = 0;
+    size_t dataLen = 0;
     thisPacket.getString("data", dataPointer, dataLen);
     uint32_t tid = thisPacket.getTrackId();
     uint64_t timestamp = thisPacket.getTime();

src/output/output_srt.cpp

@@ -27,7 +27,7 @@ namespace Mist {
   
   void OutProgressiveSRT::sendNext(){
     char * dataPointer = 0;
-    unsigned int len = 0;
+    size_t len = 0;
     thisPacket.getString("data", dataPointer, len);
 //    INFO_MSG("getting sub: %s", dataPointer);
     //ignore empty subs

src/output/output_ts_base.cpp

@@ -67,7 +67,7 @@ namespace Mist {
     firstPack = true;
 
     char * dataPointer = 0;
-    unsigned int tmpDataLen = 0;
+    size_t tmpDataLen = 0;
     thisPacket.getString("data", dataPointer, tmpDataLen); //data
     uint64_t dataLen = tmpDataLen;
     //apple compatibility timestamp correction

src/output/output_wav.cpp

@@ -33,7 +33,7 @@ namespace Mist{
 
   void OutWAV::sendNext(){
     char *dataPointer = 0;
-    unsigned int len = 0;
+    size_t len = 0;
     thisPacket.getString("data", dataPointer, len);
 
     //PCM must be converted to little-endian if > 8 bits per sample