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

MP4 live streaming support by Oswald de Bruin.

Browse source
This commit is contained in:
Thulinma 2015-09-03 20:18:42 +02:00
parent a4602f5626
commit ecbbaa4637
2 changed files with 719 additions and 386 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

844
src/output/output_progressive_mp4.cpp
View file

File diff suppressed because it is too large Load diff

37
src/output/output_progressive_mp4.h
View file

@ -1,5 +1,6 @@
#include "output_http.h" #include "output_http.h"
#include <mist/http_parser.h> #include <mist/http_parser.h>
#include <list>
namespace Mist { namespace Mist {
struct keyPart{ struct keyPart{
@ -22,16 +23,28 @@ namespace Mist {
long unsigned int size; long unsigned int size;
long long unsigned int time; long long unsigned int time;
long long unsigned int endTime; long long unsigned int endTime;
long long unsigned int byteOffset;//added for MP4 fragmented
long int timeOffset;//added for MP4 fragmented
long unsigned int duration;//added for MP4 fragmented
long unsigned int index; long unsigned int index;
}; };
struct fragSet{
long unsigned int firstPart;
long unsigned int lastPart;
long long unsigned int firstTime;
long long unsigned int lastTime;
};
class OutProgressiveMP4 : public HTTPOutput { class OutProgressiveMP4 : public HTTPOutput {
public: public:
OutProgressiveMP4(Socket::Connection & conn); OutProgressiveMP4(Socket::Connection & conn);
~OutProgressiveMP4(); ~OutProgressiveMP4();
static void init(Util::Config * cfg); static void init(Util::Config * cfg);
void parseRange(std::string header, long long & byteStart, long long & byteEnd, long long & seekPoint, unsigned int headerSize); void parseRange(std::string header, long long & byteStart, long long & byteEnd, long long & seekPoint, unsigned int headerSize);
std::string DTSCMeta2MP4Header(long long & size); std::string DTSCMeta2MP4Header(long long & size, int fragmented = 0);
//int fragmented values: 0 = non fragmented stream, 1 = frag stream main header
void buildFragment(int fragNum);//this builds the structure of the fragment header for fragment number fragNum, and stores it in a member variable
void sendFragmentHeader(int fragNum);//this builds the moof box for fragmented MP4
void findSeekPoint(long long byteStart, long long & seekPoint, unsigned int headerSize); void findSeekPoint(long long byteStart, long long & seekPoint, unsigned int headerSize);
void onHTTP(); void onHTTP();
void sendNext(); void sendNext();
@ -43,9 +56,29 @@ namespace Mist {
long long leftOver; long long leftOver;
long long currPos; long long currPos;
long long seekPoint; long long seekPoint;
std::set <keyPart> sortSet;//filling sortset for interleaving parts
//variables for standard MP4
std::set <keyPart> sortSet;//needed for unfragmented MP4, remembers the order of keyparts
//functions for fragmented MP4
void buildTrafPart();
void setvidTrack();//searching for the current vid track
//variables for fragmented
int fragSeqNum;//the sequence number of the next keyframe/fragment when producing fragmented MP4's
long unsigned int vidTrack;//the video track we use as fragmenting base
long long unsigned int realBaseOffset;//base offset for every moof packet
//from sendnext
long unsigned int partListSent;//parts of current fragSet sent
long unsigned int partListLength;//amount of packets in current fragment
long int fragKeyNumberShift;//the difference between the first fragment Number and the first keyframe number
bool sending3GP;
long long unsigned estimateFileSize(); long long unsigned estimateFileSize();
//This is a dirty solution... but it prevents copying and copying and copying again
std::map<long unsigned int, fragSet> currentPartSet;
}; };
} }