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

TS library function name unification.

Browse source
This commit is contained in:
Thulinma 2015-02-19 03:00:10 +01:00
parent 09c7881d10
commit e595964832
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/output/output_hls.cpp
View file

@ -116,10 +116,10 @@ namespace Mist {
if (PacketNumber % 42 == 0){ if (PacketNumber % 42 == 0){
TS::Packet tmpPack; TS::Packet tmpPack;
tmpPack.FromPointer(TS::PAT); tmpPack.FromPointer(TS::PAT);
tmpPack.ContinuityCounter(++contCounter[tmpPack.PID()]); tmpPack.continuityCounter(++contCounter[tmpPack.PID()]);
H.Chunkify(tmpPack.ToString(), 188, myConn); H.Chunkify(tmpPack.ToString(), 188, myConn);
tmpPack.FromPointer(TS::createPMT(selectedTracks, myMeta).c_str()); tmpPack.FromPointer(TS::createPMT(selectedTracks, myMeta).c_str());
tmpPack.ContinuityCounter(++contCounter[tmpPack.PID()]); tmpPack.continuityCounter(++contCounter[tmpPack.PID()]);
H.Chunkify(tmpPack.ToString(), 188, myConn); H.Chunkify(tmpPack.ToString(), 188, myConn);
PacketNumber += 2; PacketNumber += 2;
} }
@ -132,11 +132,11 @@ namespace Mist {
if (PackData.BytesFree() == 184){ if (PackData.BytesFree() == 184){
PackData.PID(0x100 - 1 + currentPacket.getTrackId()); PackData.PID(0x100 - 1 + currentPacket.getTrackId());
PackData.ContinuityCounter(ContCounter++); PackData.continuityCounter(ContCounter++);
if (first){ if (first){
PackData.UnitStart(1); PackData.unitStart(1);
if (currentPacket.getInt("keyframe")){ if (currentPacket.getInt("keyframe")){
PackData.RandomAccess(1); PackData.randomAccess(1);
} }
if (myMeta.tracks[currentPacket.getTrackId()].type == "video"){ if (myMeta.tracks[currentPacket.getTrackId()].type == "video"){
PackData.PCR(currentPacket.getTime() * 27000); PackData.PCR(currentPacket.getTime() * 27000);

6
src/output/output_httpts.cpp
View file

@ -41,11 +41,11 @@ namespace Mist {
if (!dataLen){return;} if (!dataLen){return;}
if (PackData.BytesFree() == 184){ if (PackData.BytesFree() == 184){
PackData.PID(0x100 - 1 + currentPacket.getTrackId()); PackData.PID(0x100 - 1 + currentPacket.getTrackId());
PackData.ContinuityCounter(ContCounter++); PackData.continuityCounter(ContCounter++);
if (first){ if (first){
PackData.UnitStart(1); PackData.unitStart(1);
if (currentPacket.getInt("keyframe")){ if (currentPacket.getInt("keyframe")){
PackData.RandomAccess(1); PackData.randomAccess(1);
PackData.PCR(currentPacket.getTime() * 27000); PackData.PCR(currentPacket.getTime() * 27000);
} }
first = false; first = false;

6
src/output/output_ts.cpp
View file

@ -68,11 +68,11 @@ namespace Mist {
if (PackData.BytesFree() == 184){ if (PackData.BytesFree() == 184){
PackData.PID(0x100 - 1 + currentPacket.getTrackId()); PackData.PID(0x100 - 1 + currentPacket.getTrackId());
PackData.ContinuityCounter(ContCounter++); PackData.continuityCounter(ContCounter++);
if (first){ if (first){
PackData.UnitStart(1); PackData.unitStart(1);
if (currentPacket.getInt("keyframe")){ if (currentPacket.getInt("keyframe")){
PackData.RandomAccess(1); PackData.randomAccess(1);
PackData.PCR(currentPacket.getTime() * 27000); PackData.PCR(currentPacket.getTime() * 27000);
} }
first = false; first = false;