justdan96/tsMuxer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #250 from jcdr428/Correct_DV_Profile_4

Browse Source 
previous to this all Single Track Double Layer files were treated as Single Track Single Layer files and now we can properly handle those cases
This commit is contained in:
Dan 2020-03-22 16:54:39 +00:00 committed by GitHub
commit 3def0c5547
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tsMuxer/hevcStreamReader.cpp
View File

@ -143,7 +143,7 @@ CheckStreamRez HEVCStreamReader::checkStream(uint8_t* buffer, int len)
m_hdr->DVCompatibility = 2;
else if (cp == 2 && tc == 2 && mc == 2 && cslt == 0) // Undefined
{
if (V3_flags & BASE_LAYER)
if (m_hdr->isDVEL)
m_hdr->DVCompatibility = 2;
else
m_hdr->DVCompatibility = 0;
@ -247,23 +247,15 @@ int HEVCStreamReader::getTSDescriptor(uint8_t* dstBuff, bool blurayMode)
int HEVCStreamReader::setDoViDescriptor(uint8_t* dstBuff)
{
int isDVBL = true;
bool DualLayers = V3_flags & BASE_LAYER;
// For Dual Layer, both RPU and EL substreams are multiplexed in the RPU stream
if (DualLayers && m_hdr->isDVRPU)
{
int isDVBL = !(V3_flags & NON_DV_TRACK);
if (!isDVBL)
m_hdr->isDVEL = true;
isDVBL = false;
}
int width = getStreamWidth();
int pixelRate = width * getStreamHeight() * getFPS();
// BL has twice the width and height of EL
if (DualLayers)
{
if (!isDVBL && V3_flags & FOUR_K)
width *= 2;
pixelRate *= 4;
}
int pixelRate = width * getStreamHeight() * getFPS();
int level = 0;
if (width <= 1280 && pixelRate <= 22118400)
@ -306,8 +298,8 @@ int HEVCStreamReader::setDoViDescriptor(uint8_t* dstBuff)
bitWriter.putBits(8, 1); // dv version major
bitWriter.putBits(8, 0); // dv version minor
// DV profile
if (DualLayers)
bitWriter.putBits(7, m_hdr->isHDR10 ? 7 : 4);
if (m_hdr->isDVEL)
bitWriter.putBits(7, isDVBL ? 4 : 7);
else
bitWriter.putBits(7, m_hdr->DVCompatibility ? 8 : 5);
bitWriter.putBits(6, level); // dv level

4
tsMuxer/tsMuxer.cpp
View File

@ -152,7 +152,7 @@ TSMuxer::~TSMuxer()
void TSMuxer::setVBVBufferLen(int value)
{
m_vbvLen = value * 90;
m_vbvLen = (int64_t)value * 90;
m_fixed_pcr_offset = m_timeOffset - m_vbvLen;
if (m_fixed_pcr_offset < 0)
m_fixed_pcr_offset = 0;
@ -194,7 +194,7 @@ void TSMuxer::intAddStream(const std::string& streamName, const std::string& cod
{
tsStreamIndex = 0x1011 + m_videoTrackCnt * doubleMux;
m_videoTrackCnt++;
V3_flags |= BASE_LAYER;
V3_flags |= NON_DV_TRACK;
}
if (m_subMode)
tsStreamIndex++;

2
tsMuxer/tsMuxer.h
View File

@ -20,7 +20,7 @@ enum V3Flags
SL_HDR2 = 8,
HDR10PLUS = 16,
FOUR_K = 32,
BASE_LAYER = 64,
NON_DV_TRACK = 64,
HDMV_V3 = 128
};