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

Changed bufferLivePacket and related functions to have const DTSC::Packet references

Browse source
This commit is contained in:
Thulinma 2017-07-28 18:38:54 +02:00
parent 05d1fa5c8d
commit 3eb69ff2c7
6 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/dtsc.h
View file

@ -324,7 +324,7 @@ namespace DTSC {
return vod || live; return vod || live;
} }
void reinit(const DTSC::Packet & source); void reinit(const DTSC::Packet & source);
void update(DTSC::Packet & pack, unsigned long segment_size = 5000); void update(const DTSC::Packet & pack, unsigned long segment_size = 5000);
void updatePosOverride(DTSC::Packet & pack, uint64_t bpos); void updatePosOverride(DTSC::Packet & pack, uint64_t bpos);
void update(JSON::Value & pack, unsigned long segment_size = 5000); void update(JSON::Value & pack, unsigned long segment_size = 5000);
void update(long long packTime, long long packOffset, long long packTrack, long long packDataSize, uint64_t packBytePos, bool isKeyframe, long long packSendSize = 0, unsigned long segment_size = 5000); void update(long long packTime, long long packOffset, long long packTrack, long long packDataSize, uint64_t packBytePos, bool isKeyframe, long long packSendSize = 0, unsigned long segment_size = 5000);

2
lib/dtscmeta.cpp
View file

@ -1438,7 +1438,7 @@ namespace DTSC {
} }
///\brief Updates a meta object given a DTSC::Packet ///\brief Updates a meta object given a DTSC::Packet
void Meta::update(DTSC::Packet & pack, unsigned long segment_size) { void Meta::update(const DTSC::Packet & pack, unsigned long segment_size) {
char * data; char * data;
unsigned int dataLen; unsigned int dataLen;
pack.getString("data", data, dataLen); pack.getString("data", data, dataLen);

10
src/io.cpp
View file

@ -253,11 +253,11 @@ namespace Mist {
///Buffers the next packet on the currently opened page ///Buffers the next packet on the currently opened page
///\param pack The packet to buffer ///\param pack The packet to buffer
void InOutBase::bufferNext(DTSC::Packet & pack) { void InOutBase::bufferNext(const DTSC::Packet & pack) {
nProxy.bufferNext(pack, myMeta); nProxy.bufferNext(pack, myMeta);
} }
void negotiationProxy::bufferNext(DTSC::Packet & pack, DTSC::Meta & myMeta) { void negotiationProxy::bufferNext(const DTSC::Packet & pack, DTSC::Meta & myMeta) {
static bool multiWrong = false; static bool multiWrong = false;
//Save the trackid of the track for easier access //Save the trackid of the track for easier access
unsigned long tid = pack.getTrackId(); unsigned long tid = pack.getTrackId();
@ -388,11 +388,11 @@ namespace Mist {
/// ///
///Initiates/continues negotiation with the buffer as well ///Initiates/continues negotiation with the buffer as well
///\param packet The packet to buffer ///\param packet The packet to buffer
void InOutBase::bufferLivePacket(DTSC::Packet & packet){ void InOutBase::bufferLivePacket(const DTSC::Packet & packet){
nProxy.bufferLivePacket(packet, myMeta); nProxy.bufferLivePacket(packet, myMeta);
} }
void negotiationProxy::bufferLivePacket(DTSC::Packet & packet, DTSC::Meta & myMeta){ void negotiationProxy::bufferLivePacket(const DTSC::Packet & packet, DTSC::Meta & myMeta){
myMeta.vod = false; myMeta.vod = false;
myMeta.live = true; myMeta.live = true;
//Store the trackid for easier access //Store the trackid for easier access
@ -426,7 +426,7 @@ namespace Mist {
} }
} }
void negotiationProxy::bufferSinglePacket(DTSC::Packet & packet, DTSC::Meta & myMeta){ void negotiationProxy::bufferSinglePacket(const DTSC::Packet & packet, DTSC::Meta & myMeta){
//Store the trackid for easier access //Store the trackid for easier access
unsigned long tid = packet.getTrackId(); unsigned long tid = packet.getTrackId();
//This update needs to happen whether the track is accepted or not. //This update needs to happen whether the track is accepted or not.

10
src/io.h
View file

@ -30,10 +30,10 @@ namespace Mist {
negotiationProxy(); negotiationProxy();
void clear(); void clear();
bool bufferStart(unsigned long tid, unsigned long pageNumber, DTSC::Meta & myMeta); bool bufferStart(unsigned long tid, unsigned long pageNumber, DTSC::Meta & myMeta);
void bufferNext(DTSC::Packet & pack, DTSC::Meta & myMeta); void bufferNext(const DTSC::Packet & pack, DTSC::Meta & myMeta);
void bufferFinalize(unsigned long tid, DTSC::Meta &myMeta); void bufferFinalize(unsigned long tid, DTSC::Meta &myMeta);
void bufferLivePacket(DTSC::Packet & packet, DTSC::Meta & myMeta); void bufferLivePacket(const DTSC::Packet & packet, DTSC::Meta & myMeta);
void bufferSinglePacket(DTSC::Packet & packet, DTSC::Meta & myMeta); void bufferSinglePacket(const DTSC::Packet & packet, DTSC::Meta & myMeta);
bool isBuffered(unsigned long tid, unsigned long keyNum); bool isBuffered(unsigned long tid, unsigned long keyNum);
unsigned long bufferedOnPage(unsigned long tid, unsigned long keyNum); unsigned long bufferedOnPage(unsigned long tid, unsigned long keyNum);
@ -66,10 +66,10 @@ namespace Mist {
public: public:
void initiateMeta(); void initiateMeta();
bool bufferStart(unsigned long tid, unsigned long pageNumber); bool bufferStart(unsigned long tid, unsigned long pageNumber);
void bufferNext(DTSC::Packet & pack); void bufferNext(const DTSC::Packet & pack);
void bufferFinalize(unsigned long tid); void bufferFinalize(unsigned long tid);
void bufferRemove(unsigned long tid, unsigned long pageNumber); void bufferRemove(unsigned long tid, unsigned long pageNumber);
virtual void bufferLivePacket(DTSC::Packet & packet); virtual void bufferLivePacket(const DTSC::Packet & packet);
protected: protected:
void continueNegotiate(unsigned long tid, bool quickNegotiate = false); void continueNegotiate(unsigned long tid, bool quickNegotiate = false);
void continueNegotiate(); void continueNegotiate();

2
src/output/output.cpp
View file

@ -39,7 +39,7 @@ namespace Mist{
cfg->addOption("noinput", option); cfg->addOption("noinput", option);
} }
void Output::bufferLivePacket(DTSC::Packet & packet){ void Output::bufferLivePacket(const DTSC::Packet & packet){
if (!pushIsOngoing){ if (!pushIsOngoing){
waitForStreamPushReady(); waitForStreamPushReady();
} }

2
src/output/output.h
View file

@ -119,7 +119,7 @@ namespace Mist {
bool allowPush(const std::string & passwd); bool allowPush(const std::string & passwd);
void waitForStreamPushReady(); void waitForStreamPushReady();
bool pushIsOngoing; bool pushIsOngoing;
void bufferLivePacket(DTSC::Packet & packet); void bufferLivePacket(const DTSC::Packet & packet);
}; };
} }