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

Style enforcement

Browse source
This commit is contained in:
Thulinma 2017-05-12 12:43:26 +02:00
parent 6811b54186
commit 56c21b5ba6
4 changed files with 939 additions and 1151 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

928
lib/ts_stream.cpp
View file

File diff suppressed because it is too large Load diff

62
lib/ts_stream.h
View file

@ -1,40 +1,35 @@
#include "ts_packet.h"
#include "adts.h"
#include "h265.h"
#include "ts_packet.h"
#include <deque>
#include <map>
#include <set>
#include <deque>
#include "h265.h"
#include "shared_memory.h"
namespace TS {
enum codecType {
H264 = 0x1B,
AAC = 0x0F,
AC3 = 0x81,
MP3 = 0x03,
H265 = 0x24,
ID3 = 0x15
};
namespace TS{
enum codecType{H264 = 0x1B, AAC = 0x0F, AC3 = 0x81, MP3 = 0x03, H265 = 0x24, ID3 = 0x15};
class ADTSRemainder{
private:
char * data;
char *data;
uint32_t max;
uint32_t now;
uint32_t len;
uint32_t bpos;
public:
void setRemainder(const aac::adts & p, const void * source, const uint32_t avail, const uint32_t bPos);
void setRemainder(const aac::adts &p, const void *source, const uint32_t avail,
const uint32_t bPos);
ADTSRemainder();
~ADTSRemainder();
uint32_t getLength();
uint32_t getBpos();
uint32_t getTodo();
char* getData();
char *getData();
void append(const char *p,uint32_t pLen);
void append(const char *p, uint32_t pLen);
bool isComplete();
void clear();
};
@ -43,25 +38,27 @@ namespace TS {
public:
Stream(bool _threaded = false);
~Stream();
void add(char * newPack, unsigned long long bytePos = 0);
void add(Packet & newPack, unsigned long long bytePos = 0);
void parse(Packet & newPack, unsigned long long bytePos);
void parse(char * newPack, unsigned long long bytePos);
void add(char *newPack, unsigned long long bytePos = 0);
void add(Packet &newPack, unsigned long long bytePos = 0);
void parse(Packet &newPack, unsigned long long bytePos);
void parse(char *newPack, unsigned long long bytePos);
void parse(unsigned long tid);
void parseNal(uint32_t tid, const char *pesPayload, const char * packetPtr, bool &isKeyFrame);
void parseNal(uint32_t tid, const char *pesPayload, const char *packetPtr, bool &isKeyFrame);
bool hasPacketOnEachTrack() const;
bool hasPacket(unsigned long tid) const;
bool hasPacket() const;
void getPacket(unsigned long tid, DTSC::Packet & pack);
void getEarliestPacket(DTSC::Packet & pack);
void initializeMetadata(DTSC::Meta & meta, unsigned long tid = 0, unsigned long mappingId = 0);
void getPacket(unsigned long tid, DTSC::Packet &pack);
void getEarliestPacket(DTSC::Packet &pack);
void initializeMetadata(DTSC::Meta &meta, unsigned long tid = 0, unsigned long mappingId = 0);
void partialClear();
void clear();
void finish();
void eraseTrack(unsigned long tid);
bool isDataTrack(unsigned long tid);
void parseBitstream(uint32_t tid, const char * pesPayload, uint32_t realPayloadSize,uint64_t timeStamp, int64_t timeOffset, uint64_t bPos);
void parseBitstream(uint32_t tid, const char *pesPayload, uint32_t realPayloadSize,
uint64_t timeStamp, int64_t timeOffset, uint64_t bPos);
std::set<unsigned long> getActiveTracks();
private:
unsigned long long lastPAT;
ProgramAssociationTable associationTable;
@ -71,15 +68,15 @@ namespace TS {
std::map<unsigned long, unsigned long long> lastPMT;
std::map<unsigned long, ProgramMappingTable> mappingTable;
std::map<unsigned long, std::deque<Packet> > pesStreams;
std::map<unsigned long, std::deque<unsigned long long> > pesPositions;
std::map<unsigned long, std::deque<DTSC::Packet> > outPackets;
std::map<unsigned long, std::deque<Packet>> pesStreams;
std::map<unsigned long, std::deque<unsigned long long>> pesPositions;
std::map<unsigned long, std::deque<DTSC::Packet>> outPackets;
std::map<unsigned long, DTSC::Packet> buildPacket;
std::map<unsigned long, unsigned long> pidToCodec;
std::map<unsigned long, aac::adts > adtsInfo;
std::map<unsigned long, std::string > spsInfo;
std::map<unsigned long, std::string > ppsInfo;
std::map<unsigned long, h265::initData > hevcInfo;
std::map<unsigned long, aac::adts> adtsInfo;
std::map<unsigned long, std::string> spsInfo;
std::map<unsigned long, std::string> ppsInfo;
std::map<unsigned long, h265::initData> hevcInfo;
std::map<unsigned long, std::string> metaInit;
std::map<unsigned long, std::string> descriptors;
std::map<unsigned long, std::string> partialBuffer;
@ -92,3 +89,4 @@ namespace TS {
void parsePES(unsigned long tid, bool finished = false);
};
}

624
src/input/input_hls.cpp
View file

File diff suppressed because it is too large Load diff

50
src/input/input_hls.h
View file

@ -1,24 +1,22 @@
#pragma once
#include "input.h"
#include <fstream>
#include <mist/dtsc.h>
#include <mist/nal.h>
#include <mist/ts_packet.h>
#include <mist/ts_stream.h>
#include <fstream>
#include <string>
#include <set>
#include <string>
#include <vector>
//#include <stdint.h>
#define BUFFERTIME 10
namespace Mist {
namespace Mist{
enum PlaylistType { VOD, LIVE, EVENT };
enum PlaylistType{VOD, LIVE, EVENT};
struct playListEntries
{
struct playListEntries{
std::string filename;
uint64_t bytePos;
float duration;
@ -26,14 +24,14 @@ namespace Mist {
unsigned int wait;
};
class Playlist {
class Playlist{
public:
Playlist(const std::string & uriSrc = "");
Playlist(const std::string &uriSrc = "");
bool atEnd() const;
bool isUrl() const;
bool reload();
void addEntry(const std::string & filename, float duration, uint64_t & totalBytes);
bool loadURL(const std::string & loadUrl);
void addEntry(const std::string &filename, float duration, uint64_t &totalBytes);
bool loadURL(const std::string &loadUrl);
std::string uri;
std::string uri_root;
@ -49,7 +47,6 @@ namespace Mist {
uint64_t media_sequence;
int lastFileIndex;
int waitTime;
PlaylistType playlistType;
std::deque<playListEntries> entries;
@ -58,22 +55,21 @@ namespace Mist {
unsigned int startTime;
};
struct entryBuffer
{
struct entryBuffer{
int timestamp;
playListEntries entry;
int playlistIndex;
};
class inputHLS : public Input {
class inputHLS : public Input{
public:
inputHLS(Util::Config * cfg);
inputHLS(Util::Config *cfg);
~inputHLS();
bool needsLock();
bool openStreamSource();
protected:
//Private Functions
// Private Functions
unsigned int startTime;
PlaylistType playlistType;
@ -83,11 +79,11 @@ namespace Mist {
bool endPlaylist;
int currentPlaylist;
//std::vector<playListEntries> entries;
// std::vector<playListEntries> entries;
std::vector<Playlist> playlists;
//std::vector<int> pidMapping;
std::map<int,int> pidMapping;
std::map<int,int> pidMappingR;
// std::vector<int> pidMapping;
std::map<int, int> pidMapping;
std::map<int, int> pidMappingR;
std::vector<int> reloadNext;
@ -95,7 +91,7 @@ namespace Mist {
std::string currentFile;
std::ifstream in;
TS::Stream tsStream;///<Used for parsing the incoming ts stream
TS::Stream tsStream; ///<Used for parsing the incoming ts stream
Socket::Connection conn;
TS::Packet tsBuf;
@ -111,12 +107,12 @@ namespace Mist {
void getNext(bool smart = true);
void seek(int seekTime);
void trackSelect(std::string trackSpec);
FILE * inFile;
FILE * tsFile;
FILE *inFile;
FILE *tsFile;
bool readIndex();
bool initPlaylist(const std::string & uri);
bool readPlaylist(const std::string & uri);
bool initPlaylist(const std::string &uri);
bool readPlaylist(const std::string &uri);
bool readNextFile();
void parseStreamHeader();