Skip to content
Snippets Groups Projects
Commit be8d32f4 authored by Bin Li's avatar Bin Li
Browse files

SCC: Merged HM-16.17.

parents cc6a8043 48daefe1
No related branches found
No related tags found
No related merge requests found
......@@ -38,7 +38,7 @@ PROJECT_NAME = "HEVC Test Model (HM)"
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = HM-16.16
PROJECT_NUMBER = HM-16.17
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
......
No preview for this file type
......@@ -191,7 +191,7 @@
\maketitle
\begin{abstract}
This document is a user manual describing usage of reference software
for the HEVC project. It applies to version 16.16
for the HEVC project. It applies to version 16.17
of the software.
\end{abstract}
......@@ -843,12 +843,15 @@ Specifies the profile to which the encoded bitstream complies.
Valid HEVC Ver. 1 values are: none, main, main10, main-still-picture
Valid HEVC Ver. 2 (RExt) values are: main-RExt, high-throughput-RExt,
monochrome, monochrome12, monochrome16, main12, main_422_10,
main_422_12, main_444, main_444_10, main_444_12, main_444_16,
main_intra, main_10_intra, main_12_intra, main_422_10_intra, main_422_12_intra,
main_444_intra, main_444_10_intra, main_444_12_intra, main_444_16_intra.
monochrome, monochrome12, monochrome16, main12, main_422_10,
main_422_12, main_444, main_444_10, main_444_12, main_444_16,
main_intra, main_10_intra, main_12_intra, main_422_10_intra, main_422_12_intra,
main_444_intra, main_444_10_intra, main_444_12_intra, main_444_16_intra,
high_throughput_444_16_intra.
When main-RExt is specified, the constraint flags are either manually specified, or calculated via the other supplied settings.
In addition, the following profiles strings are available: high_throughput_444, high_throughput_444_10, high_throughput_444_14.
When main-RExt or high-throughput-RExt is specified, the constraint flags are either manually specified, or calculated via the other supplied settings.
Compatibility flags are automatically determined according to the profile.
NB: There is currently only limited validation that the encoder configuration complies with the profile, level and tier constraints.
......
This diff is collapsed.
......@@ -64,7 +64,7 @@ inline Int64 abs (Int64 x) { return _abs64(x); };
// Version information
// ====================================================================================================================
#define NV_VERSION "16.16_SCM8.6" ///< Current software version
#define NV_VERSION "16.17_SCM8.6" ///< Current software version
// ====================================================================================================================
// Platform information
......
......@@ -321,7 +321,7 @@ Void SEIWriter::xWriteSEIPictureTiming(const SEIPictureTiming& sei, const TComSP
Void SEIWriter::xWriteSEIPanScanRect(const SEIPanScanRect &sei)
{
WRITE_UVLC( sei.m_panScanRectId, "pan_scan_rect_id" );
const UInt numRegions = sei.m_panScanRectRegions.size();
const UInt numRegions = (UInt) sei.m_panScanRectRegions.size();
if ( !sei.m_panScanRectCancelFlag && numRegions>0 )
{
WRITE_FLAG( sei.m_panScanRectCancelFlag, "pan_scan_rect_cancel_flag" );
......@@ -441,14 +441,14 @@ Void SEIWriter::xWriteSEIFilmGrainCharacteristics(const SEIFilmGrainCharacterist
for(Int c=0; c<3; c++)
{
const SEIFilmGrainCharacteristics::CompModel &cm=sei.m_compModel[c];
const UInt numIntensityIntervals = cm.intensityValues.size();
const UInt numIntensityIntervals = (UInt) cm.intensityValues.size();
const UInt numModelValues = cm.numModelValues;
WRITE_FLAG( sei.m_compModel[c].bPresentFlag && numIntensityIntervals>0 && numModelValues>0, "comp_model_present_flag[c]" );
}
for(Int c=0; c<3; c++)
{
const SEIFilmGrainCharacteristics::CompModel &cm=sei.m_compModel[c];
const UInt numIntensityIntervals = cm.intensityValues.size();
const UInt numIntensityIntervals = (UInt) cm.intensityValues.size();
const UInt numModelValues = cm.numModelValues;
if (cm.bPresentFlag && numIntensityIntervals>0 && numModelValues>0)
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment