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

Added raw PES dump mode to TS analyser

Browse source
This commit is contained in:
Thulinma 2020-08-25 14:12:36 +02:00
parent fc7a460c49
commit 385cfcb761
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/analysers/analyser_ts.cpp
View file

@ -28,6 +28,7 @@ void AnalyserTS::init(Util::Config &conf){
"= TS stream pkts, 32 = raw PES packet bytes, 64 = raw TS packet bytes"; "= TS stream pkts, 32 = raw PES packet bytes, 64 = raw TS packet bytes";
conf.addOption("detail", opt); conf.addOption("detail", opt);
opt.null(); opt.null();
opt["long"] = "pid"; opt["long"] = "pid";
opt["short"] = "P"; opt["short"] = "P";
opt["arg"] = "num"; opt["arg"] = "num";
@ -35,10 +36,21 @@ void AnalyserTS::init(Util::Config &conf){
opt["help"] = "Only use the given PID, ignore others"; opt["help"] = "Only use the given PID, ignore others";
conf.addOption("pid", opt); conf.addOption("pid", opt);
opt.null(); opt.null();
opt["long"] = "raw";
opt["short"] = "R";
opt["arg"] = "str";
opt["default"] = "";
opt["help"] = "Write raw PES payloads to given file";
conf.addOption("raw", opt);
opt.null();
} }
AnalyserTS::AnalyserTS(Util::Config &conf) : Analyser(conf){ AnalyserTS::AnalyserTS(Util::Config &conf) : Analyser(conf){
pidOnly = conf.getInteger("pid"); pidOnly = conf.getInteger("pid");
if (conf.getString("raw").size()){
outFile.open(conf.getString("raw").c_str());
}
bytes = 0; bytes = 0;
} }
@ -172,6 +184,9 @@ std::string AnalyserTS::printPES(const std::string &d, size_t PID){
} }
res << std::endl; res << std::endl;
if (outFile){
outFile.write(d.data() + 9 + headSize + padding, d.size()-(9 + headSize + padding));
}
if (detail & 32){ if (detail & 32){
size_t counter = 0; size_t counter = 0;
for (size_t i = 9 + headSize + padding; i < d.size(); ++i){ for (size_t i = 9 + headSize + padding; i < d.size(); ++i){

2
src/analysers/analyser_ts.h
View file

@ -1,6 +1,7 @@
#include "analyser.h" #include "analyser.h"
#include <mist/config.h> #include <mist/config.h>
#include <mist/ts_packet.h> #include <mist/ts_packet.h>
#include <fstream>
class AnalyserTS : public Analyser{ class AnalyserTS : public Analyser{
public: public:
@ -11,6 +12,7 @@ public:
std::string printPES(const std::string &d, size_t PID); std::string printPES(const std::string &d, size_t PID);
private: private:
std::ofstream outFile;
std::map<size_t, std::string> payloads; std::map<size_t, std::string> payloads;
size_t pidOnly; size_t pidOnly;
TS::Packet packet; TS::Packet packet;