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

4K flag set in non-hdmv mode (#322)

Browse Source 
The blurayStreamParams method is currently called only in hdmv mode, therefore the 4K flag is always off in non-hdmv mode.
This commit fixes this.
This commit is contained in:
jcdr428 2020-08-24 22:28:06 +02:00 committed by GitHub
parent d058a4d2cf
commit 637b6044b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tsMuxer/hevc.cpp
View File

@ -687,6 +687,8 @@ int HevcSpsUnit::deserialize()
separate_colour_plane_flag = m_reader.getBit();
pic_width_in_luma_samples = extractUEGolombCode();
pic_height_in_luma_samples = extractUEGolombCode();
if (pic_width_in_luma_samples >= 3840)
V3_flags |= FOUR_K;
bool conformance_window_flag = m_reader.getBit();
if (conformance_window_flag)

3
tsMuxer/tsPacket.cpp
View File

@ -2649,10 +2649,7 @@ void M2TSStreamInfo::blurayStreamParams(double fps, bool interlaced, int width,
else if (isPal)
*video_format = interlaced ? 2 : 7;
else if (width >= 2600)
{
*video_format = 8;
V3_flags |= FOUR_K;
}
else if (width >= 1300)
*video_format = interlaced ? 4 : 6; // as 1920x1080
else