Changeset 917 in SHVCSoftware for branches/SHM-upgrade
- Timestamp:
- 12 Nov 2014, 19:17:13 (10 years ago)
- Location:
- branches/SHM-upgrade/source
- Files:
-
- 5 edited
-
App/TAppEncoder/TAppEncCfg.cpp (modified) (2 diffs)
-
App/TAppEncoder/TAppEncLayerCfg.cpp (modified) (3 diffs)
-
App/TAppEncoder/TAppEncTop.cpp (modified) (5 diffs)
-
Lib/TLibCommon/TypeDef.h (modified) (3 diffs)
-
Lib/TLibEncoder/TEncAnalyze.h (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-upgrade/source/App/TAppEncoder/TAppEncCfg.cpp
r916 r917 4540 4540 printf("\n"); 4541 4541 #if SVC_EXTENSION 4542 printf("Total number of layers : %d\n", m_numLayers );4543 printf("Multiview : %d\n", m_scalabilityMask[VIEW_ORDER_INDEX] );4544 printf("Scalable : %d\n", m_scalabilityMask[SCALABILITY_ID] );4542 printf("Total number of layers : %d\n", m_numLayers ); 4543 printf("Multiview : %d\n", m_scalabilityMask[VIEW_ORDER_INDEX] ); 4544 printf("Scalable : %d\n", m_scalabilityMask[SCALABILITY_ID] ); 4545 4545 #if AVC_BASE 4546 4546 #if VPS_AVC_BL_FLAG_REMOVAL 4547 printf("Base layer : %s\n", m_nonHEVCBaseLayerFlag ? "Non-HEVC" : "HEVC");4548 #else 4549 printf("Base layer : %s\n", m_avcBaseLayerFlag ? "AVC" : "HEVC");4547 printf("Base layer : %s\n", m_nonHEVCBaseLayerFlag ? "Non-HEVC" : "HEVC"); 4548 #else 4549 printf("Base layer : %s\n", m_avcBaseLayerFlag ? "AVC" : "HEVC"); 4550 4550 #endif 4551 4551 #endif 4552 4552 #if AUXILIARY_PICTURES 4553 printf("Auxiliary pictures : %d\n", m_scalabilityMask[AUX_ID] );4553 printf("Auxiliary pictures : %d\n", m_scalabilityMask[AUX_ID] ); 4554 4554 #endif 4555 4555 #if M0040_ADAPTIVE_RESOLUTION_CHANGE 4556 printf("Adaptive Resolution Change : %d\n", m_adaptiveResolutionChange );4556 printf("Adaptive Resolution Change : %d\n", m_adaptiveResolutionChange ); 4557 4557 #endif 4558 4558 #if HIGHER_LAYER_IRAP_SKIP_FLAG 4559 printf("Skip picture at ARC switch : %d\n", m_skipPictureAtArcSwitch );4559 printf("Skip picture at ARC switch : %d\n", m_skipPictureAtArcSwitch ); 4560 4560 #endif 4561 4561 #if O0223_PICTURE_TYPES_ALIGN_FLAG 4562 printf("Align picture type : %d\n", m_crossLayerPictureTypeAlignFlag );4563 #endif 4564 printf("Cross layer IRAP alignment : %d\n", m_crossLayerIrapAlignFlag );4562 printf("Align picture type : %d\n", m_crossLayerPictureTypeAlignFlag ); 4563 #endif 4564 printf("Cross layer IRAP alignment : %d\n", m_crossLayerIrapAlignFlag ); 4565 4565 #if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG 4566 printf("IDR only for IRAP : %d\n", m_crossLayerAlignedIdrOnlyFlag );4566 printf("IDR only for IRAP : %d\n", m_crossLayerAlignedIdrOnlyFlag ); 4567 4567 #endif 4568 4568 #if O0194_WEIGHTED_PREDICTION_CGS 4569 printf("InterLayerWeightedPred : %d\n", m_useInterLayerWeightedPred ); 4570 #endif 4571 #if O0215_PHASE_ALIGNMENT 4572 printf("Cross-layer sample alignment : %d\n", m_phaseAlignFlag); 4573 #endif 4569 printf("InterLayerWeightedPred : %d\n", m_useInterLayerWeightedPred ); 4570 #endif 4571 #if O0215_PHASE_ALIGNMENT 4572 printf("Cross-layer sample alignment : %d\n", m_phaseAlignFlag); 4573 #endif 4574 printf("\n"); 4574 4575 for(UInt layer=0; layer<m_numLayers; layer++) 4575 4576 { … … 4579 4580 } 4580 4581 printf("=== Common configuration settings === \n"); 4581 printf("Bitstream File : %s\n", m_pBitstreamFile );4582 printf("Bitstream File : %s\n", m_pBitstreamFile ); 4582 4583 #else //SVC_EXTENSION 4583 4584 printf("Input File : %s\n", m_pchInputFile ); -
branches/SHM-upgrade/source/App/TAppEncoder/TAppEncLayerCfg.cpp
r916 r917 300 300 Void TAppEncLayerCfg::xPrintParameter() 301 301 { 302 printf("Input File : %s\n", m_cInputFile.c_str() );303 printf("Reconstruction File : %s\n", m_cReconFile.c_str() );302 printf("Input File : %s\n", m_cInputFile.c_str() ); 303 printf("Reconstruction File : %s\n", m_cReconFile.c_str() ); 304 304 #if REPN_FORMAT_IN_VPS 305 printf("Real Format : %dx%d %dHz\n", m_iSourceWidth - ( m_confWinLeft + m_confWinRight ) * TComSPS::getWinUnitX( m_chromaFormatIDC ), m_iSourceHeight - ( m_confWinTop + m_confWinBottom ) * TComSPS::getWinUnitY( m_chromaFormatIDC ), m_iFrameRate );306 #else 307 printf("Real Format : %dx%d %dHz\n", m_iSourceWidth - m_confWinLeft - m_confWinRight, m_iSourceHeight - m_confWinTop - m_confWinBottom, m_iFrameRate );308 #endif 309 printf("Internal Format : %dx%d %dHz\n", m_iSourceWidth, m_iSourceHeight, m_iFrameRate );305 printf("Real Format : %dx%d %dHz\n", m_iSourceWidth - ( m_confWinLeft + m_confWinRight ) * TComSPS::getWinUnitX( m_chromaFormatIDC ), m_iSourceHeight - ( m_confWinTop + m_confWinBottom ) * TComSPS::getWinUnitY( m_chromaFormatIDC ), m_iFrameRate ); 306 #else 307 printf("Real Format : %dx%d %dHz\n", m_iSourceWidth - m_confWinLeft - m_confWinRight, m_iSourceHeight - m_confWinTop - m_confWinBottom, m_iFrameRate ); 308 #endif 309 printf("Internal Format : %dx%d %dHz\n", m_iSourceWidth, m_iSourceHeight, m_iFrameRate ); 310 310 #if O0194_DIFFERENT_BITDEPTH_EL_BL 311 printf("Input bit depth : (Y:%d, C:%d)\n", m_inputBitDepth[CHANNEL_TYPE_LUMA], m_inputBitDepth[CHANNEL_TYPE_CHROMA] ); 312 printf("Internal bit depth : (Y:%d, C:%d)\n", m_internalBitDepth[CHANNEL_TYPE_LUMA], m_internalBitDepth[CHANNEL_TYPE_CHROMA] ); 313 printf("PCM sample bit depth : (Y:%d, C:%d)\n", m_cAppEncCfg->getPCMInputBitDepthFlag() ? m_inputBitDepth[CHANNEL_TYPE_LUMA] : m_internalBitDepth[CHANNEL_TYPE_LUMA], m_cAppEncCfg->getPCMInputBitDepthFlag() ? m_inputBitDepth[CHANNEL_TYPE_CHROMA] : m_internalBitDepth[CHANNEL_TYPE_CHROMA] ); 314 #endif 311 printf("Input bit depth : (Y:%d, C:%d)\n", m_inputBitDepth[CHANNEL_TYPE_LUMA], m_inputBitDepth[CHANNEL_TYPE_CHROMA] ); 312 printf("Internal bit depth : (Y:%d, C:%d)\n", m_internalBitDepth[CHANNEL_TYPE_LUMA], m_internalBitDepth[CHANNEL_TYPE_CHROMA] ); 313 printf("PCM sample bit depth : (Y:%d, C:%d)\n", m_cAppEncCfg->getPCMInputBitDepthFlag() ? m_inputBitDepth[CHANNEL_TYPE_LUMA] : m_internalBitDepth[CHANNEL_TYPE_LUMA], m_cAppEncCfg->getPCMInputBitDepthFlag() ? m_inputBitDepth[CHANNEL_TYPE_CHROMA] : m_internalBitDepth[CHANNEL_TYPE_CHROMA] ); 314 #endif 315 #if SVC_EXTENSION 316 std::cout << "Input ChromaFormatIDC :"; 317 #else 315 318 std::cout << std::setw(43) << "Input ChromaFormatIDC = "; 319 #endif 316 320 switch (m_InputChromaFormatIDC) 317 321 { … … 326 330 std::cout << std::endl; 327 331 332 #if SVC_EXTENSION 333 std::cout << "Output (internal) ChromaFormatIDC :"; 334 #else 328 335 std::cout << std::setw(43) << "Output (internal) ChromaFormatIDC = "; 336 #endif 329 337 switch (m_chromaFormatIDC) 330 338 { … … 339 347 std::cout << "\n" << std::endl; 340 348 #if LAYER_CTB 341 printf("CU size / depth : %d / %d\n", m_uiMaxCUWidth, m_uiMaxCUDepth );342 printf("RQT trans. size (min / max) : %d / %d\n", 1 << m_uiQuadtreeTULog2MinSize, 1 << m_uiQuadtreeTULog2MaxSize );343 printf("Max RQT depth inter : %d\n", m_uiQuadtreeTUMaxDepthInter);344 printf("Max RQT depth intra : %d\n", m_uiQuadtreeTUMaxDepthIntra);345 #endif 346 printf("QP : %5.2f\n", m_fQP );347 printf("Intra period : %d\n", m_iIntraPeriod );348 #if RC_SHVC_HARMONIZATION 349 printf("RateControl : %d\n", m_RCEnableRateControl );349 printf("CU size / depth : %d / %d\n", m_uiMaxCUWidth, m_uiMaxCUDepth ); 350 printf("RQT trans. size (min / max) : %d / %d\n", 1 << m_uiQuadtreeTULog2MinSize, 1 << m_uiQuadtreeTULog2MaxSize ); 351 printf("Max RQT depth inter : %d\n", m_uiQuadtreeTUMaxDepthInter); 352 printf("Max RQT depth intra : %d\n", m_uiQuadtreeTUMaxDepthIntra); 353 #endif 354 printf("QP : %5.2f\n", m_fQP ); 355 printf("Intra period : %d\n", m_iIntraPeriod ); 356 #if RC_SHVC_HARMONIZATION 357 printf("RateControl : %d\n", m_RCEnableRateControl ); 350 358 if(m_RCEnableRateControl) 351 359 { 352 printf("TargetBitrate : %d\n", m_RCTargetBitrate ); 353 printf("KeepHierarchicalBit : %d\n", m_RCKeepHierarchicalBit ); 354 printf("LCULevelRC : %d\n", m_RCLCULevelRC ); 355 printf("UseLCUSeparateModel : %d\n", m_RCUseLCUSeparateModel ); 356 printf("InitialQP : %d\n", m_RCInitialQP ); 357 printf("ForceIntraQP : %d\n", m_RCForceIntraQP ); 358 } 359 #endif 360 printf("WaveFrontSynchro:%d WaveFrontSubstreams:%d", m_waveFrontSynchro, m_iWaveFrontSubstreams); 360 printf("TargetBitrate : %d\n", m_RCTargetBitrate ); 361 printf("KeepHierarchicalBit : %d\n", m_RCKeepHierarchicalBit ); 362 printf("LCULevelRC : %d\n", m_RCLCULevelRC ); 363 printf("UseLCUSeparateModel : %d\n", m_RCUseLCUSeparateModel ); 364 printf("InitialQP : %d\n", m_RCInitialQP ); 365 printf("ForceIntraQP : %d\n", m_RCForceIntraQP ); 366 } 367 #endif 368 printf("WaveFrontSynchro : %d\n", m_waveFrontSynchro); 369 printf("WaveFrontSubstreams : %d\n", m_iWaveFrontSubstreams); 361 370 #if LAYER_CTB 362 printf("PCM :%d ", (m_cAppEncCfg->getUsePCM() && (1<<m_cAppEncCfg->getPCMLog2MinSize()) <= m_uiMaxCUWidth)? 1 : 0);371 printf("PCM : %d ", (m_cAppEncCfg->getUsePCM() && (1<<m_cAppEncCfg->getPCMLog2MinSize()) <= m_uiMaxCUWidth)? 1 : 0); 363 372 #endif 364 373 } -
branches/SHM-upgrade/source/App/TAppEncoder/TAppEncTop.cpp
r916 r917 2321 2321 //-- all 2322 2322 printf( "\n\nSUMMARY --------------------------------------------------------\n" ); 2323 printf( "\tTotal Frames | " "Bitrate " "Y-PSNR " "U-PSNR " "V-PSNR \n" );2324 2323 for(layer = 0; layer < m_numLayers; layer++) 2325 2324 { … … 2328 2327 2329 2328 printf( "\n\nI Slices--------------------------------------------------------\n" ); 2330 printf( "\tTotal Frames | " "Bitrate " "Y-PSNR " "U-PSNR " "V-PSNR \n" );2331 2329 for(layer = 0; layer < m_numLayers; layer++) 2332 2330 { … … 2335 2333 2336 2334 printf( "\n\nP Slices--------------------------------------------------------\n" ); 2337 printf( "\tTotal Frames | " "Bitrate " "Y-PSNR " "U-PSNR " "V-PSNR \n" );2338 2335 for(layer = 0; layer < m_numLayers; layer++) 2339 2336 { … … 2342 2339 2343 2340 printf( "\n\nB Slices--------------------------------------------------------\n" ); 2344 printf( "\tTotal Frames | " "Bitrate " "Y-PSNR " "U-PSNR " "V-PSNR \n" );2345 2341 for(layer = 0; layer < m_numLayers; layer++) 2346 2342 { … … 2365 2361 } 2366 2362 } 2363 2364 printf("\n"); 2365 //printf("\nRVM: %.3lf\n" , xCalculateRVM()); 2367 2366 } 2368 2367 -
branches/SHM-upgrade/source/Lib/TLibCommon/TypeDef.h
r916 r917 228 228 229 229 #define Q0195_REP_FORMAT_CLEANUP 1 ///< JCTVC-Q0195: restructureing of rep_format() signaling 230 #define REP_FORMAT_FIX 1 ///< update_rep_format_flag should be inferred to be equal to 0231 230 232 231 #define R0156_CONF_WINDOW_IN_REP_FORMAT O0096_REP_FORMAT_INDEX ///< JCTVC-R0156: add conformance window cropping offsets to rep_format() … … 296 295 }; 297 296 298 #define WPP_FIX 1299 300 297 /// normative encoder constraints -------- 301 298 #define MFM_ENCCONSTRAINT 1 ///< JCTVC-O0216: Encoder constraint for motion field mapping … … 313 310 314 311 /// SEI messages ------------------------- 315 #define P0050_KNEE_FUNCTION_SEI 1 ///< JCTVC-P0050: Knee function SEI316 312 #define SUB_BITSTREAM_PROPERTY_SEI 1 ///< JCTVC-P0204: Sub-bitstream property SEI message 317 313 #if SUB_BITSTREAM_PROPERTY_SEI -
branches/SHM-upgrade/source/Lib/TLibEncoder/TEncAnalyze.h
r916 r917 165 165 if (printMSEBasedSNR) 166 166 { 167 #if SVC_EXTENSION 168 if( layer == 0 ) 169 { 170 #endif 167 171 printf( " \tTotal Frames | " "Bitrate " "Y-PSNR" ); 168 172 … … 171 175 172 176 //printf( "\t------------ " " ----------" " -------- " " -------- " " --------\n" ); 177 #if SVC_EXTENSION 178 } 179 180 printf( "Average: L%d \t %8d %c " "%12.4lf " "%8.4lf", 181 layer, 182 183 #else 173 184 printf( "Average: \t %8d %c " "%12.4lf " "%8.4lf", 185 #endif 174 186 getNumPic(), cDelim, 175 187 getBits() * dScale, … … 182 194 else printf("\n"); 183 195 196 #if SVC_EXTENSION 197 printf( "From MSE: L%d \t %8d %c " "%12.4lf " "%8.4lf\n", 198 layer, 199 #else 184 200 printf( "From MSE:\t %8d %c " "%12.4lf " "%8.4lf\n", 201 #endif 185 202 getNumPic(), cDelim, 186 203 getBits() * dScale, … … 196 213 //printf( "\t------------ " " ----------" " -------- " " -------- " " --------\n" ); 197 214 #if SVC_EXTENSION 198 printf( " L%d\t %8d %c " "%12.4lf " "%8.4lf",215 printf( " L%d \t %8d %c " "%12.4lf " "%8.4lf", 199 216 layer, 200 217 #else … … 223 240 if (printMSEBasedSNR) 224 241 { 242 #if SVC_EXTENSION 243 if( layer == 0 ) 244 { 245 #endif 225 246 printf( " \tTotal Frames | " "Bitrate " "Y-PSNR " "U-PSNR " "V-PSNR " "YUV-PSNR " ); 226 247 … … 229 250 230 251 //printf( "\t------------ " " ----------" " -------- " " -------- " " --------\n" ); 252 #if SVC_EXTENSION 253 } 254 printf( "Average: L%d \t %8d %c " "%12.4lf " "%8.4lf " "%8.4lf " "%8.4lf " "%8.4lf", 255 layer, 256 #else 231 257 printf( "Average: \t %8d %c " "%12.4lf " "%8.4lf " "%8.4lf " "%8.4lf " "%8.4lf", 258 #endif 232 259 getNumPic(), cDelim, 233 260 getBits() * dScale, … … 247 274 else printf("\n"); 248 275 276 #if SVC_EXTENSION 277 printf( "From MSE: L%d \t %8d %c " "%12.4lf " "%8.4lf " "%8.4lf " "%8.4lf " "%8.4lf\n", 278 layer, 279 #else 249 280 printf( "From MSE:\t %8d %c " "%12.4lf " "%8.4lf " "%8.4lf " "%8.4lf " "%8.4lf\n", 281 #endif 250 282 getNumPic(), cDelim, 251 283 getBits() * dScale, … … 257 289 else 258 290 { 291 #if SVC_EXTENSION 292 if( layer == 0 ) 293 { 294 #endif 259 295 printf( "\tTotal Frames | " "Bitrate " "Y-PSNR " "U-PSNR " "V-PSNR " "YUV-PSNR " ); 260 296 … … 263 299 264 300 //printf( "\t------------ " " ----------" " -------- " " -------- " " --------\n" ); 301 #if SVC_EXTENSION 302 } 303 printf( " L%d \t %8d %c " "%12.4lf " "%8.4lf " "%8.4lf " "%8.4lf " "%8.4lf", 304 layer, 305 #else 265 306 printf( "\t %8d %c " "%12.4lf " "%8.4lf " "%8.4lf " "%8.4lf " "%8.4lf", 307 #endif 266 308 getNumPic(), cDelim, 267 309 getBits() * dScale,
Note: See TracChangeset for help on using the changeset viewer.
