Changeset 362 in 3DVCSoftware for branches/HTM-DEV-0.1-dev/source/App
- Timestamp:
- 3 May 2013, 15:34:11 (12 years ago)
- Location:
- branches/HTM-DEV-0.1-dev/source/App
- Files:
-
- 4 edited
-
TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
-
TAppEncoder/TAppEncCfg.cpp (modified) (16 diffs)
-
TAppEncoder/TAppEncCfg.h (modified) (4 diffs)
-
TAppEncoder/TAppEncTop.cpp (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-DEV-0.1-dev/source/App/TAppDecoder/TAppDecTop.cpp
r324 r362 296 296 } 297 297 if ( bNewPicture && 298 #endif 299 ( nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR 298 ( nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL 300 299 || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_N_LP 301 300 || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_N_LP 302 || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA NT303 || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA ) )301 || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_RADL 302 || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_LP ) ) 304 303 { 305 304 #if H_MV -
branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncCfg.cpp
r324 r362 78 78 #if !H_MV 79 79 m_aidQP = NULL; 80 #if J0149_TONE_MAPPING_SEI 81 m_startOfCodedInterval = NULL; 82 m_codedPivotValue = NULL; 83 m_targetPivotValue = NULL; 80 84 #endif 81 85 } … … 104 108 free(m_pchInputFile); 105 109 #endif 106 110 #if J0149_TONE_MAPPING_SEI 111 if ( m_startOfCodedInterval ) 112 { 113 delete[] m_startOfCodedInterval; 114 m_startOfCodedInterval = NULL; 115 } 116 if ( m_codedPivotValue ) 117 { 118 delete[] m_codedPivotValue; 119 m_codedPivotValue = NULL; 120 } 121 if ( m_targetPivotValue ) 122 { 123 delete[] m_targetPivotValue; 124 m_targetPivotValue = NULL; 125 } 126 #endif 107 127 free(m_pchBitstreamFile); 108 128 … … 321 341 string cfg_RowHeight; 322 342 string cfg_ScalingListFile; 343 #if J0149_TONE_MAPPING_SEI 344 string cfg_startOfCodedInterval; 345 string cfg_codedPivotValue; 346 string cfg_targetPivotValue; 347 #endif 323 348 #if SIGNAL_BITRATE_PICRATE_IN_VPS 324 349 string cfg_bitRateInfoPresentFlag; … … 417 442 ("DecodingRefreshType,-dr", m_iDecodingRefreshType, 0, "Intra refresh type (0:none 1:CRA 2:IDR)") 418 443 ("GOPSize,g", m_iGOPSize, 1, "GOP size of temporal structure") 444 #if !L0034_COMBINED_LIST_CLEANUP 419 445 ("ListCombination,-lc", m_bUseLComb, true, "Combined reference list for uni-prediction estimation in B-slices") 446 #endif 420 447 // motion options 421 448 ("FastSearch", m_iFastSearch, 1, "0:Full search 1:Diamond 2:PMVFAST") … … 473 500 ("LoopFilterTcOffset_div2", m_loopFilterTcOffsetDiv2, 0 ) 474 501 ("DeblockingFilterControlPresent", m_DeblockingFilterControlPresent, false ) 502 #if L0386_DB_METRIC 503 ("DeblockingFilterMetric", m_DeblockingFilterMetric, false ) 504 #endif 475 505 476 506 // Coding tools … … 591 621 ("SEIBufferingPeriod", m_bufferingPeriodSEIEnabled, 0, "Control generation of buffering period SEI messages") 592 622 ("SEIPictureTiming", m_pictureTimingSEIEnabled, 0, "Control generation of picture timing SEI messages") 623 #if J0149_TONE_MAPPING_SEI 624 ("SEIToneMappingInfo", m_toneMappingInfoSEIEnabled, false, "Control generation of Tone Mapping SEI messages") 625 ("SEIToneMapId", m_toneMapId, 0, "Specifies Id of Tone Mapping SEI message for a given session") 626 ("SEIToneMapCancelFlag", m_toneMapCancelFlag, false, "Indicates that Tone Mapping SEI message cancels the persistance or follows") 627 ("SEIToneMapPersistenceFlag", m_toneMapPersistenceFlag, true, "Specifies the persistence of the Tone Mapping SEI message") 628 ("SEIToneMapCodedDataBitDepth", m_toneMapCodedDataBitDepth, 8, "Specifies Coded Data BitDepth of Tone Mapping SEI messages") 629 ("SEIToneMapTargetBitDepth", m_toneMapTargetBitDepth, 8, "Specifies Output BitDepth of Tome mapping function") 630 ("SEIToneMapModelId", m_toneMapModelId, 0, "Specifies Model utilized for mapping coded data into target_bit_depth range\n" 631 "\t0: linear mapping with clipping\n" 632 "\t1: sigmoidal mapping\n" 633 "\t2: user-defined table mapping\n" 634 "\t3: piece-wise linear mapping\n" 635 "\t4: luminance dynamic range information ") 636 ("SEIToneMapMinValue", m_toneMapMinValue, 0, "Specifies the minimum value in mode 0") 637 ("SEIToneMapMaxValue", m_toneMapMaxValue, 1023, "Specifies the maxmum value in mode 0") 638 ("SEIToneMapSigmoidMidpoint", m_sigmoidMidpoint, 512, "Specifies the centre point in mode 1") 639 ("SEIToneMapSigmoidWidth", m_sigmoidWidth, 960, "Specifies the distance between 5% and 95% values of the target_bit_depth in mode 1") 640 ("SEIToneMapStartOfCodedInterval", cfg_startOfCodedInterval, string(""), "Array of user-defined mapping table") 641 ("SEIToneMapNumPivots", m_numPivots, 0, "Specifies the number of pivot points in mode 3") 642 ("SEIToneMapCodedPivotValue", cfg_codedPivotValue, string(""), "Array of pivot point") 643 ("SEIToneMapTargetPivotValue", cfg_targetPivotValue, string(""), "Array of pivot point") 644 ("SEIToneMapCameraIsoSpeedIdc", m_cameraIsoSpeedIdc, 0, "Indicates the camera ISO speed for daylight illumination") 645 ("SEIToneMapCameraIsoSpeedValue", m_cameraIsoSpeedValue, 400, "Specifies the camera ISO speed for daylight illumination of Extended_ISO") 646 ("SEIToneMapExposureCompensationValueSignFlag", m_exposureCompensationValueSignFlag, 0, "Specifies the sign of ExposureCompensationValue") 647 ("SEIToneMapExposureCompensationValueNumerator", m_exposureCompensationValueNumerator, 0, "Specifies the numerator of ExposureCompensationValue") 648 ("SEIToneMapExposureCompensationValueDenomIdc", m_exposureCompensationValueDenomIdc, 2, "Specifies the denominator of ExposureCompensationValue") 649 ("SEIToneMapRefScreenLuminanceWhite", m_refScreenLuminanceWhite, 350, "Specifies reference screen brightness setting in units of candela per square metre") 650 ("SEIToneMapExtendedRangeWhiteLevel", m_extendedRangeWhiteLevel, 800, "Indicates the luminance dynamic range") 651 ("SEIToneMapNominalBlackLevelLumaCodeValue", m_nominalBlackLevelLumaCodeValue, 16, "Specifies luma sample value of the nominal black level assigned decoded pictures") 652 ("SEIToneMapNominalWhiteLevelLumaCodeValue", m_nominalWhiteLevelLumaCodeValue, 235, "Specifies luma sample value of the nominal white level assigned decoded pictures") 653 ("SEIToneMapExtendedWhiteLevelLumaCodeValue", m_extendedWhiteLevelLumaCodeValue, 300, "Specifies luma sample value of the extended dynamic range assigned decoded pictures") 654 #endif 593 655 ("SEIFramePacking", m_framePackingSEIEnabled, 0, "Control generation of frame packing SEI messages") 594 656 ("SEIFramePackingType", m_framePackingSEIType, 0, "Define frame packing arrangement\n" … … 611 673 ("SEIGradualDecodingRefreshInfo", m_gradualDecodingRefreshInfoEnabled, 0, "Control generation of gradual decoding refresh information SEI message") 612 674 ("SEIDecodingUnitInfo", m_decodingUnitInfoSEIEnabled, 0, "Control generation of decoding unit information SEI message.") 675 #if L0208_SOP_DESCRIPTION_SEI 676 ("SEISOPDescription", m_SOPDescriptionSEIEnabled, 0, "Control generation of SOP description SEI messages") 677 #endif 678 #if K0180_SCALABLE_NESTING_SEI 679 ("SEIScalableNesting", m_scalableNestingSEIEnabled, 0, "Control generation of scalable nesting SEI messages") 680 #endif 613 681 #if SIGNAL_BITRATE_PICRATE_IN_VPS 614 682 ("BitRatePicRateMaxTLayers", m_bitRatePicRateMaxTLayers, 0, "Maximum number of sub-layers signalled; can be inferred otherwise; here for easy parsing of config. file") … … 914 982 m_iWaveFrontSubstreams = m_iWaveFrontSynchro ? (m_iSourceHeight + m_uiMaxCUHeight - 1) / m_uiMaxCUHeight : 1; 915 983 984 #if J0149_TONE_MAPPING_SEI 985 if( m_toneMappingInfoSEIEnabled && !m_toneMapCancelFlag ) 986 { 987 Char* pcStartOfCodedInterval = cfg_startOfCodedInterval.empty() ? NULL: strdup(cfg_startOfCodedInterval.c_str()); 988 Char* pcCodedPivotValue = cfg_codedPivotValue.empty() ? NULL: strdup(cfg_codedPivotValue.c_str()); 989 Char* pcTargetPivotValue = cfg_targetPivotValue.empty() ? NULL: strdup(cfg_targetPivotValue.c_str()); 990 if( m_toneMapModelId == 2 && pcStartOfCodedInterval ) 991 { 992 char *startOfCodedInterval; 993 UInt num = 1u<< m_toneMapTargetBitDepth; 994 m_startOfCodedInterval = new Int[num]; 995 ::memset( m_startOfCodedInterval, 0, sizeof(Int)*num ); 996 startOfCodedInterval = strtok(pcStartOfCodedInterval, " ."); 997 int i = 0; 998 while( startOfCodedInterval && ( i < num ) ) 999 { 1000 m_startOfCodedInterval[i] = atoi( startOfCodedInterval ); 1001 startOfCodedInterval = strtok(NULL, " ."); 1002 i++; 1003 } 1004 } 1005 else 1006 { 1007 m_startOfCodedInterval = NULL; 1008 } 1009 if( ( m_toneMapModelId == 3 ) && ( m_numPivots > 0 ) ) 1010 { 1011 if( pcCodedPivotValue && pcTargetPivotValue ) 1012 { 1013 char *codedPivotValue; 1014 char *targetPivotValue; 1015 m_codedPivotValue = new Int[m_numPivots]; 1016 m_targetPivotValue = new Int[m_numPivots]; 1017 ::memset( m_codedPivotValue, 0, sizeof(Int)*( m_numPivots ) ); 1018 ::memset( m_targetPivotValue, 0, sizeof(Int)*( m_numPivots ) ); 1019 codedPivotValue = strtok(pcCodedPivotValue, " ."); 1020 int i=0; 1021 while(codedPivotValue&&i<m_numPivots) 1022 { 1023 m_codedPivotValue[i] = atoi( codedPivotValue ); 1024 codedPivotValue = strtok(NULL, " ."); 1025 i++; 1026 } 1027 i=0; 1028 targetPivotValue = strtok(pcTargetPivotValue, " ."); 1029 while(targetPivotValue&&i<m_numPivots) 1030 { 1031 m_targetPivotValue[i]= atoi( targetPivotValue ); 1032 targetPivotValue = strtok(NULL, " ."); 1033 i++; 1034 } 1035 } 1036 } 1037 else 1038 { 1039 m_codedPivotValue = NULL; 1040 m_targetPivotValue = NULL; 1041 } 1042 } 1043 #endif 916 1044 // check validity of input parameters 917 1045 xCheckParameter(); … … 1609 1737 { 1610 1738 m_numReorderPics[i] = 0; 1739 #if L0323_DPB 1740 m_maxDecPicBuffering[i] = 1; 1741 #else 1611 1742 m_maxDecPicBuffering[i] = 0; 1743 #endif 1612 1744 } 1613 1745 for(Int i=0; i<m_iGOPSize; i++) 1614 1746 { 1747 #if L0323_DPB 1748 if(m_GOPList[i].m_numRefPics+1 > m_maxDecPicBuffering[m_GOPList[i].m_temporalId]) 1749 #else 1615 1750 if(m_GOPList[i].m_numRefPics > m_maxDecPicBuffering[m_GOPList[i].m_temporalId]) 1616 { 1751 #endif 1752 { 1753 #if L0323_DPB 1754 m_maxDecPicBuffering[m_GOPList[i].m_temporalId] = m_GOPList[i].m_numRefPics + 1; 1755 #else 1617 1756 m_maxDecPicBuffering[m_GOPList[i].m_temporalId] = m_GOPList[i].m_numRefPics; 1757 #endif 1618 1758 } 1619 1759 Int highestDecodingNumberWithLowerPOC = 0; … … 1646 1786 m_numReorderPics[i+1] = m_numReorderPics[i]; 1647 1787 } 1788 #if L0323_DPB 1789 // the value of num_reorder_pics[ i ] shall be in the range of 0 to max_dec_pic_buffering[ i ] - 1, inclusive 1790 if(m_numReorderPics[i] > m_maxDecPicBuffering[i] - 1) 1791 { 1792 m_maxDecPicBuffering[i] = m_numReorderPics[i] + 1; 1793 } 1794 #else 1648 1795 // the value of num_reorder_pics[ i ] shall be in the range of 0 to max_dec_pic_buffering[ i ], inclusive 1649 1796 if(m_numReorderPics[i] > m_maxDecPicBuffering[i]) … … 1651 1798 m_maxDecPicBuffering[i] = m_numReorderPics[i]; 1652 1799 } 1800 #endif 1653 1801 // a lower layer can not have higher value of m_uiMaxDecPicBuffering than a higher layer 1654 1802 if(m_maxDecPicBuffering[i+1] < m_maxDecPicBuffering[i]) … … 1657 1805 } 1658 1806 } 1807 1808 1809 #if L0323_DPB 1810 // the value of num_reorder_pics[ i ] shall be in the range of 0 to max_dec_pic_buffering[ i ] - 1, inclusive 1811 if(m_numReorderPics[MAX_TLAYER-1] > m_maxDecPicBuffering[MAX_TLAYER-1] - 1) 1812 { 1813 m_maxDecPicBuffering[MAX_TLAYER-1] = m_numReorderPics[MAX_TLAYER-1] + 1; 1814 } 1815 #else 1659 1816 // the value of num_reorder_pics[ i ] shall be in the range of 0 to max_dec_pic_buffering[ i ], inclusive 1660 1817 if(m_numReorderPics[MAX_TLAYER-1] > m_maxDecPicBuffering[MAX_TLAYER-1]) … … 1662 1819 m_maxDecPicBuffering[MAX_TLAYER-1] = m_numReorderPics[MAX_TLAYER-1]; 1663 1820 } 1821 #endif 1664 1822 1665 1823 if(m_vuiParametersPresentFlag && m_bitstreamRestrictionFlag) … … 1736 1894 } 1737 1895 } 1896 #if !L0034_COMBINED_LIST_CLEANUP 1738 1897 xConfirmPara( m_bUseLComb==false && m_numReorderPics[MAX_TLAYER-1]!=0, "ListCombination can only be 0 in low delay coding (more precisely when L0 and L1 are identical)" ); // Note however this is not the full necessary condition as ref_pic_list_combination_flag can only be 0 if L0 == L1. 1898 #endif 1739 1899 xConfirmPara( m_iWaveFrontSynchro < 0, "WaveFrontSynchro cannot be negative" ); 1740 1900 xConfirmPara( m_iWaveFrontSubstreams <= 0, "WaveFrontSubstreams must be positive" ); … … 1742 1902 1743 1903 xConfirmPara( m_decodedPictureHashSEIEnabled<0 || m_decodedPictureHashSEIEnabled>3, "this hash type is not correct!\n"); 1904 1905 #if J0149_TONE_MAPPING_SEI 1906 if (m_toneMappingInfoSEIEnabled) 1907 { 1908 xConfirmPara( m_toneMapCodedDataBitDepth < 8 || m_toneMapCodedDataBitDepth > 14 , "SEIToneMapCodedDataBitDepth must be in rage 8 to 14"); 1909 xConfirmPara( m_toneMapTargetBitDepth < 1 || (m_toneMapTargetBitDepth > 16 && m_toneMapTargetBitDepth < 255) , "SEIToneMapTargetBitDepth must be in rage 1 to 16 or equal to 255"); 1910 xConfirmPara( m_toneMapModelId < 0 || m_toneMapModelId > 4 , "SEIToneMapModelId must be in rage 0 to 4"); 1911 xConfirmPara( m_cameraIsoSpeedValue == 0, "SEIToneMapCameraIsoSpeedValue shall not be equal to 0"); 1912 xConfirmPara( m_extendedRangeWhiteLevel < 100, "SEIToneMapExtendedRangeWhiteLevel should be greater than or equal to 100"); 1913 xConfirmPara( m_nominalBlackLevelLumaCodeValue >= m_nominalWhiteLevelLumaCodeValue, "SEIToneMapNominalWhiteLevelLumaCodeValue shall be greater than SEIToneMapNominalBlackLevelLumaCodeValue"); 1914 xConfirmPara( m_extendedWhiteLevelLumaCodeValue < m_nominalWhiteLevelLumaCodeValue, "SEIToneMapExtendedWhiteLevelLumaCodeValue shall be greater than or equal to SEIToneMapNominalWhiteLevelLumaCodeValue"); 1915 } 1916 #endif 1744 1917 1745 1918 #if RATE_CONTROL_LAMBDA_DOMAIN … … 1908 2081 printf("SQP:%d ", m_uiDeltaQpRD ); 1909 2082 printf("ASR:%d ", m_bUseASR ); 2083 #if !L0034_COMBINED_LIST_CLEANUP 1910 2084 printf("LComb:%d ", m_bUseLComb ); 2085 #endif 1911 2086 printf("FEN:%d ", m_bUseFastEnc ); 1912 2087 printf("ECU:%d ", m_bUseEarlyCU ); -
branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncCfg.h
r324 r362 124 124 GOPEntry m_GOPList[MAX_GOP]; ///< the coding structure entries from the config file 125 125 Int m_numReorderPics[MAX_TLAYER]; ///< total number of reorder pictures 126 #if L0323_DPB 127 Int m_maxDecPicBuffering[MAX_TLAYER]; ///< total number of pictures in the decoded picture buffer 128 #else 126 129 Int m_maxDecPicBuffering[MAX_TLAYER]; ///< total number of reference pictures needed for decoding 127 130 #endif 131 #if !L0034_COMBINED_LIST_CLEANUP 128 132 Bool m_bUseLComb; ///< flag for using combined reference list for uni-prediction in B-slices (JCTVC-D421) 133 #endif 129 134 Bool m_useTransformSkip; ///< flag for enabling intra transform skipping 130 135 Bool m_useTransformSkipFast; ///< flag for enabling fast intra transform skipping … … 207 212 Int m_loopFilterTcOffsetDiv2; ///< tc offset for deblocking filter 208 213 Bool m_DeblockingFilterControlPresent; ///< deblocking filter control present flag in PPS 214 #if L0386_DB_METRIC 215 Bool m_DeblockingFilterMetric; ///< blockiness metric in encoder 216 #endif 209 217 210 218 // coding tools (PCM) … … 256 264 Int m_bufferingPeriodSEIEnabled; 257 265 Int m_pictureTimingSEIEnabled; 266 #if J0149_TONE_MAPPING_SEI 267 Bool m_toneMappingInfoSEIEnabled; 268 Int m_toneMapId; 269 Bool m_toneMapCancelFlag; 270 Bool m_toneMapPersistenceFlag; 271 Int m_toneMapCodedDataBitDepth; 272 Int m_toneMapTargetBitDepth; 273 Int m_toneMapModelId; 274 Int m_toneMapMinValue; 275 Int m_toneMapMaxValue; 276 Int m_sigmoidMidpoint; 277 Int m_sigmoidWidth; 278 Int m_numPivots; 279 Int m_cameraIsoSpeedIdc; 280 Int m_cameraIsoSpeedValue; 281 Int m_exposureCompensationValueSignFlag; 282 Int m_exposureCompensationValueNumerator; 283 Int m_exposureCompensationValueDenomIdc; 284 Int m_refScreenLuminanceWhite; 285 Int m_extendedRangeWhiteLevel; 286 Int m_nominalBlackLevelLumaCodeValue; 287 Int m_nominalWhiteLevelLumaCodeValue; 288 Int m_extendedWhiteLevelLumaCodeValue; 289 Int* m_startOfCodedInterval; 290 Int* m_codedPivotValue; 291 Int* m_targetPivotValue; 292 #endif 258 293 Int m_framePackingSEIEnabled; 259 294 Int m_framePackingSEIType; … … 265 300 Int m_gradualDecodingRefreshInfoEnabled; 266 301 Int m_decodingUnitInfoSEIEnabled; 302 #if L0208_SOP_DESCRIPTION_SEI 303 Int m_SOPDescriptionSEIEnabled; 304 #endif 305 #if K0180_SCALABLE_NESTING_SEI 306 Int m_scalableNestingSEIEnabled; 307 #endif 267 308 // weighted prediction 268 309 Bool m_useWeightedPred; ///< Use of weighted prediction in P slices -
branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncTop.cpp
r324 r362 207 207 m_cTEncTop.setLoopFilterTcOffset ( m_loopFilterTcOffsetDiv2 ); 208 208 m_cTEncTop.setDeblockingFilterControlPresent( m_DeblockingFilterControlPresent); 209 #if L0386_DB_METRIC 210 m_cTEncTop.setDeblockingFilterMetric ( m_DeblockingFilterMetric ); 211 #endif 209 212 210 213 //====== Motion search ======== … … 243 246 m_cTEncTop.setUseHADME ( m_bUseHADME ); 244 247 m_cTEncTop.setUseLossless ( m_useLossless ); 248 #if !L0034_COMBINED_LIST_CLEANUP 245 249 m_cTEncTop.setUseLComb ( m_bUseLComb ); 250 #endif 246 251 #if H_MV 247 252 m_cTEncTop.setdQPs ( m_aidQP[layer] ); … … 321 326 m_cTEncTop.setBufferingPeriodSEIEnabled( m_bufferingPeriodSEIEnabled ); 322 327 m_cTEncTop.setPictureTimingSEIEnabled( m_pictureTimingSEIEnabled ); 328 #if J0149_TONE_MAPPING_SEI 329 m_cTEncTop.setToneMappingInfoSEIEnabled ( m_toneMappingInfoSEIEnabled ); 330 m_cTEncTop.setTMISEIToneMapId ( m_toneMapId ); 331 m_cTEncTop.setTMISEIToneMapCancelFlag ( m_toneMapCancelFlag ); 332 m_cTEncTop.setTMISEIToneMapPersistenceFlag ( m_toneMapPersistenceFlag ); 333 m_cTEncTop.setTMISEICodedDataBitDepth ( m_toneMapCodedDataBitDepth ); 334 m_cTEncTop.setTMISEITargetBitDepth ( m_toneMapTargetBitDepth ); 335 m_cTEncTop.setTMISEIModelID ( m_toneMapModelId ); 336 m_cTEncTop.setTMISEIMinValue ( m_toneMapMinValue ); 337 m_cTEncTop.setTMISEIMaxValue ( m_toneMapMaxValue ); 338 m_cTEncTop.setTMISEISigmoidMidpoint ( m_sigmoidMidpoint ); 339 m_cTEncTop.setTMISEISigmoidWidth ( m_sigmoidWidth ); 340 m_cTEncTop.setTMISEIStartOfCodedInterva ( m_startOfCodedInterval ); 341 m_cTEncTop.setTMISEINumPivots ( m_numPivots ); 342 m_cTEncTop.setTMISEICodedPivotValue ( m_codedPivotValue ); 343 m_cTEncTop.setTMISEITargetPivotValue ( m_targetPivotValue ); 344 m_cTEncTop.setTMISEICameraIsoSpeedIdc ( m_cameraIsoSpeedIdc ); 345 m_cTEncTop.setTMISEICameraIsoSpeedValue ( m_cameraIsoSpeedValue ); 346 m_cTEncTop.setTMISEIExposureCompensationValueSignFlag ( m_exposureCompensationValueSignFlag ); 347 m_cTEncTop.setTMISEIExposureCompensationValueNumerator ( m_exposureCompensationValueNumerator ); 348 m_cTEncTop.setTMISEIExposureCompensationValueDenomIdc ( m_exposureCompensationValueDenomIdc ); 349 m_cTEncTop.setTMISEIRefScreenLuminanceWhite ( m_refScreenLuminanceWhite ); 350 m_cTEncTop.setTMISEIExtendedRangeWhiteLevel ( m_extendedRangeWhiteLevel ); 351 m_cTEncTop.setTMISEINominalBlackLevelLumaCodeValue ( m_nominalBlackLevelLumaCodeValue ); 352 m_cTEncTop.setTMISEINominalWhiteLevelLumaCodeValue ( m_nominalWhiteLevelLumaCodeValue ); 353 m_cTEncTop.setTMISEIExtendedWhiteLevelLumaCodeValue ( m_extendedWhiteLevelLumaCodeValue ); 354 #endif 323 355 m_cTEncTop.setFramePackingArrangementSEIEnabled( m_framePackingSEIEnabled ); 324 356 m_cTEncTop.setFramePackingArrangementSEIType( m_framePackingSEIType ); … … 330 362 m_cTEncTop.setGradualDecodingRefreshInfoEnabled( m_gradualDecodingRefreshInfoEnabled ); 331 363 m_cTEncTop.setDecodingUnitInfoSEIEnabled( m_decodingUnitInfoSEIEnabled ); 364 #if L0208_SOP_DESCRIPTION_SEI 365 m_cTEncTop.setSOPDescriptionSEIEnabled( m_SOPDescriptionSEIEnabled ); 366 #endif 367 #if K0180_SCALABLE_NESTING_SEI 368 m_cTEncTop.setScalableNestingSEIEnabled( m_scalableNestingSEIEnabled ); 369 #endif 332 370 m_cTEncTop.setUniformSpacingIdr ( m_iUniformSpacingIdr ); 333 371 m_cTEncTop.setNumColumnsMinus1 ( m_iNumColumnsMinus1 ); … … 832 870 case NAL_UNIT_CODED_SLICE_TRAIL_R: 833 871 case NAL_UNIT_CODED_SLICE_TRAIL_N: 834 case NAL_UNIT_CODED_SLICE_TLA :872 case NAL_UNIT_CODED_SLICE_TLA_R: 835 873 case NAL_UNIT_CODED_SLICE_TSA_N: 836 874 case NAL_UNIT_CODED_SLICE_STSA_R: 837 875 case NAL_UNIT_CODED_SLICE_STSA_N: 838 case NAL_UNIT_CODED_SLICE_BLA :839 case NAL_UNIT_CODED_SLICE_BLA NT:876 case NAL_UNIT_CODED_SLICE_BLA_W_LP: 877 case NAL_UNIT_CODED_SLICE_BLA_W_RADL: 840 878 case NAL_UNIT_CODED_SLICE_BLA_N_LP: 841 case NAL_UNIT_CODED_SLICE_IDR :879 case NAL_UNIT_CODED_SLICE_IDR_W_RADL: 842 880 case NAL_UNIT_CODED_SLICE_IDR_N_LP: 843 881 case NAL_UNIT_CODED_SLICE_CRA: 844 882 case NAL_UNIT_CODED_SLICE_RADL_N: 845 case NAL_UNIT_CODED_SLICE_ DLP:883 case NAL_UNIT_CODED_SLICE_RADL_R: 846 884 case NAL_UNIT_CODED_SLICE_RASL_N: 847 case NAL_UNIT_CODED_SLICE_ TFD:885 case NAL_UNIT_CODED_SLICE_RASL_R: 848 886 case NAL_UNIT_VPS: 849 887 case NAL_UNIT_SPS:
Note: See TracChangeset for help on using the changeset viewer.
