Uniform structure and documentation for the converters.

src/converters/dtsc2flv.cpp

@@ -15,10 +15,11 @@
 #include <mist/amf.h> //AMF support
 #include <mist/config.h>
 
-/// Holds all code that converts filetypes to/from DTSC.
+///\brief Holds everything unique to converters.
 namespace Converters {
 
-  /// Reads DTSC from STDIN, outputs FLV to STDOUT.
+  ///\brief Converts DTSC from stdin to FLV on stdout.
+  ///\return The return code for the converter.
   int DTSC2FLV(){
     FLV::Tag FLV_out; // Temporary storage for outgoing FLV data.
     DTSC::Stream Strm;

src/converters/dtsc2ts.cpp

@@ -10,17 +10,18 @@
 #include <mist/ts_packet.h> //TS support
 #include <mist/dtsc.h> //DTSC support
 #include <mist/mp4.h> //For initdata conversion
-#define VIDEO_SCALING ( 27000000.0 / (double)DTSCStream.metadata["video"]["fpks"].asInt())
+#include <mist/config.h>
-#define AUDIO_SCALING ( 27000000.0 / (double)DTSCStream.metadata["audio"]["rate"].asInt())
 
-int main(){
+///\brief Holds everything unique to converters.
+namespace Converters {
+  ///\brief Converts DTSC from stdin to TS on stdout.
+  ///\return The return code for the converter.
+  int DTSC2TS(){
     char charBuffer[1024 * 10];
     unsigned int charCount;
     std::string StrData;
-  std::string ToPack;
-  std::string DTMIData;
     TS::Packet PackData;
-  DTSC::Stream DTSCStream;
+    DTSC::Stream Strm;
     int PacketNumber = 0;
     long long unsigned int TimeStamp = 0;
     int ThisNaluSize;
@@ -28,125 +29,94 @@ int main(){
     char AudioCounter = 0;
     bool WritePesHeader;
     bool IsKeyFrame;
-  bool FirstKeyFrame = true;
-  bool FirstIDRInKeyFrame;
     MP4::AVCC avccbox;
     bool haveAvcc = false;
+    std::stringstream TSBuf;
+
 
     while (std::cin.good()){
-    if (DTSCStream.parsePacket(StrData)){
+      if (Strm.parsePacket(StrData)){
+        if (Strm.lastType() == DTSC::PAUSEMARK){
+          TSBuf.flush();
+          if (TSBuf.str().size()){
+            std::cout << TSBuf.str();
+            TSBuf.str("");
+            PacketNumber = 0;
+          }
+          TSBuf.str("");
+        }
         if ( !haveAvcc){
-        avccbox.setPayload(DTSCStream.metadata["video"]["init"].asString());
+          avccbox.setPayload(Strm.metadata["video"]["init"].asString());
           haveAvcc = true;
         }
-      if (DTSCStream.lastType() == DTSC::VIDEO){
+        if (Strm.lastType() == DTSC::VIDEO || Strm.lastType() == DTSC::AUDIO){
-        DTMIData = DTSCStream.lastData();
+          Socket::Buffer ToPack;
-        if (DTSCStream.getPacket(0).isMember("keyframe")){
+          //write PAT and PMT TS packets
-          IsKeyFrame = true;
+          if (PacketNumber == 0){
-          FirstIDRInKeyFrame = true;
-        }else{
-          IsKeyFrame = false;
-          FirstKeyFrame = false;
-        }
-        if (IsKeyFrame){
-          TimeStamp = (DTSCStream.getPacket(0)["time"].asInt() * 27000);
-        }
-        int TSType;
-        bool FirstPic = true;
-        while (DTMIData.size()){
-          ThisNaluSize = (DTMIData[0] << 24) + (DTMIData[1] << 16) + (DTMIData[2] << 8) + DTMIData[3];
-          DTMIData.erase(0, 4); //Erase the first four characters;
-          TSType = (int)DTMIData[0] & 0x1F;
-          if ( !(TSType == 0x09)){
-            if (TSType == 0x05){
-              if (FirstPic){
-                ToPack += avccbox.asAnnexB();
-                FirstPic = false;
-              }
-              if (IsKeyFrame){
-                if ( !FirstKeyFrame && FirstIDRInKeyFrame){
-                  ToPack.append(TS::NalHeader, 4);
-                  FirstIDRInKeyFrame = false;
-                }else{
-                  ToPack.append(TS::ShortNalHeader, 3);
-                }
-              }
-            }else if (TSType == 0x01){
-              if (FirstPic){
-                ToPack.append(TS::NalHeader, 4);
-                FirstPic = false;
-              }else{
-                ToPack.append(TS::ShortNalHeader, 3);
-              }
-            }else{
-              ToPack.append(TS::NalHeader, 4);
-            }
-            ToPack.append(DTMIData, 0, ThisNaluSize);
-          }
-          DTMIData.erase(0, ThisNaluSize);
-        }
-        WritePesHeader = true;
-        while (ToPack.size()){
-          if ((PacketNumber % 42) == 0){
             PackData.DefaultPAT();
-            std::cout.write(PackData.ToString(), 188);
+            TSBuf.write(PackData.ToString(), 188);
             PackData.DefaultPMT();
-            std::cout.write(PackData.ToString(), 188);
+            TSBuf.write(PackData.ToString(), 188);
             PacketNumber += 2;
           }
+
+          int PIDno = 0;
+          char * ContCounter = 0;
+          if (Strm.lastType() == DTSC::VIDEO){
+            IsKeyFrame = Strm.getPacket(0).isMember("keyframe");
+            if (IsKeyFrame){
+              TimeStamp = (Strm.getPacket(0)["time"].asInt() * 27000);
+            }
+            ToPack.append(avccbox.asAnnexB());
+            while (Strm.lastData().size()){
+              ThisNaluSize = (Strm.lastData()[0] << 24) + (Strm.lastData()[1] << 16) + (Strm.lastData()[2] << 8) + Strm.lastData()[3];
+              Strm.lastData().replace(0, 4, TS::NalHeader, 4);
+              if (ThisNaluSize + 4 == Strm.lastData().size()){
+                ToPack.append(Strm.lastData());
+                break;
+              }else{
+                ToPack.append(Strm.lastData().c_str(), ThisNaluSize + 4);
+                Strm.lastData().erase(0, ThisNaluSize + 4);
+              }
+            }
+            ToPack.prepend(TS::Packet::getPESVideoLeadIn(0ul, Strm.getPacket(0)["time"].asInt() * 90));
+            PIDno = 0x100;
+            ContCounter = &VideoCounter;
+          }else if (Strm.lastType() == DTSC::AUDIO){
+            ToPack.append(TS::GetAudioHeader(Strm.lastData().size(), Strm.metadata["audio"]["init"].asString()));
+            ToPack.append(Strm.lastData());
+            ToPack.prepend(TS::Packet::getPESAudioLeadIn(ToPack.bytes(1073741824ul), Strm.getPacket(0)["time"].asInt() * 90));
+            PIDno = 0x101;
+            ContCounter = &AudioCounter;
+          }
+
+          //initial packet
           PackData.Clear();
-          PackData.PID(0x100);
+          PackData.PID(PIDno);
-          PackData.ContinuityCounter(VideoCounter);
+          PackData.ContinuityCounter(( *ContCounter)++);
-          VideoCounter++;
-          if (WritePesHeader){
           PackData.UnitStart(1);
           if (IsKeyFrame){
             PackData.RandomAccess(1);
             PackData.PCR(TimeStamp);
-            }else{
-              PackData.AdaptationField(1);
           }
-            PackData.AddStuffing(184 - (20 + ToPack.size()));
+          unsigned int toSend = PackData.AddStuffing(ToPack.bytes(184));
-            PackData.PESVideoLeadIn(ToPack.size(), DTSCStream.getPacket(0)["time"].asInt() * 90);
+          std::string gonnaSend = ToPack.remove(toSend);
-            WritePesHeader = false;
+          PackData.FillFree(gonnaSend);
-          }else{
+          TSBuf.write(PackData.ToString(), 188);
-            PackData.AdaptationField(1);
-            PackData.AddStuffing(184 - (ToPack.size()));
-          }
-          PackData.FillFree(ToPack);
-          std::cout.write(PackData.ToString(), 188);
           PacketNumber++;
-        }
+
-      }else if (DTSCStream.lastType() == DTSC::AUDIO){
+          //rest of packets
-        WritePesHeader = true;
-        DTMIData = DTSCStream.lastData();
-        ToPack = TS::GetAudioHeader(DTMIData.size(), DTSCStream.metadata["audio"]["init"].asString());
-        ToPack += DTMIData;
           while (ToPack.size()){
-          if ((PacketNumber % 42) == 0){
-            PackData.DefaultPAT();
-            std::cout.write(PackData.ToString(), 188);
-            PackData.DefaultPMT();
-            std::cout.write(PackData.ToString(), 188);
-            PacketNumber += 2;
-          }
             PackData.Clear();
-          PackData.PID(0x101);
+            PackData.PID(PIDno);
-          PackData.ContinuityCounter(AudioCounter);
+            PackData.ContinuityCounter(( *ContCounter)++);
-          AudioCounter++;
+            toSend = PackData.AddStuffing(ToPack.bytes(184));
-          if (WritePesHeader){
+            gonnaSend = ToPack.remove(toSend);
-            PackData.UnitStart(1);
+            PackData.FillFree(gonnaSend);
-            PackData.AddStuffing(184 - (14 + ToPack.size()));
+            TSBuf.write(PackData.ToString(), 188);
-            PackData.PESAudioLeadIn(ToPack.size(), DTSCStream.getPacket(0)["time"].asInt() * 90);
-            WritePesHeader = false;
-          }else{
-            PackData.AdaptationField(1);
-            PackData.AddStuffing(184 - ToPack.size());
-          }
-          PackData.FillFree(ToPack);
-          std::cout.write(PackData.ToString(), 188);
             PacketNumber++;
           }
+
         }
       }else{
         std::cin.read(charBuffer, 1024 * 10);
@@ -156,3 +126,11 @@ int main(){
     }
     return 0;
   }
+}
+
+///\brief Entry point for DTSC2TS, simply calls Converters::DTSC2TS().
+int main(int argc, char* argv[]){
+  Util::Config conf = Util::Config(argv[0], PACKAGE_VERSION);
+  conf.parseArgs(argc, argv);
+  return Converters::DTSC2TS();
+}

src/converters/dtscfix.cpp

@@ -6,10 +6,12 @@
 #include <mist/json.h>
 #include <mist/config.h>
 
-/// Holds all code that converts filetypes to/from to DTSC.
+///\brief Holds everything unique to converters.
 namespace Converters {
 
-  /// Reads an DTSC file and attempts to fix the metadata in it.
+  ///\brief Reads a DTSC file and attempts to fix the metadata in it.
+  ///\param conf The current configuration of the program.
+  ///\return The return code for the fixed program.
   int DTSCFix(Util::Config & conf){
     DTSC::File F(conf.getString("filename"));
     JSON::Value oriheader = F.getFirstMeta();
@@ -124,7 +126,7 @@ namespace Converters {
 
 }
 
-/// Entry point for FLV2DTSC, simply calls Converters::FLV2DTSC().
+/// Entry point for DTSCFix, simply calls Converters::DTSCFix().
 int main(int argc, char ** argv){
   Util::Config conf = Util::Config(argv[0], PACKAGE_VERSION);
   conf.addOption("filename", JSON::fromString("{\"arg_num\":1, \"arg\":\"string\", \"help\":\"Filename of the file to attempt to fix.\"}"));

src/converters/flv2dtsc.cpp

@@ -16,10 +16,11 @@
 #include <mist/amf.h>
 #include <mist/config.h>
 
-/// Holds all code that converts filetypes to/from to DTSC.
+///\brief Holds everything unique to converters.
 namespace Converters {
 
-  /// Reads FLV from STDIN, outputs DTSC to STDOUT.
+  ///\brief Converts FLV from stdin to DTSC on stdout.
+  ///\return The return code for the converter.
   int FLV2DTSC(){
     FLV::Tag FLV_in; // Temporary storage for incoming FLV data.
     JSON::Value meta_out; // Storage for outgoing header data.
@@ -75,7 +76,7 @@ namespace Converters {
 
 }
 
-/// Entry point for FLV2DTSC, simply calls Converters::FLV2DTSC().
+///\brief Entry point for FLV2DTSC, simply calls Converters::FLV2DTSC().
 int main(int argc, char ** argv){
   Util::Config conf = Util::Config(argv[0], PACKAGE_VERSION);
   conf.parseArgs(argc, argv);