Changeset 1360 in 3DVCSoftware for branches/HTM-15.2-dev/source/App/TAppEncoder
- Timestamp:
- 28 Oct 2015, 17:46:00 (9 years ago)
- Location:
- branches/HTM-15.2-dev/source/App/TAppEncoder
- Files:
-
- 3 edited
-
TAppEncCfg.cpp (modified) (61 diffs)
-
TAppEncCfg.h (modified) (16 diffs)
-
TAppEncTop.cpp (modified) (15 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-15.2-dev/source/App/TAppEncoder/TAppEncCfg.cpp
r1356 r1360 109 109 110 110 TAppEncCfg::TAppEncCfg() 111 #if NH_MV 112 : m_pchBitstreamFile() 113 #else 114 : m_pchInputFile() 115 , m_pchBitstreamFile() 116 , m_pchReconFile() 117 #endif 118 , m_inputColourSpaceConvert(IPCOLOURSPACE_UNCHANGED) 111 : m_inputColourSpaceConvert(IPCOLOURSPACE_UNCHANGED) 119 112 , m_snrInternalColourSpace(false) 120 113 , m_outputInternalColourSpace(false) 121 , m_pchdQPFile()122 , m_scalingListFile()123 114 { 124 115 #if !NH_MV … … 171 162 m_targetPivotValue = NULL; 172 163 } 173 #if !NH_MV174 free(m_pchInputFile);175 #endif176 free(m_pchBitstreamFile);177 164 #if NH_MV 178 165 for(Int i = 0; i< m_pchReconFileList.size(); i++ ) … … 181 168 free (m_pchReconFileList[i]); 182 169 } 183 #else 184 free(m_pchReconFile); 185 #endif 186 free(m_pchdQPFile); 187 free(m_scalingListFile); 188 #if NH_MV 170 189 171 for( Int i = 0; i < m_GOPListMvc.size(); i++ ) 190 172 { … … 196 178 } 197 179 #endif 180 198 181 #if NH_3D 199 182 #if NH_3D_VSO … … 302 285 } 303 286 304 Bool confirmPara(Bool bflag, const Char* message);287 Bool confirmPara(Bool bflag, const TChar* message); 305 288 306 289 static inline ChromaFormat numberToChromaFormat(const Int val) … … 318 301 static const struct MapStrToProfile 319 302 { 320 const Char* str;303 const TChar* str; 321 304 Profile::Name value; 322 305 } … … 340 323 static const struct MapStrToExtendedProfile 341 324 { 342 const Char* str;325 const TChar* str; 343 326 ExtendedProfileName value; 344 327 } … … 405 388 static const struct MapStrToTier 406 389 { 407 const Char* str;390 const TChar* str; 408 391 Level::Tier value; 409 392 } … … 416 399 static const struct MapStrToLevel 417 400 { 418 const Char* str;401 const TChar* str; 419 402 Level::Name value; 420 403 } … … 438 421 }; 439 422 423 #if U0132_TARGET_BITS_SATURATION 424 UInt g_uiMaxCpbSize[2][21] = 425 { 426 // LEVEL1, LEVEL2,LEVEL2_1, LEVEL3, LEVEL3_1, LEVEL4, LEVEL4_1, LEVEL5, LEVEL5_1, LEVEL5_2, LEVEL6, LEVEL6_1, LEVEL6_2 427 { 0, 0, 0, 350000, 0, 0, 1500000, 3000000, 0, 6000000, 10000000, 0, 12000000, 20000000, 0, 25000000, 40000000, 60000000, 60000000, 120000000, 240000000 }, 428 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30000000, 50000000, 0, 100000000, 160000000, 240000000, 240000000, 480000000, 800000000 } 429 }; 430 #endif 431 440 432 static const struct MapStrToCostMode 441 433 { 442 const Char* str;434 const TChar* str; 443 435 CostMode value; 444 436 } … … 453 445 static const struct MapStrToScalingListMode 454 446 { 455 const Char* str;447 const TChar* str; 456 448 ScalingListMode value; 457 449 } … … 533 525 { 534 526 const T minValIncl; 535 const T maxValIncl; // Use 0 for unlimited527 const T maxValIncl; 536 528 const std::size_t minNumValuesIncl; 537 529 const std::size_t maxNumValuesIncl; // Use 0 for unlimited … … 545 537 SMultiValueInput<T> &operator=(const std::vector<T> &userValues) { values=userValues; return *this; } 546 538 SMultiValueInput<T> &operator=(const SMultiValueInput<T> &userValues) { values=userValues.values; return *this; } 539 540 T readValue(const TChar *&pStr, Bool &bSuccess); 541 542 istream& readValues(std::istream &in); 547 543 }; 548 544 549 static inline istream& operator >> (istream &in, SMultiValueInput<UInt> &values) 545 template <class T> 546 static inline istream& operator >> (std::istream &in, SMultiValueInput<T> &values) 550 547 { 551 values.values.clear(); 548 return values.readValues(in); 549 } 550 551 template<> 552 UInt SMultiValueInput<UInt>::readValue(const TChar *&pStr, Bool &bSuccess) 553 { 554 TChar *eptr; 555 UInt val=strtoul(pStr, &eptr, 0); 556 pStr=eptr; 557 bSuccess=!(*eptr!=0 && !isspace(*eptr) && *eptr!=',') && !(val<minValIncl || val>maxValIncl); 558 return val; 559 } 560 561 template<> 562 Int SMultiValueInput<Int>::readValue(const TChar *&pStr, Bool &bSuccess) 563 { 564 TChar *eptr; 565 Int val=strtol(pStr, &eptr, 0); 566 pStr=eptr; 567 bSuccess=!(*eptr!=0 && !isspace(*eptr) && *eptr!=',') && !(val<minValIncl || val>maxValIncl); 568 return val; 569 } 570 571 template<> 572 Double SMultiValueInput<Double>::readValue(const TChar *&pStr, Bool &bSuccess) 573 { 574 TChar *eptr; 575 Double val=strtod(pStr, &eptr); 576 pStr=eptr; 577 bSuccess=!(*eptr!=0 && !isspace(*eptr) && *eptr!=',') && !(val<minValIncl || val>maxValIncl); 578 return val; 579 } 580 581 template<> 582 Bool SMultiValueInput<Bool>::readValue(const TChar *&pStr, Bool &bSuccess) 583 { 584 TChar *eptr; 585 Int val=strtol(pStr, &eptr, 0); 586 pStr=eptr; 587 bSuccess=!(*eptr!=0 && !isspace(*eptr) && *eptr!=',') && !(val<Int(minValIncl) || val>Int(maxValIncl)); 588 return val!=0; 589 } 590 591 template <class T> 592 istream& SMultiValueInput<T>::readValues(std::istream &in) 593 { 594 values.clear(); 552 595 string str; 553 596 while (!in.eof()) … … 557 600 if (!str.empty()) 558 601 { 559 const Char *pStr=str.c_str();602 const TChar *pStr=str.c_str(); 560 603 // soak up any whitespace 561 604 for(;isspace(*pStr);pStr++); … … 563 606 while (*pStr != 0) 564 607 { 565 Char *eptr;566 UInt val=strtoul(pStr, &eptr, 0);567 if ( *eptr!=0 && !isspace(*eptr) && *eptr!=',')608 Bool bSuccess=true; 609 T val=readValue(pStr, bSuccess); 610 if (!bSuccess) 568 611 { 569 612 in.setstate(ios::failbit); 570 613 break; 571 614 } 572 if (val<values.minValIncl || val>values.maxValIncl) 615 616 if (maxNumValuesIncl != 0 && values.size() >= maxNumValuesIncl) 573 617 { 574 618 in.setstate(ios::failbit); 575 619 break; 576 620 } 577 578 if (values.maxNumValuesIncl != 0 && values.values.size() >= values.maxNumValuesIncl) 579 { 580 in.setstate(ios::failbit); 581 break; 582 } 583 values.values.push_back(val); 621 values.push_back(val); 584 622 // soak up any whitespace and up to 1 comma. 585 pStr=eptr;586 623 for(;isspace(*pStr);pStr++); 587 624 if (*pStr == ',') … … 592 629 } 593 630 } 594 if (values.values.size() < values.minNumValuesIncl) 595 { 596 in.setstate(ios::failbit); 597 } 598 return in; 599 } 600 601 static inline istream& operator >> (istream &in, SMultiValueInput<Int> &values) 602 { 603 values.values.clear(); 604 string str; 605 while (!in.eof()) 606 { 607 string tmp; in >> tmp; str+=" " + tmp; 608 } 609 if (!str.empty()) 610 { 611 const Char *pStr=str.c_str(); 612 // soak up any whitespace 613 for(;isspace(*pStr);pStr++); 614 615 while (*pStr != 0) 616 { 617 Char *eptr; 618 Int val=strtol(pStr, &eptr, 0); 619 if (*eptr!=0 && !isspace(*eptr) && *eptr!=',') 620 { 621 in.setstate(ios::failbit); 622 break; 623 } 624 if (val<values.minValIncl || val>values.maxValIncl) 625 { 626 in.setstate(ios::failbit); 627 break; 628 } 629 630 if (values.maxNumValuesIncl != 0 && values.values.size() >= values.maxNumValuesIncl) 631 { 632 in.setstate(ios::failbit); 633 break; 634 } 635 values.values.push_back(val); 636 // soak up any whitespace and up to 1 comma. 637 pStr=eptr; 638 for(;isspace(*pStr);pStr++); 639 if (*pStr == ',') 640 { 641 pStr++; 642 } 643 for(;isspace(*pStr);pStr++); 644 } 645 } 646 if (values.values.size() < values.minNumValuesIncl) 647 { 648 in.setstate(ios::failbit); 649 } 650 return in; 651 } 652 653 static inline istream& operator >> (istream &in, SMultiValueInput<Bool> &values) 654 { 655 values.values.clear(); 656 string str; 657 while (!in.eof()) 658 { 659 string tmp; in >> tmp; str+=" " + tmp; 660 } 661 if (!str.empty()) 662 { 663 const Char *pStr=str.c_str(); 664 // soak up any whitespace 665 for(;isspace(*pStr);pStr++); 666 667 while (*pStr != 0) 668 { 669 Char *eptr; 670 Int val=strtol(pStr, &eptr, 0); 671 if (*eptr!=0 && !isspace(*eptr) && *eptr!=',') 672 { 673 in.setstate(ios::failbit); 674 break; 675 } 676 if (val<Int(values.minValIncl) || val>Int(values.maxValIncl)) 677 { 678 in.setstate(ios::failbit); 679 break; 680 } 681 682 if (values.maxNumValuesIncl != 0 && values.values.size() >= values.maxNumValuesIncl) 683 { 684 in.setstate(ios::failbit); 685 break; 686 } 687 values.values.push_back(val!=0); 688 // soak up any whitespace and up to 1 comma. 689 pStr=eptr; 690 for(;isspace(*pStr);pStr++); 691 if (*pStr == ',') 692 { 693 pStr++; 694 } 695 for(;isspace(*pStr);pStr++); 696 } 697 } 698 if (values.values.size() < values.minNumValuesIncl) 631 if (values.size() < minNumValuesIncl) 699 632 { 700 633 in.setstate(ios::failbit); … … 786 719 \retval true when success 787 720 */ 788 Bool TAppEncCfg::parseCfg( Int argc, Char* argv[] )721 Bool TAppEncCfg::parseCfg( Int argc, TChar* argv[] ) 789 722 { 790 723 Bool do_help = false; … … 815 748 Int tmpInputChromaFormat; 816 749 Int tmpConstraintChromaFormat; 750 Int tmpWeightedPredictionMethod; 751 Int tmpFastInterSearchMode; 752 Int tmpMotionEstimationSearchMethod; 753 Int tmpSliceMode; 754 Int tmpSliceSegmentMode; 755 Int tmpDecodedPictureHashSEIMappedType; 817 756 string inputColourSpaceConvert; 818 757 #if NH_MV … … 829 768 SMultiValueInput<Int> cfg_codedPivotValue (std::numeric_limits<Int>::min(), std::numeric_limits<Int>::max(), 0, 1<<16); 830 769 SMultiValueInput<Int> cfg_targetPivotValue (std::numeric_limits<Int>::min(), std::numeric_limits<Int>::max(), 0, 1<<16); 770 771 SMultiValueInput<Double> cfg_adIntraLambdaModifier (0, std::numeric_limits<Double>::max(), 0, MAX_TLAYER); ///< Lambda modifier for Intra pictures, one for each temporal layer. If size>temporalLayer, then use [temporalLayer], else if size>0, use [size()-1], else use m_adLambdaModifier. 772 831 773 832 774 const UInt defaultInputKneeCodes[3] = { 600, 800, 900 }; … … 866 808 ("InputFile_%d,i_%d", m_pchInputFileList, (char *) 0 , MAX_NUM_LAYER_IDS , "original Yuv input file name %d") 867 809 #else 868 ("InputFile,i", cfg_InputFile,string(""), "Original YUV input file name")869 #endif 870 ("BitstreamFile,b", cfg_BitstreamFile,string(""), "Bitstream output file name")810 ("InputFile,i", m_inputFileName, string(""), "Original YUV input file name") 811 #endif 812 ("BitstreamFile,b", m_bitstreamFileName, string(""), "Bitstream output file name") 871 813 #if NH_MV 872 814 ("ReconFile_%d,o_%d", m_pchReconFileList, (char *) 0 , MAX_NUM_LAYER_IDS , "reconstructed Yuv output file name %d") 873 815 #else 874 ("ReconFile,o", cfg_ReconFile,string(""), "Reconstructed YUV output file name")816 ("ReconFile,o", m_reconFileName, string(""), "Reconstructed YUV output file name") 875 817 #endif 876 818 #if NH_MV … … 941 883 ("ConfWinTop", m_confWinTop, 0, "Top offset for window conformance mode 3") 942 884 ("ConfWinBottom", m_confWinBottom, 0, "Bottom offset for window conformance mode 3") 885 ("AccessUnitDelimiter", m_AccessUnitDelimiter, false, "Enable Access Unit Delimiter NALUs") 943 886 ("FrameRate,-fr", m_iFrameRate, 0, "Frame rate") 944 887 ("FrameSkip,-fs", m_FrameSkip, 0u, "Number of frames to skip at start of input YUV") … … 1003 946 // motion search options 1004 947 ("DisableIntraInInter", m_bDisableIntraPUsInInterSlices, false, "Flag to disable intra PUs in inter slices") 1005 ("FastSearch", m_iFastSearch, 1, "0:Full search 1:Diamond 2:PMVFAST")948 ("FastSearch", tmpMotionEstimationSearchMethod, Int(MESEARCH_DIAMOND), "0:Full search 1:Diamond 2:Selective 3:Enhanced Diamond") 1006 949 ("SearchRange,-sr", m_iSearchRange, 96, "Motion search range") 1007 950 #if NH_MV … … 1010 953 #endif 1011 954 ("BipredSearchRange", m_bipredSearchRange, 4, "Motion search range for bipred refinement") 955 ("MinSearchWindow", m_minSearchWindow, 8, "Minimum motion search window size for the adaptive window ME") 956 ("RestrictMESampling", m_bRestrictMESampling, false, "Restrict ME Sampling for selective inter motion search") 1012 957 ("ClipForBiPredMEEnabled", m_bClipForBiPredMeEnabled, false, "Enables clipping in the Bi-Pred ME. It is disabled to reduce encoder run-time") 1013 958 ("FastMEAssumingSmootherMVEnabled", m_bFastMEAssumingSmootherMVEnabled, true, "Enables fast ME assuming a smoother MV.") … … 1017 962 1018 963 // Mode decision parameters 1019 ("LambdaModifier0,-LM0", m_adLambdaModifier[ 0 ], ( Double )1.0, "Lambda modifier for temporal layer 0") 1020 ("LambdaModifier1,-LM1", m_adLambdaModifier[ 1 ], ( Double )1.0, "Lambda modifier for temporal layer 1") 1021 ("LambdaModifier2,-LM2", m_adLambdaModifier[ 2 ], ( Double )1.0, "Lambda modifier for temporal layer 2") 1022 ("LambdaModifier3,-LM3", m_adLambdaModifier[ 3 ], ( Double )1.0, "Lambda modifier for temporal layer 3") 1023 ("LambdaModifier4,-LM4", m_adLambdaModifier[ 4 ], ( Double )1.0, "Lambda modifier for temporal layer 4") 1024 ("LambdaModifier5,-LM5", m_adLambdaModifier[ 5 ], ( Double )1.0, "Lambda modifier for temporal layer 5") 1025 ("LambdaModifier6,-LM6", m_adLambdaModifier[ 6 ], ( Double )1.0, "Lambda modifier for temporal layer 6") 964 ("LambdaModifier0,-LM0", m_adLambdaModifier[ 0 ], ( Double )1.0, "Lambda modifier for temporal layer 0. If LambdaModifierI is used, this will not affect intra pictures") 965 ("LambdaModifier1,-LM1", m_adLambdaModifier[ 1 ], ( Double )1.0, "Lambda modifier for temporal layer 1. If LambdaModifierI is used, this will not affect intra pictures") 966 ("LambdaModifier2,-LM2", m_adLambdaModifier[ 2 ], ( Double )1.0, "Lambda modifier for temporal layer 2. If LambdaModifierI is used, this will not affect intra pictures") 967 ("LambdaModifier3,-LM3", m_adLambdaModifier[ 3 ], ( Double )1.0, "Lambda modifier for temporal layer 3. If LambdaModifierI is used, this will not affect intra pictures") 968 ("LambdaModifier4,-LM4", m_adLambdaModifier[ 4 ], ( Double )1.0, "Lambda modifier for temporal layer 4. If LambdaModifierI is used, this will not affect intra pictures") 969 ("LambdaModifier5,-LM5", m_adLambdaModifier[ 5 ], ( Double )1.0, "Lambda modifier for temporal layer 5. If LambdaModifierI is used, this will not affect intra pictures") 970 ("LambdaModifier6,-LM6", m_adLambdaModifier[ 6 ], ( Double )1.0, "Lambda modifier for temporal layer 6. If LambdaModifierI is used, this will not affect intra pictures") 971 ("LambdaModifierI,-LMI", cfg_adIntraLambdaModifier, cfg_adIntraLambdaModifier, "Lambda modifiers for Intra pictures, comma separated, up to one the number of temporal layer. If entry for temporalLayer exists, then use it, else if some are specified, use the last, else use the standard LambdaModifiers.") 972 ("IQPFactor,-IQF", m_dIntraQpFactor, -1.0, "Intra QP Factor for Lambda Computation. If negative, use the default equation: 0.57*(1.0 - Clip3( 0.0, 0.5, 0.05*(Double)(isField ? (GopSize-1)/2 : GopSize-1) ))") 1026 973 1027 974 /* Quantization parameters */ … … 1046 993 ("AdaptiveQP,-aq", m_bUseAdaptiveQP, false, "QP adaptation based on a psycho-visual model") 1047 994 ("MaxQPAdaptationRange,-aqr", m_iQPAdaptationRange, 6, "QP adaptation range") 1048 ("dQPFile,m", cfg_dQPFile,string(""), "dQP file name")995 ("dQPFile,m", m_dQPFileName, string(""), "dQP file name") 1049 996 ("RDOQ", m_useRDOQ, true) 1050 997 ("RDOQTS", m_useRDOQTS, true) … … 1090 1037 ("MaxNumOffsetsPerPic", m_maxNumOffsetsPerPic, 2048, "Max number of SAO offset per picture (Default: 2048)") 1091 1038 ("SAOLcuBoundary", m_saoCtuBoundary, false, "0: right/bottom CTU boundary areas skipped from SAO parameter estimation, 1: non-deblocked pixels are used for those areas") 1092 ("SliceMode", m_sliceMode, 0, "0: Disable all Recon slice limits, 1: Enforce max # of CTUs, 2: Enforce max # of bytes, 3:specify tiles per dependent slice")1039 ("SliceMode", tmpSliceMode, Int(NO_SLICES), "0: Disable all Recon slice limits, 1: Enforce max # of CTUs, 2: Enforce max # of bytes, 3:specify tiles per dependent slice") 1093 1040 ("SliceArgument", m_sliceArgument, 0, "Depending on SliceMode being:" 1094 1041 "\t1: max number of CTUs per slice" 1095 1042 "\t2: max number of bytes per slice" 1096 1043 "\t3: max number of tiles per slice") 1097 ("SliceSegmentMode", m_sliceSegmentMode, 0, "0: Disable all slice segment limits, 1: Enforce max # of CTUs, 2: Enforce max # of bytes, 3:specify tiles per dependent slice")1044 ("SliceSegmentMode", tmpSliceSegmentMode, Int(NO_SLICES), "0: Disable all slice segment limits, 1: Enforce max # of CTUs, 2: Enforce max # of bytes, 3:specify tiles per dependent slice") 1098 1045 ("SliceSegmentArgument", m_sliceSegmentArgument, 0, "Depending on SliceSegmentMode being:" 1099 1046 "\t1: max number of CTUs per slice segment" … … 1112 1059 ("PCMInputBitDepthFlag", m_bPCMInputBitDepthFlag, true) 1113 1060 ("PCMFilterDisableFlag", m_bPCMFilterDisableFlag, false) 1114 ("IntraReferenceSmoothing", m_enableIntraReferenceSmoothing, true, "0: Disable use of intra reference smoothing . 1: Enable use of intra reference smoothing (not valid in V1 profiles)")1061 ("IntraReferenceSmoothing", m_enableIntraReferenceSmoothing, true, "0: Disable use of intra reference smoothing (not valid in V1 profiles). 1: Enable use of intra reference smoothing (same as V1)") 1115 1062 ("WeightedPredP,-wpP", m_useWeightedPred, false, "Use weighted prediction in P slices") 1116 1063 ("WeightedPredB,-wpB", m_useWeightedBiPred, false, "Use weighted (bidirectional) prediction in B slices") 1064 ("WeightedPredMethod,-wpM", tmpWeightedPredictionMethod, Int(WP_PER_PICTURE_WITH_SIMPLE_DC_COMBINED_COMPONENT), "Weighted prediction method") 1117 1065 ("Log2ParallelMergeLevel", m_log2ParallelMergeLevel, 2u, "Parallel merge estimation region") 1118 1066 //deprecated copies of renamed tile parameters … … 1127 1075 ("TileRowHeightArray", cfg_RowHeight, cfg_RowHeight, "Array containing tile row height values in units of CTU") 1128 1076 ("LFCrossTileBoundaryFlag", m_bLFCrossTileBoundaryFlag, true, "1: cross-tile-boundary loop filtering. 0:non-cross-tile-boundary loop filtering") 1129 ("WaveFrontSynchro", m_ iWaveFrontSynchro, 0, "0: no synchro; 1 synchro with top-right-right")1077 ("WaveFrontSynchro", m_entropyCodingSyncEnabledFlag, false, "0: entropy coding sync disabled; 1 entropy coding sync enabled") 1130 1078 ("ScalingList", m_useScalingListId, SCALING_LIST_OFF, "0/off: no scaling list, 1/default: default scaling lists, 2/file: scaling lists specified in ScalingListFile") 1131 ("ScalingListFile", cfg_ScalingListFile,string(""), "Scaling list file name. Use an empty string to produce help.")1079 ("ScalingListFile", m_scalingListFileName, string(""), "Scaling list file name. Use an empty string to produce help.") 1132 1080 ("SignHideFlag,-SBH", m_signHideFlag, true) 1133 1081 ("MaxNumMergeCand", m_maxNumMergeCand, 5u, "Maximum number of merge candidates") 1134 1082 /* Misc. */ 1135 ("SEIDecodedPictureHash", m_decodedPictureHashSEIEnabled,0, "Control generation of decode picture hash SEI messages\n"1083 ("SEIDecodedPictureHash", tmpDecodedPictureHashSEIMappedType, 0, "Control generation of decode picture hash SEI messages\n" 1136 1084 "\t3: checksum\n" 1137 1085 "\t2: CRC\n" … … 1139 1087 "\t0: disable") 1140 1088 ("TMVPMode", m_TMVPModeId, 1, "TMVP mode 0: TMVP disable for all slices. 1: TMVP enable for all slices (default) 2: TMVP enable for certain slices only") 1141 ("FEN", m_bUseFastEnc, false, "fast encoder setting")1089 ("FEN", tmpFastInterSearchMode, Int(FASTINTERSEARCH_DISABLED), "fast encoder setting") 1142 1090 ("ECU", m_bUseEarlyCU, false, "Early CU setting") 1143 1091 ("FDM", m_useFastDecisionForMerge, true, "Fast decision for Merge RD Cost") … … 1151 1099 ( "InitialQP", m_RCInitialQP, 0, "Rate control: initial QP" ) 1152 1100 ( "RCForceIntraQP", m_RCForceIntraQP, false, "Rate control: force intra QP to be equal to initial QP" ) 1101 1102 #if U0132_TARGET_BITS_SATURATION 1103 ( "RCCpbSaturation", m_RCCpbSaturationEnabled, false, "Rate control: enable target bits saturation to avoid CPB overflow and underflow" ) 1104 ( "RCCpbSize", m_RCCpbSize, 0u, "Rate control: CPB size" ) 1105 ( "RCInitialCpbFullness", m_RCInitialCpbFullness, 0.9, "Rate control: initial CPB fullness" ) 1106 #endif 1153 1107 1154 1108 #if KWU_RC_VIEWRC_E0227 … … 1227 1181 ("Log2MaxMvLengthHorizontal", m_log2MaxMvLengthHorizontal, 15, "Indicate the maximum absolute value of a decoded horizontal MV component in quarter-pel luma units") 1228 1182 ("Log2MaxMvLengthVertical", m_log2MaxMvLengthVertical, 15, "Indicate the maximum absolute value of a decoded vertical MV component in quarter-pel luma units") 1229 ("SEIRecoveryPoint", m_recoveryPointSEIEnabled, 0, "Control generation of recovery point SEI messages") 1230 ("SEIBufferingPeriod", m_bufferingPeriodSEIEnabled, 0, "Control generation of buffering period SEI messages") 1231 ("SEIPictureTiming", m_pictureTimingSEIEnabled, 0, "Control generation of picture timing SEI messages") 1183 ("SEIColourRemappingInfoFileRoot,-cri", m_colourRemapSEIFileRoot, string(""), "Colour Remapping Information SEI parameters root file name (wo num ext)") 1184 ("SEIRecoveryPoint", m_recoveryPointSEIEnabled, false, "Control generation of recovery point SEI messages") 1185 ("SEIBufferingPeriod", m_bufferingPeriodSEIEnabled, false, "Control generation of buffering period SEI messages") 1186 ("SEIPictureTiming", m_pictureTimingSEIEnabled, false, "Control generation of picture timing SEI messages") 1232 1187 ("SEIToneMappingInfo", m_toneMappingInfoSEIEnabled, false, "Control generation of Tone Mapping SEI messages") 1233 1188 ("SEIToneMapId", m_toneMapId, 0, "Specifies Id of Tone Mapping SEI message for a given session") … … 1262 1217 ("SEIToneMapNominalWhiteLevelLumaCodeValue", m_nominalWhiteLevelLumaCodeValue, 235, "Specifies luma sample value of the nominal white level assigned decoded pictures") 1263 1218 ("SEIToneMapExtendedWhiteLevelLumaCodeValue", m_extendedWhiteLevelLumaCodeValue, 300, "Specifies luma sample value of the extended dynamic range assigned decoded pictures") 1264 ("SEIChroma SamplingFilterHint", m_chromaSamplingFilterSEIenabled,false, "Control generation of the chroma sampling filter hint SEI message")1265 ("SEIChroma SamplingHorizontalFilterType", m_chromaSamplingHorFilterIdc,2, "Defines the Index of the chroma sampling horizontal filter\n"1219 ("SEIChromaResamplingFilterHint", m_chromaResamplingFilterSEIenabled, false, "Control generation of the chroma sampling filter hint SEI message") 1220 ("SEIChromaResamplingHorizontalFilterType", m_chromaResamplingHorFilterIdc, 2, "Defines the Index of the chroma sampling horizontal filter\n" 1266 1221 "\t0: unspecified - Chroma filter is unknown or is determined by the application" 1267 1222 "\t1: User-defined - Filter coefficients are specified in the chroma sampling filter hint SEI message" 1268 1223 "\t2: Standards-defined - ITU-T Rec. T.800 | ISO/IEC15444-1, 5/3 filter") 1269 ("SEIChroma SamplingVerticalFilterType", m_chromaSamplingVerFilterIdc, 2, "Defines the Index of the chroma sampling vertical filter\n"1224 ("SEIChromaResamplingVerticalFilterType", m_chromaResamplingVerFilterIdc, 2, "Defines the Index of the chroma sampling vertical filter\n" 1270 1225 "\t0: unspecified - Chroma filter is unknown or is determined by the application" 1271 1226 "\t1: User-defined - Filter coefficients are specified in the chroma sampling filter hint SEI message" 1272 1227 "\t2: Standards-defined - ITU-T Rec. T.800 | ISO/IEC15444-1, 5/3 filter") 1273 ("SEIFramePacking", m_framePackingSEIEnabled, 0, "Control generation of frame packing SEI messages")1228 ("SEIFramePacking", m_framePackingSEIEnabled, false, "Control generation of frame packing SEI messages") 1274 1229 ("SEIFramePackingType", m_framePackingSEIType, 0, "Define frame packing arrangement\n" 1275 1230 "\t3: side by side - frames are displayed horizontally\n" … … 1282 1237 "\t1: stereo pair, frame0 represents left view\n" 1283 1238 "\t2: stereo pair, frame0 represents right view") 1284 ("SEISegmentedRectFramePacking", m_segmentedRectFramePackingSEIEnabled, 0, "Controls generation of segmented rectangular frame packing SEI messages")1239 ("SEISegmentedRectFramePacking", m_segmentedRectFramePackingSEIEnabled, false, "Controls generation of segmented rectangular frame packing SEI messages") 1285 1240 ("SEISegmentedRectFramePackingCancel", m_segmentedRectFramePackingSEICancel, false, "If equal to 1, cancels the persistence of any previous SRFPA SEI message") 1286 1241 ("SEISegmentedRectFramePackingType", m_segmentedRectFramePackingSEIType, 0, "Specifies the arrangement of the frames in the reconstructed picture") … … 1289 1244 "\tN: 0 < N < (2^16 - 1) enable display orientation SEI message with anticlockwise_rotation = N and display_orientation_repetition_period = 1\n" 1290 1245 "\t0: disable") 1291 ("SEITemporalLevel0Index", m_temporalLevel0IndexSEIEnabled, 0, "Control generation of temporal level 0 index SEI messages")1292 ("SEIGradualDecodingRefreshInfo", m_gradualDecodingRefreshInfoEnabled, 0, "Control generation of gradual decoding refresh information SEI message")1246 ("SEITemporalLevel0Index", m_temporalLevel0IndexSEIEnabled, false, "Control generation of temporal level 0 index SEI messages") 1247 ("SEIGradualDecodingRefreshInfo", m_gradualDecodingRefreshInfoEnabled, false, "Control generation of gradual decoding refresh information SEI message") 1293 1248 ("SEINoDisplay", m_noDisplaySEITLayer, 0, "Control generation of no display SEI message\n" 1294 1249 "\tN: 0 < N enable no display SEI message for temporal layer N or higher\n" 1295 1250 "\t0: disable") 1296 ("SEIDecodingUnitInfo", m_decodingUnitInfoSEIEnabled, 0, "Control generation of decoding unit information SEI message.")1297 ("SEISOPDescription", m_SOPDescriptionSEIEnabled, 0, "Control generation of SOP description SEI messages")1298 ("SEIScalableNesting", m_scalableNestingSEIEnabled, 0, "Control generation of scalable nesting SEI messages")1251 ("SEIDecodingUnitInfo", m_decodingUnitInfoSEIEnabled, false, "Control generation of decoding unit information SEI message.") 1252 ("SEISOPDescription", m_SOPDescriptionSEIEnabled, false, "Control generation of SOP description SEI messages") 1253 ("SEIScalableNesting", m_scalableNestingSEIEnabled, false, "Control generation of scalable nesting SEI messages") 1299 1254 ("SEITempMotionConstrainedTileSets", m_tmctsSEIEnabled, false, "Control generation of temporal motion constrained tile sets SEI message") 1300 1255 ("SEITimeCodeEnabled", m_timeCodeSEIEnabled, false, "Control generation of time code information SEI message") … … 1341 1296 ("SEISubBitstreamMaxBitRate", m_sbPropMaxBitRate, IntAry1d (1,0) ,"Specifies maximum bit rate of the i-th sub-bitstream") 1342 1297 #else 1343 ("SeiCfgFileName_%d", m_seiCfgFileNames, ( Char *) 0 ,MAX_NUM_SEIS , "SEI cfg file name %d")1298 ("SeiCfgFileName_%d", m_seiCfgFileNames, (TChar *) 0 ,MAX_NUM_SEIS , "SEI cfg file name %d") 1344 1299 #endif 1345 1300 ("OutputVpsInfo", m_outputVpsInfo, false ,"Output information about the layer dependencies and layer sets") … … 1348 1303 /* Camera parameters */ 1349 1304 ("Depth420OutputFlag", m_depth420OutputFlag, true , "Output depth layers in 4:2:0 ") 1350 ("CameraParameterFile,cpf", m_pchCameraParameterFile, ( Char *) 0,"Camera Parameter File Name")1351 ("BaseViewCameraNumbers", m_pchBaseViewCameraNumbers, ( Char *) 0,"Numbers of base views")1305 ("CameraParameterFile,cpf", m_pchCameraParameterFile, (TChar *) 0 , "Camera Parameter File Name") 1306 ("BaseViewCameraNumbers", m_pchBaseViewCameraNumbers, (TChar *) 0 , "Numbers of base views") 1352 1307 ("CodedCamParsPrecision", m_iCodedCamParPrecision, STD_CAM_PARAMETERS_PRECISION, "precision for coding of camera parameters (in units of 2^(-x) luma samples)" ) 1353 1308 1354 1309 #if NH_3D_VSO 1355 1310 /* View Synthesis Optimization */ 1356 ("VSOConfig", m_pchVSOConfig , ( Char *) 0,"VSO configuration")1311 ("VSOConfig", m_pchVSOConfig , (TChar *) 0 ,"VSO configuration") 1357 1312 ("VSO", m_bUseVSO , false ,"Use VSO" ) 1358 1313 ("VSOMode", m_uiVSOMode , (UInt) 4 ,"VSO Mode") … … 1447 1402 po::setDefaults(opts); 1448 1403 po::ErrorReporter err; 1449 const list<const Char*>& argv_unhandled = po::scanArgv(opts, argc, (constChar**) argv, err);1450 1451 for (list<const Char*>::const_iterator it = argv_unhandled.begin(); it != argv_unhandled.end(); it++)1404 const list<const TChar*>& argv_unhandled = po::scanArgv(opts, argc, (const TChar**) argv, err); 1405 1406 for (list<const TChar*>::const_iterator it = argv_unhandled.begin(); it != argv_unhandled.end(); it++) 1452 1407 { 1453 1408 fprintf(stderr, "Unhandled argument ignored: `%s'\n", *it); … … 1473 1428 * Set any derived parameters 1474 1429 */ 1475 /* convert std::string to c string for compatability */ 1476 #if !NH_MV 1477 m_pchInputFile = cfg_InputFile.empty() ? NULL : strdup(cfg_InputFile.c_str()); 1478 #endif 1479 m_pchBitstreamFile = cfg_BitstreamFile.empty() ? NULL : strdup(cfg_BitstreamFile.c_str()); 1480 #if !NH_MV 1481 m_pchReconFile = cfg_ReconFile.empty() ? NULL : strdup(cfg_ReconFile.c_str()); 1482 #endif 1483 m_pchdQPFile = cfg_dQPFile.empty() ? NULL : strdup(cfg_dQPFile.c_str()); 1484 1430 m_adIntraLambdaModifier = cfg_adIntraLambdaModifier.values; 1485 1431 if(m_isField) 1486 1432 { … … 1545 1491 } 1546 1492 1547 m_scalingListFile = cfg_ScalingListFile.empty() ? NULL : strdup(cfg_ScalingListFile.c_str());1548 1549 1493 /* rules for input, output and internal bitdepths as per help text */ 1550 1494 if (m_MSBExtendedBitDepth[CHANNEL_TYPE_LUMA ] == 0) … … 1579 1523 m_InputChromaFormatIDC = numberToChromaFormat(tmpInputChromaFormat); 1580 1524 m_chromaFormatIDC = ((tmpChromaFormat == 0) ? (m_InputChromaFormatIDC) : (numberToChromaFormat(tmpChromaFormat))); 1525 1526 1527 assert(tmpWeightedPredictionMethod>=0 && tmpWeightedPredictionMethod<=WP_PER_PICTURE_WITH_HISTOGRAM_AND_PER_COMPONENT_AND_CLIPPING_AND_EXTENSION); 1528 if (!(tmpWeightedPredictionMethod>=0 && tmpWeightedPredictionMethod<=WP_PER_PICTURE_WITH_HISTOGRAM_AND_PER_COMPONENT_AND_CLIPPING_AND_EXTENSION)) 1529 { 1530 exit(EXIT_FAILURE); 1531 } 1532 m_weightedPredictionMethod = WeightedPredictionMethod(tmpWeightedPredictionMethod); 1533 1534 assert(tmpFastInterSearchMode>=0 && tmpFastInterSearchMode<=FASTINTERSEARCH_MODE3); 1535 if (tmpFastInterSearchMode<0 || tmpFastInterSearchMode>FASTINTERSEARCH_MODE3) 1536 { 1537 exit(EXIT_FAILURE); 1538 } 1539 m_fastInterSearchMode = FastInterSearchMode(tmpFastInterSearchMode); 1540 1541 assert(tmpMotionEstimationSearchMethod>=0 && tmpMotionEstimationSearchMethod<MESEARCH_NUMBER_OF_METHODS); 1542 if (tmpMotionEstimationSearchMethod<0 || tmpMotionEstimationSearchMethod>=MESEARCH_NUMBER_OF_METHODS) 1543 { 1544 exit(EXIT_FAILURE); 1545 } 1546 m_motionEstimationSearchMethod=MESearchMethod(tmpMotionEstimationSearchMethod); 1581 1547 1582 1548 #if NH_MV … … 1802 1768 } 1803 1769 1770 if (tmpSliceMode<0 || tmpSliceMode>=Int(NUMBER_OF_SLICE_CONSTRAINT_MODES)) 1771 { 1772 fprintf(stderr, "Error: bad slice mode\n"); 1773 exit(EXIT_FAILURE); 1774 } 1775 m_sliceMode = SliceConstraint(tmpSliceMode); 1776 if (tmpSliceSegmentMode<0 || tmpSliceSegmentMode>=Int(NUMBER_OF_SLICE_CONSTRAINT_MODES)) 1777 { 1778 fprintf(stderr, "Error: bad slice segment mode\n"); 1779 exit(EXIT_FAILURE); 1780 } 1781 m_sliceSegmentMode = SliceConstraint(tmpSliceSegmentMode); 1782 1783 if (tmpDecodedPictureHashSEIMappedType<0 || tmpDecodedPictureHashSEIMappedType>=Int(NUMBER_OF_HASHTYPES)) 1784 { 1785 fprintf(stderr, "Error: bad checksum mode\n"); 1786 exit(EXIT_FAILURE); 1787 } 1788 // Need to map values to match those of the SEI message: 1789 if (tmpDecodedPictureHashSEIMappedType==0) 1790 { 1791 m_decodedPictureHashSEIType=HASHTYPE_NONE; 1792 } 1793 else 1794 { 1795 m_decodedPictureHashSEIType=HashType(tmpDecodedPictureHashSEIMappedType-1); 1796 } 1797 1804 1798 // allocate slice-based dQP values 1805 1799 #if NH_MV … … 1923 1917 1924 1918 // reading external dQP description from file 1925 if ( m_pchdQPFile)1926 { 1927 FILE* fpt=fopen( m_ pchdQPFile, "r" );1919 if ( !m_dQPFileName.empty() ) 1920 { 1921 FILE* fpt=fopen( m_dQPFileName.c_str(), "r" ); 1928 1922 if ( fpt ) 1929 1923 { … … 2145 2139 Void TAppEncCfg::xCheckParameter() 2146 2140 { 2147 if ( !m_decodedPictureHashSEIEnabled)2141 if (m_decodedPictureHashSEIType==HASHTYPE_NONE) 2148 2142 { 2149 2143 fprintf(stderr, "******************************************************************\n"); … … 2173 2167 #define xConfirmPara(a,b) check_failed |= confirmPara(a,b) 2174 2168 2175 xConfirmPara(m_ pchBitstreamFile==NULL, "A bitstream file name must be specified (BitstreamFile)");2169 xConfirmPara(m_bitstreamFileName.empty(), "A bitstream file name must be specified (BitstreamFile)"); 2176 2170 const UInt maxBitDepth=(m_chromaFormatIDC==CHROMA_400) ? m_internalBitDepth[CHANNEL_TYPE_LUMA] : std::max(m_internalBitDepth[CHANNEL_TYPE_LUMA], m_internalBitDepth[CHANNEL_TYPE_CHROMA]); 2177 2171 xConfirmPara(m_bitDepthConstraint<maxBitDepth, "The internalBitDepth must not be greater than the bitDepthConstraint value"); … … 2544 2538 xConfirmPara( m_loopFilterBetaOffsetDiv2 < -6 || m_loopFilterBetaOffsetDiv2 > 6, "Loop Filter Beta Offset div. 2 exceeds supported range (-6 to 6)"); 2545 2539 xConfirmPara( m_loopFilterTcOffsetDiv2 < -6 || m_loopFilterTcOffsetDiv2 > 6, "Loop Filter Tc Offset div. 2 exceeds supported range (-6 to 6)"); 2546 xConfirmPara( m_iFastSearch < 0 || m_iFastSearch > 2, "Fast Search Mode is not supported value (0:Full search 1:Diamond 2:PMVFAST)" );2547 2540 xConfirmPara( m_iSearchRange < 0 , "Search Range must be more than 0" ); 2548 xConfirmPara( m_bipredSearchRange < 0 , "Search Range must be more than 0" ); 2541 xConfirmPara( m_bipredSearchRange < 0 , "Bi-prediction refinement search range must be more than 0" ); 2542 xConfirmPara( m_minSearchWindow < 0, "Minimum motion search window size for the adaptive window ME must be greater than or equal to 0" ); 2549 2543 #if NH_MV 2550 2544 xConfirmPara( m_iVerticalDisparitySearchRange <= 0 , "Vertical Disparity Search Range must be more than 0" ); … … 2624 2618 } 2625 2619 2626 xConfirmPara( m_sliceMode < 0 || m_sliceMode > 3, "SliceMode exceeds supported range (0 to 3)" ); 2627 if (m_sliceMode!=0) 2620 if (m_sliceMode!=NO_SLICES) 2628 2621 { 2629 2622 xConfirmPara( m_sliceArgument < 1 , "SliceArgument should be larger than or equal to 1" ); 2630 2623 } 2631 xConfirmPara( m_sliceSegmentMode < 0 || m_sliceSegmentMode > 3, "SliceSegmentMode exceeds supported range (0 to 3)" ); 2632 if (m_sliceSegmentMode!=0) 2624 if (m_sliceSegmentMode!=NO_SLICES) 2633 2625 { 2634 2626 xConfirmPara( m_sliceSegmentArgument < 1 , "SliceSegmentArgument should be larger than or equal to 1" ); … … 2638 2630 if (m_profile!=Profile::HIGHTHROUGHPUTREXT) 2639 2631 { 2640 xConfirmPara( tileFlag && m_ iWaveFrontSynchro, "Tile and Wavefrontcan not be applied together, except in the High Throughput Intra 4:4:4 16 profile");2632 xConfirmPara( tileFlag && m_entropyCodingSyncEnabledFlag, "Tiles and entropy-coding-sync (Wavefronts) can not be applied together, except in the High Throughput Intra 4:4:4 16 profile"); 2641 2633 } 2642 2634 … … 3237 3229 m_minSpatialSegmentationIdc = 4*PicSizeInSamplesY/maxSizeInSamplesY-4; 3238 3230 } 3239 else if(m_ iWaveFrontSynchro)3231 else if(m_entropyCodingSyncEnabledFlag) 3240 3232 { 3241 3233 m_minSpatialSegmentationIdc = 4*PicSizeInSamplesY/((2*m_iSourceHeight+m_iSourceWidth)*m_uiMaxCUHeight)-4; … … 3250 3242 } 3251 3243 } 3252 3253 xConfirmPara( m_iWaveFrontSynchro < 0, "WaveFrontSynchro cannot be negative" );3254 3255 xConfirmPara( m_decodedPictureHashSEIEnabled<0 || m_decodedPictureHashSEIEnabled>3, "this hash type is not correct!\n");3256 3244 3257 3245 if (m_toneMappingInfoSEIEnabled) … … 3282 3270 } 3283 3271 3272 if (m_chromaResamplingFilterSEIenabled) 3273 { 3274 xConfirmPara( (m_chromaFormatIDC == CHROMA_400 ), "chromaResamplingFilterSEI is not allowed to be present when ChromaFormatIDC is equal to zero (4:0:0)" ); 3275 xConfirmPara(m_vuiParametersPresentFlag && m_chromaLocInfoPresentFlag && (m_chromaSampleLocTypeTopField != m_chromaSampleLocTypeBottomField ), "When chromaResamplingFilterSEI is enabled, ChromaSampleLocTypeTopField has to be equal to ChromaSampleLocTypeBottomField" ); 3276 } 3277 3284 3278 if ( m_RCEnableRateControl ) 3285 3279 { … … 3293 3287 } 3294 3288 xConfirmPara( m_uiDeltaQpRD > 0, "Rate control cannot be used together with slice level multiple-QP optimization!\n" ); 3295 } 3289 #if U0132_TARGET_BITS_SATURATION 3290 #if NH_MV 3291 if ((m_RCCpbSaturationEnabled) && (m_level[0]!=Level::NONE) && (m_profile!=Profile::NONE)) 3292 { 3293 UInt uiLevelIdx = (m_level[0] / 10) + (UInt)((m_level[0] % 10) / 3); // (m_level / 30)*3 + ((m_level % 10) / 3); 3294 xConfirmPara(m_RCCpbSize > g_uiMaxCpbSize[m_levelTier[0]][uiLevelIdx], "RCCpbSize should be smaller than or equal to Max CPB size according to tier and level"); 3295 xConfirmPara(m_RCInitialCpbFullness > 1, "RCInitialCpbFullness should be smaller than or equal to 1"); 3296 } 3297 #else 3298 if ((m_RCCpbSaturationEnabled) && (m_level!=Level::NONE) && (m_profile!=Profile::NONE)) 3299 { 3300 UInt uiLevelIdx = (m_level / 10) + (UInt)((m_level % 10) / 3); // (m_level / 30)*3 + ((m_level % 10) / 3); 3301 xConfirmPara(m_RCCpbSize > g_uiMaxCpbSize[m_levelTier][uiLevelIdx], "RCCpbSize should be smaller than or equal to Max CPB size according to tier and level"); 3302 xConfirmPara(m_RCInitialCpbFullness > 1, "RCInitialCpbFullness should be smaller than or equal to 1"); 3303 } 3304 #endif 3305 #endif 3306 } 3307 #if U0132_TARGET_BITS_SATURATION 3308 else 3309 { 3310 xConfirmPara( m_RCCpbSaturationEnabled != 0, "Target bits saturation cannot be processed without Rate control" ); 3311 } 3312 #endif 3313 3296 3314 #if NH_MV 3297 3315 // VPS VUI … … 3351 3369 if (m_segmentedRectFramePackingSEIEnabled) 3352 3370 { 3353 xConfirmPara(m_framePackingSEIEnabled > 0, "SEISegmentedRectFramePacking must be 0 when SEIFramePacking is 1");3371 xConfirmPara(m_framePackingSEIEnabled , "SEISegmentedRectFramePacking must be 0 when SEIFramePacking is 1"); 3354 3372 } 3355 3373 … … 3372 3390 } 3373 3391 3374 const Char *profileToString(const Profile::Name profile)3392 const TChar *profileToString(const Profile::Name profile) 3375 3393 { 3376 3394 static const UInt numberOfProfiles = sizeof(strToProfile)/sizeof(*strToProfile); … … 3400 3418 } 3401 3419 #else 3402 printf("Input File : %s\n", m_pchInputFile);3403 #endif 3404 printf("Bitstream File : %s\n", m_pchBitstreamFile);3420 printf("Input File : %s\n", m_inputFileName.c_str() ); 3421 #endif 3422 printf("Bitstream File : %s\n", m_bitstreamFileName.c_str() ); 3405 3423 #if NH_MV 3406 3424 for( Int layer = 0; layer < m_numberOfLayers; layer++) … … 3409 3427 } 3410 3428 #else 3411 printf("Reconstruction File : %s\n", m_pchReconFile);3429 printf("Reconstruction File : %s\n", m_reconFileName.c_str() ); 3412 3430 #endif 3413 3431 #if NH_MV … … 3581 3599 3582 3600 printf("RateControl : %d\n", m_RCEnableRateControl ); 3601 printf("WPMethod : %d\n", Int(m_weightedPredictionMethod)); 3583 3602 3584 3603 if(m_RCEnableRateControl) … … 3590 3609 printf("InitialQP : %d\n", m_RCInitialQP ); 3591 3610 printf("ForceIntraQP : %d\n", m_RCForceIntraQP ); 3611 3612 #if U0132_TARGET_BITS_SATURATION 3613 printf("CpbSaturation : %d\n", m_RCCpbSaturationEnabled ); 3614 if (m_RCCpbSaturationEnabled) 3615 { 3616 printf("CpbSize : %d\n", m_RCCpbSize); 3617 printf("InitalCpbFullness : %.2f\n", m_RCInitialCpbFullness); 3618 } 3619 #endif 3592 3620 3593 3621 #if KWU_RC_MADPRED_E0227 … … 3648 3676 printf("SQP:%d ", m_uiDeltaQpRD ); 3649 3677 printf("ASR:%d ", m_bUseASR ); 3650 printf("FEN:%d ", m_bUseFastEnc ); 3678 printf("MinSearchWindow:%d ", m_minSearchWindow ); 3679 printf("RestrictMESampling:%d ", m_bRestrictMESampling ); 3680 printf("FEN:%d ", Int(m_fastInterSearchMode) ); 3651 3681 printf("ECU:%d ", m_bUseEarlyCU ); 3652 3682 printf("FDM:%d ", m_useFastDecisionForMerge ); … … 3657 3687 printf("TransformSkipFast:%d ", m_useTransformSkipFast ); 3658 3688 printf("TransformSkipLog2MaxSize:%d ", m_log2MaxTransformSkipBlockSize); 3659 printf("Slice: M=%d ", m_sliceMode);3689 printf("Slice: M=%d ", Int(m_sliceMode)); 3660 3690 if (m_sliceMode!=NO_SLICES) 3661 3691 { … … 3685 3715 printf("WPB:%d ", (Int)m_useWeightedBiPred); 3686 3716 printf("PME:%d ", m_log2ParallelMergeLevel); 3687 const Int iWaveFrontSubstreams = m_iWaveFrontSynchro ? (m_iSourceHeight + m_uiMaxCUHeight - 1) / m_uiMaxCUHeight : 1; 3688 printf(" WaveFrontSynchro:%d WaveFrontSubstreams:%d", 3689 m_iWaveFrontSynchro, iWaveFrontSubstreams); 3717 const Int iWaveFrontSubstreams = m_entropyCodingSyncEnabledFlag ? (m_iSourceHeight + m_uiMaxCUHeight - 1) / m_uiMaxCUHeight : 1; 3718 printf(" WaveFrontSynchro:%d WaveFrontSubstreams:%d", m_entropyCodingSyncEnabledFlag?1:0, iWaveFrontSubstreams); 3690 3719 printf(" ScalingList:%d ", m_useScalingListId ); 3691 3720 printf("TMVPMode:%d ", m_TMVPModeId ); … … 3730 3759 } 3731 3760 3732 Bool confirmPara(Bool bflag, const Char* message)3761 Bool confirmPara(Bool bflag, const TChar* message) 3733 3762 { 3734 3763 if (!bflag) -
branches/HTM-15.2-dev/source/App/TAppEncoder/TAppEncCfg.h
r1356 r1360 62 62 // file I/O 63 63 #if NH_MV 64 std::vector< char*> m_pchInputFileList; ///< source file names65 #else 66 Char* m_pchInputFile;///< source file name67 #endif 68 Char* m_pchBitstreamFile;///< output bitstream file64 std::vector<TChar*> m_pchInputFileList; ///< source file names 65 #else 66 std::string m_inputFileName; ///< source file name 67 #endif 68 std::string m_bitstreamFileName; ///< output bitstream file 69 69 #if NH_MV 70 70 std::vector<char*> m_pchReconFileList; ///< output reconstruction file names … … 72 72 Int m_iNumberOfViews; ///< number of Layers that are views 73 73 #else 74 Char* m_pchReconFile;///< output reconstruction file74 std::string m_reconFileName; ///< output reconstruction file 75 75 #endif 76 76 #if NH_MV … … 112 112 Bool m_bitRatePresentVpsFlag; 113 113 Bool m_picRatePresentVpsFlag; 114 BoolAry2d m_bitRatePresentFlag; 115 BoolAry2d m_picRatePresentFlag; 116 IntAry2d m_avgBitRate; 117 IntAry2d m_maxBitRate; 118 IntAry2d m_constantPicRateIdc; 119 IntAry2d m_avgPicRate; 120 Bool m_tilesNotInUseFlag; 121 BoolAry1d m_tilesInUseFlag; 122 BoolAry1d m_loopFilterNotAcrossTilesFlag; 123 Bool m_wppNotInUseFlag; 124 BoolAry1d m_wppInUseFlag; 125 126 BoolAry2d m_tileBoundariesAlignedFlag; 127 Bool m_ilpRestrictedRefLayersFlag; 128 IntAry2d m_minSpatialSegmentOffsetPlus1; 129 BoolAry2d m_ctuBasedOffsetEnabledFlag; 130 IntAry2d m_minHorizontalCtuOffsetPlus1; 131 Bool m_singleLayerForNonIrapFlag; 132 Bool m_higherLayerIrapSkipFlag; 133 134 114 BoolAry2d m_bitRatePresentFlag; 115 BoolAry2d m_picRatePresentFlag; 116 IntAry2d m_avgBitRate; 117 IntAry2d m_maxBitRate; 118 IntAry2d m_constantPicRateIdc; 119 IntAry2d m_avgPicRate; 120 Bool m_tilesNotInUseFlag; 121 BoolAry1d m_tilesInUseFlag; 122 BoolAry1d m_loopFilterNotAcrossTilesFlag; 123 Bool m_wppNotInUseFlag; 124 BoolAry1d m_wppInUseFlag; 125 126 BoolAry2d m_tileBoundariesAlignedFlag; 127 Bool m_ilpRestrictedRefLayersFlag; 128 IntAry2d m_minSpatialSegmentOffsetPlus1; 129 BoolAry2d m_ctuBasedOffsetEnabledFlag; 130 IntAry2d m_minHorizontalCtuOffsetPlus1; 131 Bool m_singleLayerForNonIrapFlag; 132 Bool m_higherLayerIrapSkipFlag; 135 133 #if NH_3D 136 134 Bool m_abUseIC; 137 135 Bool m_bUseLowLatencyICEnc; 138 136 #endif 139 140 137 #endif 141 138 Double m_adLambdaModifier[ MAX_TLAYER ]; ///< Lambda modifier array for each temporal layer 139 std::vector<Double> m_adIntraLambdaModifier; ///< Lambda modifier for Intra pictures, one for each temporal layer. If size>temporalLayer, then use [temporalLayer], else if size>0, use [size()-1], else use m_adLambdaModifier. 140 Double m_dIntraQpFactor; ///< Intra Q Factor. If negative, use a default equation: 0.57*(1.0 - Clip3( 0.0, 0.5, 0.05*(Double)(isField ? (GopSize-1)/2 : GopSize-1) )) 141 142 142 // source specification 143 143 Int m_iFrameRate; ///< source frame-rates (Hz) … … 160 160 Int m_framesToBeEncoded; ///< number of encoded frames 161 161 Int m_aiPad[2]; ///< number of padded pixels for width and height 162 Bool m_AccessUnitDelimiter; ///< add Access Unit Delimiter NAL units 162 163 InputColourSpaceConversion m_inputColourSpaceConvert; ///< colour space conversion to apply to input video 163 164 Bool m_snrInternalColourSpace; ///< if true, then no colour space conversion is applied for snr calculation, otherwise inverse of input is applied. … … 237 238 Int m_iQP; ///< QP value of key-picture (integer) 238 239 #endif 239 Char* m_pchdQPFile;///< QP offset for each slice (initialized from external file)240 std::string m_dQPFileName; ///< QP offset for each slice (initialized from external file) 240 241 #if NH_MV 241 242 std::vector<Int*> m_aidQP; ///< array of slice QP values for each layer … … 338 339 Int m_rdPenalty; ///< RD-penalty for 32x32 TU for intra in non-intra slices (0: no RD-penalty, 1: RD-penalty, 2: maximum RD-penalty) 339 340 Bool m_bDisableIntraPUsInInterSlices; ///< Flag for disabling intra predicted PUs in inter slices. 340 Int m_iFastSearch; ///< ME mode, 0 = full, 1 = diamond, 2 = PMVFAST 341 MESearchMethod m_motionEstimationSearchMethod; 342 Bool m_bRestrictMESampling; ///< Restrict sampling for the Selective ME 341 343 Int m_iSearchRange; ///< ME search range 342 344 Int m_bipredSearchRange; ///< ME search range for bipred refinement 345 Int m_minSearchWindow; ///< ME minimum search window size for the Adaptive Window ME 343 346 Bool m_bClipForBiPredMeEnabled; ///< Enables clipping for Bi-Pred ME. 344 347 Bool m_bFastMEAssumingSmootherMVEnabled; ///< Enables fast ME assuming a smoother MV. … … 347 350 Int m_iVerticalDisparitySearchRange; ///< ME vertical search range for inter-view prediction 348 351 #endif 349 Bool m_bUseFastEnc; ///< flag for using fast encoder setting352 FastInterSearchMode m_fastInterSearchMode; ///< Parameter that controls fast encoder settings 350 353 Bool m_bUseEarlyCU; ///< flag for using Early CU setting 351 354 Bool m_useFastDecisionForMerge; ///< flag for using Fast Decision Merge RD-Cost 352 355 Bool m_bUseCbfFastMode; ///< flag for using Cbf Fast PU Mode Decision 353 356 Bool m_useEarlySkipDetection; ///< flag for using Early SKIP Detection 354 Int m_sliceMode; ///< 0: no slice limits, 1 : max number of CTBs per slice, 2: max number of bytes per slice, 355 ///< 3: max number of tiles per slice 357 SliceConstraint m_sliceMode; 356 358 Int m_sliceArgument; ///< argument according to selected slice mode 357 Int m_sliceSegmentMode; ///< 0: no slice segment limits, 1 : max number of CTBs per slice segment, 2: max number of bytes per slice segment, 358 ///< 3: max number of tiles per slice segment 359 SliceConstraint m_sliceSegmentMode; 359 360 Int m_sliceSegmentArgument; ///< argument according to selected slice segment mode 360 361 … … 366 367 std::vector<Int> m_tileColumnWidth; 367 368 std::vector<Int> m_tileRowHeight; 368 Int m_iWaveFrontSynchro; //< 0: no WPP. >= 1: WPP is enabled, the "Top right" from which inheritance occurs is this LCU offset in the line above the current. 369 Int m_iWaveFrontFlush; //< enable(1)/disable(0) the CABAC flush at the end of each line of LCUs. 369 Bool m_entropyCodingSyncEnabledFlag; 370 370 371 371 Bool m_bUseConstrainedIntraPred; ///< flag for using constrained intra prediction … … 374 374 Bool m_bUseBLambdaForNonKeyLowDelayPictures; 375 375 376 Int m_decodedPictureHashSEIEnabled; ///< Checksum(3)/CRC(2)/MD5(1)/disable(0) acting ondecoded picture hash SEI message377 Intm_recoveryPointSEIEnabled;378 Intm_bufferingPeriodSEIEnabled;379 Intm_pictureTimingSEIEnabled;376 HashType m_decodedPictureHashSEIType; ///< Checksum mode for decoded picture hash SEI message 377 Bool m_recoveryPointSEIEnabled; 378 Bool m_bufferingPeriodSEIEnabled; 379 Bool m_pictureTimingSEIEnabled; 380 380 Bool m_toneMappingInfoSEIEnabled; 381 Bool m_chroma SamplingFilterSEIenabled;382 Int m_chroma SamplingHorFilterIdc;383 Int m_chroma SamplingVerFilterIdc;381 Bool m_chromaResamplingFilterSEIenabled; 382 Int m_chromaResamplingHorFilterIdc; 383 Int m_chromaResamplingVerFilterIdc; 384 384 Int m_toneMapId; 385 385 Bool m_toneMapCancelFlag; … … 408 408 Int* m_codedPivotValue; 409 409 Int* m_targetPivotValue; 410 Intm_framePackingSEIEnabled;410 Bool m_framePackingSEIEnabled; 411 411 Int m_framePackingSEIType; 412 412 Int m_framePackingSEIId; 413 413 Int m_framePackingSEIQuincunx; 414 414 Int m_framePackingSEIInterpretation; 415 Intm_segmentedRectFramePackingSEIEnabled;415 Bool m_segmentedRectFramePackingSEIEnabled; 416 416 Bool m_segmentedRectFramePackingSEICancel; 417 417 Int m_segmentedRectFramePackingSEIType; 418 418 Bool m_segmentedRectFramePackingSEIPersistence; 419 419 Int m_displayOrientationSEIAngle; 420 Intm_temporalLevel0IndexSEIEnabled;421 Intm_gradualDecodingRefreshInfoEnabled;420 Bool m_temporalLevel0IndexSEIEnabled; 421 Bool m_gradualDecodingRefreshInfoEnabled; 422 422 Int m_noDisplaySEITLayer; 423 Intm_decodingUnitInfoSEIEnabled;424 Intm_SOPDescriptionSEIEnabled;425 Intm_scalableNestingSEIEnabled;423 Bool m_decodingUnitInfoSEIEnabled; 424 Bool m_SOPDescriptionSEIEnabled; 425 Bool m_scalableNestingSEIEnabled; 426 426 Bool m_tmctsSEIEnabled; 427 427 Bool m_timeCodeSEIEnabled; … … 442 442 Bool m_useWeightedPred; ///< Use of weighted prediction in P slices 443 443 Bool m_useWeightedBiPred; ///< Use of bi-directional weighted prediction in B slices 444 WeightedPredictionMethod m_weightedPredictionMethod; 444 445 445 446 UInt m_log2ParallelMergeLevel; ///< Parallel merge estimation region … … 455 456 Int m_RCInitialQP; ///< inital QP for rate control 456 457 Bool m_RCForceIntraQP; ///< force all intra picture to use initial QP or not 457 458 459 #if U0132_TARGET_BITS_SATURATION 460 Bool m_RCCpbSaturationEnabled; ///< enable target bits saturation to avoid CPB overflow and underflow 461 UInt m_RCCpbSize; ///< CPB size 462 Double m_RCInitialCpbFullness; ///< initial CPB fullness 463 #endif 464 458 465 #if KWU_RC_VIEWRC_E0227 459 466 vector<Int> m_viewTargetBits; … … 464 471 #endif 465 472 466 ScalingListMode m_useScalingListId; ///< using quantization matrix467 Char* m_scalingListFile;///< quantization matrix file name473 ScalingListMode m_useScalingListId; ///< using quantization matrix 474 std::string m_scalingListFileName; ///< quantization matrix file name 468 475 469 476 Bool m_TransquantBypassEnableFlag; ///< transquant_bypass_enable_flag setting in PPS. … … 509 516 Int m_log2MaxMvLengthHorizontal; ///< Indicate the maximum absolute value of a decoded horizontal MV component in quarter-pel luma units 510 517 Int m_log2MaxMvLengthVertical; ///< Indicate the maximum absolute value of a decoded vertical MV component in quarter-pel luma units 518 std::string m_colourRemapSEIFileRoot; 519 511 520 std::string m_summaryOutFilename; ///< filename to use for producing summary output file. 512 521 std::string m_summaryPicFilenameBase; ///< Base filename to use for producing summary picture output files. The actual filenames used will have I.txt, P.txt and B.txt appended. … … 528 537 Bool m_depth420OutputFlag; ///< Output depth layers in 4:2:0 format 529 538 // Camera parameters 530 Char*m_pchCameraParameterFile; ///< camera parameter file531 Char*m_pchBaseViewCameraNumbers;539 TChar* m_pchCameraParameterFile; ///< camera parameter file 540 TChar* m_pchBaseViewCameraNumbers; 532 541 TAppComCamPara m_cCameraData; 533 542 Int m_iCodedCamParPrecision; ///< precision for coding of camera parameters 534 543 #if NH_3D_VSO 535 Char*m_pchVSOConfig;544 TChar* m_pchVSOConfig; 536 545 Bool m_bUseVSO; ///< flag for using View Synthesis Optimization 537 546 Bool m_bVSOLSTable; ///< Depth QP dependent Lagrange parameter optimization (m23714) … … 674 683 Void create (); ///< create option handling class 675 684 Void destroy (); ///< destroy option handling class 676 Bool parseCfg ( Int argc, Char* argv[] );///< parse configuration file to fill member variables685 Bool parseCfg ( Int argc, TChar* argv[] ); ///< parse configuration file to fill member variables 677 686 678 687 };// END CLASS DEFINITION TAppEncCfg -
branches/HTM-15.2-dev/source/App/TAppEncoder/TAppEncTop.cpp
r1356 r1360 378 378 m_cTEncTop.setLambdaModifier ( uiLoop, m_adLambdaModifier[ uiLoop ] ); 379 379 } 380 m_cTEncTop.setIntraLambdaModifier ( m_adIntraLambdaModifier ); 381 m_cTEncTop.setIntraQpFactor ( m_dIntraQpFactor ); 382 380 383 #if NH_MV 381 384 m_cTEncTop.setQP ( m_iQP[layerIdInVps] ); … … 385 388 386 389 m_cTEncTop.setPad ( m_aiPad ); 387 390 m_cTEncTop.setAccessUnitDelimiter ( m_AccessUnitDelimiter ); 388 391 #if NH_MV 389 392 m_cTEncTop.setMaxTempLayer ( m_maxTempLayerMvc[layerIdInVps] ); … … 408 411 //====== Motion search ======== 409 412 m_cTEncTop.setDisableIntraPUsInInterSlices ( m_bDisableIntraPUsInInterSlices ); 410 m_cTEncTop.set FastSearch ( m_iFastSearch);413 m_cTEncTop.setMotionEstimationSearchMethod ( m_motionEstimationSearchMethod ); 411 414 m_cTEncTop.setSearchRange ( m_iSearchRange ); 412 415 m_cTEncTop.setBipredSearchRange ( m_bipredSearchRange ); 413 416 m_cTEncTop.setClipForBiPredMeEnabled ( m_bClipForBiPredMeEnabled ); 414 417 m_cTEncTop.setFastMEAssumingSmootherMVEnabled ( m_bFastMEAssumingSmootherMVEnabled ); 418 m_cTEncTop.setMinSearchWindow ( m_minSearchWindow ); 419 m_cTEncTop.setRestrictMESampling ( m_bRestrictMESampling ); 415 420 416 421 #if NH_MV … … 439 444 m_cTEncTop.setExtendedPrecisionProcessingFlag ( m_extendedPrecisionProcessingFlag ); 440 445 m_cTEncTop.setHighPrecisionOffsetsEnabledFlag ( m_highPrecisionOffsetsEnabledFlag ); 446 447 m_cTEncTop.setWeightedPredictionMethod( m_weightedPredictionMethod ); 448 441 449 //====== Tool list ======== 442 450 m_cTEncTop.setDeltaQpRD ( m_uiDeltaQpRD ); … … 463 471 m_cTEncTop.setQuadtreeTUMaxDepthInter ( m_uiQuadtreeTUMaxDepthInter ); 464 472 m_cTEncTop.setQuadtreeTUMaxDepthIntra ( m_uiQuadtreeTUMaxDepthIntra ); 465 m_cTEncTop.set UseFastEnc ( m_bUseFastEnc);473 m_cTEncTop.setFastInterSearchMode ( m_fastInterSearchMode ); 466 474 m_cTEncTop.setUseEarlyCU ( m_bUseEarlyCU ); 467 475 m_cTEncTop.setUseFastDecisionForMerge ( m_useFastDecisionForMerge ); … … 513 521 514 522 //====== Slice ======== 515 m_cTEncTop.setSliceMode ( (SliceConstraint)m_sliceMode );523 m_cTEncTop.setSliceMode ( m_sliceMode ); 516 524 m_cTEncTop.setSliceArgument ( m_sliceArgument ); 517 525 518 526 //====== Dependent Slice ======== 519 m_cTEncTop.setSliceSegmentMode ( (SliceConstraint)m_sliceSegmentMode );527 m_cTEncTop.setSliceSegmentMode ( m_sliceSegmentMode ); 520 528 m_cTEncTop.setSliceSegmentArgument ( m_sliceSegmentArgument ); 521 529 … … 540 548 541 549 m_cTEncTop.setIntraSmoothingDisabledFlag (!m_enableIntraReferenceSmoothing ); 542 m_cTEncTop.setDecodedPictureHashSEI Enabled ( m_decodedPictureHashSEIEnabled);550 m_cTEncTop.setDecodedPictureHashSEIType ( m_decodedPictureHashSEIType ); 543 551 m_cTEncTop.setRecoveryPointSEIEnabled ( m_recoveryPointSEIEnabled ); 544 552 m_cTEncTop.setBufferingPeriodSEIEnabled ( m_bufferingPeriodSEIEnabled ); … … 571 579 m_cTEncTop.setTMISEINominalWhiteLevelLumaCodeValue ( m_nominalWhiteLevelLumaCodeValue ); 572 580 m_cTEncTop.setTMISEIExtendedWhiteLevelLumaCodeValue ( m_extendedWhiteLevelLumaCodeValue ); 573 m_cTEncTop.setChroma SamplingFilterHintEnabled ( m_chromaSamplingFilterSEIenabled );574 m_cTEncTop.setChroma SamplingHorFilterIdc ( m_chromaSamplingHorFilterIdc );575 m_cTEncTop.setChroma SamplingVerFilterIdc ( m_chromaSamplingVerFilterIdc );581 m_cTEncTop.setChromaResamplingFilterHintEnabled ( m_chromaResamplingFilterSEIenabled ); 582 m_cTEncTop.setChromaResamplingHorFilterIdc ( m_chromaResamplingHorFilterIdc ); 583 m_cTEncTop.setChromaResamplingVerFilterIdc ( m_chromaResamplingVerFilterIdc ); 576 584 m_cTEncTop.setFramePackingArrangementSEIEnabled ( m_framePackingSEIEnabled ); 577 585 m_cTEncTop.setFramePackingArrangementSEIType ( m_framePackingSEIType ); … … 623 631 m_cTEncTop.setKneeSEIInputKneePoint ( m_kneeSEIInputKneePoint ); 624 632 m_cTEncTop.setKneeSEIOutputKneePoint ( m_kneeSEIOutputKneePoint ); 633 m_cTEncTop.setColourRemapInfoSEIFileRoot ( m_colourRemapSEIFileRoot ); 625 634 m_cTEncTop.setMasteringDisplaySEI ( m_masteringDisplay ); 626 635 … … 644 653 } 645 654 m_cTEncTop.setLFCrossTileBoundaryFlag ( m_bLFCrossTileBoundaryFlag ); 646 m_cTEncTop.set WaveFrontSynchro ( m_iWaveFrontSynchro);655 m_cTEncTop.setEntropyCodingSyncEnabledFlag ( m_entropyCodingSyncEnabledFlag ); 647 656 m_cTEncTop.setTMVPModeId ( m_TMVPModeId ); 648 657 m_cTEncTop.setUseScalingListId ( m_useScalingListId ); 649 m_cTEncTop.setScalingListFile ( m_scalingListFile);658 m_cTEncTop.setScalingListFileName ( m_scalingListFileName ); 650 659 m_cTEncTop.setSignHideFlag ( m_signHideFlag); 651 660 #if KWU_RC_VIEWRC_E0227 || KWU_RC_MADPRED_E0227 … … 669 678 m_cTEncTop.setInitialQP ( m_RCInitialQP ); 670 679 m_cTEncTop.setForceIntraQP ( m_RCForceIntraQP ); 680 #if U0132_TARGET_BITS_SATURATION 681 m_cTEncTop.setCpbSaturationEnabled ( m_RCCpbSaturationEnabled ); 682 m_cTEncTop.setCpbSize ( m_RCCpbSize ); 683 m_cTEncTop.setInitialCpbFullness ( m_RCInitialCpbFullness ); 684 #endif 685 671 686 #if KWU_RC_MADPRED_E0227 672 687 if(m_cTEncTop.getUseRateCtrl() && !m_cTEncTop.getIsDepth()) … … 843 858 #else 844 859 // Video I/O 845 m_cTVideoIOYuvInputFile.open( m_ pchInputFile, false, m_inputBitDepth, m_MSBExtendedBitDepth, m_internalBitDepth ); // read mode860 m_cTVideoIOYuvInputFile.open( m_inputFileName, false, m_inputBitDepth, m_MSBExtendedBitDepth, m_internalBitDepth ); // read mode 846 861 m_cTVideoIOYuvInputFile.skipFrames(m_FrameSkip, m_iSourceWidth - m_aiPad[0], m_iSourceHeight - m_aiPad[1], m_InputChromaFormatIDC); 847 862 848 if ( m_pchReconFile)849 { 850 m_cTVideoIOYuvReconFile.open(m_ pchReconFile, true, m_outputBitDepth, m_outputBitDepth, m_internalBitDepth); // write mode863 if (!m_reconFileName.empty()) 864 { 865 m_cTVideoIOYuvReconFile.open(m_reconFileName, true, m_outputBitDepth, m_outputBitDepth, m_internalBitDepth); // write mode 851 866 } 852 867 … … 917 932 Void TAppEncTop::encode() 918 933 { 919 fstream bitstreamFile(m_ pchBitstreamFile, fstream::binary | fstream::out);934 fstream bitstreamFile(m_bitstreamFileName.c_str(), fstream::binary | fstream::out); 920 935 if (!bitstreamFile) 921 936 { 922 fprintf(stderr, "\nfailed to open bitstream file `%s' for writing\n", m_ pchBitstreamFile);937 fprintf(stderr, "\nfailed to open bitstream file `%s' for writing\n", m_bitstreamFileName.c_str()); 923 938 exit(EXIT_FAILURE); 924 939 } … … 1295 1310 } 1296 1311 #else 1297 if ( m_pchReconFile)1312 if (!m_reconFileName.empty()) 1298 1313 { 1299 1314 m_cTVideoIOYuvReconFile.write( pcPicYuvRecTop, pcPicYuvRecBottom, ipCSC, m_confWinLeft, m_confWinRight, m_confWinTop, m_confWinBottom, NUM_CHROMA_FORMAT, m_isTopFieldFirst ); … … 1352 1367 } 1353 1368 #else 1354 if ( m_pchReconFile)1369 if (!m_reconFileName.empty()) 1355 1370 { 1356 1371 m_cTVideoIOYuvReconFile.write( pcPicYuvRec, ipCSC, m_confWinLeft, m_confWinRight, m_confWinTop, m_confWinBottom,
Note: See TracChangeset for help on using the changeset viewer.
