LX3JL/xlxd
1
0
Fork 0
mirror of https://github.com/LX3JL/xlxd.git synced 2025-12-06 07:42:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #213 from narspt/patch-16

Browse source 
fix frame sequence for streams initiated on different mode
This commit is contained in:
LX3JL 2023-03-01 18:25:32 +01:00 committed by GitHub
parent 8428d1ef40 ee95248e95
commit 19b13dfc8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/cpacket.cpp
View file

@ -174,7 +174,10 @@ void CPacket::UpdatePids(uint32 pid)
} }
if ( m_uiYsfPacketFrameId == 0xFF ) if ( m_uiYsfPacketFrameId == 0xFF )
{ {
m_uiYsfPacketFrameId = ((pid / 5) & 0x7FU) << 1; if (IsDvHeader())
m_uiYsfPacketFrameId = 0;
else
m_uiYsfPacketFrameId = (((pid / 5) + 1) & 0x7FU) << 1;
} }
// imrs pid needs update ? // imrs pid needs update ?
if ( m_uiImrsPacketId == 0xFF ) if ( m_uiImrsPacketId == 0xFF )
@ -184,6 +187,9 @@ void CPacket::UpdatePids(uint32 pid)
} }
if ( m_uiImrsPacketFrameId == 0xFFFF ) if ( m_uiImrsPacketFrameId == 0xFFFF )
{ {
m_uiImrsPacketFrameId = LOWORD(pid / 5); if (IsDvHeader())
m_uiImrsPacketFrameId = 0;
else
m_uiImrsPacketFrameId = LOWORD((pid / 5) + 1);
} }
} }

3
src/cpacketstream.cpp
View file

@ -77,7 +77,8 @@ void CPacketStream::Push(CPacket *Packet)
{ {
// update stream dependent packet data // update stream dependent packet data
m_LastPacketTime.Now(); m_LastPacketTime.Now();
Packet->UpdatePids(m_uiPacketCntr++); Packet->UpdatePids(m_uiPacketCntr);
if (Packet->IsDvFrame()) { m_uiPacketCntr++; }
// transcoder avaliable ? // transcoder avaliable ?
if ( m_CodecStream != NULL ) if ( m_CodecStream != NULL )
{ {