Memory optimizations and supporting code for libmist changes.
This commit is contained in:
parent
6ade063756
commit
8e3d636381
9 changed files with 15 additions and 12 deletions
|
@ -56,10 +56,10 @@ namespace Mist {
|
|||
void Output::updateMeta(){
|
||||
//read metadata from page to myMeta variable
|
||||
if (streamIndex.mapped){
|
||||
JSON::Value jsonMeta;
|
||||
unsigned int i = 0;
|
||||
JSON::fromDTMI((const unsigned char*)streamIndex.mapped + 8, streamIndex.len - 8, i, jsonMeta);
|
||||
myMeta = DTSC::Meta(jsonMeta);
|
||||
DTSC::Packet tmpMeta(streamIndex.mapped, streamIndex.len, true);
|
||||
if (tmpMeta){
|
||||
myMeta.reinit(tmpMeta);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -108,7 +108,7 @@ namespace Mist {
|
|||
bool IsKeyFrame = false;
|
||||
|
||||
char * dataPointer = 0;
|
||||
int dataLen = 0;
|
||||
unsigned int dataLen = 0;
|
||||
currentPacket.getString("data", dataPointer, dataLen);
|
||||
|
||||
if (currentPacket.getTime() >= until){
|
||||
|
|
|
@ -79,7 +79,7 @@ namespace Mist {
|
|||
return;
|
||||
}
|
||||
char * dataPointer = 0;
|
||||
int len = 0;
|
||||
unsigned int len = 0;
|
||||
currentPacket.getString("data", dataPointer, len);
|
||||
HTTP_S.Chunkify(dataPointer, len, myConn);
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@ namespace Mist {
|
|||
|
||||
void OutProgressiveMP3::sendNext(){
|
||||
char * dataPointer = 0;
|
||||
int len = 0;
|
||||
unsigned int len = 0;
|
||||
currentPacket.getString("data", dataPointer, len);
|
||||
myConn.SendNow(dataPointer, len);
|
||||
}
|
||||
|
|
|
@ -435,7 +435,7 @@ namespace Mist {
|
|||
void OutProgressiveMP4::sendNext(){
|
||||
static bool perfect = true;
|
||||
char * dataPointer = 0;
|
||||
int len = 0;
|
||||
unsigned int len = 0;
|
||||
currentPacket.getString("data", dataPointer, len);
|
||||
if (currentPacket.getTrackId() != sortSet.begin()->trackID || currentPacket.getTime() != sortSet.begin()->time){
|
||||
if (perfect){
|
||||
|
|
|
@ -66,7 +66,7 @@ namespace Mist {
|
|||
char dataheader[] = {0, 0, 0, 0, 0};
|
||||
unsigned int dheader_len = 1;
|
||||
char * tmpData = 0;//pointer to raw media data
|
||||
int data_len = 0;//length of processed media data
|
||||
unsigned int data_len = 0;//length of processed media data
|
||||
currentPacket.getString("data", tmpData, data_len);
|
||||
DTSC::Track & track = myMeta.tracks[currentPacket.getTrackId()];
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ namespace Mist {
|
|||
|
||||
void OutProgressiveSRT::sendNext(){
|
||||
char * dataPointer = 0;
|
||||
int len = 0;
|
||||
unsigned int len = 0;
|
||||
currentPacket.getString("data", dataPointer, len);
|
||||
std::stringstream tmp;
|
||||
if(!webVTT) {
|
||||
|
|
|
@ -61,7 +61,7 @@ namespace Mist {
|
|||
bool IsKeyFrame = false;
|
||||
|
||||
char * dataPointer = 0;
|
||||
int dataLen = 0;
|
||||
unsigned int dataLen = 0;
|
||||
currentPacket.getString("data", dataPointer, dataLen);
|
||||
|
||||
//detect packet type, and put converted data into ToPack.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue