Changeset 1400 in SHVCSoftware for branches/SHM-dev/source/App
- Timestamp:
- 4 Aug 2015, 03:50:01 (9 years ago)
- Location:
- branches/SHM-dev/source/App/TAppEncoder
- Files:
-
- 3 edited
-
TAppEncCfg.cpp (modified) (9 diffs)
-
TAppEncCfg.h (modified) (1 diff)
-
TAppEncTop.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp
r1391 r1400 975 975 Int tmpInputChromaFormat; 976 976 Int tmpConstraintChromaFormat; 977 Int tmpWeightedPredictionMethod; 977 978 string inputColourSpaceConvert; 978 979 #if SVC_EXTENSION … … 1394 1395 ("WeightedPredP,-wpP", m_useWeightedPred, false, "Use weighted prediction in P slices") 1395 1396 ("WeightedPredB,-wpB", m_useWeightedBiPred, false, "Use weighted (bidirectional) prediction in B slices") 1397 ("WeightedPredMethod,-wpM", tmpWeightedPredictionMethod, Int(WP_PER_PICTURE_WITH_SIMPLE_DC_COMBINED_COMPONENT), "Weighted prediction method") 1396 1398 ("Log2ParallelMergeLevel", m_log2ParallelMergeLevel, 2u, "Parallel merge estimation region") 1397 1399 //deprecated copies of renamed tile parameters 1398 ("UniformSpacingIdc", m_tileUniformSpacingFlag, false, "deprecated alias of TileUniformSpacing")1400 ("UniformSpacingIdc", m_tileUniformSpacingFlag, false, "deprecated alias of TileUniformSpacing") 1399 1401 ("ColumnWidthArray", cfg_ColumnWidth, cfg_ColumnWidth, "deprecated alias of TileColumnWidthArray") 1400 1402 ("RowHeightArray", cfg_RowHeight, cfg_RowHeight, "deprecated alias of TileRowHeightArray") 1401 1403 1402 ("TileUniformSpacing", m_tileUniformSpacingFlag, false, "Indicates that tile columns and rows are distributed uniformly")1403 ("NumTileColumnsMinus1", m_numTileColumnsMinus1, 0, "Number of tile columns in a picture minus 1")1404 ("NumTileRowsMinus1", m_numTileRowsMinus1, 0, "Number of rows in a picture minus 1")1404 ("TileUniformSpacing", m_tileUniformSpacingFlag, false, "Indicates that tile columns and rows are distributed uniformly") 1405 ("NumTileColumnsMinus1", m_numTileColumnsMinus1, 0, "Number of tile columns in a picture minus 1") 1406 ("NumTileRowsMinus1", m_numTileRowsMinus1, 0, "Number of rows in a picture minus 1") 1405 1407 ("TileColumnWidthArray", cfg_ColumnWidth, cfg_ColumnWidth, "Array containing tile column width values in units of CTU") 1406 1408 ("TileRowHeightArray", cfg_RowHeight, cfg_RowHeight, "Array containing tile row height values in units of CTU") … … 1557 1559 "\t0: disable") 1558 1560 ("SEIDecodingUnitInfo", m_decodingUnitInfoSEIEnabled, 0, "Control generation of decoding unit information SEI message.") 1559 #if LAYERS_NOT_PRESENT_SEI1560 ("SEILayersNotPresent", m_layersNotPresentSEIEnabled, 0, "Control generation of layers not present SEI message")1561 #endif1562 1561 ("SEISOPDescription", m_SOPDescriptionSEIEnabled, 0, "Control generation of SOP description SEI messages") 1563 1562 ("SEIScalableNesting", m_scalableNestingSEIEnabled, 0, "Control generation of scalable nesting SEI messages") … … 1596 1595 ("SEIMasteringDisplayPrimaries", cfg_DisplayPrimariesCode, cfg_DisplayPrimariesCode, "Mastering display primaries for all three colour planes in CIE xy coordinates in increments of 1/50000 (results in the ranges 0 to 50000 inclusive)") 1597 1596 ("SEIMasteringDisplayWhitePoint", cfg_DisplayWhitePointCode, cfg_DisplayWhitePointCode, "Mastering display white point CIE xy coordinates in normalised increments of 1/50000 (e.g. 0.333 = 16667)") 1598 1597 1598 #if LAYERS_NOT_PRESENT_SEI 1599 ("SEILayersNotPresent", m_layersNotPresentSEIEnabled, 0, "Control generation of layers not present SEI message") 1600 #endif 1599 1601 #if P0123_ALPHA_CHANNEL_SEI 1600 1602 ("SEIAlphaChannelInfo", m_alphaSEIEnabled, false, "Enables transmission of information associated with alpha channel (default : 0)") … … 1864 1866 m_apcLayerCfg[layer]->m_MSBExtendedBitDepth[CHANNEL_TYPE_CHROMA] = m_apcLayerCfg[layer]->m_MSBExtendedBitDepth[CHANNEL_TYPE_LUMA ]; 1865 1867 1866 if (m_apcLayerCfg[layer]->m_internalBitDepth [CHANNEL_TYPE_LUMA ] == 0) { m_apcLayerCfg[layer]->m_internalBitDepth [CHANNEL_TYPE_LUMA ] = m_apcLayerCfg[layer]->m_MSBExtendedBitDepth[CHANNEL_TYPE_LUMA ]; } 1867 if (m_apcLayerCfg[layer]->m_internalBitDepth [CHANNEL_TYPE_CHROMA] == 0) { m_apcLayerCfg[layer]->m_internalBitDepth [CHANNEL_TYPE_CHROMA] = m_apcLayerCfg[layer]->m_internalBitDepth [CHANNEL_TYPE_LUMA ]; } 1868 if (m_apcLayerCfg[layer]->m_inputBitDepth [CHANNEL_TYPE_CHROMA] == 0) { m_apcLayerCfg[layer]->m_inputBitDepth [CHANNEL_TYPE_CHROMA] = m_apcLayerCfg[layer]->m_inputBitDepth [CHANNEL_TYPE_LUMA ]; } 1869 if (m_apcLayerCfg[layer]->m_outputBitDepth [CHANNEL_TYPE_LUMA ] == 0) { m_apcLayerCfg[layer]->m_outputBitDepth [CHANNEL_TYPE_LUMA ] = m_apcLayerCfg[layer]->m_internalBitDepth [CHANNEL_TYPE_LUMA ]; } 1870 if (m_apcLayerCfg[layer]->m_outputBitDepth [CHANNEL_TYPE_CHROMA] == 0) { m_apcLayerCfg[layer]->m_outputBitDepth [CHANNEL_TYPE_CHROMA] = m_apcLayerCfg[layer]->m_internalBitDepth [CHANNEL_TYPE_CHROMA]; } 1868 if (m_apcLayerCfg[layer]->m_internalBitDepth [CHANNEL_TYPE_LUMA ] == 0) 1869 { 1870 m_apcLayerCfg[layer]->m_internalBitDepth [CHANNEL_TYPE_LUMA ] = m_apcLayerCfg[layer]->m_MSBExtendedBitDepth[CHANNEL_TYPE_LUMA ]; 1871 } 1872 if (m_apcLayerCfg[layer]->m_internalBitDepth [CHANNEL_TYPE_CHROMA] == 0) 1873 { 1874 m_apcLayerCfg[layer]->m_internalBitDepth [CHANNEL_TYPE_CHROMA] = m_apcLayerCfg[layer]->m_internalBitDepth [CHANNEL_TYPE_LUMA ]; 1875 } 1876 if (m_apcLayerCfg[layer]->m_inputBitDepth [CHANNEL_TYPE_CHROMA] == 0) 1877 { 1878 m_apcLayerCfg[layer]->m_inputBitDepth [CHANNEL_TYPE_CHROMA] = m_apcLayerCfg[layer]->m_inputBitDepth [CHANNEL_TYPE_LUMA ]; 1879 } 1880 if (m_apcLayerCfg[layer]->m_outputBitDepth [CHANNEL_TYPE_LUMA ] == 0) 1881 { 1882 m_apcLayerCfg[layer]->m_outputBitDepth [CHANNEL_TYPE_LUMA ] = m_apcLayerCfg[layer]->m_internalBitDepth [CHANNEL_TYPE_LUMA ]; 1883 } 1884 if (m_apcLayerCfg[layer]->m_outputBitDepth [CHANNEL_TYPE_CHROMA] == 0) 1885 { 1886 m_apcLayerCfg[layer]->m_outputBitDepth [CHANNEL_TYPE_CHROMA] = m_apcLayerCfg[layer]->m_internalBitDepth [CHANNEL_TYPE_CHROMA]; 1887 } 1871 1888 1872 1889 m_apcLayerCfg[layer]->m_InputChromaFormatIDC = numberToChromaFormat(tmpInputChromaFormat); … … 1978 1995 m_scalingListFile = cfg_ScalingListFile.empty() ? NULL : strdup(cfg_ScalingListFile.c_str()); 1979 1996 1980 /* rules for input, output and internal bitdepths as per help text */1997 /* rules for input, output and internal bitdepths as per help text */ 1981 1998 if (m_MSBExtendedBitDepth[CHANNEL_TYPE_LUMA ] == 0) 1982 1999 { … … 2010 2027 m_InputChromaFormatIDC = numberToChromaFormat(tmpInputChromaFormat); 2011 2028 m_chromaFormatIDC = ((tmpChromaFormat == 0) ? (m_InputChromaFormatIDC) : (numberToChromaFormat(tmpChromaFormat))); 2012 2029 #endif 2030 assert(tmpWeightedPredictionMethod>=0 && tmpWeightedPredictionMethod<=WP_PER_PICTURE_WITH_HISTOGRAM_AND_PER_COMPONENT_AND_CLIPPING_AND_EXTENSION); 2031 if (!(tmpWeightedPredictionMethod>=0 && tmpWeightedPredictionMethod<=WP_PER_PICTURE_WITH_HISTOGRAM_AND_PER_COMPONENT_AND_CLIPPING_AND_EXTENSION)) 2032 { 2033 exit(EXIT_FAILURE); 2034 } 2035 m_weightedPredictionMethod = WeightedPredictionMethod(tmpWeightedPredictionMethod); 2036 2037 #if !SVC_EXTENSION 2013 2038 if (extendedProfile >= 1000 && extendedProfile <= 12316) 2014 2039 { … … 3413 3438 memset( m_extraRPSs, 0, sizeof( m_extraRPSs ) ); 3414 3439 #else 3415 m_extraRPSs=0; 3440 m_extraRPSs=0; 3416 3441 #endif 3417 3442 … … 4446 4471 #if !RC_SHVC_HARMONIZATION 4447 4472 printf("RateControl : %d\n", m_RCEnableRateControl ); 4448 4473 #endif 4474 printf("WPMethod : %d\n", Int(m_weightedPredictionMethod)); 4475 4476 #if !RC_SHVC_HARMONIZATION 4449 4477 if(m_RCEnableRateControl) 4450 4478 { -
branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h
r1391 r1400 389 389 Bool m_useWeightedPred; ///< Use of weighted prediction in P slices 390 390 Bool m_useWeightedBiPred; ///< Use of bi-directional weighted prediction in B slices 391 WeightedPredictionMethod m_weightedPredictionMethod; 391 392 392 393 UInt m_log2ParallelMergeLevel; ///< Parallel merge estimation region -
branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp
r1391 r1400 585 585 m_cTEncTop.setExtendedPrecisionProcessingFlag ( m_extendedPrecisionProcessingFlag ); 586 586 m_cTEncTop.setHighPrecisionOffsetsEnabledFlag ( m_highPrecisionOffsetsEnabledFlag ); 587 588 m_cTEncTop.setWeightedPredictionMethod( m_weightedPredictionMethod ); 589 587 590 //====== Tool list ======== 588 591 m_cTEncTop.setDeltaQpRD ( m_uiDeltaQpRD );
Note: See TracChangeset for help on using the changeset viewer.
