Fixes and improvements to generic push-input handling
This commit is contained in:
parent
7b1652498b
commit
5e2b29466b
5 changed files with 6 additions and 4 deletions
|
@ -1387,6 +1387,7 @@ namespace DTSC {
|
|||
}
|
||||
vod = (packBytePos > 0);
|
||||
live = !vod;
|
||||
EXTREME_MSG("Updating meta with %lld@%lld+%lld", packTrack, packTime, packOffset);
|
||||
if (packTrack > 0 && tracks.count(packTrack)){
|
||||
tracks[packTrack].update(packTime, packOffset, packDataSize, packBytePos, isKeyframe, packSendSize, segment_size);
|
||||
}
|
||||
|
|
|
@ -213,6 +213,8 @@ namespace h264 {
|
|||
unsigned int timeScale = bs.get(32);
|
||||
result.fps = (double)timeScale / (2 * unitsInTick);
|
||||
bs.skip(1);
|
||||
}else{
|
||||
result.fps = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -305,9 +305,7 @@ namespace Mist {
|
|||
|
||||
|
||||
if (myMeta.live){
|
||||
//Update the metadata
|
||||
DTSC::Packet updatePack(myPage.mapped + curOffset, size + 8, true);
|
||||
myMeta.update(updatePack);
|
||||
myMeta.update(pack);
|
||||
}
|
||||
|
||||
//End of brain melt
|
||||
|
@ -402,6 +400,7 @@ namespace Mist {
|
|||
myMeta.live = true;
|
||||
//Store the trackid for easier access
|
||||
unsigned long tid = packet.getTrackId();
|
||||
VERYHIGH_MSG("Buffering %s packet on track %lu: %llums, %db", myMeta.tracks[tid].codec.c_str(), tid, packet.getTime(), packet.getPayloadLen());
|
||||
//Do nothing if the trackid is invalid
|
||||
if (!tid) {
|
||||
WARN_MSG("Packet without trackid!");
|
||||
|
|
|
@ -198,6 +198,7 @@ namespace Mist{
|
|||
if (nProxy.userClient.getData()){
|
||||
nProxy.userClient.finish();
|
||||
}
|
||||
nProxy.streamName = streamName;
|
||||
char userPageName[NAME_BUFFER_SIZE];
|
||||
snprintf(userPageName, NAME_BUFFER_SIZE, SHM_USERS, streamName.c_str());
|
||||
unsigned int attempts = 0;
|
||||
|
|
|
@ -927,7 +927,6 @@ namespace Mist {
|
|||
snprintf(userPageName, NAME_BUFFER_SIZE, SHM_USERS, streamName.c_str());
|
||||
nProxy.userClient = IPC::sharedClient(userPageName, PLAY_EX_SIZE, true);
|
||||
}
|
||||
nProxy.streamName = streamName;
|
||||
bufferLivePacket(thisPacket);
|
||||
}
|
||||
break;
|
||||
|
|
Loading…
Add table
Reference in a new issue