diff --git a/lib/dtsc.h b/lib/dtsc.h index b1404431..d557c34b 100644 --- a/lib/dtsc.h +++ b/lib/dtsc.h @@ -324,7 +324,7 @@ namespace DTSC { return vod || live; } 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 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); diff --git a/lib/dtscmeta.cpp b/lib/dtscmeta.cpp index 9aa90975..7cfe2535 100644 --- a/lib/dtscmeta.cpp +++ b/lib/dtscmeta.cpp @@ -1438,7 +1438,7 @@ namespace DTSC { } ///\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; unsigned int dataLen; pack.getString("data", data, dataLen); diff --git a/src/io.cpp b/src/io.cpp index cf19c70f..d382532e 100644 --- a/src/io.cpp +++ b/src/io.cpp @@ -253,11 +253,11 @@ namespace Mist { ///Buffers the next packet on the currently opened page ///\param pack The packet to buffer - void InOutBase::bufferNext(DTSC::Packet & pack) { + void InOutBase::bufferNext(const DTSC::Packet & pack) { 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; //Save the trackid of the track for easier access unsigned long tid = pack.getTrackId(); @@ -388,11 +388,11 @@ namespace Mist { /// ///Initiates/continues negotiation with the buffer as well ///\param packet The packet to buffer - void InOutBase::bufferLivePacket(DTSC::Packet & packet){ + void InOutBase::bufferLivePacket(const DTSC::Packet & packet){ 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.live = true; //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 unsigned long tid = packet.getTrackId(); //This update needs to happen whether the track is accepted or not. diff --git a/src/io.h b/src/io.h index 3e85b902..c95e4d90 100644 --- a/src/io.h +++ b/src/io.h @@ -30,10 +30,10 @@ namespace Mist { negotiationProxy(); void clear(); 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 bufferLivePacket(DTSC::Packet & packet, DTSC::Meta & myMeta); - void bufferSinglePacket(DTSC::Packet & packet, DTSC::Meta & myMeta); + void bufferLivePacket(const DTSC::Packet & packet, DTSC::Meta & myMeta); + void bufferSinglePacket(const DTSC::Packet & packet, DTSC::Meta & myMeta); bool isBuffered(unsigned long tid, unsigned long keyNum); unsigned long bufferedOnPage(unsigned long tid, unsigned long keyNum); @@ -66,10 +66,10 @@ namespace Mist { public: void initiateMeta(); 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 bufferRemove(unsigned long tid, unsigned long pageNumber); - virtual void bufferLivePacket(DTSC::Packet & packet); + virtual void bufferLivePacket(const DTSC::Packet & packet); protected: void continueNegotiate(unsigned long tid, bool quickNegotiate = false); void continueNegotiate(); diff --git a/src/output/output.cpp b/src/output/output.cpp index b6e06167..da6e444b 100644 --- a/src/output/output.cpp +++ b/src/output/output.cpp @@ -39,7 +39,7 @@ namespace Mist{ cfg->addOption("noinput", option); } - void Output::bufferLivePacket(DTSC::Packet & packet){ + void Output::bufferLivePacket(const DTSC::Packet & packet){ if (!pushIsOngoing){ waitForStreamPushReady(); } diff --git a/src/output/output.h b/src/output/output.h index 14ce5258..6412322e 100644 --- a/src/output/output.h +++ b/src/output/output.h @@ -119,7 +119,7 @@ namespace Mist { bool allowPush(const std::string & passwd); void waitForStreamPushReady(); bool pushIsOngoing; - void bufferLivePacket(DTSC::Packet & packet); + void bufferLivePacket(const DTSC::Packet & packet); }; }