Changeset 1475 in SHVCSoftware for branches/SHM-dev/source/App/TAppDecoder
- Timestamp:
- 22 Sep 2015, 20:18:26 (9 years ago)
- Location:
- branches/SHM-dev/source/App/TAppDecoder
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.cpp
r1472 r1475 128 128 ("TarDecLayerIdSetFile,l", cfg_TargetDecLayerIdSetFile, string(""), "targetDecLayerIdSet file name. The file should include white space separated LayerId values to be decoded. Omitting the option or a value of -1 in the file decodes all layers.") 129 129 ("RespectDefDispWindow,w", m_respectDefDispWindow, 0, "Only output content inside the default display window\n") 130 #if Q0074_COLOUR_REMAPPING_SEI131 130 ("SEIColourRemappingInfoFilename", m_colourRemapSEIFileName, string(""), "Colour Remapping YUV output file name. If empty, no remapping is applied (ignore SEI message)\n") 132 #endif133 131 #if O0043_BEST_EFFORT_DECODING 134 132 ("ForceDecodeBitDepth", m_forceDecodeBitDepth, 0U, "Force the decoder to operate at a particular bit-depth (best effort decoding)") -
branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.h
r1472 r1475 74 74 Int m_decodedPictureHashSEIEnabled; ///< Checksum(3)/CRC(2)/MD5(1)/disable(0) acting on decoded picture hash SEI message 75 75 Bool m_decodedNoDisplaySEIEnabled; ///< Enable(true)/disable(false) writing only pictures that get displayed based on the no display SEI message 76 #if Q0074_COLOUR_REMAPPING_SEI77 76 std::string m_colourRemapSEIFileName; ///< output Colour Remapping file name 78 #endif79 77 std::vector<Int> m_targetDecLayerIdSet; ///< set of LayerIds to be included in the sub-bitstream extraction process. 80 78 Int m_respectDefDispWindow; ///< Only output content inside the default display window … … 112 110 , m_decodedPictureHashSEIEnabled(0) 113 111 , m_decodedNoDisplaySEIEnabled(false) 114 #if Q0074_COLOUR_REMAPPING_SEI115 112 , m_colourRemapSEIFileName() 116 #endif117 113 , m_targetDecLayerIdSet() 118 114 , m_respectDefDispWindow(0) -
branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp
r1472 r1475 62 62 #if SVC_EXTENSION 63 63 TAppDecTop::TAppDecTop() 64 #if Q0074_COLOUR_REMAPPING_SEI65 64 : m_pcSeiColourRemappingInfoPrevious(NULL) 66 #endif67 65 { 68 66 memset( m_apcTDecTop, 0, sizeof(m_apcTDecTop) ); … … 77 75 TAppDecTop::TAppDecTop() 78 76 : m_iPOCLastDisplay(-MAX_INT) 79 #if Q0074_COLOUR_REMAPPING_SEI80 77 ,m_pcSeiColourRemappingInfoPrevious(NULL) 81 #endif82 78 { 83 79 } … … 163 159 #endif 164 160 165 #if Q0074_COLOUR_REMAPPING_SEI166 161 // clear contents of colour-remap-information-SEI output file 167 162 if (!m_colourRemapSEIFileName.empty()) … … 174 169 } 175 170 } 176 #endif177 171 178 172 // main decoder loop … … 629 623 m_cTDecTop.destroy(); 630 624 #endif 631 #if Q0074_COLOUR_REMAPPING_SEI632 625 if (m_pcSeiColourRemappingInfoPrevious != NULL) 633 626 { … … 635 628 m_pcSeiColourRemappingInfoPrevious = NULL; 636 629 } 637 #endif638 630 } 639 631 … … 656 648 m_cTDecTop.setForceDecodeBitDepth(m_forceDecodeBitDepth); 657 649 #endif 658 659 650 if (!m_outputDecodedSEIMessagesFilename.empty()) 660 651 { … … 674 665 #endif 675 666 676 #if Q0074_COLOUR_REMAPPING_SEI677 667 if (m_pcSeiColourRemappingInfoPrevious != NULL) 678 668 { … … 680 670 m_pcSeiColourRemappingInfoPrevious = NULL; 681 671 } 682 #endif683 672 } 684 673 … … 911 900 } 912 901 913 #if Q0074_COLOUR_REMAPPING_SEI914 902 if (!m_colourRemapSEIFileName.empty()) 915 903 { 916 904 xOutputColourRemapPic(pcPic); 917 905 } 918 #endif919 906 920 907 // update POC of display order … … 1083 1070 } 1084 1071 1085 #if Q0074_COLOUR_REMAPPING_SEI1086 1072 if (!m_colourRemapSEIFileName.empty()) 1087 1073 { 1088 1074 xOutputColourRemapPic(pcPic); 1089 1075 } 1090 #endif1091 1076 1092 1077 // update POC of display order … … 1146 1131 return false; 1147 1132 } 1148 1149 #if Q0074_COLOUR_REMAPPING_SEI1150 1133 1151 1134 Void TAppDecTop::xOutputColourRemapPic(TComPic* pcPic) … … 1468 1451 } 1469 1452 } 1470 #endif1471 1453 1472 1454 #if ALIGNED_BUMPING … … 1491 1473 conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset() ); 1492 1474 1493 #if Q0074_COLOUR_REMAPPING_SEI1494 1475 if( !m_colourRemapSEIFileName.empty() ) 1495 1476 { 1496 1477 xOutputColourRemapPic(pic); 1497 1478 } 1498 #endif1499 1479 } 1500 1480 // update POC of display order -
branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.h
r1470 r1475 81 81 std::ofstream m_seiMessageFileStream; ///< Used for outputing SEI messages. 82 82 83 #if Q0074_COLOUR_REMAPPING_SEI84 83 SEIColourRemappingInfo* m_pcSeiColourRemappingInfoPrevious; 85 #endif86 84 87 85 public: … … 125 123 Bool isNaluWithinTargetDecLayerIdSet ( InputNALUnit* nalu ); ///< check whether given Nalu is within targetDecLayerIdSet 126 124 127 #if Q0074_COLOUR_REMAPPING_SEI128 125 private: 129 126 Void applyColourRemapping(const TComPicYuv& pic, SEIColourRemappingInfo& pCriSEI, const TComSPS &activeSPS); 130 127 Void xOutputColourRemapPic(TComPic* pcPic); 131 #endif 128 132 129 #if ALIGNED_BUMPING 133 130 Void checkOutputBeforeDecoding(Int layerIdx);
Note: See TracChangeset for help on using the changeset viewer.