Changeset 1270 in 3DVCSoftware for branches/HTM-14.1-update-dev3


Ignore:
Timestamp:
13 Jul 2015, 15:22:02 (9 years ago)
Author:
tech
Message:

Merged 14.1-update-dev4-Qualcomm@1266

Location:
branches/HTM-14.1-update-dev3
Files:
42 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-14.1-update-dev3/HTM.xcodeproj/project.pbxproj

    r758 r1270  
    2525
    2626/* Begin PBXBuildFile section */
    27                 7874637E17D5DD900040CFC7 /* encmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462C117D5DD7B0040CFC7 /* encmain.cpp */; };
    28                 7874637F17D5DD900040CFC7 /* TAppEncCfg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462C217D5DD7B0040CFC7 /* TAppEncCfg.cpp */; };
    29                 7874638017D5DD900040CFC7 /* TAppEncTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462C417D5DD7B0040CFC7 /* TAppEncTop.cpp */; };
    30                 7874638117D5DDA60040CFC7 /* NALwrite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874633F17D5DD840040CFC7 /* NALwrite.cpp */; };
    31                 7874638217D5DDA60040CFC7 /* SEIwrite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874634117D5DD840040CFC7 /* SEIwrite.cpp */; };
    32                 7874638317D5DDA60040CFC7 /* SyntaxElementWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874634317D5DD840040CFC7 /* SyntaxElementWriter.cpp */; };
    33                 7874638417D5DDA60040CFC7 /* TEncAnalyze.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874634517D5DD840040CFC7 /* TEncAnalyze.cpp */; };
    34                 7874638517D5DDA60040CFC7 /* TEncBinCoderCABAC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874634817D5DD840040CFC7 /* TEncBinCoderCABAC.cpp */; };
    35                 7874638617D5DDA60040CFC7 /* TEncBinCoderCABACCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874634A17D5DD840040CFC7 /* TEncBinCoderCABACCounter.cpp */; };
    36                 7874638717D5DDA60040CFC7 /* TEncCavlc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874634C17D5DD840040CFC7 /* TEncCavlc.cpp */; };
    37                 7874638817D5DDA60040CFC7 /* TEncCu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874634F17D5DD840040CFC7 /* TEncCu.cpp */; };
    38                 7874638917D5DDA60040CFC7 /* TEncEntropy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874635117D5DD840040CFC7 /* TEncEntropy.cpp */; };
    39                 7874638A17D5DDA60040CFC7 /* TEncGOP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874635317D5DD840040CFC7 /* TEncGOP.cpp */; };
    40                 7874638B17D5DDA60040CFC7 /* TEncPic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874635517D5DD840040CFC7 /* TEncPic.cpp */; };
    41                 7874638C17D5DDA60040CFC7 /* TEncPreanalyzer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874635717D5DD840040CFC7 /* TEncPreanalyzer.cpp */; };
    42                 7874638D17D5DDA60040CFC7 /* TEncRateCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874635917D5DD840040CFC7 /* TEncRateCtrl.cpp */; };
    43                 7874638E17D5DDA60040CFC7 /* TEncSampleAdaptiveOffset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874635B17D5DD840040CFC7 /* TEncSampleAdaptiveOffset.cpp */; };
    44                 7874638F17D5DDA60040CFC7 /* TEncSbac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874635D17D5DD840040CFC7 /* TEncSbac.cpp */; };
    45                 7874639017D5DDA60040CFC7 /* TEncSearch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874635F17D5DD840040CFC7 /* TEncSearch.cpp */; };
    46                 7874639117D5DDA60040CFC7 /* TEncSlice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874636117D5DD840040CFC7 /* TEncSlice.cpp */; };
    47                 7874639217D5DDA60040CFC7 /* TEncTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874636317D5DD840040CFC7 /* TEncTop.cpp */; };
    48                 7874639317D5DDA60040CFC7 /* WeightPredAnalysis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874636517D5DD840040CFC7 /* WeightPredAnalysis.cpp */; };
    49                 7874639417D5DE070040CFC7 /* TComPrediction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874630E17D5DD840040CFC7 /* TComPrediction.cpp */; };
    50                 7874639517D5DE070040CFC7 /* TComRdCost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874631017D5DD840040CFC7 /* TComRdCost.cpp */; };
    51                 7874639617D5DE070040CFC7 /* TComRdCostWeightPrediction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874631217D5DD840040CFC7 /* TComRdCostWeightPrediction.cpp */; };
    52                 7874639717D5DE070040CFC7 /* TComRom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874631417D5DD840040CFC7 /* TComRom.cpp */; };
    53                 7874639817D5DE070040CFC7 /* TComSampleAdaptiveOffset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874631617D5DD840040CFC7 /* TComSampleAdaptiveOffset.cpp */; };
    54                 7874639917D5DE070040CFC7 /* TComSlice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874631817D5DD840040CFC7 /* TComSlice.cpp */; };
    55                 7874639A17D5DE070040CFC7 /* TComTrQuant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874631A17D5DD840040CFC7 /* TComTrQuant.cpp */; };
    56                 7874639B17D5DE070040CFC7 /* TComWedgelet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874631C17D5DD840040CFC7 /* TComWedgelet.cpp */; };
    57                 7874639C17D5DE070040CFC7 /* TComWeightPrediction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874631E17D5DD840040CFC7 /* TComWeightPrediction.cpp */; };
    58                 7874639D17D5DE070040CFC7 /* TComYuv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874632017D5DD840040CFC7 /* TComYuv.cpp */; };
    59                 7874639E17D5DE230040CFC7 /* TComMotionInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874630217D5DD840040CFC7 /* TComMotionInfo.cpp */; };
    60                 7874639F17D5DE230040CFC7 /* TComPattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874630517D5DD840040CFC7 /* TComPattern.cpp */; };
    61                 787463A017D5DE230040CFC7 /* TComPic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874630717D5DD840040CFC7 /* TComPic.cpp */; };
    62                 787463A117D5DE230040CFC7 /* TComPicSym.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874630917D5DD840040CFC7 /* TComPicSym.cpp */; };
    63                 787463A217D5DE230040CFC7 /* TComPicYuv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874630B17D5DD840040CFC7 /* TComPicYuv.cpp */; };
    64                 787463A317D5DE230040CFC7 /* TComPicYuvMD5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874630D17D5DD840040CFC7 /* TComPicYuvMD5.cpp */; };
    65                 787463A417D5DE400040CFC7 /* TComCABACTables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462F917D5DD840040CFC7 /* TComCABACTables.cpp */; };
    66                 787463A517D5DE400040CFC7 /* TComDataCU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462FB17D5DD840040CFC7 /* TComDataCU.cpp */; };
    67                 787463A617D5DE400040CFC7 /* TComInterpolationFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462FD17D5DD840040CFC7 /* TComInterpolationFilter.cpp */; };
    68                 787463A717D5DE400040CFC7 /* TComLoopFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874630017D5DD840040CFC7 /* TComLoopFilter.cpp */; };
    69                 787463A817D5DE4B0040CFC7 /* TComBitStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462F717D5DD840040CFC7 /* TComBitStream.cpp */; };
    70                 787463A917D5DE640040CFC7 /* ContextModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462EE17D5DD840040CFC7 /* ContextModel.cpp */; };
    71                 787463AA17D5DE640040CFC7 /* ContextModel3DBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462F017D5DD840040CFC7 /* ContextModel3DBuffer.cpp */; };
    72                 787463AB17D5DE640040CFC7 /* SEI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462F417D5DD840040CFC7 /* SEI.cpp */; };
    73                 787463AC17D5DE8A0040CFC7 /* TVideoIOYuv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874637C17D5DD840040CFC7 /* TVideoIOYuv.cpp */; };
    74                 787463AD17D5DE980040CFC7 /* TRenFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874636B17D5DD840040CFC7 /* TRenFilter.cpp */; };
    75                 787463AE17D5DE980040CFC7 /* TRenImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874636D17D5DD840040CFC7 /* TRenImage.cpp */; };
    76                 787463AF17D5DE980040CFC7 /* TRenImagePlane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874636F17D5DD840040CFC7 /* TRenImagePlane.cpp */; };
    77                 787463B017D5DE980040CFC7 /* TRenInterpFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874637117D5DD840040CFC7 /* TRenInterpFilter.cpp */; };
    78                 787463B117D5DE9D0040CFC7 /* TRenModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874637317D5DD840040CFC7 /* TRenModel.cpp */; };
    79                 787463B217D5DE9D0040CFC7 /* TRenModSetupStrParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874637517D5DD840040CFC7 /* TRenModSetupStrParser.cpp */; };
    80                 787463B317D5DE9D0040CFC7 /* TRenSingleModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874637717D5DD840040CFC7 /* TRenSingleModel.cpp */; };
    81                 787463B417D5DE9D0040CFC7 /* TRenTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874637917D5DD840040CFC7 /* TRenTop.cpp */; };
    82                 787463B517D5DEAF0040CFC7 /* program_options_lite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462E717D5DD840040CFC7 /* program_options_lite.cpp */; };
    83                 787463B617D5DEAF0040CFC7 /* TAppComCamPara.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462E917D5DD840040CFC7 /* TAppComCamPara.cpp */; };
    84                 787463B717D5DED40040CFC7 /* libmd5.c in Sources */ = {isa = PBXBuildFile; fileRef = 787462E317D5DD840040CFC7 /* libmd5.c */; };
    85                 787463B817D5DEE80040CFC7 /* AnnexBread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874632417D5DD840040CFC7 /* AnnexBread.cpp */; };
    86                 787463B917D5DEE80040CFC7 /* NALread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874632617D5DD840040CFC7 /* NALread.cpp */; };
    87                 787463BA17D5DEE80040CFC7 /* SEIread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874632817D5DD840040CFC7 /* SEIread.cpp */; };
    88                 787463BB17D5DEE80040CFC7 /* SyntaxElementParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874632A17D5DD840040CFC7 /* SyntaxElementParser.cpp */; };
    89                 787463BC17D5DEE80040CFC7 /* TDecBinCoderCABAC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874632D17D5DD840040CFC7 /* TDecBinCoderCABAC.cpp */; };
    90                 787463BD17D5DEE80040CFC7 /* TDecCAVLC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874632F17D5DD840040CFC7 /* TDecCAVLC.cpp */; };
    91                 787463BE17D5DEE80040CFC7 /* TDecCu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874633117D5DD840040CFC7 /* TDecCu.cpp */; };
    92                 787463BF17D5DEE80040CFC7 /* TDecEntropy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874633317D5DD840040CFC7 /* TDecEntropy.cpp */; };
    93                 787463C017D5DEE80040CFC7 /* TDecGop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874633517D5DD840040CFC7 /* TDecGop.cpp */; };
    94                 787463C117D5DEE80040CFC7 /* TDecSbac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874633717D5DD840040CFC7 /* TDecSbac.cpp */; };
    95                 787463C217D5DEE80040CFC7 /* TDecSlice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874633917D5DD840040CFC7 /* TDecSlice.cpp */; };
    96                 787463C317D5DEE80040CFC7 /* TDecTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874633B17D5DD840040CFC7 /* TDecTop.cpp */; };
    97                 787463C417D5DEFB0040CFC7 /* decmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462BB17D5DD7B0040CFC7 /* decmain.cpp */; };
    98                 787463C517D5DEFB0040CFC7 /* TAppDecCfg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462BC17D5DD7B0040CFC7 /* TAppDecCfg.cpp */; };
    99                 787463C617D5DEFB0040CFC7 /* TAppDecTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462BE17D5DD7B0040CFC7 /* TAppDecTop.cpp */; };
    100                 787463C717D5DF080040CFC7 /* extrmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462C717D5DD7B0040CFC7 /* extrmain.cpp */; };
    101                 787463C817D5DF080040CFC7 /* TAppExtrCfg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462C817D5DD7B0040CFC7 /* TAppExtrCfg.cpp */; };
    102                 787463C917D5DF080040CFC7 /* TAppExtrTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462CA17D5DD7B0040CFC7 /* TAppExtrTop.cpp */; };
    103                 787463CA17D5DF0E0040CFC7 /* RendererMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462CD17D5DD7B0040CFC7 /* RendererMain.cpp */; };
    104                 787463CB17D5DF0E0040CFC7 /* TAppRendererCfg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462CE17D5DD7B0040CFC7 /* TAppRendererCfg.cpp */; };
    105                 787463CC17D5DF0E0040CFC7 /* TAppRendererTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 787462D017D5DD7B0040CFC7 /* TAppRendererTop.cpp */; };
    106                 787463CD17D5DF220040CFC7 /* TExtrTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7874636817D5DD840040CFC7 /* TExtrTop.cpp */; };
     27                784870741B0B62D10098FD5A /* decmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FA71B0B62C70098FD5A /* decmain.cpp */; };
     28                784870751B0B62D10098FD5A /* TAppDecCfg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FA81B0B62C70098FD5A /* TAppDecCfg.cpp */; };
     29                784870761B0B62D10098FD5A /* TAppDecTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FAA1B0B62C70098FD5A /* TAppDecTop.cpp */; };
     30                784870771B0B62D80098FD5A /* encmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FAD1B0B62C70098FD5A /* encmain.cpp */; };
     31                784870781B0B62D80098FD5A /* TAppEncCfg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FAE1B0B62C70098FD5A /* TAppEncCfg.cpp */; };
     32                784870791B0B62D80098FD5A /* TAppEncTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FB01B0B62C70098FD5A /* TAppEncTop.cpp */; };
     33                7848707A1B0B62E10098FD5A /* extrmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FB31B0B62C70098FD5A /* extrmain.cpp */; };
     34                7848707B1B0B62E10098FD5A /* TAppExtrCfg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FB41B0B62C70098FD5A /* TAppExtrCfg.cpp */; };
     35                7848707C1B0B62E10098FD5A /* TAppExtrTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FB61B0B62C70098FD5A /* TAppExtrTop.cpp */; };
     36                7848707D1B0B62E80098FD5A /* RendererMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FB91B0B62C70098FD5A /* RendererMain.cpp */; };
     37                7848707E1B0B62E80098FD5A /* TAppRendererCfg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FBA1B0B62C70098FD5A /* TAppRendererCfg.cpp */; };
     38                7848707F1B0B62E80098FD5A /* TAppRendererTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FBC1B0B62C70098FD5A /* TAppRendererTop.cpp */; };
     39                784870801B0B63040098FD5A /* program_options_lite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FD41B0B62C70098FD5A /* program_options_lite.cpp */; };
     40                784870811B0B63040098FD5A /* TAppComCamPara.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FD61B0B62C70098FD5A /* TAppComCamPara.cpp */; };
     41                784870821B0B63230098FD5A /* ContextModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FDB1B0B62C70098FD5A /* ContextModel.cpp */; };
     42                784870831B0B63230098FD5A /* ContextModel3DBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FDD1B0B62C70098FD5A /* ContextModel3DBuffer.cpp */; };
     43                784870841B0B63230098FD5A /* Debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FE01B0B62C70098FD5A /* Debug.cpp */; };
     44                784870851B0B63230098FD5A /* SEI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FE31B0B62C70098FD5A /* SEI.cpp */; };
     45                784870861B0B63230098FD5A /* TComBitStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FE61B0B62C70098FD5A /* TComBitStream.cpp */; };
     46                784870871B0B63230098FD5A /* TComCABACTables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FE81B0B62C70098FD5A /* TComCABACTables.cpp */; };
     47                784870881B0B63230098FD5A /* TComChromaFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FEA1B0B62C70098FD5A /* TComChromaFormat.cpp */; };
     48                784870891B0B63230098FD5A /* TComDataCU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FED1B0B62C70098FD5A /* TComDataCU.cpp */; };
     49                7848708A1B0B63230098FD5A /* TComInterpolationFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FEF1B0B62C70098FD5A /* TComInterpolationFilter.cpp */; };
     50                7848708B1B0B63230098FD5A /* TComLoopFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FF21B0B62C70098FD5A /* TComLoopFilter.cpp */; };
     51                7848708C1B0B63230098FD5A /* TComMotionInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FF41B0B62C70098FD5A /* TComMotionInfo.cpp */; };
     52                7848708D1B0B63230098FD5A /* TComPattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FF71B0B62C70098FD5A /* TComPattern.cpp */; };
     53                7848708E1B0B63230098FD5A /* TComPic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FF91B0B62C70098FD5A /* TComPic.cpp */; };
     54                7848708F1B0B63230098FD5A /* TComPicSym.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FFB1B0B62C70098FD5A /* TComPicSym.cpp */; };
     55                784870901B0B63230098FD5A /* TComPicYuv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FFD1B0B62C70098FD5A /* TComPicYuv.cpp */; };
     56                784870911B0B63230098FD5A /* TComPicYuvMD5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 78486FFF1B0B62C70098FD5A /* TComPicYuvMD5.cpp */; };
     57                784870921B0B63230098FD5A /* TComPrediction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870001B0B62C70098FD5A /* TComPrediction.cpp */; };
     58                784870931B0B63230098FD5A /* TComRdCost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870021B0B62C70098FD5A /* TComRdCost.cpp */; };
     59                784870941B0B63230098FD5A /* TComRdCostWeightPrediction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870041B0B62C70098FD5A /* TComRdCostWeightPrediction.cpp */; };
     60                784870951B0B63230098FD5A /* TComRom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870071B0B62C70098FD5A /* TComRom.cpp */; };
     61                784870961B0B63230098FD5A /* TComSampleAdaptiveOffset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870091B0B62C70098FD5A /* TComSampleAdaptiveOffset.cpp */; };
     62                784870971B0B63230098FD5A /* TComSlice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848700B1B0B62C70098FD5A /* TComSlice.cpp */; };
     63                784870981B0B63230098FD5A /* TComTrQuant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848700D1B0B62C70098FD5A /* TComTrQuant.cpp */; };
     64                784870991B0B63230098FD5A /* TComTU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848700F1B0B62C70098FD5A /* TComTU.cpp */; };
     65                7848709A1B0B63230098FD5A /* TComWedgelet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870111B0B62C70098FD5A /* TComWedgelet.cpp */; };
     66                7848709B1B0B63230098FD5A /* TComWeightPrediction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870131B0B62C70098FD5A /* TComWeightPrediction.cpp */; };
     67                7848709C1B0B63230098FD5A /* TComYuv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870151B0B62C70098FD5A /* TComYuv.cpp */; };
     68                7848709D1B0B63360098FD5A /* AnnexBread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870191B0B62C70098FD5A /* AnnexBread.cpp */; };
     69                7848709E1B0B63360098FD5A /* NALread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848701B1B0B62C70098FD5A /* NALread.cpp */; };
     70                7848709F1B0B63360098FD5A /* SEIread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848701D1B0B62C70098FD5A /* SEIread.cpp */; };
     71                784870A01B0B63360098FD5A /* SyntaxElementParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848701F1B0B62C70098FD5A /* SyntaxElementParser.cpp */; };
     72                784870A11B0B63360098FD5A /* TDecBinCoderCABAC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870221B0B62C70098FD5A /* TDecBinCoderCABAC.cpp */; };
     73                784870A21B0B63360098FD5A /* TDecCAVLC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870241B0B62C70098FD5A /* TDecCAVLC.cpp */; };
     74                784870A31B0B63360098FD5A /* TDecCu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870261B0B62C70098FD5A /* TDecCu.cpp */; };
     75                784870A41B0B63360098FD5A /* TDecEntropy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870281B0B62C70098FD5A /* TDecEntropy.cpp */; };
     76                784870A51B0B63360098FD5A /* TDecGop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848702A1B0B62C70098FD5A /* TDecGop.cpp */; };
     77                784870A61B0B63360098FD5A /* TDecSbac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848702C1B0B62C70098FD5A /* TDecSbac.cpp */; };
     78                784870A71B0B63360098FD5A /* TDecSlice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848702E1B0B62C70098FD5A /* TDecSlice.cpp */; };
     79                784870A81B0B63360098FD5A /* TDecTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870301B0B62C70098FD5A /* TDecTop.cpp */; };
     80                784870A91B0B634A0098FD5A /* NALwrite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870341B0B62C70098FD5A /* NALwrite.cpp */; };
     81                784870AA1B0B634A0098FD5A /* SEIEncoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870361B0B62C70098FD5A /* SEIEncoder.cpp */; };
     82                784870AB1B0B634A0098FD5A /* SEIwrite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870381B0B62C70098FD5A /* SEIwrite.cpp */; };
     83                784870AC1B0B634A0098FD5A /* SyntaxElementWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848703A1B0B62C70098FD5A /* SyntaxElementWriter.cpp */; };
     84                784870AD1B0B634A0098FD5A /* TEncBinCoderCABAC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848703E1B0B62C70098FD5A /* TEncBinCoderCABAC.cpp */; };
     85                784870AE1B0B634A0098FD5A /* TEncBinCoderCABACCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870401B0B62C70098FD5A /* TEncBinCoderCABACCounter.cpp */; };
     86                784870AF1B0B634A0098FD5A /* TEncCavlc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870421B0B62C70098FD5A /* TEncCavlc.cpp */; };
     87                784870B01B0B634A0098FD5A /* TEncCu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870451B0B62C70098FD5A /* TEncCu.cpp */; };
     88                784870B11B0B634A0098FD5A /* TEncEntropy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870471B0B62C70098FD5A /* TEncEntropy.cpp */; };
     89                784870B21B0B634A0098FD5A /* TEncGOP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870491B0B62C70098FD5A /* TEncGOP.cpp */; };
     90                784870B31B0B634A0098FD5A /* TEncPic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848704B1B0B62C70098FD5A /* TEncPic.cpp */; };
     91                784870B41B0B634A0098FD5A /* TEncPreanalyzer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848704D1B0B62C70098FD5A /* TEncPreanalyzer.cpp */; };
     92                784870B51B0B634A0098FD5A /* TEncRateCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848704F1B0B62C70098FD5A /* TEncRateCtrl.cpp */; };
     93                784870B61B0B634A0098FD5A /* TEncSampleAdaptiveOffset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870511B0B62C70098FD5A /* TEncSampleAdaptiveOffset.cpp */; };
     94                784870B71B0B634A0098FD5A /* TEncSbac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870531B0B62C70098FD5A /* TEncSbac.cpp */; };
     95                784870B81B0B634A0098FD5A /* TEncSearch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870551B0B62C70098FD5A /* TEncSearch.cpp */; };
     96                784870B91B0B634A0098FD5A /* TEncSlice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870571B0B62C70098FD5A /* TEncSlice.cpp */; };
     97                784870BA1B0B634A0098FD5A /* TEncTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870591B0B62C70098FD5A /* TEncTop.cpp */; };
     98                784870BB1B0B634A0098FD5A /* WeightPredAnalysis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848705B1B0B62C70098FD5A /* WeightPredAnalysis.cpp */; };
     99                784870BC1B0B63520098FD5A /* TExtrTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848705E1B0B62C70098FD5A /* TExtrTop.cpp */; };
     100                784870BD1B0B635C0098FD5A /* TRenFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870611B0B62C70098FD5A /* TRenFilter.cpp */; };
     101                784870BE1B0B635C0098FD5A /* TRenImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870631B0B62C70098FD5A /* TRenImage.cpp */; };
     102                784870BF1B0B635C0098FD5A /* TRenImagePlane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870651B0B62C70098FD5A /* TRenImagePlane.cpp */; };
     103                784870C01B0B635C0098FD5A /* TRenInterpFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870671B0B62C70098FD5A /* TRenInterpFilter.cpp */; };
     104                784870C11B0B635C0098FD5A /* TRenModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870691B0B62C70098FD5A /* TRenModel.cpp */; };
     105                784870C21B0B635C0098FD5A /* TRenModSetupStrParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848706B1B0B62C70098FD5A /* TRenModSetupStrParser.cpp */; };
     106                784870C31B0B635C0098FD5A /* TRenSingleModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848706D1B0B62C70098FD5A /* TRenSingleModel.cpp */; };
     107                784870C41B0B635C0098FD5A /* TRenTop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7848706F1B0B62C70098FD5A /* TRenTop.cpp */; };
     108                784870C51B0B63610098FD5A /* TVideoIOYuv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 784870721B0B62C70098FD5A /* TVideoIOYuv.cpp */; };
     109                784870C61B0B63740098FD5A /* libmd5.c in Sources */ = {isa = PBXBuildFile; fileRef = 78486FD01B0B62C70098FD5A /* libmd5.c */; };
    107110                78C5940D15872233004401C5 /* libTLibCommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6767959411AD61BB00421804 /* libTLibCommon.a */; };
    108111                78C5940E15872233004401C5 /* libTLibEncoder.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6767961911AD626F00421804 /* libTLibEncoder.a */; };
     
    289292                6767966A11AD635600421804 /* TAppEncoder */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TAppEncoder; sourceTree = BUILT_PRODUCTS_DIR; };
    290293                6782E0DE11AD691A00E8FFB8 /* TAppDecoder */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TAppDecoder; sourceTree = BUILT_PRODUCTS_DIR; };
    291                 785E596C17D9AFA8001F6DD1 /* TStatHeader.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TStatHeader.cpp; sourceTree = "<group>"; };
    292                 785E596D17D9AFA8001F6DD1 /* TStatHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TStatHeader.h; sourceTree = "<group>"; };
    293                 785E596E17D9AFA8001F6DD1 /* TStatLayer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TStatLayer.cpp; sourceTree = "<group>"; };
    294                 785E596F17D9AFA8001F6DD1 /* TStatLayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TStatLayer.h; sourceTree = "<group>"; };
    295                 785E597017D9AFA8001F6DD1 /* TStatTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TStatTop.cpp; sourceTree = "<group>"; };
    296                 785E597117D9AFA8001F6DD1 /* TStatTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TStatTop.h; sourceTree = "<group>"; };
    297                 787462BB17D5DD7B0040CFC7 /* decmain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = decmain.cpp; sourceTree = "<group>"; };
    298                 787462BC17D5DD7B0040CFC7 /* TAppDecCfg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppDecCfg.cpp; sourceTree = "<group>"; };
    299                 787462BD17D5DD7B0040CFC7 /* TAppDecCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppDecCfg.h; sourceTree = "<group>"; };
    300                 787462BE17D5DD7B0040CFC7 /* TAppDecTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppDecTop.cpp; sourceTree = "<group>"; };
    301                 787462BF17D5DD7B0040CFC7 /* TAppDecTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppDecTop.h; sourceTree = "<group>"; };
    302                 787462C117D5DD7B0040CFC7 /* encmain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = encmain.cpp; sourceTree = "<group>"; };
    303                 787462C217D5DD7B0040CFC7 /* TAppEncCfg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppEncCfg.cpp; sourceTree = "<group>"; };
    304                 787462C317D5DD7B0040CFC7 /* TAppEncCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppEncCfg.h; sourceTree = "<group>"; };
    305                 787462C417D5DD7B0040CFC7 /* TAppEncTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppEncTop.cpp; sourceTree = "<group>"; };
    306                 787462C517D5DD7B0040CFC7 /* TAppEncTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppEncTop.h; sourceTree = "<group>"; };
    307                 787462C717D5DD7B0040CFC7 /* extrmain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = extrmain.cpp; sourceTree = "<group>"; };
    308                 787462C817D5DD7B0040CFC7 /* TAppExtrCfg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppExtrCfg.cpp; sourceTree = "<group>"; };
    309                 787462C917D5DD7B0040CFC7 /* TAppExtrCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppExtrCfg.h; sourceTree = "<group>"; };
    310                 787462CA17D5DD7B0040CFC7 /* TAppExtrTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppExtrTop.cpp; sourceTree = "<group>"; };
    311                 787462CB17D5DD7B0040CFC7 /* TAppExtrTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppExtrTop.h; sourceTree = "<group>"; };
    312                 787462CD17D5DD7B0040CFC7 /* RendererMain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RendererMain.cpp; sourceTree = "<group>"; };
    313                 787462CE17D5DD7B0040CFC7 /* TAppRendererCfg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppRendererCfg.cpp; sourceTree = "<group>"; };
    314                 787462CF17D5DD7B0040CFC7 /* TAppRendererCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppRendererCfg.h; sourceTree = "<group>"; };
    315                 787462D017D5DD7B0040CFC7 /* TAppRendererTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppRendererTop.cpp; sourceTree = "<group>"; };
    316                 787462D117D5DD7B0040CFC7 /* TAppRendererTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppRendererTop.h; sourceTree = "<group>"; };
    317                 787462D317D5DD7B0040CFC7 /* annexBbytecount.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = annexBbytecount.cpp; sourceTree = "<group>"; };
    318                 787462D517D5DD7B0040CFC7 /* encode.shl */ = {isa = PBXFileReference; lastKnownFileType = text; path = encode.shl; sourceTree = "<group>"; };
    319                 787462D617D5DD7B0040CFC7 /* encodeCommand.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = encodeCommand.sh; sourceTree = "<group>"; };
    320                 787462D717D5DD7B0040CFC7 /* ExtractBitrates.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ExtractBitrates.cpp; sourceTree = "<group>"; };
    321                 787462D817D5DD7B0040CFC7 /* ExtractBitrates.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExtractBitrates.h; sourceTree = "<group>"; };
    322                 787462D917D5DD7B0040CFC7 /* ExtractBitratesMain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ExtractBitratesMain.cpp; sourceTree = "<group>"; };
    323                 787462DA17D5DD7B0040CFC7 /* GuessLambdaModifiers.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GuessLambdaModifiers.cpp; sourceTree = "<group>"; };
    324                 787462DB17D5DD7B0040CFC7 /* GuessLambdaModifiers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GuessLambdaModifiers.h; sourceTree = "<group>"; };
    325                 787462DC17D5DD7B0040CFC7 /* GuessLambdaModifiersMain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GuessLambdaModifiersMain.cpp; sourceTree = "<group>"; };
    326                 787462DD17D5DD7B0040CFC7 /* makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = makefile; sourceTree = "<group>"; };
    327                 787462DE17D5DD7B0040CFC7 /* QuickStartGuide.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = QuickStartGuide.pdf; sourceTree = "<group>"; };
    328                 787462DF17D5DD7B0040CFC7 /* RuntimeError.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RuntimeError.h; sourceTree = "<group>"; };
    329                 787462E017D5DD7B0040CFC7 /* targetBitrates.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = targetBitrates.sh; sourceTree = "<group>"; };
    330                 787462E117D5DD7B0040CFC7 /* convert_NtoMbit_YCbCr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = convert_NtoMbit_YCbCr.cpp; sourceTree = "<group>"; };
    331                 787462E317D5DD840040CFC7 /* libmd5.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = libmd5.c; sourceTree = "<group>"; };
    332                 787462E417D5DD840040CFC7 /* libmd5.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = libmd5.h; sourceTree = "<group>"; };
    333                 787462E517D5DD840040CFC7 /* MD5.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MD5.h; sourceTree = "<group>"; };
    334                 787462E717D5DD840040CFC7 /* program_options_lite.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = program_options_lite.cpp; sourceTree = "<group>"; };
    335                 787462E817D5DD840040CFC7 /* program_options_lite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = program_options_lite.h; sourceTree = "<group>"; };
    336                 787462E917D5DD840040CFC7 /* TAppComCamPara.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppComCamPara.cpp; sourceTree = "<group>"; };
    337                 787462EA17D5DD840040CFC7 /* TAppComCamPara.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppComCamPara.h; sourceTree = "<group>"; };
    338                 787462EC17D5DD840040CFC7 /* AccessUnit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AccessUnit.h; sourceTree = "<group>"; };
    339                 787462ED17D5DD840040CFC7 /* CommonDef.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonDef.h; sourceTree = "<group>"; };
    340                 787462EE17D5DD840040CFC7 /* ContextModel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ContextModel.cpp; sourceTree = "<group>"; };
    341                 787462EF17D5DD840040CFC7 /* ContextModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContextModel.h; sourceTree = "<group>"; };
    342                 787462F017D5DD840040CFC7 /* ContextModel3DBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ContextModel3DBuffer.cpp; sourceTree = "<group>"; };
    343                 787462F117D5DD840040CFC7 /* ContextModel3DBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContextModel3DBuffer.h; sourceTree = "<group>"; };
    344                 787462F217D5DD840040CFC7 /* ContextTables.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContextTables.h; sourceTree = "<group>"; };
    345                 787462F317D5DD840040CFC7 /* NAL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NAL.h; sourceTree = "<group>"; };
    346                 787462F417D5DD840040CFC7 /* SEI.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SEI.cpp; sourceTree = "<group>"; };
    347                 787462F517D5DD840040CFC7 /* SEI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SEI.h; sourceTree = "<group>"; };
    348                 787462F617D5DD840040CFC7 /* TComBitCounter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComBitCounter.h; sourceTree = "<group>"; };
    349                 787462F717D5DD840040CFC7 /* TComBitStream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComBitStream.cpp; sourceTree = "<group>"; };
    350                 787462F817D5DD840040CFC7 /* TComBitStream.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComBitStream.h; sourceTree = "<group>"; };
    351                 787462F917D5DD840040CFC7 /* TComCABACTables.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComCABACTables.cpp; sourceTree = "<group>"; };
    352                 787462FA17D5DD840040CFC7 /* TComCABACTables.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComCABACTables.h; sourceTree = "<group>"; };
    353                 787462FB17D5DD840040CFC7 /* TComDataCU.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComDataCU.cpp; sourceTree = "<group>"; };
    354                 787462FC17D5DD840040CFC7 /* TComDataCU.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComDataCU.h; sourceTree = "<group>"; };
    355                 787462FD17D5DD840040CFC7 /* TComInterpolationFilter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComInterpolationFilter.cpp; sourceTree = "<group>"; };
    356                 787462FE17D5DD840040CFC7 /* TComInterpolationFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComInterpolationFilter.h; sourceTree = "<group>"; };
    357                 787462FF17D5DD840040CFC7 /* TComList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComList.h; sourceTree = "<group>"; };
    358                 7874630017D5DD840040CFC7 /* TComLoopFilter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComLoopFilter.cpp; sourceTree = "<group>"; };
    359                 7874630117D5DD840040CFC7 /* TComLoopFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComLoopFilter.h; sourceTree = "<group>"; };
    360                 7874630217D5DD840040CFC7 /* TComMotionInfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComMotionInfo.cpp; sourceTree = "<group>"; };
    361                 7874630317D5DD840040CFC7 /* TComMotionInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComMotionInfo.h; sourceTree = "<group>"; };
    362                 7874630417D5DD840040CFC7 /* TComMv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComMv.h; sourceTree = "<group>"; };
    363                 7874630517D5DD840040CFC7 /* TComPattern.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPattern.cpp; sourceTree = "<group>"; };
    364                 7874630617D5DD840040CFC7 /* TComPattern.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComPattern.h; sourceTree = "<group>"; };
    365                 7874630717D5DD840040CFC7 /* TComPic.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPic.cpp; sourceTree = "<group>"; };
    366                 7874630817D5DD840040CFC7 /* TComPic.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComPic.h; sourceTree = "<group>"; };
    367                 7874630917D5DD840040CFC7 /* TComPicSym.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPicSym.cpp; sourceTree = "<group>"; };
    368                 7874630A17D5DD840040CFC7 /* TComPicSym.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComPicSym.h; sourceTree = "<group>"; };
    369                 7874630B17D5DD840040CFC7 /* TComPicYuv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPicYuv.cpp; sourceTree = "<group>"; };
    370                 7874630C17D5DD840040CFC7 /* TComPicYuv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComPicYuv.h; sourceTree = "<group>"; };
    371                 7874630D17D5DD840040CFC7 /* TComPicYuvMD5.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPicYuvMD5.cpp; sourceTree = "<group>"; };
    372                 7874630E17D5DD840040CFC7 /* TComPrediction.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPrediction.cpp; sourceTree = "<group>"; };
    373                 7874630F17D5DD840040CFC7 /* TComPrediction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComPrediction.h; sourceTree = "<group>"; };
    374                 7874631017D5DD840040CFC7 /* TComRdCost.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComRdCost.cpp; sourceTree = "<group>"; };
    375                 7874631117D5DD840040CFC7 /* TComRdCost.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComRdCost.h; sourceTree = "<group>"; };
    376                 7874631217D5DD840040CFC7 /* TComRdCostWeightPrediction.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComRdCostWeightPrediction.cpp; sourceTree = "<group>"; };
    377                 7874631317D5DD840040CFC7 /* TComRdCostWeightPrediction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComRdCostWeightPrediction.h; sourceTree = "<group>"; };
    378                 7874631417D5DD840040CFC7 /* TComRom.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComRom.cpp; sourceTree = "<group>"; };
    379                 7874631517D5DD840040CFC7 /* TComRom.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComRom.h; sourceTree = "<group>"; };
    380                 7874631617D5DD840040CFC7 /* TComSampleAdaptiveOffset.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComSampleAdaptiveOffset.cpp; sourceTree = "<group>"; };
    381                 7874631717D5DD840040CFC7 /* TComSampleAdaptiveOffset.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComSampleAdaptiveOffset.h; sourceTree = "<group>"; };
    382                 7874631817D5DD840040CFC7 /* TComSlice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComSlice.cpp; sourceTree = "<group>"; };
    383                 7874631917D5DD840040CFC7 /* TComSlice.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComSlice.h; sourceTree = "<group>"; };
    384                 7874631A17D5DD840040CFC7 /* TComTrQuant.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComTrQuant.cpp; sourceTree = "<group>"; };
    385                 7874631B17D5DD840040CFC7 /* TComTrQuant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComTrQuant.h; sourceTree = "<group>"; };
    386                 7874631C17D5DD840040CFC7 /* TComWedgelet.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComWedgelet.cpp; sourceTree = "<group>"; };
    387                 7874631D17D5DD840040CFC7 /* TComWedgelet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComWedgelet.h; sourceTree = "<group>"; };
    388                 7874631E17D5DD840040CFC7 /* TComWeightPrediction.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComWeightPrediction.cpp; sourceTree = "<group>"; };
    389                 7874631F17D5DD840040CFC7 /* TComWeightPrediction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComWeightPrediction.h; sourceTree = "<group>"; };
    390                 7874632017D5DD840040CFC7 /* TComYuv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComYuv.cpp; sourceTree = "<group>"; };
    391                 7874632117D5DD840040CFC7 /* TComYuv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComYuv.h; sourceTree = "<group>"; };
    392                 7874632217D5DD840040CFC7 /* TypeDef.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TypeDef.h; sourceTree = "<group>"; };
    393                 7874632417D5DD840040CFC7 /* AnnexBread.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AnnexBread.cpp; sourceTree = "<group>"; };
    394                 7874632517D5DD840040CFC7 /* AnnexBread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnnexBread.h; sourceTree = "<group>"; };
    395                 7874632617D5DD840040CFC7 /* NALread.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = NALread.cpp; sourceTree = "<group>"; };
    396                 7874632717D5DD840040CFC7 /* NALread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NALread.h; sourceTree = "<group>"; };
    397                 7874632817D5DD840040CFC7 /* SEIread.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SEIread.cpp; sourceTree = "<group>"; };
    398                 7874632917D5DD840040CFC7 /* SEIread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SEIread.h; sourceTree = "<group>"; };
    399                 7874632A17D5DD840040CFC7 /* SyntaxElementParser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SyntaxElementParser.cpp; sourceTree = "<group>"; };
    400                 7874632B17D5DD840040CFC7 /* SyntaxElementParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SyntaxElementParser.h; sourceTree = "<group>"; };
    401                 7874632C17D5DD840040CFC7 /* TDecBinCoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecBinCoder.h; sourceTree = "<group>"; };
    402                 7874632D17D5DD840040CFC7 /* TDecBinCoderCABAC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecBinCoderCABAC.cpp; sourceTree = "<group>"; };
    403                 7874632E17D5DD840040CFC7 /* TDecBinCoderCABAC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecBinCoderCABAC.h; sourceTree = "<group>"; };
    404                 7874632F17D5DD840040CFC7 /* TDecCAVLC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecCAVLC.cpp; sourceTree = "<group>"; };
    405                 7874633017D5DD840040CFC7 /* TDecCAVLC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecCAVLC.h; sourceTree = "<group>"; };
    406                 7874633117D5DD840040CFC7 /* TDecCu.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecCu.cpp; sourceTree = "<group>"; };
    407                 7874633217D5DD840040CFC7 /* TDecCu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecCu.h; sourceTree = "<group>"; };
    408                 7874633317D5DD840040CFC7 /* TDecEntropy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecEntropy.cpp; sourceTree = "<group>"; };
    409                 7874633417D5DD840040CFC7 /* TDecEntropy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecEntropy.h; sourceTree = "<group>"; };
    410                 7874633517D5DD840040CFC7 /* TDecGop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecGop.cpp; sourceTree = "<group>"; };
    411                 7874633617D5DD840040CFC7 /* TDecGop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecGop.h; sourceTree = "<group>"; };
    412                 7874633717D5DD840040CFC7 /* TDecSbac.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecSbac.cpp; sourceTree = "<group>"; };
    413                 7874633817D5DD840040CFC7 /* TDecSbac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecSbac.h; sourceTree = "<group>"; };
    414                 7874633917D5DD840040CFC7 /* TDecSlice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecSlice.cpp; sourceTree = "<group>"; };
    415                 7874633A17D5DD840040CFC7 /* TDecSlice.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecSlice.h; sourceTree = "<group>"; };
    416                 7874633B17D5DD840040CFC7 /* TDecTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecTop.cpp; sourceTree = "<group>"; };
    417                 7874633C17D5DD840040CFC7 /* TDecTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecTop.h; sourceTree = "<group>"; };
    418                 7874633E17D5DD840040CFC7 /* AnnexBwrite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnnexBwrite.h; sourceTree = "<group>"; };
    419                 7874633F17D5DD840040CFC7 /* NALwrite.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = NALwrite.cpp; sourceTree = "<group>"; };
    420                 7874634017D5DD840040CFC7 /* NALwrite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NALwrite.h; sourceTree = "<group>"; };
    421                 7874634117D5DD840040CFC7 /* SEIwrite.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SEIwrite.cpp; sourceTree = "<group>"; };
    422                 7874634217D5DD840040CFC7 /* SEIwrite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SEIwrite.h; sourceTree = "<group>"; };
    423                 7874634317D5DD840040CFC7 /* SyntaxElementWriter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SyntaxElementWriter.cpp; sourceTree = "<group>"; };
    424                 7874634417D5DD840040CFC7 /* SyntaxElementWriter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SyntaxElementWriter.h; sourceTree = "<group>"; };
    425                 7874634517D5DD840040CFC7 /* TEncAnalyze.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncAnalyze.cpp; sourceTree = "<group>"; };
    426                 7874634617D5DD840040CFC7 /* TEncAnalyze.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncAnalyze.h; sourceTree = "<group>"; };
    427                 7874634717D5DD840040CFC7 /* TEncBinCoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncBinCoder.h; sourceTree = "<group>"; };
    428                 7874634817D5DD840040CFC7 /* TEncBinCoderCABAC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncBinCoderCABAC.cpp; sourceTree = "<group>"; };
    429                 7874634917D5DD840040CFC7 /* TEncBinCoderCABAC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncBinCoderCABAC.h; sourceTree = "<group>"; };
    430                 7874634A17D5DD840040CFC7 /* TEncBinCoderCABACCounter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncBinCoderCABACCounter.cpp; sourceTree = "<group>"; };
    431                 7874634B17D5DD840040CFC7 /* TEncBinCoderCABACCounter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncBinCoderCABACCounter.h; sourceTree = "<group>"; };
    432                 7874634C17D5DD840040CFC7 /* TEncCavlc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncCavlc.cpp; sourceTree = "<group>"; };
    433                 7874634D17D5DD840040CFC7 /* TEncCavlc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncCavlc.h; sourceTree = "<group>"; };
    434                 7874634E17D5DD840040CFC7 /* TEncCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncCfg.h; sourceTree = "<group>"; };
    435                 7874634F17D5DD840040CFC7 /* TEncCu.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncCu.cpp; sourceTree = "<group>"; };
    436                 7874635017D5DD840040CFC7 /* TEncCu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncCu.h; sourceTree = "<group>"; };
    437                 7874635117D5DD840040CFC7 /* TEncEntropy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncEntropy.cpp; sourceTree = "<group>"; };
    438                 7874635217D5DD840040CFC7 /* TEncEntropy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncEntropy.h; sourceTree = "<group>"; };
    439                 7874635317D5DD840040CFC7 /* TEncGOP.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncGOP.cpp; sourceTree = "<group>"; };
    440                 7874635417D5DD840040CFC7 /* TEncGOP.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncGOP.h; sourceTree = "<group>"; };
    441                 7874635517D5DD840040CFC7 /* TEncPic.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncPic.cpp; sourceTree = "<group>"; };
    442                 7874635617D5DD840040CFC7 /* TEncPic.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncPic.h; sourceTree = "<group>"; };
    443                 7874635717D5DD840040CFC7 /* TEncPreanalyzer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncPreanalyzer.cpp; sourceTree = "<group>"; };
    444                 7874635817D5DD840040CFC7 /* TEncPreanalyzer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncPreanalyzer.h; sourceTree = "<group>"; };
    445                 7874635917D5DD840040CFC7 /* TEncRateCtrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncRateCtrl.cpp; sourceTree = "<group>"; };
    446                 7874635A17D5DD840040CFC7 /* TEncRateCtrl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncRateCtrl.h; sourceTree = "<group>"; };
    447                 7874635B17D5DD840040CFC7 /* TEncSampleAdaptiveOffset.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncSampleAdaptiveOffset.cpp; sourceTree = "<group>"; };
    448                 7874635C17D5DD840040CFC7 /* TEncSampleAdaptiveOffset.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncSampleAdaptiveOffset.h; sourceTree = "<group>"; };
    449                 7874635D17D5DD840040CFC7 /* TEncSbac.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncSbac.cpp; sourceTree = "<group>"; };
    450                 7874635E17D5DD840040CFC7 /* TEncSbac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncSbac.h; sourceTree = "<group>"; };
    451                 7874635F17D5DD840040CFC7 /* TEncSearch.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncSearch.cpp; sourceTree = "<group>"; };
    452                 7874636017D5DD840040CFC7 /* TEncSearch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncSearch.h; sourceTree = "<group>"; };
    453                 7874636117D5DD840040CFC7 /* TEncSlice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncSlice.cpp; sourceTree = "<group>"; };
    454                 7874636217D5DD840040CFC7 /* TEncSlice.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncSlice.h; sourceTree = "<group>"; };
    455                 7874636317D5DD840040CFC7 /* TEncTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncTop.cpp; sourceTree = "<group>"; };
    456                 7874636417D5DD840040CFC7 /* TEncTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncTop.h; sourceTree = "<group>"; };
    457                 7874636517D5DD840040CFC7 /* WeightPredAnalysis.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WeightPredAnalysis.cpp; sourceTree = "<group>"; };
    458                 7874636617D5DD840040CFC7 /* WeightPredAnalysis.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WeightPredAnalysis.h; sourceTree = "<group>"; };
    459                 7874636817D5DD840040CFC7 /* TExtrTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TExtrTop.cpp; sourceTree = "<group>"; };
    460                 7874636917D5DD840040CFC7 /* TExtrTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TExtrTop.h; sourceTree = "<group>"; };
    461                 7874636B17D5DD840040CFC7 /* TRenFilter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenFilter.cpp; sourceTree = "<group>"; };
    462                 7874636C17D5DD840040CFC7 /* TRenFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenFilter.h; sourceTree = "<group>"; };
    463                 7874636D17D5DD840040CFC7 /* TRenImage.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenImage.cpp; sourceTree = "<group>"; };
    464                 7874636E17D5DD840040CFC7 /* TRenImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenImage.h; sourceTree = "<group>"; };
    465                 7874636F17D5DD840040CFC7 /* TRenImagePlane.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenImagePlane.cpp; sourceTree = "<group>"; };
    466                 7874637017D5DD840040CFC7 /* TRenImagePlane.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenImagePlane.h; sourceTree = "<group>"; };
    467                 7874637117D5DD840040CFC7 /* TRenInterpFilter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenInterpFilter.cpp; sourceTree = "<group>"; };
    468                 7874637217D5DD840040CFC7 /* TRenInterpFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenInterpFilter.h; sourceTree = "<group>"; };
    469                 7874637317D5DD840040CFC7 /* TRenModel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenModel.cpp; sourceTree = "<group>"; };
    470                 7874637417D5DD840040CFC7 /* TRenModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenModel.h; sourceTree = "<group>"; };
    471                 7874637517D5DD840040CFC7 /* TRenModSetupStrParser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenModSetupStrParser.cpp; sourceTree = "<group>"; };
    472                 7874637617D5DD840040CFC7 /* TRenModSetupStrParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenModSetupStrParser.h; sourceTree = "<group>"; };
    473                 7874637717D5DD840040CFC7 /* TRenSingleModel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenSingleModel.cpp; sourceTree = "<group>"; };
    474                 7874637817D5DD840040CFC7 /* TRenSingleModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenSingleModel.h; sourceTree = "<group>"; };
    475                 7874637917D5DD840040CFC7 /* TRenTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenTop.cpp; sourceTree = "<group>"; };
    476                 7874637A17D5DD840040CFC7 /* TRenTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenTop.h; sourceTree = "<group>"; };
    477                 7874637C17D5DD840040CFC7 /* TVideoIOYuv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TVideoIOYuv.cpp; sourceTree = "<group>"; };
    478                 7874637D17D5DD840040CFC7 /* TVideoIOYuv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TVideoIOYuv.h; sourceTree = "<group>"; };
     294                78486FA71B0B62C70098FD5A /* decmain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = decmain.cpp; sourceTree = "<group>"; };
     295                78486FA81B0B62C70098FD5A /* TAppDecCfg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppDecCfg.cpp; sourceTree = "<group>"; };
     296                78486FA91B0B62C70098FD5A /* TAppDecCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppDecCfg.h; sourceTree = "<group>"; };
     297                78486FAA1B0B62C70098FD5A /* TAppDecTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppDecTop.cpp; sourceTree = "<group>"; };
     298                78486FAB1B0B62C70098FD5A /* TAppDecTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppDecTop.h; sourceTree = "<group>"; };
     299                78486FAD1B0B62C70098FD5A /* encmain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = encmain.cpp; sourceTree = "<group>"; };
     300                78486FAE1B0B62C70098FD5A /* TAppEncCfg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppEncCfg.cpp; sourceTree = "<group>"; };
     301                78486FAF1B0B62C70098FD5A /* TAppEncCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppEncCfg.h; sourceTree = "<group>"; };
     302                78486FB01B0B62C70098FD5A /* TAppEncTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppEncTop.cpp; sourceTree = "<group>"; };
     303                78486FB11B0B62C70098FD5A /* TAppEncTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppEncTop.h; sourceTree = "<group>"; };
     304                78486FB31B0B62C70098FD5A /* extrmain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = extrmain.cpp; sourceTree = "<group>"; };
     305                78486FB41B0B62C70098FD5A /* TAppExtrCfg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppExtrCfg.cpp; sourceTree = "<group>"; };
     306                78486FB51B0B62C70098FD5A /* TAppExtrCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppExtrCfg.h; sourceTree = "<group>"; };
     307                78486FB61B0B62C70098FD5A /* TAppExtrTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppExtrTop.cpp; sourceTree = "<group>"; };
     308                78486FB71B0B62C70098FD5A /* TAppExtrTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppExtrTop.h; sourceTree = "<group>"; };
     309                78486FB91B0B62C70098FD5A /* RendererMain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RendererMain.cpp; sourceTree = "<group>"; };
     310                78486FBA1B0B62C70098FD5A /* TAppRendererCfg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppRendererCfg.cpp; sourceTree = "<group>"; };
     311                78486FBB1B0B62C70098FD5A /* TAppRendererCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppRendererCfg.h; sourceTree = "<group>"; };
     312                78486FBC1B0B62C70098FD5A /* TAppRendererTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppRendererTop.cpp; sourceTree = "<group>"; };
     313                78486FBD1B0B62C70098FD5A /* TAppRendererTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppRendererTop.h; sourceTree = "<group>"; };
     314                78486FBF1B0B62C70098FD5A /* annexBbytecount.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = annexBbytecount.cpp; sourceTree = "<group>"; };
     315                78486FC11B0B62C70098FD5A /* encode.shl */ = {isa = PBXFileReference; lastKnownFileType = text; path = encode.shl; sourceTree = "<group>"; };
     316                78486FC21B0B62C70098FD5A /* encodeCommand.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = encodeCommand.sh; sourceTree = "<group>"; };
     317                78486FC31B0B62C70098FD5A /* ExtractBitrates.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ExtractBitrates.cpp; sourceTree = "<group>"; };
     318                78486FC41B0B62C70098FD5A /* ExtractBitrates.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExtractBitrates.h; sourceTree = "<group>"; };
     319                78486FC51B0B62C70098FD5A /* ExtractBitratesMain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ExtractBitratesMain.cpp; sourceTree = "<group>"; };
     320                78486FC61B0B62C70098FD5A /* GuessLambdaModifiers.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GuessLambdaModifiers.cpp; sourceTree = "<group>"; };
     321                78486FC71B0B62C70098FD5A /* GuessLambdaModifiers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GuessLambdaModifiers.h; sourceTree = "<group>"; };
     322                78486FC81B0B62C70098FD5A /* GuessLambdaModifiersMain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GuessLambdaModifiersMain.cpp; sourceTree = "<group>"; };
     323                78486FC91B0B62C70098FD5A /* makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = makefile; sourceTree = "<group>"; };
     324                78486FCA1B0B62C70098FD5A /* QuickStartGuide.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = QuickStartGuide.pdf; sourceTree = "<group>"; };
     325                78486FCB1B0B62C70098FD5A /* RuntimeError.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RuntimeError.h; sourceTree = "<group>"; };
     326                78486FCC1B0B62C70098FD5A /* targetBitrates.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = targetBitrates.sh; sourceTree = "<group>"; };
     327                78486FCD1B0B62C70098FD5A /* convert_NtoMbit_YCbCr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = convert_NtoMbit_YCbCr.cpp; sourceTree = "<group>"; };
     328                78486FD01B0B62C70098FD5A /* libmd5.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = libmd5.c; sourceTree = "<group>"; };
     329                78486FD11B0B62C70098FD5A /* libmd5.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = libmd5.h; sourceTree = "<group>"; };
     330                78486FD21B0B62C70098FD5A /* MD5.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MD5.h; sourceTree = "<group>"; };
     331                78486FD41B0B62C70098FD5A /* program_options_lite.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = program_options_lite.cpp; sourceTree = "<group>"; };
     332                78486FD51B0B62C70098FD5A /* program_options_lite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = program_options_lite.h; sourceTree = "<group>"; };
     333                78486FD61B0B62C70098FD5A /* TAppComCamPara.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAppComCamPara.cpp; sourceTree = "<group>"; };
     334                78486FD71B0B62C70098FD5A /* TAppComCamPara.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAppComCamPara.h; sourceTree = "<group>"; };
     335                78486FD91B0B62C70098FD5A /* AccessUnit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AccessUnit.h; sourceTree = "<group>"; };
     336                78486FDA1B0B62C70098FD5A /* CommonDef.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonDef.h; sourceTree = "<group>"; };
     337                78486FDB1B0B62C70098FD5A /* ContextModel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ContextModel.cpp; sourceTree = "<group>"; };
     338                78486FDC1B0B62C70098FD5A /* ContextModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContextModel.h; sourceTree = "<group>"; };
     339                78486FDD1B0B62C70098FD5A /* ContextModel3DBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ContextModel3DBuffer.cpp; sourceTree = "<group>"; };
     340                78486FDE1B0B62C70098FD5A /* ContextModel3DBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ContextModel3DBuffer.h; sourceTree = "<group>"; };
     341                78486FDF1B0B62C70098FD5A /* ContextTables.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = ContextTables.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
     342                78486FE01B0B62C70098FD5A /* Debug.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Debug.cpp; sourceTree = "<group>"; };
     343                78486FE11B0B62C70098FD5A /* Debug.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Debug.h; sourceTree = "<group>"; };
     344                78486FE21B0B62C70098FD5A /* NAL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NAL.h; sourceTree = "<group>"; };
     345                78486FE31B0B62C70098FD5A /* SEI.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SEI.cpp; sourceTree = "<group>"; };
     346                78486FE41B0B62C70098FD5A /* SEI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SEI.h; sourceTree = "<group>"; };
     347                78486FE51B0B62C70098FD5A /* TComBitCounter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComBitCounter.h; sourceTree = "<group>"; };
     348                78486FE61B0B62C70098FD5A /* TComBitStream.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComBitStream.cpp; sourceTree = "<group>"; };
     349                78486FE71B0B62C70098FD5A /* TComBitStream.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComBitStream.h; sourceTree = "<group>"; };
     350                78486FE81B0B62C70098FD5A /* TComCABACTables.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComCABACTables.cpp; sourceTree = "<group>"; };
     351                78486FE91B0B62C70098FD5A /* TComCABACTables.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComCABACTables.h; sourceTree = "<group>"; };
     352                78486FEA1B0B62C70098FD5A /* TComChromaFormat.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComChromaFormat.cpp; sourceTree = "<group>"; };
     353                78486FEB1B0B62C70098FD5A /* TComChromaFormat.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComChromaFormat.h; sourceTree = "<group>"; };
     354                78486FEC1B0B62C70098FD5A /* TComCodingStatistics.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComCodingStatistics.h; sourceTree = "<group>"; };
     355                78486FED1B0B62C70098FD5A /* TComDataCU.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComDataCU.cpp; sourceTree = "<group>"; };
     356                78486FEE1B0B62C70098FD5A /* TComDataCU.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComDataCU.h; sourceTree = "<group>"; };
     357                78486FEF1B0B62C70098FD5A /* TComInterpolationFilter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComInterpolationFilter.cpp; sourceTree = "<group>"; };
     358                78486FF01B0B62C70098FD5A /* TComInterpolationFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComInterpolationFilter.h; sourceTree = "<group>"; };
     359                78486FF11B0B62C70098FD5A /* TComList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComList.h; sourceTree = "<group>"; };
     360                78486FF21B0B62C70098FD5A /* TComLoopFilter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComLoopFilter.cpp; sourceTree = "<group>"; };
     361                78486FF31B0B62C70098FD5A /* TComLoopFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComLoopFilter.h; sourceTree = "<group>"; };
     362                78486FF41B0B62C70098FD5A /* TComMotionInfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComMotionInfo.cpp; sourceTree = "<group>"; };
     363                78486FF51B0B62C70098FD5A /* TComMotionInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComMotionInfo.h; sourceTree = "<group>"; };
     364                78486FF61B0B62C70098FD5A /* TComMv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComMv.h; sourceTree = "<group>"; };
     365                78486FF71B0B62C70098FD5A /* TComPattern.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPattern.cpp; sourceTree = "<group>"; };
     366                78486FF81B0B62C70098FD5A /* TComPattern.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComPattern.h; sourceTree = "<group>"; };
     367                78486FF91B0B62C70098FD5A /* TComPic.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPic.cpp; sourceTree = "<group>"; };
     368                78486FFA1B0B62C70098FD5A /* TComPic.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComPic.h; sourceTree = "<group>"; };
     369                78486FFB1B0B62C70098FD5A /* TComPicSym.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPicSym.cpp; sourceTree = "<group>"; };
     370                78486FFC1B0B62C70098FD5A /* TComPicSym.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComPicSym.h; sourceTree = "<group>"; };
     371                78486FFD1B0B62C70098FD5A /* TComPicYuv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPicYuv.cpp; sourceTree = "<group>"; };
     372                78486FFE1B0B62C70098FD5A /* TComPicYuv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComPicYuv.h; sourceTree = "<group>"; };
     373                78486FFF1B0B62C70098FD5A /* TComPicYuvMD5.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComPicYuvMD5.cpp; sourceTree = "<group>"; };
     374                784870001B0B62C70098FD5A /* TComPrediction.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = TComPrediction.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
     375                784870011B0B62C70098FD5A /* TComPrediction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = TComPrediction.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
     376                784870021B0B62C70098FD5A /* TComRdCost.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComRdCost.cpp; sourceTree = "<group>"; };
     377                784870031B0B62C70098FD5A /* TComRdCost.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComRdCost.h; sourceTree = "<group>"; };
     378                784870041B0B62C70098FD5A /* TComRdCostWeightPrediction.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComRdCostWeightPrediction.cpp; sourceTree = "<group>"; };
     379                784870051B0B62C70098FD5A /* TComRdCostWeightPrediction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComRdCostWeightPrediction.h; sourceTree = "<group>"; };
     380                784870061B0B62C70098FD5A /* TComRectangle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComRectangle.h; sourceTree = "<group>"; };
     381                784870071B0B62C70098FD5A /* TComRom.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComRom.cpp; sourceTree = "<group>"; };
     382                784870081B0B62C70098FD5A /* TComRom.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComRom.h; sourceTree = "<group>"; };
     383                784870091B0B62C70098FD5A /* TComSampleAdaptiveOffset.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComSampleAdaptiveOffset.cpp; sourceTree = "<group>"; };
     384                7848700A1B0B62C70098FD5A /* TComSampleAdaptiveOffset.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComSampleAdaptiveOffset.h; sourceTree = "<group>"; };
     385                7848700B1B0B62C70098FD5A /* TComSlice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComSlice.cpp; sourceTree = "<group>"; };
     386                7848700C1B0B62C70098FD5A /* TComSlice.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComSlice.h; sourceTree = "<group>"; };
     387                7848700D1B0B62C70098FD5A /* TComTrQuant.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComTrQuant.cpp; sourceTree = "<group>"; };
     388                7848700E1B0B62C70098FD5A /* TComTrQuant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComTrQuant.h; sourceTree = "<group>"; };
     389                7848700F1B0B62C70098FD5A /* TComTU.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComTU.cpp; sourceTree = "<group>"; };
     390                784870101B0B62C70098FD5A /* TComTU.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComTU.h; sourceTree = "<group>"; };
     391                784870111B0B62C70098FD5A /* TComWedgelet.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComWedgelet.cpp; sourceTree = "<group>"; };
     392                784870121B0B62C70098FD5A /* TComWedgelet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComWedgelet.h; sourceTree = "<group>"; };
     393                784870131B0B62C70098FD5A /* TComWeightPrediction.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComWeightPrediction.cpp; sourceTree = "<group>"; };
     394                784870141B0B62C70098FD5A /* TComWeightPrediction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComWeightPrediction.h; sourceTree = "<group>"; };
     395                784870151B0B62C70098FD5A /* TComYuv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TComYuv.cpp; sourceTree = "<group>"; };
     396                784870161B0B62C70098FD5A /* TComYuv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TComYuv.h; sourceTree = "<group>"; };
     397                784870171B0B62C70098FD5A /* TypeDef.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = TypeDef.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
     398                784870191B0B62C70098FD5A /* AnnexBread.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AnnexBread.cpp; sourceTree = "<group>"; };
     399                7848701A1B0B62C70098FD5A /* AnnexBread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnnexBread.h; sourceTree = "<group>"; };
     400                7848701B1B0B62C70098FD5A /* NALread.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = NALread.cpp; sourceTree = "<group>"; };
     401                7848701C1B0B62C70098FD5A /* NALread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NALread.h; sourceTree = "<group>"; };
     402                7848701D1B0B62C70098FD5A /* SEIread.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SEIread.cpp; sourceTree = "<group>"; };
     403                7848701E1B0B62C70098FD5A /* SEIread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SEIread.h; sourceTree = "<group>"; };
     404                7848701F1B0B62C70098FD5A /* SyntaxElementParser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SyntaxElementParser.cpp; sourceTree = "<group>"; };
     405                784870201B0B62C70098FD5A /* SyntaxElementParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SyntaxElementParser.h; sourceTree = "<group>"; };
     406                784870211B0B62C70098FD5A /* TDecBinCoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecBinCoder.h; sourceTree = "<group>"; };
     407                784870221B0B62C70098FD5A /* TDecBinCoderCABAC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecBinCoderCABAC.cpp; sourceTree = "<group>"; };
     408                784870231B0B62C70098FD5A /* TDecBinCoderCABAC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecBinCoderCABAC.h; sourceTree = "<group>"; };
     409                784870241B0B62C70098FD5A /* TDecCAVLC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecCAVLC.cpp; sourceTree = "<group>"; };
     410                784870251B0B62C70098FD5A /* TDecCAVLC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecCAVLC.h; sourceTree = "<group>"; };
     411                784870261B0B62C70098FD5A /* TDecCu.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecCu.cpp; sourceTree = "<group>"; };
     412                784870271B0B62C70098FD5A /* TDecCu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecCu.h; sourceTree = "<group>"; };
     413                784870281B0B62C70098FD5A /* TDecEntropy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecEntropy.cpp; sourceTree = "<group>"; };
     414                784870291B0B62C70098FD5A /* TDecEntropy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecEntropy.h; sourceTree = "<group>"; };
     415                7848702A1B0B62C70098FD5A /* TDecGop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecGop.cpp; sourceTree = "<group>"; };
     416                7848702B1B0B62C70098FD5A /* TDecGop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecGop.h; sourceTree = "<group>"; };
     417                7848702C1B0B62C70098FD5A /* TDecSbac.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = TDecSbac.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
     418                7848702D1B0B62C70098FD5A /* TDecSbac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = TDecSbac.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
     419                7848702E1B0B62C70098FD5A /* TDecSlice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecSlice.cpp; sourceTree = "<group>"; };
     420                7848702F1B0B62C70098FD5A /* TDecSlice.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecSlice.h; sourceTree = "<group>"; };
     421                784870301B0B62C70098FD5A /* TDecTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TDecTop.cpp; sourceTree = "<group>"; };
     422                784870311B0B62C70098FD5A /* TDecTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDecTop.h; sourceTree = "<group>"; };
     423                784870331B0B62C70098FD5A /* AnnexBwrite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnnexBwrite.h; sourceTree = "<group>"; };
     424                784870341B0B62C70098FD5A /* NALwrite.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = NALwrite.cpp; sourceTree = "<group>"; };
     425                784870351B0B62C70098FD5A /* NALwrite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NALwrite.h; sourceTree = "<group>"; };
     426                784870361B0B62C70098FD5A /* SEIEncoder.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SEIEncoder.cpp; sourceTree = "<group>"; };
     427                784870371B0B62C70098FD5A /* SEIEncoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SEIEncoder.h; sourceTree = "<group>"; };
     428                784870381B0B62C70098FD5A /* SEIwrite.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SEIwrite.cpp; sourceTree = "<group>"; };
     429                784870391B0B62C70098FD5A /* SEIwrite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SEIwrite.h; sourceTree = "<group>"; };
     430                7848703A1B0B62C70098FD5A /* SyntaxElementWriter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SyntaxElementWriter.cpp; sourceTree = "<group>"; };
     431                7848703B1B0B62C70098FD5A /* SyntaxElementWriter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SyntaxElementWriter.h; sourceTree = "<group>"; };
     432                7848703C1B0B62C70098FD5A /* TEncAnalyze.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncAnalyze.h; sourceTree = "<group>"; };
     433                7848703D1B0B62C70098FD5A /* TEncBinCoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncBinCoder.h; sourceTree = "<group>"; };
     434                7848703E1B0B62C70098FD5A /* TEncBinCoderCABAC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncBinCoderCABAC.cpp; sourceTree = "<group>"; };
     435                7848703F1B0B62C70098FD5A /* TEncBinCoderCABAC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncBinCoderCABAC.h; sourceTree = "<group>"; };
     436                784870401B0B62C70098FD5A /* TEncBinCoderCABACCounter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncBinCoderCABACCounter.cpp; sourceTree = "<group>"; };
     437                784870411B0B62C70098FD5A /* TEncBinCoderCABACCounter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncBinCoderCABACCounter.h; sourceTree = "<group>"; };
     438                784870421B0B62C70098FD5A /* TEncCavlc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncCavlc.cpp; sourceTree = "<group>"; };
     439                784870431B0B62C70098FD5A /* TEncCavlc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncCavlc.h; sourceTree = "<group>"; };
     440                784870441B0B62C70098FD5A /* TEncCfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncCfg.h; sourceTree = "<group>"; };
     441                784870451B0B62C70098FD5A /* TEncCu.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncCu.cpp; sourceTree = "<group>"; };
     442                784870461B0B62C70098FD5A /* TEncCu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncCu.h; sourceTree = "<group>"; };
     443                784870471B0B62C70098FD5A /* TEncEntropy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncEntropy.cpp; sourceTree = "<group>"; };
     444                784870481B0B62C70098FD5A /* TEncEntropy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncEntropy.h; sourceTree = "<group>"; };
     445                784870491B0B62C70098FD5A /* TEncGOP.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncGOP.cpp; sourceTree = "<group>"; };
     446                7848704A1B0B62C70098FD5A /* TEncGOP.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncGOP.h; sourceTree = "<group>"; };
     447                7848704B1B0B62C70098FD5A /* TEncPic.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncPic.cpp; sourceTree = "<group>"; };
     448                7848704C1B0B62C70098FD5A /* TEncPic.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncPic.h; sourceTree = "<group>"; };
     449                7848704D1B0B62C70098FD5A /* TEncPreanalyzer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncPreanalyzer.cpp; sourceTree = "<group>"; };
     450                7848704E1B0B62C70098FD5A /* TEncPreanalyzer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncPreanalyzer.h; sourceTree = "<group>"; };
     451                7848704F1B0B62C70098FD5A /* TEncRateCtrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncRateCtrl.cpp; sourceTree = "<group>"; };
     452                784870501B0B62C70098FD5A /* TEncRateCtrl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncRateCtrl.h; sourceTree = "<group>"; };
     453                784870511B0B62C70098FD5A /* TEncSampleAdaptiveOffset.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncSampleAdaptiveOffset.cpp; sourceTree = "<group>"; };
     454                784870521B0B62C70098FD5A /* TEncSampleAdaptiveOffset.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncSampleAdaptiveOffset.h; sourceTree = "<group>"; };
     455                784870531B0B62C70098FD5A /* TEncSbac.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = TEncSbac.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
     456                784870541B0B62C70098FD5A /* TEncSbac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = TEncSbac.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
     457                784870551B0B62C70098FD5A /* TEncSearch.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = TEncSearch.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
     458                784870561B0B62C70098FD5A /* TEncSearch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = TEncSearch.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
     459                784870571B0B62C70098FD5A /* TEncSlice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncSlice.cpp; sourceTree = "<group>"; };
     460                784870581B0B62C70098FD5A /* TEncSlice.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncSlice.h; sourceTree = "<group>"; };
     461                784870591B0B62C70098FD5A /* TEncTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TEncTop.cpp; sourceTree = "<group>"; };
     462                7848705A1B0B62C70098FD5A /* TEncTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TEncTop.h; sourceTree = "<group>"; };
     463                7848705B1B0B62C70098FD5A /* WeightPredAnalysis.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WeightPredAnalysis.cpp; sourceTree = "<group>"; };
     464                7848705C1B0B62C70098FD5A /* WeightPredAnalysis.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WeightPredAnalysis.h; sourceTree = "<group>"; };
     465                7848705E1B0B62C70098FD5A /* TExtrTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TExtrTop.cpp; sourceTree = "<group>"; };
     466                7848705F1B0B62C70098FD5A /* TExtrTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TExtrTop.h; sourceTree = "<group>"; };
     467                784870611B0B62C70098FD5A /* TRenFilter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenFilter.cpp; sourceTree = "<group>"; };
     468                784870621B0B62C70098FD5A /* TRenFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenFilter.h; sourceTree = "<group>"; };
     469                784870631B0B62C70098FD5A /* TRenImage.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenImage.cpp; sourceTree = "<group>"; };
     470                784870641B0B62C70098FD5A /* TRenImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenImage.h; sourceTree = "<group>"; };
     471                784870651B0B62C70098FD5A /* TRenImagePlane.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenImagePlane.cpp; sourceTree = "<group>"; };
     472                784870661B0B62C70098FD5A /* TRenImagePlane.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenImagePlane.h; sourceTree = "<group>"; };
     473                784870671B0B62C70098FD5A /* TRenInterpFilter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenInterpFilter.cpp; sourceTree = "<group>"; };
     474                784870681B0B62C70098FD5A /* TRenInterpFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenInterpFilter.h; sourceTree = "<group>"; };
     475                784870691B0B62C70098FD5A /* TRenModel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenModel.cpp; sourceTree = "<group>"; };
     476                7848706A1B0B62C70098FD5A /* TRenModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenModel.h; sourceTree = "<group>"; };
     477                7848706B1B0B62C70098FD5A /* TRenModSetupStrParser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenModSetupStrParser.cpp; sourceTree = "<group>"; };
     478                7848706C1B0B62C70098FD5A /* TRenModSetupStrParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenModSetupStrParser.h; sourceTree = "<group>"; };
     479                7848706D1B0B62C70098FD5A /* TRenSingleModel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenSingleModel.cpp; sourceTree = "<group>"; };
     480                7848706E1B0B62C70098FD5A /* TRenSingleModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenSingleModel.h; sourceTree = "<group>"; };
     481                7848706F1B0B62C70098FD5A /* TRenTop.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TRenTop.cpp; sourceTree = "<group>"; };
     482                784870701B0B62C70098FD5A /* TRenTop.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TRenTop.h; sourceTree = "<group>"; };
     483                784870721B0B62C70098FD5A /* TVideoIOYuv.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TVideoIOYuv.cpp; sourceTree = "<group>"; };
     484                784870731B0B62C70098FD5A /* TVideoIOYuv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TVideoIOYuv.h; sourceTree = "<group>"; };
    479485                7885897D15664E3D00982C12 /* libTLibExtractor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libTLibExtractor.a; sourceTree = BUILT_PRODUCTS_DIR; };
    480486                7885899415664E6A00982C12 /* TAppExtractor */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TAppExtractor; sourceTree = BUILT_PRODUCTS_DIR; };
     
    595601                        isa = PBXGroup;
    596602                        children = (
    597                                 78C592E7158720BB004401C5 /* App */,
    598                                 78C59310158720BB004401C5 /* Lib */,
     603                                78486FA51B0B62C70098FD5A /* App */,
     604                                78486FCE1B0B62C70098FD5A /* Lib */,
    599605                        );
    600606                        indentWidth = 2;
     
    621627                        sourceTree = "<group>";
    622628                };
    623                 785E596B17D9AFA8001F6DD1 /* TLibStatistics */ = {
     629                78486FA51B0B62C70098FD5A /* App */ = {
    624630                        isa = PBXGroup;
    625631                        children = (
    626                                 785E596C17D9AFA8001F6DD1 /* TStatHeader.cpp */,
    627                                 785E596D17D9AFA8001F6DD1 /* TStatHeader.h */,
    628                                 785E596E17D9AFA8001F6DD1 /* TStatLayer.cpp */,
    629                                 785E596F17D9AFA8001F6DD1 /* TStatLayer.h */,
    630                                 785E597017D9AFA8001F6DD1 /* TStatTop.cpp */,
    631                                 785E597117D9AFA8001F6DD1 /* TStatTop.h */,
    632                         );
    633                         path = TLibStatistics;
    634                         sourceTree = "<group>";
    635                 };
    636                 787462BA17D5DD7B0040CFC7 /* TAppDecoder */ = {
    637                         isa = PBXGroup;
    638                         children = (
    639                                 787462BB17D5DD7B0040CFC7 /* decmain.cpp */,
    640                                 787462BC17D5DD7B0040CFC7 /* TAppDecCfg.cpp */,
    641                                 787462BD17D5DD7B0040CFC7 /* TAppDecCfg.h */,
    642                                 787462BE17D5DD7B0040CFC7 /* TAppDecTop.cpp */,
    643                                 787462BF17D5DD7B0040CFC7 /* TAppDecTop.h */,
    644                         );
    645                         path = TAppDecoder;
    646                         sourceTree = "<group>";
    647                 };
    648                 787462C017D5DD7B0040CFC7 /* TAppEncoder */ = {
    649                         isa = PBXGroup;
    650                         children = (
    651                                 787462C117D5DD7B0040CFC7 /* encmain.cpp */,
    652                                 787462C217D5DD7B0040CFC7 /* TAppEncCfg.cpp */,
    653                                 787462C317D5DD7B0040CFC7 /* TAppEncCfg.h */,
    654                                 787462C417D5DD7B0040CFC7 /* TAppEncTop.cpp */,
    655                                 787462C517D5DD7B0040CFC7 /* TAppEncTop.h */,
    656                         );
    657                         path = TAppEncoder;
    658                         sourceTree = "<group>";
    659                 };
    660                 787462C617D5DD7B0040CFC7 /* TAppExtractor */ = {
    661                         isa = PBXGroup;
    662                         children = (
    663                                 787462C717D5DD7B0040CFC7 /* extrmain.cpp */,
    664                                 787462C817D5DD7B0040CFC7 /* TAppExtrCfg.cpp */,
    665                                 787462C917D5DD7B0040CFC7 /* TAppExtrCfg.h */,
    666                                 787462CA17D5DD7B0040CFC7 /* TAppExtrTop.cpp */,
    667                                 787462CB17D5DD7B0040CFC7 /* TAppExtrTop.h */,
    668                         );
    669                         path = TAppExtractor;
    670                         sourceTree = "<group>";
    671                 };
    672                 787462CC17D5DD7B0040CFC7 /* TAppRenderer */ = {
    673                         isa = PBXGroup;
    674                         children = (
    675                                 787462CD17D5DD7B0040CFC7 /* RendererMain.cpp */,
    676                                 787462CE17D5DD7B0040CFC7 /* TAppRendererCfg.cpp */,
    677                                 787462CF17D5DD7B0040CFC7 /* TAppRendererCfg.h */,
    678                                 787462D017D5DD7B0040CFC7 /* TAppRendererTop.cpp */,
    679                                 787462D117D5DD7B0040CFC7 /* TAppRendererTop.h */,
    680                         );
    681                         path = TAppRenderer;
    682                         sourceTree = "<group>";
    683                 };
    684                 787462D217D5DD7B0040CFC7 /* utils */ = {
    685                         isa = PBXGroup;
    686                         children = (
    687                                 787462D317D5DD7B0040CFC7 /* annexBbytecount.cpp */,
    688                                 787462D417D5DD7B0040CFC7 /* BitrateTargeting */,
    689                                 787462E117D5DD7B0040CFC7 /* convert_NtoMbit_YCbCr.cpp */,
    690                         );
    691                         path = utils;
    692                         sourceTree = "<group>";
    693                 };
    694                 787462D417D5DD7B0040CFC7 /* BitrateTargeting */ = {
    695                         isa = PBXGroup;
    696                         children = (
    697                                 787462D517D5DD7B0040CFC7 /* encode.shl */,
    698                                 787462D617D5DD7B0040CFC7 /* encodeCommand.sh */,
    699                                 787462D717D5DD7B0040CFC7 /* ExtractBitrates.cpp */,
    700                                 787462D817D5DD7B0040CFC7 /* ExtractBitrates.h */,
    701                                 787462D917D5DD7B0040CFC7 /* ExtractBitratesMain.cpp */,
    702                                 787462DA17D5DD7B0040CFC7 /* GuessLambdaModifiers.cpp */,
    703                                 787462DB17D5DD7B0040CFC7 /* GuessLambdaModifiers.h */,
    704                                 787462DC17D5DD7B0040CFC7 /* GuessLambdaModifiersMain.cpp */,
    705                                 787462DD17D5DD7B0040CFC7 /* makefile */,
    706                                 787462DE17D5DD7B0040CFC7 /* QuickStartGuide.pdf */,
    707                                 787462DF17D5DD7B0040CFC7 /* RuntimeError.h */,
    708                                 787462E017D5DD7B0040CFC7 /* targetBitrates.sh */,
    709                         );
    710                         path = BitrateTargeting;
    711                         sourceTree = "<group>";
    712                 };
    713                 787462E217D5DD840040CFC7 /* libmd5 */ = {
    714                         isa = PBXGroup;
    715                         children = (
    716                                 787462E317D5DD840040CFC7 /* libmd5.c */,
    717                                 787462E417D5DD840040CFC7 /* libmd5.h */,
    718                                 787462E517D5DD840040CFC7 /* MD5.h */,
    719                         );
    720                         path = libmd5;
    721                         sourceTree = "<group>";
    722                 };
    723                 787462E617D5DD840040CFC7 /* TAppCommon */ = {
    724                         isa = PBXGroup;
    725                         children = (
    726                                 787462E717D5DD840040CFC7 /* program_options_lite.cpp */,
    727                                 787462E817D5DD840040CFC7 /* program_options_lite.h */,
    728                                 787462E917D5DD840040CFC7 /* TAppComCamPara.cpp */,
    729                                 787462EA17D5DD840040CFC7 /* TAppComCamPara.h */,
    730                         );
    731                         path = TAppCommon;
    732                         sourceTree = "<group>";
    733                 };
    734                 787462EB17D5DD840040CFC7 /* TLibCommon */ = {
    735                         isa = PBXGroup;
    736                         children = (
    737                                 787462EC17D5DD840040CFC7 /* AccessUnit.h */,
    738                                 787462ED17D5DD840040CFC7 /* CommonDef.h */,
    739                                 787462EE17D5DD840040CFC7 /* ContextModel.cpp */,
    740                                 787462EF17D5DD840040CFC7 /* ContextModel.h */,
    741                                 787462F017D5DD840040CFC7 /* ContextModel3DBuffer.cpp */,
    742                                 787462F117D5DD840040CFC7 /* ContextModel3DBuffer.h */,
    743                                 787462F217D5DD840040CFC7 /* ContextTables.h */,
    744                                 787462F317D5DD840040CFC7 /* NAL.h */,
    745                                 787462F417D5DD840040CFC7 /* SEI.cpp */,
    746                                 787462F517D5DD840040CFC7 /* SEI.h */,
    747                                 787462F617D5DD840040CFC7 /* TComBitCounter.h */,
    748                                 787462F717D5DD840040CFC7 /* TComBitStream.cpp */,
    749                                 787462F817D5DD840040CFC7 /* TComBitStream.h */,
    750                                 787462F917D5DD840040CFC7 /* TComCABACTables.cpp */,
    751                                 787462FA17D5DD840040CFC7 /* TComCABACTables.h */,
    752                                 787462FB17D5DD840040CFC7 /* TComDataCU.cpp */,
    753                                 787462FC17D5DD840040CFC7 /* TComDataCU.h */,
    754                                 787462FD17D5DD840040CFC7 /* TComInterpolationFilter.cpp */,
    755                                 787462FE17D5DD840040CFC7 /* TComInterpolationFilter.h */,
    756                                 787462FF17D5DD840040CFC7 /* TComList.h */,
    757                                 7874630017D5DD840040CFC7 /* TComLoopFilter.cpp */,
    758                                 7874630117D5DD840040CFC7 /* TComLoopFilter.h */,
    759                                 7874630217D5DD840040CFC7 /* TComMotionInfo.cpp */,
    760                                 7874630317D5DD840040CFC7 /* TComMotionInfo.h */,
    761                                 7874630417D5DD840040CFC7 /* TComMv.h */,
    762                                 7874630517D5DD840040CFC7 /* TComPattern.cpp */,
    763                                 7874630617D5DD840040CFC7 /* TComPattern.h */,
    764                                 7874630717D5DD840040CFC7 /* TComPic.cpp */,
    765                                 7874630817D5DD840040CFC7 /* TComPic.h */,
    766                                 7874630917D5DD840040CFC7 /* TComPicSym.cpp */,
    767                                 7874630A17D5DD840040CFC7 /* TComPicSym.h */,
    768                                 7874630B17D5DD840040CFC7 /* TComPicYuv.cpp */,
    769                                 7874630C17D5DD840040CFC7 /* TComPicYuv.h */,
    770                                 7874630D17D5DD840040CFC7 /* TComPicYuvMD5.cpp */,
    771                                 7874630E17D5DD840040CFC7 /* TComPrediction.cpp */,
    772                                 7874630F17D5DD840040CFC7 /* TComPrediction.h */,
    773                                 7874631017D5DD840040CFC7 /* TComRdCost.cpp */,
    774                                 7874631117D5DD840040CFC7 /* TComRdCost.h */,
    775                                 7874631217D5DD840040CFC7 /* TComRdCostWeightPrediction.cpp */,
    776                                 7874631317D5DD840040CFC7 /* TComRdCostWeightPrediction.h */,
    777                                 7874631417D5DD840040CFC7 /* TComRom.cpp */,
    778                                 7874631517D5DD840040CFC7 /* TComRom.h */,
    779                                 7874631617D5DD840040CFC7 /* TComSampleAdaptiveOffset.cpp */,
    780                                 7874631717D5DD840040CFC7 /* TComSampleAdaptiveOffset.h */,
    781                                 7874631817D5DD840040CFC7 /* TComSlice.cpp */,
    782                                 7874631917D5DD840040CFC7 /* TComSlice.h */,
    783                                 7874631A17D5DD840040CFC7 /* TComTrQuant.cpp */,
    784                                 7874631B17D5DD840040CFC7 /* TComTrQuant.h */,
    785                                 7874631C17D5DD840040CFC7 /* TComWedgelet.cpp */,
    786                                 7874631D17D5DD840040CFC7 /* TComWedgelet.h */,
    787                                 7874631E17D5DD840040CFC7 /* TComWeightPrediction.cpp */,
    788                                 7874631F17D5DD840040CFC7 /* TComWeightPrediction.h */,
    789                                 7874632017D5DD840040CFC7 /* TComYuv.cpp */,
    790                                 7874632117D5DD840040CFC7 /* TComYuv.h */,
    791                                 7874632217D5DD840040CFC7 /* TypeDef.h */,
    792                         );
    793                         path = TLibCommon;
    794                         sourceTree = "<group>";
    795                 };
    796                 7874632317D5DD840040CFC7 /* TLibDecoder */ = {
    797                         isa = PBXGroup;
    798                         children = (
    799                                 7874632417D5DD840040CFC7 /* AnnexBread.cpp */,
    800                                 7874632517D5DD840040CFC7 /* AnnexBread.h */,
    801                                 7874632617D5DD840040CFC7 /* NALread.cpp */,
    802                                 7874632717D5DD840040CFC7 /* NALread.h */,
    803                                 7874632817D5DD840040CFC7 /* SEIread.cpp */,
    804                                 7874632917D5DD840040CFC7 /* SEIread.h */,
    805                                 7874632A17D5DD840040CFC7 /* SyntaxElementParser.cpp */,
    806                                 7874632B17D5DD840040CFC7 /* SyntaxElementParser.h */,
    807                                 7874632C17D5DD840040CFC7 /* TDecBinCoder.h */,
    808                                 7874632D17D5DD840040CFC7 /* TDecBinCoderCABAC.cpp */,
    809                                 7874632E17D5DD840040CFC7 /* TDecBinCoderCABAC.h */,
    810                                 7874632F17D5DD840040CFC7 /* TDecCAVLC.cpp */,
    811                                 7874633017D5DD840040CFC7 /* TDecCAVLC.h */,
    812                                 7874633117D5DD840040CFC7 /* TDecCu.cpp */,
    813                                 7874633217D5DD840040CFC7 /* TDecCu.h */,
    814                                 7874633317D5DD840040CFC7 /* TDecEntropy.cpp */,
    815                                 7874633417D5DD840040CFC7 /* TDecEntropy.h */,
    816                                 7874633517D5DD840040CFC7 /* TDecGop.cpp */,
    817                                 7874633617D5DD840040CFC7 /* TDecGop.h */,
    818                                 7874633717D5DD840040CFC7 /* TDecSbac.cpp */,
    819                                 7874633817D5DD840040CFC7 /* TDecSbac.h */,
    820                                 7874633917D5DD840040CFC7 /* TDecSlice.cpp */,
    821                                 7874633A17D5DD840040CFC7 /* TDecSlice.h */,
    822                                 7874633B17D5DD840040CFC7 /* TDecTop.cpp */,
    823                                 7874633C17D5DD840040CFC7 /* TDecTop.h */,
    824                         );
    825                         path = TLibDecoder;
    826                         sourceTree = "<group>";
    827                 };
    828                 7874633D17D5DD840040CFC7 /* TLibEncoder */ = {
    829                         isa = PBXGroup;
    830                         children = (
    831                                 7874633E17D5DD840040CFC7 /* AnnexBwrite.h */,
    832                                 7874633F17D5DD840040CFC7 /* NALwrite.cpp */,
    833                                 7874634017D5DD840040CFC7 /* NALwrite.h */,
    834                                 7874634117D5DD840040CFC7 /* SEIwrite.cpp */,
    835                                 7874634217D5DD840040CFC7 /* SEIwrite.h */,
    836                                 7874634317D5DD840040CFC7 /* SyntaxElementWriter.cpp */,
    837                                 7874634417D5DD840040CFC7 /* SyntaxElementWriter.h */,
    838                                 7874634517D5DD840040CFC7 /* TEncAnalyze.cpp */,
    839                                 7874634617D5DD840040CFC7 /* TEncAnalyze.h */,
    840                                 7874634717D5DD840040CFC7 /* TEncBinCoder.h */,
    841                                 7874634817D5DD840040CFC7 /* TEncBinCoderCABAC.cpp */,
    842                                 7874634917D5DD840040CFC7 /* TEncBinCoderCABAC.h */,
    843                                 7874634A17D5DD840040CFC7 /* TEncBinCoderCABACCounter.cpp */,
    844                                 7874634B17D5DD840040CFC7 /* TEncBinCoderCABACCounter.h */,
    845                                 7874634C17D5DD840040CFC7 /* TEncCavlc.cpp */,
    846                                 7874634D17D5DD840040CFC7 /* TEncCavlc.h */,
    847                                 7874634E17D5DD840040CFC7 /* TEncCfg.h */,
    848                                 7874634F17D5DD840040CFC7 /* TEncCu.cpp */,
    849                                 7874635017D5DD840040CFC7 /* TEncCu.h */,
    850                                 7874635117D5DD840040CFC7 /* TEncEntropy.cpp */,
    851                                 7874635217D5DD840040CFC7 /* TEncEntropy.h */,
    852                                 7874635317D5DD840040CFC7 /* TEncGOP.cpp */,
    853                                 7874635417D5DD840040CFC7 /* TEncGOP.h */,
    854                                 7874635517D5DD840040CFC7 /* TEncPic.cpp */,
    855                                 7874635617D5DD840040CFC7 /* TEncPic.h */,
    856                                 7874635717D5DD840040CFC7 /* TEncPreanalyzer.cpp */,
    857                                 7874635817D5DD840040CFC7 /* TEncPreanalyzer.h */,
    858                                 7874635917D5DD840040CFC7 /* TEncRateCtrl.cpp */,
    859                                 7874635A17D5DD840040CFC7 /* TEncRateCtrl.h */,
    860                                 7874635B17D5DD840040CFC7 /* TEncSampleAdaptiveOffset.cpp */,
    861                                 7874635C17D5DD840040CFC7 /* TEncSampleAdaptiveOffset.h */,
    862                                 7874635D17D5DD840040CFC7 /* TEncSbac.cpp */,
    863                                 7874635E17D5DD840040CFC7 /* TEncSbac.h */,
    864                                 7874635F17D5DD840040CFC7 /* TEncSearch.cpp */,
    865                                 7874636017D5DD840040CFC7 /* TEncSearch.h */,
    866                                 7874636117D5DD840040CFC7 /* TEncSlice.cpp */,
    867                                 7874636217D5DD840040CFC7 /* TEncSlice.h */,
    868                                 7874636317D5DD840040CFC7 /* TEncTop.cpp */,
    869                                 7874636417D5DD840040CFC7 /* TEncTop.h */,
    870                                 7874636517D5DD840040CFC7 /* WeightPredAnalysis.cpp */,
    871                                 7874636617D5DD840040CFC7 /* WeightPredAnalysis.h */,
    872                         );
    873                         path = TLibEncoder;
    874                         sourceTree = "<group>";
    875                 };
    876                 7874636717D5DD840040CFC7 /* TLibExtractor */ = {
    877                         isa = PBXGroup;
    878                         children = (
    879                                 7874636817D5DD840040CFC7 /* TExtrTop.cpp */,
    880                                 7874636917D5DD840040CFC7 /* TExtrTop.h */,
    881                         );
    882                         path = TLibExtractor;
    883                         sourceTree = "<group>";
    884                 };
    885                 7874636A17D5DD840040CFC7 /* TLibRenderer */ = {
    886                         isa = PBXGroup;
    887                         children = (
    888                                 7874636B17D5DD840040CFC7 /* TRenFilter.cpp */,
    889                                 7874636C17D5DD840040CFC7 /* TRenFilter.h */,
    890                                 7874636D17D5DD840040CFC7 /* TRenImage.cpp */,
    891                                 7874636E17D5DD840040CFC7 /* TRenImage.h */,
    892                                 7874636F17D5DD840040CFC7 /* TRenImagePlane.cpp */,
    893                                 7874637017D5DD840040CFC7 /* TRenImagePlane.h */,
    894                                 7874637117D5DD840040CFC7 /* TRenInterpFilter.cpp */,
    895                                 7874637217D5DD840040CFC7 /* TRenInterpFilter.h */,
    896                                 7874637317D5DD840040CFC7 /* TRenModel.cpp */,
    897                                 7874637417D5DD840040CFC7 /* TRenModel.h */,
    898                                 7874637517D5DD840040CFC7 /* TRenModSetupStrParser.cpp */,
    899                                 7874637617D5DD840040CFC7 /* TRenModSetupStrParser.h */,
    900                                 7874637717D5DD840040CFC7 /* TRenSingleModel.cpp */,
    901                                 7874637817D5DD840040CFC7 /* TRenSingleModel.h */,
    902                                 7874637917D5DD840040CFC7 /* TRenTop.cpp */,
    903                                 7874637A17D5DD840040CFC7 /* TRenTop.h */,
    904                         );
    905                         path = TLibRenderer;
    906                         sourceTree = "<group>";
    907                 };
    908                 7874637B17D5DD840040CFC7 /* TLibVideoIO */ = {
    909                         isa = PBXGroup;
    910                         children = (
    911                                 7874637C17D5DD840040CFC7 /* TVideoIOYuv.cpp */,
    912                                 7874637D17D5DD840040CFC7 /* TVideoIOYuv.h */,
    913                         );
    914                         path = TLibVideoIO;
    915                         sourceTree = "<group>";
    916                 };
    917                 78C592E7158720BB004401C5 /* App */ = {
    918                         isa = PBXGroup;
    919                         children = (
    920                                 787462BA17D5DD7B0040CFC7 /* TAppDecoder */,
    921                                 787462C017D5DD7B0040CFC7 /* TAppEncoder */,
    922                                 787462C617D5DD7B0040CFC7 /* TAppExtractor */,
    923                                 787462CC17D5DD7B0040CFC7 /* TAppRenderer */,
    924                                 787462D217D5DD7B0040CFC7 /* utils */,
     632                                78486FA61B0B62C70098FD5A /* TAppDecoder */,
     633                                78486FAC1B0B62C70098FD5A /* TAppEncoder */,
     634                                78486FB21B0B62C70098FD5A /* TAppExtractor */,
     635                                78486FB81B0B62C70098FD5A /* TAppRenderer */,
     636                                78486FBE1B0B62C70098FD5A /* utils */,
    925637                        );
    926638                        name = App;
     
    928640                        sourceTree = "<group>";
    929641                };
    930                 78C59310158720BB004401C5 /* Lib */ = {
     642                78486FA61B0B62C70098FD5A /* TAppDecoder */ = {
    931643                        isa = PBXGroup;
    932644                        children = (
    933                                 787462E217D5DD840040CFC7 /* libmd5 */,
    934                                 787462E617D5DD840040CFC7 /* TAppCommon */,
    935                                 787462EB17D5DD840040CFC7 /* TLibCommon */,
    936                                 7874632317D5DD840040CFC7 /* TLibDecoder */,
    937                                 7874633D17D5DD840040CFC7 /* TLibEncoder */,
    938                                 7874636717D5DD840040CFC7 /* TLibExtractor */,
    939                                 7874636A17D5DD840040CFC7 /* TLibRenderer */,
    940                                 7874637B17D5DD840040CFC7 /* TLibVideoIO */,
    941                                 785E596B17D9AFA8001F6DD1 /* TLibStatistics */,
     645                                78486FA71B0B62C70098FD5A /* decmain.cpp */,
     646                                78486FA81B0B62C70098FD5A /* TAppDecCfg.cpp */,
     647                                78486FA91B0B62C70098FD5A /* TAppDecCfg.h */,
     648                                78486FAA1B0B62C70098FD5A /* TAppDecTop.cpp */,
     649                                78486FAB1B0B62C70098FD5A /* TAppDecTop.h */,
     650                        );
     651                        path = TAppDecoder;
     652                        sourceTree = "<group>";
     653                };
     654                78486FAC1B0B62C70098FD5A /* TAppEncoder */ = {
     655                        isa = PBXGroup;
     656                        children = (
     657                                78486FAD1B0B62C70098FD5A /* encmain.cpp */,
     658                                78486FAE1B0B62C70098FD5A /* TAppEncCfg.cpp */,
     659                                78486FAF1B0B62C70098FD5A /* TAppEncCfg.h */,
     660                                78486FB01B0B62C70098FD5A /* TAppEncTop.cpp */,
     661                                78486FB11B0B62C70098FD5A /* TAppEncTop.h */,
     662                        );
     663                        path = TAppEncoder;
     664                        sourceTree = "<group>";
     665                };
     666                78486FB21B0B62C70098FD5A /* TAppExtractor */ = {
     667                        isa = PBXGroup;
     668                        children = (
     669                                78486FB31B0B62C70098FD5A /* extrmain.cpp */,
     670                                78486FB41B0B62C70098FD5A /* TAppExtrCfg.cpp */,
     671                                78486FB51B0B62C70098FD5A /* TAppExtrCfg.h */,
     672                                78486FB61B0B62C70098FD5A /* TAppExtrTop.cpp */,
     673                                78486FB71B0B62C70098FD5A /* TAppExtrTop.h */,
     674                        );
     675                        path = TAppExtractor;
     676                        sourceTree = "<group>";
     677                };
     678                78486FB81B0B62C70098FD5A /* TAppRenderer */ = {
     679                        isa = PBXGroup;
     680                        children = (
     681                                78486FB91B0B62C70098FD5A /* RendererMain.cpp */,
     682                                78486FBA1B0B62C70098FD5A /* TAppRendererCfg.cpp */,
     683                                78486FBB1B0B62C70098FD5A /* TAppRendererCfg.h */,
     684                                78486FBC1B0B62C70098FD5A /* TAppRendererTop.cpp */,
     685                                78486FBD1B0B62C70098FD5A /* TAppRendererTop.h */,
     686                        );
     687                        path = TAppRenderer;
     688                        sourceTree = "<group>";
     689                };
     690                78486FBE1B0B62C70098FD5A /* utils */ = {
     691                        isa = PBXGroup;
     692                        children = (
     693                                78486FBF1B0B62C70098FD5A /* annexBbytecount.cpp */,
     694                                78486FC01B0B62C70098FD5A /* BitrateTargeting */,
     695                                78486FCD1B0B62C70098FD5A /* convert_NtoMbit_YCbCr.cpp */,
     696                        );
     697                        path = utils;
     698                        sourceTree = "<group>";
     699                };
     700                78486FC01B0B62C70098FD5A /* BitrateTargeting */ = {
     701                        isa = PBXGroup;
     702                        children = (
     703                                78486FC11B0B62C70098FD5A /* encode.shl */,
     704                                78486FC21B0B62C70098FD5A /* encodeCommand.sh */,
     705                                78486FC31B0B62C70098FD5A /* ExtractBitrates.cpp */,
     706                                78486FC41B0B62C70098FD5A /* ExtractBitrates.h */,
     707                                78486FC51B0B62C70098FD5A /* ExtractBitratesMain.cpp */,
     708                                78486FC61B0B62C70098FD5A /* GuessLambdaModifiers.cpp */,
     709                                78486FC71B0B62C70098FD5A /* GuessLambdaModifiers.h */,
     710                                78486FC81B0B62C70098FD5A /* GuessLambdaModifiersMain.cpp */,
     711                                78486FC91B0B62C70098FD5A /* makefile */,
     712                                78486FCA1B0B62C70098FD5A /* QuickStartGuide.pdf */,
     713                                78486FCB1B0B62C70098FD5A /* RuntimeError.h */,
     714                                78486FCC1B0B62C70098FD5A /* targetBitrates.sh */,
     715                        );
     716                        path = BitrateTargeting;
     717                        sourceTree = "<group>";
     718                };
     719                78486FCE1B0B62C70098FD5A /* Lib */ = {
     720                        isa = PBXGroup;
     721                        children = (
     722                                78486FCF1B0B62C70098FD5A /* libmd5 */,
     723                                78486FD31B0B62C70098FD5A /* TAppCommon */,
     724                                78486FD81B0B62C70098FD5A /* TLibCommon */,
     725                                784870181B0B62C70098FD5A /* TLibDecoder */,
     726                                784870321B0B62C70098FD5A /* TLibEncoder */,
     727                                7848705D1B0B62C70098FD5A /* TLibExtractor */,
     728                                784870601B0B62C70098FD5A /* TLibRenderer */,
     729                                784870711B0B62C70098FD5A /* TLibVideoIO */,
    942730                        );
    943731                        name = Lib;
    944732                        path = source/Lib;
     733                        sourceTree = "<group>";
     734                };
     735                78486FCF1B0B62C70098FD5A /* libmd5 */ = {
     736                        isa = PBXGroup;
     737                        children = (
     738                                78486FD01B0B62C70098FD5A /* libmd5.c */,
     739                                78486FD11B0B62C70098FD5A /* libmd5.h */,
     740                                78486FD21B0B62C70098FD5A /* MD5.h */,
     741                        );
     742                        path = libmd5;
     743                        sourceTree = "<group>";
     744                };
     745                78486FD31B0B62C70098FD5A /* TAppCommon */ = {
     746                        isa = PBXGroup;
     747                        children = (
     748                                78486FD41B0B62C70098FD5A /* program_options_lite.cpp */,
     749                                78486FD51B0B62C70098FD5A /* program_options_lite.h */,
     750                                78486FD61B0B62C70098FD5A /* TAppComCamPara.cpp */,
     751                                78486FD71B0B62C70098FD5A /* TAppComCamPara.h */,
     752                        );
     753                        path = TAppCommon;
     754                        sourceTree = "<group>";
     755                };
     756                78486FD81B0B62C70098FD5A /* TLibCommon */ = {
     757                        isa = PBXGroup;
     758                        children = (
     759                                78486FD91B0B62C70098FD5A /* AccessUnit.h */,
     760                                78486FDA1B0B62C70098FD5A /* CommonDef.h */,
     761                                78486FDB1B0B62C70098FD5A /* ContextModel.cpp */,
     762                                78486FDC1B0B62C70098FD5A /* ContextModel.h */,
     763                                78486FDD1B0B62C70098FD5A /* ContextModel3DBuffer.cpp */,
     764                                78486FDE1B0B62C70098FD5A /* ContextModel3DBuffer.h */,
     765                                78486FDF1B0B62C70098FD5A /* ContextTables.h */,
     766                                78486FE01B0B62C70098FD5A /* Debug.cpp */,
     767                                78486FE11B0B62C70098FD5A /* Debug.h */,
     768                                78486FE21B0B62C70098FD5A /* NAL.h */,
     769                                78486FE31B0B62C70098FD5A /* SEI.cpp */,
     770                                78486FE41B0B62C70098FD5A /* SEI.h */,
     771                                78486FE51B0B62C70098FD5A /* TComBitCounter.h */,
     772                                78486FE61B0B62C70098FD5A /* TComBitStream.cpp */,
     773                                78486FE71B0B62C70098FD5A /* TComBitStream.h */,
     774                                78486FE81B0B62C70098FD5A /* TComCABACTables.cpp */,
     775                                78486FE91B0B62C70098FD5A /* TComCABACTables.h */,
     776                                78486FEA1B0B62C70098FD5A /* TComChromaFormat.cpp */,
     777                                78486FEB1B0B62C70098FD5A /* TComChromaFormat.h */,
     778                                78486FEC1B0B62C70098FD5A /* TComCodingStatistics.h */,
     779                                78486FED1B0B62C70098FD5A /* TComDataCU.cpp */,
     780                                78486FEE1B0B62C70098FD5A /* TComDataCU.h */,
     781                                78486FEF1B0B62C70098FD5A /* TComInterpolationFilter.cpp */,
     782                                78486FF01B0B62C70098FD5A /* TComInterpolationFilter.h */,
     783                                78486FF11B0B62C70098FD5A /* TComList.h */,
     784                                78486FF21B0B62C70098FD5A /* TComLoopFilter.cpp */,
     785                                78486FF31B0B62C70098FD5A /* TComLoopFilter.h */,
     786                                78486FF41B0B62C70098FD5A /* TComMotionInfo.cpp */,
     787                                78486FF51B0B62C70098FD5A /* TComMotionInfo.h */,
     788                                78486FF61B0B62C70098FD5A /* TComMv.h */,
     789                                78486FF71B0B62C70098FD5A /* TComPattern.cpp */,
     790                                78486FF81B0B62C70098FD5A /* TComPattern.h */,
     791                                78486FF91B0B62C70098FD5A /* TComPic.cpp */,
     792                                78486FFA1B0B62C70098FD5A /* TComPic.h */,
     793                                78486FFB1B0B62C70098FD5A /* TComPicSym.cpp */,
     794                                78486FFC1B0B62C70098FD5A /* TComPicSym.h */,
     795                                78486FFD1B0B62C70098FD5A /* TComPicYuv.cpp */,
     796                                78486FFE1B0B62C70098FD5A /* TComPicYuv.h */,
     797                                78486FFF1B0B62C70098FD5A /* TComPicYuvMD5.cpp */,
     798                                784870001B0B62C70098FD5A /* TComPrediction.cpp */,
     799                                784870011B0B62C70098FD5A /* TComPrediction.h */,
     800                                784870021B0B62C70098FD5A /* TComRdCost.cpp */,
     801                                784870031B0B62C70098FD5A /* TComRdCost.h */,
     802                                784870041B0B62C70098FD5A /* TComRdCostWeightPrediction.cpp */,
     803                                784870051B0B62C70098FD5A /* TComRdCostWeightPrediction.h */,
     804                                784870061B0B62C70098FD5A /* TComRectangle.h */,
     805                                784870071B0B62C70098FD5A /* TComRom.cpp */,
     806                                784870081B0B62C70098FD5A /* TComRom.h */,
     807                                784870091B0B62C70098FD5A /* TComSampleAdaptiveOffset.cpp */,
     808                                7848700A1B0B62C70098FD5A /* TComSampleAdaptiveOffset.h */,
     809                                7848700B1B0B62C70098FD5A /* TComSlice.cpp */,
     810                                7848700C1B0B62C70098FD5A /* TComSlice.h */,
     811                                7848700D1B0B62C70098FD5A /* TComTrQuant.cpp */,
     812                                7848700E1B0B62C70098FD5A /* TComTrQuant.h */,
     813                                7848700F1B0B62C70098FD5A /* TComTU.cpp */,
     814                                784870101B0B62C70098FD5A /* TComTU.h */,
     815                                784870111B0B62C70098FD5A /* TComWedgelet.cpp */,
     816                                784870121B0B62C70098FD5A /* TComWedgelet.h */,
     817                                784870131B0B62C70098FD5A /* TComWeightPrediction.cpp */,
     818                                784870141B0B62C70098FD5A /* TComWeightPrediction.h */,
     819                                784870151B0B62C70098FD5A /* TComYuv.cpp */,
     820                                784870161B0B62C70098FD5A /* TComYuv.h */,
     821                                784870171B0B62C70098FD5A /* TypeDef.h */,
     822                        );
     823                        path = TLibCommon;
     824                        sourceTree = "<group>";
     825                };
     826                784870181B0B62C70098FD5A /* TLibDecoder */ = {
     827                        isa = PBXGroup;
     828                        children = (
     829                                784870191B0B62C70098FD5A /* AnnexBread.cpp */,
     830                                7848701A1B0B62C70098FD5A /* AnnexBread.h */,
     831                                7848701B1B0B62C70098FD5A /* NALread.cpp */,
     832                                7848701C1B0B62C70098FD5A /* NALread.h */,
     833                                7848701D1B0B62C70098FD5A /* SEIread.cpp */,
     834                                7848701E1B0B62C70098FD5A /* SEIread.h */,
     835                                7848701F1B0B62C70098FD5A /* SyntaxElementParser.cpp */,
     836                                784870201B0B62C70098FD5A /* SyntaxElementParser.h */,
     837                                784870211B0B62C70098FD5A /* TDecBinCoder.h */,
     838                                784870221B0B62C70098FD5A /* TDecBinCoderCABAC.cpp */,
     839                                784870231B0B62C70098FD5A /* TDecBinCoderCABAC.h */,
     840                                784870241B0B62C70098FD5A /* TDecCAVLC.cpp */,
     841                                784870251B0B62C70098FD5A /* TDecCAVLC.h */,
     842                                784870261B0B62C70098FD5A /* TDecCu.cpp */,
     843                                784870271B0B62C70098FD5A /* TDecCu.h */,
     844                                784870281B0B62C70098FD5A /* TDecEntropy.cpp */,
     845                                784870291B0B62C70098FD5A /* TDecEntropy.h */,
     846                                7848702A1B0B62C70098FD5A /* TDecGop.cpp */,
     847                                7848702B1B0B62C70098FD5A /* TDecGop.h */,
     848                                7848702C1B0B62C70098FD5A /* TDecSbac.cpp */,
     849                                7848702D1B0B62C70098FD5A /* TDecSbac.h */,
     850                                7848702E1B0B62C70098FD5A /* TDecSlice.cpp */,
     851                                7848702F1B0B62C70098FD5A /* TDecSlice.h */,
     852                                784870301B0B62C70098FD5A /* TDecTop.cpp */,
     853                                784870311B0B62C70098FD5A /* TDecTop.h */,
     854                        );
     855                        path = TLibDecoder;
     856                        sourceTree = "<group>";
     857                };
     858                784870321B0B62C70098FD5A /* TLibEncoder */ = {
     859                        isa = PBXGroup;
     860                        children = (
     861                                784870331B0B62C70098FD5A /* AnnexBwrite.h */,
     862                                784870341B0B62C70098FD5A /* NALwrite.cpp */,
     863                                784870351B0B62C70098FD5A /* NALwrite.h */,
     864                                784870361B0B62C70098FD5A /* SEIEncoder.cpp */,
     865                                784870371B0B62C70098FD5A /* SEIEncoder.h */,
     866                                784870381B0B62C70098FD5A /* SEIwrite.cpp */,
     867                                784870391B0B62C70098FD5A /* SEIwrite.h */,
     868                                7848703A1B0B62C70098FD5A /* SyntaxElementWriter.cpp */,
     869                                7848703B1B0B62C70098FD5A /* SyntaxElementWriter.h */,
     870                                7848703C1B0B62C70098FD5A /* TEncAnalyze.h */,
     871                                7848703D1B0B62C70098FD5A /* TEncBinCoder.h */,
     872                                7848703E1B0B62C70098FD5A /* TEncBinCoderCABAC.cpp */,
     873                                7848703F1B0B62C70098FD5A /* TEncBinCoderCABAC.h */,
     874                                784870401B0B62C70098FD5A /* TEncBinCoderCABACCounter.cpp */,
     875                                784870411B0B62C70098FD5A /* TEncBinCoderCABACCounter.h */,
     876                                784870421B0B62C70098FD5A /* TEncCavlc.cpp */,
     877                                784870431B0B62C70098FD5A /* TEncCavlc.h */,
     878                                784870441B0B62C70098FD5A /* TEncCfg.h */,
     879                                784870451B0B62C70098FD5A /* TEncCu.cpp */,
     880                                784870461B0B62C70098FD5A /* TEncCu.h */,
     881                                784870471B0B62C70098FD5A /* TEncEntropy.cpp */,
     882                                784870481B0B62C70098FD5A /* TEncEntropy.h */,
     883                                784870491B0B62C70098FD5A /* TEncGOP.cpp */,
     884                                7848704A1B0B62C70098FD5A /* TEncGOP.h */,
     885                                7848704B1B0B62C70098FD5A /* TEncPic.cpp */,
     886                                7848704C1B0B62C70098FD5A /* TEncPic.h */,
     887                                7848704D1B0B62C70098FD5A /* TEncPreanalyzer.cpp */,
     888                                7848704E1B0B62C70098FD5A /* TEncPreanalyzer.h */,
     889                                7848704F1B0B62C70098FD5A /* TEncRateCtrl.cpp */,
     890                                784870501B0B62C70098FD5A /* TEncRateCtrl.h */,
     891                                784870511B0B62C70098FD5A /* TEncSampleAdaptiveOffset.cpp */,
     892                                784870521B0B62C70098FD5A /* TEncSampleAdaptiveOffset.h */,
     893                                784870531B0B62C70098FD5A /* TEncSbac.cpp */,
     894                                784870541B0B62C70098FD5A /* TEncSbac.h */,
     895                                784870551B0B62C70098FD5A /* TEncSearch.cpp */,
     896                                784870561B0B62C70098FD5A /* TEncSearch.h */,
     897                                784870571B0B62C70098FD5A /* TEncSlice.cpp */,
     898                                784870581B0B62C70098FD5A /* TEncSlice.h */,
     899                                784870591B0B62C70098FD5A /* TEncTop.cpp */,
     900                                7848705A1B0B62C70098FD5A /* TEncTop.h */,
     901                                7848705B1B0B62C70098FD5A /* WeightPredAnalysis.cpp */,
     902                                7848705C1B0B62C70098FD5A /* WeightPredAnalysis.h */,
     903                        );
     904                        path = TLibEncoder;
     905                        sourceTree = "<group>";
     906                };
     907                7848705D1B0B62C70098FD5A /* TLibExtractor */ = {
     908                        isa = PBXGroup;
     909                        children = (
     910                                7848705E1B0B62C70098FD5A /* TExtrTop.cpp */,
     911                                7848705F1B0B62C70098FD5A /* TExtrTop.h */,
     912                        );
     913                        path = TLibExtractor;
     914                        sourceTree = "<group>";
     915                };
     916                784870601B0B62C70098FD5A /* TLibRenderer */ = {
     917                        isa = PBXGroup;
     918                        children = (
     919                                784870611B0B62C70098FD5A /* TRenFilter.cpp */,
     920                                784870621B0B62C70098FD5A /* TRenFilter.h */,
     921                                784870631B0B62C70098FD5A /* TRenImage.cpp */,
     922                                784870641B0B62C70098FD5A /* TRenImage.h */,
     923                                784870651B0B62C70098FD5A /* TRenImagePlane.cpp */,
     924                                784870661B0B62C70098FD5A /* TRenImagePlane.h */,
     925                                784870671B0B62C70098FD5A /* TRenInterpFilter.cpp */,
     926                                784870681B0B62C70098FD5A /* TRenInterpFilter.h */,
     927                                784870691B0B62C70098FD5A /* TRenModel.cpp */,
     928                                7848706A1B0B62C70098FD5A /* TRenModel.h */,
     929                                7848706B1B0B62C70098FD5A /* TRenModSetupStrParser.cpp */,
     930                                7848706C1B0B62C70098FD5A /* TRenModSetupStrParser.h */,
     931                                7848706D1B0B62C70098FD5A /* TRenSingleModel.cpp */,
     932                                7848706E1B0B62C70098FD5A /* TRenSingleModel.h */,
     933                                7848706F1B0B62C70098FD5A /* TRenTop.cpp */,
     934                                784870701B0B62C70098FD5A /* TRenTop.h */,
     935                        );
     936                        path = TLibRenderer;
     937                        sourceTree = "<group>";
     938                };
     939                784870711B0B62C70098FD5A /* TLibVideoIO */ = {
     940                        isa = PBXGroup;
     941                        children = (
     942                                784870721B0B62C70098FD5A /* TVideoIOYuv.cpp */,
     943                                784870731B0B62C70098FD5A /* TVideoIOYuv.h */,
     944                        );
     945                        path = TLibVideoIO;
    945946                        sourceTree = "<group>";
    946947                };
     
    12081209                        attributes = {
    12091210                                BuildIndependentTargetsInParallel = YES;
    1210                                 LastUpgradeCheck = 0500;
     1211                                LastUpgradeCheck = 0620;
    12111212                        };
    12121213                        buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "HTM" */;
     
    12451246                        buildActionMask = 2147483647;
    12461247                        files = (
    1247                                 7874639417D5DE070040CFC7 /* TComPrediction.cpp in Sources */,
    1248                                 7874639517D5DE070040CFC7 /* TComRdCost.cpp in Sources */,
    1249                                 7874639617D5DE070040CFC7 /* TComRdCostWeightPrediction.cpp in Sources */,
    1250                                 7874639717D5DE070040CFC7 /* TComRom.cpp in Sources */,
    1251                                 7874639817D5DE070040CFC7 /* TComSampleAdaptiveOffset.cpp in Sources */,
    1252                                 7874639917D5DE070040CFC7 /* TComSlice.cpp in Sources */,
    1253                                 7874639A17D5DE070040CFC7 /* TComTrQuant.cpp in Sources */,
    1254                                 7874639B17D5DE070040CFC7 /* TComWedgelet.cpp in Sources */,
    1255                                 7874639C17D5DE070040CFC7 /* TComWeightPrediction.cpp in Sources */,
    1256                                 7874639D17D5DE070040CFC7 /* TComYuv.cpp in Sources */,
    1257                                 7874639E17D5DE230040CFC7 /* TComMotionInfo.cpp in Sources */,
    1258                                 7874639F17D5DE230040CFC7 /* TComPattern.cpp in Sources */,
    1259                                 787463A017D5DE230040CFC7 /* TComPic.cpp in Sources */,
    1260                                 787463A117D5DE230040CFC7 /* TComPicSym.cpp in Sources */,
    1261                                 787463A217D5DE230040CFC7 /* TComPicYuv.cpp in Sources */,
    1262                                 787463A317D5DE230040CFC7 /* TComPicYuvMD5.cpp in Sources */,
    1263                                 787463A417D5DE400040CFC7 /* TComCABACTables.cpp in Sources */,
    1264                                 787463A517D5DE400040CFC7 /* TComDataCU.cpp in Sources */,
    1265                                 787463A617D5DE400040CFC7 /* TComInterpolationFilter.cpp in Sources */,
    1266                                 787463A717D5DE400040CFC7 /* TComLoopFilter.cpp in Sources */,
    1267                                 787463A817D5DE4B0040CFC7 /* TComBitStream.cpp in Sources */,
    1268                                 787463A917D5DE640040CFC7 /* ContextModel.cpp in Sources */,
    1269                                 787463AA17D5DE640040CFC7 /* ContextModel3DBuffer.cpp in Sources */,
    1270                                 787463AB17D5DE640040CFC7 /* SEI.cpp in Sources */,
    1271                                 787463B717D5DED40040CFC7 /* libmd5.c in Sources */,
     1248                                784870871B0B63230098FD5A /* TComCABACTables.cpp in Sources */,
     1249                                7848709C1B0B63230098FD5A /* TComYuv.cpp in Sources */,
     1250                                7848709A1B0B63230098FD5A /* TComWedgelet.cpp in Sources */,
     1251                                784870931B0B63230098FD5A /* TComRdCost.cpp in Sources */,
     1252                                784870881B0B63230098FD5A /* TComChromaFormat.cpp in Sources */,
     1253                                7848708A1B0B63230098FD5A /* TComInterpolationFilter.cpp in Sources */,
     1254                                784870C61B0B63740098FD5A /* libmd5.c in Sources */,
     1255                                7848709B1B0B63230098FD5A /* TComWeightPrediction.cpp in Sources */,
     1256                                784870941B0B63230098FD5A /* TComRdCostWeightPrediction.cpp in Sources */,
     1257                                784870831B0B63230098FD5A /* ContextModel3DBuffer.cpp in Sources */,
     1258                                7848708E1B0B63230098FD5A /* TComPic.cpp in Sources */,
     1259                                784870961B0B63230098FD5A /* TComSampleAdaptiveOffset.cpp in Sources */,
     1260                                784870851B0B63230098FD5A /* SEI.cpp in Sources */,
     1261                                784870971B0B63230098FD5A /* TComSlice.cpp in Sources */,
     1262                                784870981B0B63230098FD5A /* TComTrQuant.cpp in Sources */,
     1263                                7848708D1B0B63230098FD5A /* TComPattern.cpp in Sources */,
     1264                                784870891B0B63230098FD5A /* TComDataCU.cpp in Sources */,
     1265                                7848708B1B0B63230098FD5A /* TComLoopFilter.cpp in Sources */,
     1266                                7848708F1B0B63230098FD5A /* TComPicSym.cpp in Sources */,
     1267                                784870991B0B63230098FD5A /* TComTU.cpp in Sources */,
     1268                                784870861B0B63230098FD5A /* TComBitStream.cpp in Sources */,
     1269                                784870951B0B63230098FD5A /* TComRom.cpp in Sources */,
     1270                                784870911B0B63230098FD5A /* TComPicYuvMD5.cpp in Sources */,
     1271                                784870821B0B63230098FD5A /* ContextModel.cpp in Sources */,
     1272                                784870841B0B63230098FD5A /* Debug.cpp in Sources */,
     1273                                7848708C1B0B63230098FD5A /* TComMotionInfo.cpp in Sources */,
     1274                                784870921B0B63230098FD5A /* TComPrediction.cpp in Sources */,
     1275                                784870901B0B63230098FD5A /* TComPicYuv.cpp in Sources */,
    12721276                        );
    12731277                        runOnlyForDeploymentPostprocessing = 0;
     
    12771281                        buildActionMask = 2147483647;
    12781282                        files = (
    1279                                 787463B817D5DEE80040CFC7 /* AnnexBread.cpp in Sources */,
    1280                                 787463B917D5DEE80040CFC7 /* NALread.cpp in Sources */,
    1281                                 787463BA17D5DEE80040CFC7 /* SEIread.cpp in Sources */,
    1282                                 787463BB17D5DEE80040CFC7 /* SyntaxElementParser.cpp in Sources */,
    1283                                 787463BC17D5DEE80040CFC7 /* TDecBinCoderCABAC.cpp in Sources */,
    1284                                 787463BD17D5DEE80040CFC7 /* TDecCAVLC.cpp in Sources */,
    1285                                 787463BE17D5DEE80040CFC7 /* TDecCu.cpp in Sources */,
    1286                                 787463BF17D5DEE80040CFC7 /* TDecEntropy.cpp in Sources */,
    1287                                 787463C017D5DEE80040CFC7 /* TDecGop.cpp in Sources */,
    1288                                 787463C117D5DEE80040CFC7 /* TDecSbac.cpp in Sources */,
    1289                                 787463C217D5DEE80040CFC7 /* TDecSlice.cpp in Sources */,
    1290                                 787463C317D5DEE80040CFC7 /* TDecTop.cpp in Sources */,
     1283                                784870A61B0B63360098FD5A /* TDecSbac.cpp in Sources */,
     1284                                784870A51B0B63360098FD5A /* TDecGop.cpp in Sources */,
     1285                                7848709F1B0B63360098FD5A /* SEIread.cpp in Sources */,
     1286                                784870A81B0B63360098FD5A /* TDecTop.cpp in Sources */,
     1287                                784870A41B0B63360098FD5A /* TDecEntropy.cpp in Sources */,
     1288                                7848709D1B0B63360098FD5A /* AnnexBread.cpp in Sources */,
     1289                                784870A31B0B63360098FD5A /* TDecCu.cpp in Sources */,
     1290                                784870A01B0B63360098FD5A /* SyntaxElementParser.cpp in Sources */,
     1291                                784870A71B0B63360098FD5A /* TDecSlice.cpp in Sources */,
     1292                                784870A11B0B63360098FD5A /* TDecBinCoderCABAC.cpp in Sources */,
     1293                                7848709E1B0B63360098FD5A /* NALread.cpp in Sources */,
     1294                                784870A21B0B63360098FD5A /* TDecCAVLC.cpp in Sources */,
    12911295                        );
    12921296                        runOnlyForDeploymentPostprocessing = 0;
     
    12961300                        buildActionMask = 2147483647;
    12971301                        files = (
    1298                                 7874638117D5DDA60040CFC7 /* NALwrite.cpp in Sources */,
    1299                                 7874638217D5DDA60040CFC7 /* SEIwrite.cpp in Sources */,
    1300                                 7874638317D5DDA60040CFC7 /* SyntaxElementWriter.cpp in Sources */,
    1301                                 7874638417D5DDA60040CFC7 /* TEncAnalyze.cpp in Sources */,
    1302                                 7874638517D5DDA60040CFC7 /* TEncBinCoderCABAC.cpp in Sources */,
    1303                                 7874638617D5DDA60040CFC7 /* TEncBinCoderCABACCounter.cpp in Sources */,
    1304                                 7874638717D5DDA60040CFC7 /* TEncCavlc.cpp in Sources */,
    1305                                 7874638817D5DDA60040CFC7 /* TEncCu.cpp in Sources */,
    1306                                 7874638917D5DDA60040CFC7 /* TEncEntropy.cpp in Sources */,
    1307                                 7874638A17D5DDA60040CFC7 /* TEncGOP.cpp in Sources */,
    1308                                 7874638B17D5DDA60040CFC7 /* TEncPic.cpp in Sources */,
    1309                                 7874638C17D5DDA60040CFC7 /* TEncPreanalyzer.cpp in Sources */,
    1310                                 7874638D17D5DDA60040CFC7 /* TEncRateCtrl.cpp in Sources */,
    1311                                 7874638E17D5DDA60040CFC7 /* TEncSampleAdaptiveOffset.cpp in Sources */,
    1312                                 7874638F17D5DDA60040CFC7 /* TEncSbac.cpp in Sources */,
    1313                                 7874639017D5DDA60040CFC7 /* TEncSearch.cpp in Sources */,
    1314                                 7874639117D5DDA60040CFC7 /* TEncSlice.cpp in Sources */,
    1315                                 7874639217D5DDA60040CFC7 /* TEncTop.cpp in Sources */,
    1316                                 7874639317D5DDA60040CFC7 /* WeightPredAnalysis.cpp in Sources */,
     1302                                784870AF1B0B634A0098FD5A /* TEncCavlc.cpp in Sources */,
     1303                                784870AD1B0B634A0098FD5A /* TEncBinCoderCABAC.cpp in Sources */,
     1304                                784870B61B0B634A0098FD5A /* TEncSampleAdaptiveOffset.cpp in Sources */,
     1305                                784870B11B0B634A0098FD5A /* TEncEntropy.cpp in Sources */,
     1306                                784870AA1B0B634A0098FD5A /* SEIEncoder.cpp in Sources */,
     1307                                784870B71B0B634A0098FD5A /* TEncSbac.cpp in Sources */,
     1308                                784870A91B0B634A0098FD5A /* NALwrite.cpp in Sources */,
     1309                                784870B51B0B634A0098FD5A /* TEncRateCtrl.cpp in Sources */,
     1310                                784870AE1B0B634A0098FD5A /* TEncBinCoderCABACCounter.cpp in Sources */,
     1311                                784870B31B0B634A0098FD5A /* TEncPic.cpp in Sources */,
     1312                                784870BB1B0B634A0098FD5A /* WeightPredAnalysis.cpp in Sources */,
     1313                                784870B41B0B634A0098FD5A /* TEncPreanalyzer.cpp in Sources */,
     1314                                784870BA1B0B634A0098FD5A /* TEncTop.cpp in Sources */,
     1315                                784870B21B0B634A0098FD5A /* TEncGOP.cpp in Sources */,
     1316                                784870B01B0B634A0098FD5A /* TEncCu.cpp in Sources */,
     1317                                784870AC1B0B634A0098FD5A /* SyntaxElementWriter.cpp in Sources */,
     1318                                784870AB1B0B634A0098FD5A /* SEIwrite.cpp in Sources */,
     1319                                784870B81B0B634A0098FD5A /* TEncSearch.cpp in Sources */,
     1320                                784870B91B0B634A0098FD5A /* TEncSlice.cpp in Sources */,
    13171321                        );
    13181322                        runOnlyForDeploymentPostprocessing = 0;
     
    13221326                        buildActionMask = 2147483647;
    13231327                        files = (
    1324                                 787463AC17D5DE8A0040CFC7 /* TVideoIOYuv.cpp in Sources */,
     1328                                784870C51B0B63610098FD5A /* TVideoIOYuv.cpp in Sources */,
    13251329                        );
    13261330                        runOnlyForDeploymentPostprocessing = 0;
     
    13301334                        buildActionMask = 2147483647;
    13311335                        files = (
    1332                                 7874637E17D5DD900040CFC7 /* encmain.cpp in Sources */,
    1333                                 7874637F17D5DD900040CFC7 /* TAppEncCfg.cpp in Sources */,
    1334                                 7874638017D5DD900040CFC7 /* TAppEncTop.cpp in Sources */,
     1336                                784870781B0B62D80098FD5A /* TAppEncCfg.cpp in Sources */,
     1337                                784870791B0B62D80098FD5A /* TAppEncTop.cpp in Sources */,
     1338                                784870771B0B62D80098FD5A /* encmain.cpp in Sources */,
    13351339                        );
    13361340                        runOnlyForDeploymentPostprocessing = 0;
     
    13401344                        buildActionMask = 2147483647;
    13411345                        files = (
    1342                                 787463C417D5DEFB0040CFC7 /* decmain.cpp in Sources */,
    1343                                 787463C517D5DEFB0040CFC7 /* TAppDecCfg.cpp in Sources */,
    1344                                 787463C617D5DEFB0040CFC7 /* TAppDecTop.cpp in Sources */,
     1346                                784870751B0B62D10098FD5A /* TAppDecCfg.cpp in Sources */,
     1347                                784870741B0B62D10098FD5A /* decmain.cpp in Sources */,
     1348                                784870761B0B62D10098FD5A /* TAppDecTop.cpp in Sources */,
    13451349                        );
    13461350                        runOnlyForDeploymentPostprocessing = 0;
     
    13501354                        buildActionMask = 2147483647;
    13511355                        files = (
    1352                                 787463CD17D5DF220040CFC7 /* TExtrTop.cpp in Sources */,
     1356                                784870BC1B0B63520098FD5A /* TExtrTop.cpp in Sources */,
    13531357                        );
    13541358                        runOnlyForDeploymentPostprocessing = 0;
     
    13581362                        buildActionMask = 2147483647;
    13591363                        files = (
    1360                                 787463C717D5DF080040CFC7 /* extrmain.cpp in Sources */,
    1361                                 787463C817D5DF080040CFC7 /* TAppExtrCfg.cpp in Sources */,
    1362                                 787463C917D5DF080040CFC7 /* TAppExtrTop.cpp in Sources */,
     1364                                7848707B1B0B62E10098FD5A /* TAppExtrCfg.cpp in Sources */,
     1365                                7848707A1B0B62E10098FD5A /* extrmain.cpp in Sources */,
     1366                                7848707C1B0B62E10098FD5A /* TAppExtrTop.cpp in Sources */,
    13631367                        );
    13641368                        runOnlyForDeploymentPostprocessing = 0;
     
    13681372                        buildActionMask = 2147483647;
    13691373                        files = (
    1370                                 787463AD17D5DE980040CFC7 /* TRenFilter.cpp in Sources */,
    1371                                 787463AE17D5DE980040CFC7 /* TRenImage.cpp in Sources */,
    1372                                 787463AF17D5DE980040CFC7 /* TRenImagePlane.cpp in Sources */,
    1373                                 787463B017D5DE980040CFC7 /* TRenInterpFilter.cpp in Sources */,
    1374                                 787463B117D5DE9D0040CFC7 /* TRenModel.cpp in Sources */,
    1375                                 787463B217D5DE9D0040CFC7 /* TRenModSetupStrParser.cpp in Sources */,
    1376                                 787463B317D5DE9D0040CFC7 /* TRenSingleModel.cpp in Sources */,
    1377                                 787463B417D5DE9D0040CFC7 /* TRenTop.cpp in Sources */,
     1374                                784870C41B0B635C0098FD5A /* TRenTop.cpp in Sources */,
     1375                                784870C31B0B635C0098FD5A /* TRenSingleModel.cpp in Sources */,
     1376                                784870BE1B0B635C0098FD5A /* TRenImage.cpp in Sources */,
     1377                                784870C11B0B635C0098FD5A /* TRenModel.cpp in Sources */,
     1378                                784870C21B0B635C0098FD5A /* TRenModSetupStrParser.cpp in Sources */,
     1379                                784870BD1B0B635C0098FD5A /* TRenFilter.cpp in Sources */,
     1380                                784870C01B0B635C0098FD5A /* TRenInterpFilter.cpp in Sources */,
     1381                                784870BF1B0B635C0098FD5A /* TRenImagePlane.cpp in Sources */,
    13781382                        );
    13791383                        runOnlyForDeploymentPostprocessing = 0;
     
    13831387                        buildActionMask = 2147483647;
    13841388                        files = (
    1385                                 787463CA17D5DF0E0040CFC7 /* RendererMain.cpp in Sources */,
    1386                                 787463CB17D5DF0E0040CFC7 /* TAppRendererCfg.cpp in Sources */,
    1387                                 787463CC17D5DF0E0040CFC7 /* TAppRendererTop.cpp in Sources */,
     1389                                7848707E1B0B62E80098FD5A /* TAppRendererCfg.cpp in Sources */,
     1390                                7848707D1B0B62E80098FD5A /* RendererMain.cpp in Sources */,
     1391                                7848707F1B0B62E80098FD5A /* TAppRendererTop.cpp in Sources */,
    13881392                        );
    13891393                        runOnlyForDeploymentPostprocessing = 0;
     
    13931397                        buildActionMask = 2147483647;
    13941398                        files = (
    1395                                 787463B517D5DEAF0040CFC7 /* program_options_lite.cpp in Sources */,
    1396                                 787463B617D5DEAF0040CFC7 /* TAppComCamPara.cpp in Sources */,
     1399                                784870811B0B63040098FD5A /* TAppComCamPara.cpp in Sources */,
     1400                                784870801B0B63040098FD5A /* program_options_lite.cpp in Sources */,
    13971401                        );
    13981402                        runOnlyForDeploymentPostprocessing = 0;
     
    15211525                                GCC_WARN_UNUSED_VARIABLE = YES;
    15221526                                HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/source/Lib/";
    1523                                 MACOSX_DEPLOYMENT_TARGET = 10.7;
    15241527                                ONLY_ACTIVE_ARCH = YES;
    1525                                 SDKROOT = macosx;
     1528                                OTHER_CPLUSPLUSFLAGS = (
     1529                                        "$(OTHER_CFLAGS)",
     1530                                        "-DDEBUG",
     1531                                );
    15261532                        };
    15271533                        name = Debug;
     
    15321538                                GCC_OPTIMIZATION_LEVEL = s;
    15331539                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
    1534                                 GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
    15351540                                GCC_WARN_UNUSED_VARIABLE = YES;
    15361541                                HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/source/Lib/";
    1537                                 MACOSX_DEPLOYMENT_TARGET = 10.7;
    1538                                 SDKROOT = macosx;
    15391542                        };
    15401543                        name = Release;
     
    15431546                        isa = XCBuildConfiguration;
    15441547                        buildSettings = {
    1545                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
     1548                                COMBINE_HIDPI_IMAGES = YES;
    15461549                                INSTALL_PATH = /usr/local/lib;
    15471550                                PRODUCT_NAME = TLibCommon;
     
    15521555                        isa = XCBuildConfiguration;
    15531556                        buildSettings = {
    1554                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
     1557                                COMBINE_HIDPI_IMAGES = YES;
    15551558                                INSTALL_PATH = /usr/local/lib;
    15561559                                PRODUCT_NAME = TLibCommon;
     
    15611564                        isa = XCBuildConfiguration;
    15621565                        buildSettings = {
    1563                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
     1566                                COMBINE_HIDPI_IMAGES = YES;
    15641567                                INSTALL_PATH = /usr/local/lib;
    15651568                                PRODUCT_NAME = TLibDecoder;
     
    15701573                        isa = XCBuildConfiguration;
    15711574                        buildSettings = {
    1572                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
     1575                                COMBINE_HIDPI_IMAGES = YES;
    15731576                                INSTALL_PATH = /usr/local/lib;
    15741577                                PRODUCT_NAME = TLibDecoder;
     
    15791582                        isa = XCBuildConfiguration;
    15801583                        buildSettings = {
    1581                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
     1584                                COMBINE_HIDPI_IMAGES = YES;
    15821585                                INSTALL_PATH = /usr/local/lib;
    15831586                                PRODUCT_NAME = TLibEncoder;
     
    15881591                        isa = XCBuildConfiguration;
    15891592                        buildSettings = {
    1590                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
     1593                                COMBINE_HIDPI_IMAGES = YES;
    15911594                                INSTALL_PATH = /usr/local/lib;
    15921595                                PRODUCT_NAME = TLibEncoder;
     
    15971600                        isa = XCBuildConfiguration;
    15981601                        buildSettings = {
    1599                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
     1602                                COMBINE_HIDPI_IMAGES = YES;
    16001603                                INSTALL_PATH = /usr/local/lib;
    16011604                                PRODUCT_NAME = TLibVideoIO;
     
    16061609                        isa = XCBuildConfiguration;
    16071610                        buildSettings = {
    1608                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
     1611                                COMBINE_HIDPI_IMAGES = YES;
    16091612                                INSTALL_PATH = /usr/local/lib;
    16101613                                PRODUCT_NAME = TLibVideoIO;
     
    16151618                        isa = XCBuildConfiguration;
    16161619                        buildSettings = {
    1617                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
    16181620                                INSTALL_PATH = /usr/local/bin;
    16191621                                PRODUCT_NAME = TAppEncoder;
     
    16241626                        isa = XCBuildConfiguration;
    16251627                        buildSettings = {
    1626                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
    16271628                                INSTALL_PATH = /usr/local/bin;
    16281629                                PRODUCT_NAME = TAppEncoder;
     
    16331634                        isa = XCBuildConfiguration;
    16341635                        buildSettings = {
    1635                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
    16361636                                INSTALL_PATH = /usr/local/bin;
    16371637                                PRODUCT_NAME = TAppDecoder;
     
    16421642                        isa = XCBuildConfiguration;
    16431643                        buildSettings = {
    1644                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
    16451644                                INSTALL_PATH = /usr/local/bin;
    16461645                                PRODUCT_NAME = TAppDecoder;
     
    16511650                        isa = XCBuildConfiguration;
    16521651                        buildSettings = {
    1653                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
     1652                                COMBINE_HIDPI_IMAGES = YES;
    16541653                                INSTALL_PATH = /usr/local/lib;
    16551654                                PRODUCT_NAME = TLibExtractor;
     
    16601659                        isa = XCBuildConfiguration;
    16611660                        buildSettings = {
    1662                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
     1661                                COMBINE_HIDPI_IMAGES = YES;
    16631662                                INSTALL_PATH = /usr/local/lib;
    16641663                                PRODUCT_NAME = TLibExtractor;
     
    16691668                        isa = XCBuildConfiguration;
    16701669                        buildSettings = {
    1671                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
    16721670                                INSTALL_PATH = /usr/local/bin;
    16731671                                PRODUCT_NAME = TAppExtractor;
     
    16781676                        isa = XCBuildConfiguration;
    16791677                        buildSettings = {
    1680                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
    16811678                                INSTALL_PATH = /usr/local/bin;
    16821679                                PRODUCT_NAME = TAppExtractor;
     
    16871684                        isa = XCBuildConfiguration;
    16881685                        buildSettings = {
    1689                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
     1686                                COMBINE_HIDPI_IMAGES = YES;
    16901687                                INSTALL_PATH = /usr/local/lib;
    16911688                                PRODUCT_NAME = TLibRenderer;
     
    16961693                        isa = XCBuildConfiguration;
    16971694                        buildSettings = {
    1698                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
     1695                                COMBINE_HIDPI_IMAGES = YES;
    16991696                                INSTALL_PATH = /usr/local/lib;
    17001697                                PRODUCT_NAME = TLibRenderer;
     
    17051702                        isa = XCBuildConfiguration;
    17061703                        buildSettings = {
    1707                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
    17081704                                INSTALL_PATH = /usr/local/bin;
    17091705                                PRODUCT_NAME = TAppRenderer;
     
    17141710                        isa = XCBuildConfiguration;
    17151711                        buildSettings = {
    1716                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
    17171712                                INSTALL_PATH = /usr/local/bin;
    17181713                                PRODUCT_NAME = TAppRenderer;
     
    17231718                        isa = XCBuildConfiguration;
    17241719                        buildSettings = {
    1725                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
     1720                                COMBINE_HIDPI_IMAGES = YES;
    17261721                                INSTALL_PATH = /usr/local/lib;
    17271722                                PRODUCT_NAME = TAppCommon;
     
    17321727                        isa = XCBuildConfiguration;
    17331728                        buildSettings = {
    1734                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
     1729                                COMBINE_HIDPI_IMAGES = YES;
    17351730                                INSTALL_PATH = /usr/local/lib;
    17361731                                PRODUCT_NAME = TAppCommon;
     
    17411736                        isa = XCBuildConfiguration;
    17421737                        buildSettings = {
    1743                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
    17441738                                PRODUCT_NAME = "$(TARGET_NAME)";
    17451739                        };
     
    17491743                        isa = XCBuildConfiguration;
    17501744                        buildSettings = {
    1751                                 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
    17521745                                PRODUCT_NAME = "$(TARGET_NAME)";
    17531746                        };
  • branches/HTM-14.1-update-dev3/source/App/TAppEncoder/TAppEncCfg.cpp

    r1200 r1270  
    22872287
    22882288  dimBitOffset[ 0 ] = 0;
    2289   for (Int j = 1; j <= ((Int) m_dimIds.size() - m_splittingFlag ? 1 : 0); j++ )
     2289  for (Int j = 1; j <= (((Int) m_dimIds.size() - m_splittingFlag) ? 1 : 0); j++ )
    22902290  {
    22912291    dimBitOffset[ j ] = dimBitOffset[ j - 1 ] + m_dimensionIdLen[ j - 1];
  • branches/HTM-14.1-update-dev3/source/App/TAppRenderer/TAppRendererCfg.cpp

    r1200 r1270  
    306306
    307307  Int iNumNonNULL;
    308   for (iNumNonNULL = 0; (iNumNonNULL < m_iNumberOfInputViews)  && m_pchDepthInputFileList[iNumNonNULL]; iNumNonNULL++);  xConfirmPara( iNumNonNULL < m_iNumberOfInputViews,  "Number of DepthInputFiles  must be greater than or equal to number of BaseViewNumbers" );
    309   for (iNumNonNULL = 0; (iNumNonNULL < m_iNumberOfInputViews)  && m_pchVideoInputFileList[iNumNonNULL]; iNumNonNULL++);  xConfirmPara( iNumNonNULL < m_iNumberOfInputViews,  "Number of DepthInputFiles  must be greater than or equal to number of BaseViewNumbers" );
     308  for (iNumNonNULL = 0; (iNumNonNULL < m_iNumberOfInputViews)  && m_pchDepthInputFileList[iNumNonNULL]; iNumNonNULL++) {};  xConfirmPara( iNumNonNULL < m_iNumberOfInputViews,  "Number of DepthInputFiles  must be greater than or equal to number of BaseViewNumbers" );
     309  for (iNumNonNULL = 0; (iNumNonNULL < m_iNumberOfInputViews)  && m_pchVideoInputFileList[iNumNonNULL]; iNumNonNULL++) {};  xConfirmPara( iNumNonNULL < m_iNumberOfInputViews,  "Number of DepthInputFiles  must be greater than or equal to number of BaseViewNumbers" );
    310310
    311311
    312312  if ( !m_bSweep )
    313313  {
    314   for (iNumNonNULL = 0; (iNumNonNULL < m_iNumberOfOutputViews) && m_pchSynthOutputFileList[iNumNonNULL]; iNumNonNULL++); xConfirmPara( iNumNonNULL < m_iNumberOfOutputViews, "Number of SynthOutputFiles must be greater than or equal to number of SynthViewNumbers" );
     314    for (iNumNonNULL = 0; (iNumNonNULL < m_iNumberOfOutputViews) && m_pchSynthOutputFileList[iNumNonNULL]; iNumNonNULL++) {}; xConfirmPara( iNumNonNULL < m_iNumberOfOutputViews, "Number of SynthOutputFiles must be greater than or equal to number of SynthViewNumbers" );
    315315  }
    316316  else
  • branches/HTM-14.1-update-dev3/source/Lib/TAppCommon/TAppComCamPara.cpp

    r1200 r1270  
    13731373  Int  iSourceViewNum = m_aiBaseViews[ iViewIdx ];
    13741374  Double dBaseLine = 0.0;
    1375   Double dFL1, dCS1, dCP1, dZN1, dZF1;
    1376   Bool bInterpolated;
    1377   double dPos[3];
     1375  Double dFL1 = 1.0, dCS1 = 1.0, dCP1 = 1.0, dZN1 = 1.0, dZF1 = 1.0;
     1376  Bool bInterpolated = false;
     1377  double dPos[3] = {0.0, 0.0, 0.0};
    13781378
    13791379  if( m_iNumberOfBaseViews == 3 )
  • branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/CommonDef.h

    r1233 r1270  
    363363#endif
    364364
    365 #if NH_3D_MLC
     365#if NH_3D_MLC  || NH_3D_ARP
    366366#define MRG_MAX_NUM_CANDS_MEM       (MRG_MAX_NUM_CANDS+1) // one extra for inter-view motion prediction
    367367#endif
  • branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/ContextTables.h

    r1200 r1270  
    162162#define NUM_CU_TRANSQUANT_BYPASS_FLAG_CTX  1
    163163
    164 #if H_3D_ARP
     164#if NH_3D_ARP
    165165#define NUM_ARPW_CTX                  3       ///< number of context models for weighting factor index used by advanced residual prediction
    166166#endif
     
    188188#define NUM_SDC_FLAG_CTX              1      ///< number of context
    189189#endif
    190 #if H_3D_DBBP
     190#if NH_3D_DBBP
    191191#define DBBP_NUM_FLAG_CTX                 1
    192192#endif
     
    542542//! \}
    543543
    544 #if H_3D_ARP
     544#if NH_3D_ARP
    545545static const UChar
    546546INIT_ARPW[3][NUM_ARPW_CTX] =
     
    629629#endif
    630630
    631 #if H_3D_DBBP
     631#if NH_3D_DBBP
    632632static const UChar INIT_DBBP_FLAG[3][DBBP_NUM_FLAG_CTX] =
    633633{
  • branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComCodingStatistics.h

    r1200 r1270  
    8181  STATS__CABAC_BITS__ESCAPE_BITS,
    8282
     83#if NH_3D_DBBP
     84  STATS__CABAC_BITS__DBBP_FLAG,
     85#endif
     86#if NH_3D_ARP
     87  STATS__CABAC_BITS__ARP_FLAG,
     88#endif
    8389  STATS__CABAC_BITS__SAO,
    8490  STATS__CABAC_TRM_BITS,
     
    131137    "CABAC_BITS__SIGN_BIT",
    132138    "CABAC_BITS__ESCAPE_BITS",
     139#if NH_3D_DBBP
     140    "CABAC_BITS__DBBP_FLAG",
     141#endif
    133142    "CABAC_BITS__SAO",
    134143    "CABAC_TRM_BITS",
  • branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComDataCU.cpp

    r1268 r1270  
    134134  m_pbSPIVMPFlag         = NULL;
    135135#endif
    136 #if H_3D_ARP
     136#if NH_3D_ARP
    137137  m_puhARPW              = NULL;
    138138#endif
     
    142142#if H_3D_INTER_SDC
    143143#endif
    144 #if H_3D_DBBP
     144#if NH_3D_DBBP
    145145  m_pbDBBPFlag         = NULL;
    146146#endif
     
    249249    }
    250250
    251 #if H_3D_ARP
    252     m_puhARPW            = new UChar[ uiNumPartition];
     251#if NH_3D_ARP
     252    m_puhARPW            = (UChar*  )xMalloc(UChar,   uiNumPartition);
    253253#endif
    254254#if H_3D_IC
     
    273273#endif
    274274#endif
    275 #if H_3D_DBBP
     275#if NH_3D_DBBP
    276276    m_pbDBBPFlag         = (Bool*  )xMalloc(Bool,   uiNumPartition);
    277277#endif
     
    472472
    473473
    474 #if H_3D_ARP
    475     if ( m_puhARPW            ) { delete[] m_puhARPW;           m_puhARPW           = NULL; }
     474#if NH_3D_ARP
     475    if ( m_puhARPW            ) { xFree(m_puhARPW);             m_puhARPW           = NULL; }
    476476#endif
    477477#if H_3D_IC
     
    497497#endif   
    498498#endif   
    499 #if H_3D_DBBP
     499#if NH_3D_DBBP
    500500    if ( m_pbDBBPFlag         ) { xFree(m_pbDBBPFlag);          m_pbDBBPFlag        = NULL; }
    501501#endif
     
    602602  memset( m_puhHeight         , maxCUHeight,                m_uiNumPartition * sizeof( *m_puhHeight ) );
    603603
    604 #if H_3D_ARP
    605     m_puhARPW   [ui] = pcFrom->getARPW( ui );
    606 #endif
    607604#if H_3D_IC
    608605    m_pbICFlag[ui]   =  pcFrom->m_pbICFlag[ui];
     
    636633    m_pbSDCFlag[ui] = pcFrom->m_pbSDCFlag[ui];
    637634#endif
    638 #if H_3D_DBBP
    639     m_pbDBBPFlag[ui] = pcFrom->m_pbDBBPFlag[ui];
     635#if NH_3D_DBBP
     636  memset( m_pbDBBPFlag , false, m_uiNumPartition * sizeof( *m_pbDBBPFlag ));
    640637#endif
    641638#if H_3D
     
    649646  }
    650647
    651 #if H_3D_ARP
    652     memset( m_puhARPW           + firstElement, 0,                        numElements * sizeof( UChar )         );
     648#if NH_3D_ARP
     649  memset( m_puhARPW      ,      0,        m_uiNumPartition * sizeof( *m_puhARPW )         );
    653650#endif
    654651#if H_3D_IC
     
    676673    m_apDmmPredictor[0] = 0;
    677674    m_apDmmPredictor[1] = 0;
    678 #endif
    679 #if H_3D_DBBP
    680     memset( m_pbDBBPFlag        + firstElement, false,                    numElements * sizeof( *m_pbDBBPFlag ) );
    681675#endif
    682676
     
    810804      m_puhCbf[comp][ui] = 0;
    811805    }
    812 #if H_3D_ARP
     806#if NH_3D_ARP
    813807      m_puhARPW[ui] = 0;
    814808#endif
     
    838832      m_apDmmPredictor[1] = 0;
    839833#endif
    840 #if H_3D_DBBP
     834#if NH_3D_DBBP
    841835      m_pbDBBPFlag[ui] = false;
    842836#endif
     
    916910    memset( m_explicitRdpcmMode[comp],             NUMBER_OF_RDPCM_MODES, iSizeInUchar );
    917911  }
    918 #if H_3D_ARP
    919   memset( m_puhARPW,            0, iSizeInUchar  );
    920 #endif
    921912
    922913  memset( m_puhDepth,     uiDepth, iSizeInUchar );
     
    924915  memset( m_puhHeight,         uhHeight, iSizeInUchar );
    925916  memset( m_pbIPCMFlag,        0, iSizeInBool  );
     917#if NH_3D_ARP
     918  memset( m_puhARPW,           0, iSizeInUchar  );
     919#endif
    926920#if H_3D_IC
    927921  memset( m_pbICFlag,          0, iSizeInBool  );
     
    947941  m_apDmmPredictor[1] = 0;
    948942#endif
    949 #if H_3D_DBBP
    950   memset( m_pbDBBPFlag,         0, iSizeInBool  );
     943#if NH_3D_DBBP
     944  memset( m_pbDBBPFlag,         0, sizeof(Bool) * m_uiNumPartition  );
    951945#endif
    952946
     
    981975    m_pbSPIVMPFlag[ui]=pcCU->m_pbSPIVMPFlag[uiPartOffset+ui];
    982976#endif
    983 #if H_3D_ARP
     977#if NH_3D_ARP
    984978      m_puhARPW           [ui] = pcCU->getARPW( uiPartOffset+ui );
    985979#endif
     
    1005999#endif
    10061000#endif
    1007 #if H_3D_DBBP
     1001#if NH_3D_DBBP
    10081002      m_pbDBBPFlag[ui]=pcCU->m_pbDBBPFlag[uiPartOffset+ui];
    10091003#endif
     
    10881082  m_pbSPIVMPFlag        = pcCU->getSPIVMPFlag()          + uiPart;
    10891083#endif
    1090 #if H_3D_ARP
     1084#if NH_3D_ARP
    10911085  m_puhARPW             = pcCU->getARPW()             + uiPart;
    10921086#endif
     
    11281122#endif 
    11291123#endif 
    1130 #if H_3D_DBBP
     1124#if NH_3D_DBBP
    11311125  m_pbDBBPFlag              = pcCU->getDBBPFlag()         + uiPart;
    11321126#endif
     
    12461240  m_apiMVPIdx[eRefPicList] = pcCU->getMVPIdx(eRefPicList) + uiAbsPartIdx;
    12471241  m_apiMVPNum[eRefPicList] = pcCU->getMVPNum(eRefPicList) + uiAbsPartIdx;
    1248 #if H_3D_ARP
     1242#if NH_3D_ARP
    12491243  m_puhARPW            = pcCU->getARPW()                  + uiAbsPartIdx;
    12501244#endif   
    1251 #if H_3D_DBBP
     1245#if NH_3D_DBBP
    12521246  m_pbDBBPFlag       = pcCU->getDBBPFlag()              + uiAbsPartIdx;
    12531247#endif
     
    12981292  memcpy( m_pDvInfo             + uiOffset, pcCU->getDvInfo(),            sizeof( *m_pDvInfo ) * uiNumPartition );
    12991293#endif
    1300 #if NH_3D_SPIVMP
     1294#if NH_3D_SPIVMP  || NH_3D_DBBP
    13011295  memcpy( m_pbSPIVMPFlag        + uiOffset, pcCU->getSPIVMPFlag(),        sizeof( Bool ) * uiNumPartition );
    13021296#endif
     
    13351329#endif
    13361330#endif
    1337 #if H_3D_DBBP
     1331#if NH_3D_DBBP
    13381332  memcpy( m_pbDBBPFlag          + uiOffset, pcCU->getDBBPFlag(),          iSizeInBool  );
     1333#endif
     1334#if NH_3D_ARP
     1335  memcpy( m_puhARPW             + uiOffset, pcCU->getARPW(),              iSizeInUchar );
    13391336#endif
    13401337
     
    13781375  }
    13791376
    1380 #if H_3D_ARP
    1381   memcpy( m_puhARPW             + uiOffset, pcCU->getARPW(),              iSizeInUchar );
    1382 #endif
    13831377#if H_3D_IC
    13841378  memcpy( m_pbICFlag            + uiOffset, pcCU->getICFlag(),            iSizeInBool );
     
    14241418  memcpy( pCtu->getVSPFlag()           + m_absZIdxInCtu, m_piVSPFlag,           sizeof( Char ) * m_uiNumPartition );
    14251419#endif
     1420#if NH_3D_DBBP
     1421  memcpy( pCtu->getDvInfo()            + m_absZIdxInCtu, m_pDvInfo,             sizeof( *m_pDvInfo ) * m_uiNumPartition );
     1422#endif
    14261423#if NH_3D_SPIVMP
    14271424  memcpy( pCtu->getSPIVMPFlag()        + m_absZIdxInCtu, m_pbSPIVMPFlag,        sizeof( Bool ) * m_uiNumPartition );
     
    14621459#endif
    14631460#endif
    1464 #if H_3D_DBBP
    1465   memcpy( rpcCU->getDBBPFlag()          + m_uiAbsIdxInLCU, m_pbDBBPFlag,          iSizeInBool  );
     1461#if NH_3D_DBBP
     1462  memcpy( pCtu->getDBBPFlag()          + m_absZIdxInCtu, m_pbDBBPFlag,          iSizeInBool  );
     1463#endif
     1464#if NH_3D_ARP
     1465  memcpy( pCtu->getARPW()              + m_absZIdxInCtu, m_puhARPW,             iSizeInUchar );
    14661466#endif
    14671467
     
    14981498  }
    14991499
    1500 #if H_3D_ARP
    1501   memcpy( rpcCU->getARPW()             + m_uiAbsIdxInLCU, m_puhARPW,             iSizeInUchar );
    1502 #endif
    15031500#if H_3D_IC
    15041501  memcpy( rpcCU->getICFlag()           + m_uiAbsIdxInLCU, m_pbICFlag,            iSizeInBool );
     
    15331530  memcpy( rpcCU->getSDCSegmentDCOffset(1) + uiPartOffset, m_apSegmentDCOffset[1], sizeof( Pel ) * uiQNumPart);
    15341531#endif
    1535 #endif
    1536 #if H_3D_DBBP
    1537   memcpy( rpcCU->getDBBPFlag()          + uiPartOffset, m_pbDBBPFlag,          iSizeInBool  );
    1538 #endif
    1539 #if H_3D_ARP
    1540   memcpy( rpcCU->getARPW()             + uiPartOffset, m_puhARPW,             iSizeInUchar );
    15411532#endif
    15421533#if H_3D_IC
     
    20942085  return uiCtx;
    20952086}
    2096 #if H_3D_ARP
     2087#if NH_3D_ARP
    20972088UInt TComDataCU::getCTXARPWFlag( UInt uiAbsPartIdx )
    20982089{
     
    21012092  UInt        uiCtx = 0;
    21022093 
    2103   pcTempCU = getPULeft( uiTempPartIdx, m_uiAbsIdxInLCU + uiAbsPartIdx );
     2094  pcTempCU = getPULeft( uiTempPartIdx, m_absZIdxInCtu + uiAbsPartIdx );
    21042095  uiCtx    = ( pcTempCU ) ? ((pcTempCU->getARPW( uiTempPartIdx )==0)?0:1) : 0;
    21052096    return uiCtx;
    21062097}
    21072098#endif
    2108 #if H_3D_DBBP
     2099#if NH_3D_DBBP
    21092100Pel* TComDataCU::getVirtualDepthBlock(UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight, UInt& uiDepthStride)
    21102101{
     2102  const TComSPS* sps = getSlice()->getSPS();
     2103  UInt uiMaxCUWidth = sps->getMaxCUWidth();
     2104  UInt uiMaxCUHeight = sps->getMaxCUHeight();
     2105 
    21112106  // get coded and reconstructed depth view
    21122107  TComPicYuv* depthPicYuv = NULL;
     
    21142109 
    21152110  // DBBP is a texture coding tool
    2116   if( getSlice()->getIsDepth() )
    2117   {
    2118     return NULL;
    2119   } 
     2111  assert( !getSlice()->getIsDepth() );
     2112 
    21202113#if H_3D_FCO
    21212114  TComPic* depthPic = getSlice()->getIvPic(true, getSlice()->getViewIndex() );
     
    21442137    depthPicYuv   = baseDepthPic->getPicYuvRec();
    21452138    depthPicYuv->extendPicBorder();
    2146     uiDepthStride = depthPicYuv->getStride();
     2139    uiDepthStride = depthPicYuv->getStride(COMPONENT_Y);
    21472140   
    2148     Int iBlkX = ( getAddr() % baseDepthPic->getFrameWidthInCU() ) * g_uiMaxCUWidth  + g_auiRasterToPelX[ g_auiZscanToRaster[ getZorderIdxInCU()+uiAbsPartIdx ] ];
    2149     Int iBlkY = ( getAddr() / baseDepthPic->getFrameWidthInCU() ) * g_uiMaxCUHeight + g_auiRasterToPelY[ g_auiZscanToRaster[ getZorderIdxInCU()+uiAbsPartIdx ] ];
     2141    Int iBlkX = ( getCtuRsAddr() % baseDepthPic->getFrameWidthInCtus() ) * uiMaxCUWidth  + g_auiRasterToPelX[ g_auiZscanToRaster[ getZorderIdxInCtu()+uiAbsPartIdx ] ];
     2142    Int iBlkY = ( getCtuRsAddr() / baseDepthPic->getFrameWidthInCtus() ) * uiMaxCUHeight + g_auiRasterToPelY[ g_auiZscanToRaster[ getZorderIdxInCtu()+uiAbsPartIdx ] ];
    21502143   
    2151     Int iPictureWidth  = depthPicYuv->getWidth();
    2152     Int iPictureHeight = depthPicYuv->getHeight();
     2144    Int iPictureWidth  = depthPicYuv->getWidth(COMPONENT_Y);
     2145    Int iPictureHeight = depthPicYuv->getHeight(COMPONENT_Y);
    21532146   
    21542147   
     
    21672160    Int depthPosY = Clip3(0,   iPictureHeight - 1, iBlkY + ((cDv.getVer()+2)>>2));
    21682161   
    2169     pDepthPels = depthPicYuv->getLumaAddr() + depthPosX + depthPosY * uiDepthStride;
     2162    pDepthPels = depthPicYuv->getAddr(COMPONENT_Y) + depthPosX + depthPosY * uiDepthStride;
    21702163  }
    21712164#endif
     
    21792172#endif
    21802173
    2181 #if H_3D_DBBP
     2174#if NH_3D_DBBP
    21822175Void TComDataCU::setDBBPFlagSubParts ( Bool bDBBPFlag, UInt uiAbsPartIdx, UInt uiPartIdx, UInt uiDepth )
    21832176{
     
    27232716
    27242717// This is for use by a leaf/sub CU object only, with no additional AbsPartIdx
    2725 #if H_3D_IC | NH_3D_VSP
     2718#if H_3D_IC || NH_3D_VSP
    27262719Void TComDataCU::getPartIndexAndSize( UInt uiPartIdx, UInt& ruiPartAddr, Int& riWidth, Int& riHeight, UInt uiAbsPartIdx, Bool bLCU)
    27272720{
     
    33383331  Bool bICFlag = getICFlag(uiAbsPartIdx);
    33393332#endif
    3340 #if H_3D_ARP
     3333#if NH_3D_ARP
    33413334  Bool bARPFlag = getARPW(uiAbsPartIdx) > 0;
    33423335#endif
    3343 #if H_3D_DBBP
     3336#if NH_3D_DBBP
    33443337  Bool bDBBPFlag = getDBBPFlag(uiAbsPartIdx);
    33453338  assert(bDBBPFlag == getDBBPFlag(0)); 
     
    33753368      && !bICFlag
    33763369#endif
    3377 #if H_3D_ARP
     3370#if NH_3D_ARP
    33783371      && !bARPFlag
    33793372#endif
    3380 #if H_3D_DBBP
     3373#if NH_3D_DBBP
    33813374      && !bDBBPFlag
    33823375#endif
     
    37073700        spiMvpFlag = true;
    37083701      }
    3709 #if H_3D_DBBP
     3702#if NH_3D_DBBP
    37103703      spiMvpFlag &= !bDBBPFlag;
    37113704#endif
     
    37413734      !bICFlag &&
    37423735#endif
    3743 #if H_3D_ARP
     3736#if NH_3D_ARP
    37443737      !bARPFlag &&
    37453738#endif
     
    37473740      (nPSW + nPSH > 12) &&
    37483741#endif
    3749 #if H_3D_DBBP
     3742#if NH_3D_DBBP
    37503743      !bDBBPFlag &&
    37513744#endif
     
    44764469  UInt partAddr;
    44774470
    4478 #if H_3D_DBBP
     4471#if NH_3D_DBBP
    44794472  if( getDBBPFlag(0) )
    44804473  {
     
    54795472#if NH_3D_VSP // bug fix
    54805473  UInt uiCurrPartNumb = m_pcPic->getNumPartitionsInCtu() >> (uiDepth << 1);
     5474  assert(m_pcPic->getNumPartitionsInCtu() ==m_pcPic->getNumPartInCtuWidth()*m_pcPic->getNumPartInCtuHeight());
     5475
    54815476#else
    54825477  UInt uiCurrPartNumb = m_pcPic->getNumPartInCtuWidth() >> (uiDepth << 1);
     
    54875482  }
    54885483}
    5489 #if NH_3D_VSP
     5484#if NH_3D_VSP  || NH_3D_DBBP
    54905485Void TComDataCU::setDvInfoSubParts( DisInfo cDvInfo, UInt uiAbsPartIdx, UInt uiPUIdx, UInt uiDepth )
    54915486{
     
    60376032}
    60386033#endif
    6039 #if H_3D_ARP
     6034#if NH_3D_ARP
    60406035Void TComDataCU::setARPWSubParts ( UChar w, UInt uiAbsPartIdx, UInt uiDepth )
    60416036{
    6042   assert( sizeof( *m_puhARPW) == 1 );
    6043   memset( m_puhARPW + uiAbsPartIdx, w, m_pcPic->getNumPartInCU() >> ( 2 * uiDepth ) );
     6037  setSubPart<UChar>( w, m_puhARPW, uiAbsPartIdx, uiDepth, 0 );
    60446038}
    60456039#endif
  • branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComDataCU.h

    r1259 r1270  
    5050#include "TComPattern.h"
    5151
    52 #if H_3D_ARP
    53 #include "TComYuv.h"
    54 #endif
    5552#if H_3D
    5653#include <algorithm>
     
    6562static const UInt NUM_MOST_PROBABLE_MODES=3;
    6663
    67 #if H_3D_DBBP
     64#if NH_3D_DBBP
    6865typedef struct _DBBPTmpData
    6966{
     
    176173  Bool*         m_pbSPIVMPFlag;       ///< array of sub-PU IVMP flags to indicate whehter a block uses sub-PU IVMP ///< 0: non-SPIVMP; 1: SPIVMP
    177174#endif
    178 #if H_3D_ARP
     175#if NH_3D_ARP
    179176  UChar*        m_puhARPW;
    180177#endif
     
    193190#endif
    194191#endif
    195 #if H_3D_DBBP
     192#if NH_3D_DBBP
    196193  Bool*         m_pbDBBPFlag;        ///< array of DBBP flags
    197194  DbbpTmpData   m_sDBBPTmpData;
     
    249246
    250247  /// compute scaling factor from POC difference
    251 #if !H_3D_ARP
     248#if !NH_3D_ARP
    252249  Int           xGetDistScaleFactor   ( Int iCurrPOC, Int iCurrRefPOC, Int iColPOC, Int iColRefPOC );
    253250#endif
     
    266263  // create / destroy / initialize / copy
    267264  // -------------------------------------------------------------------------------------------------------------------
    268 #if H_3D_ARP
     265#if NH_3D_ARP
     266  /// compute scaling factor from POC difference
    269267  Int           xGetDistScaleFactor   ( Int iCurrPOC, Int iCurrRefPOC, Int iColPOC, Int iColRefPOC );
    270268#endif
     
    317315#endif
    318316
     317#if NH_3D_ARP
     318  Void          setSlice              ( TComSlice* pcSlice)     { m_pcSlice = pcSlice;       }
     319  Void          setPic                ( TComDataCU* pcCU  )     { m_pcPic              = pcCU->getPic(); }
     320#endif
    319321  // -------------------------------------------------------------------------------------------------------------------
    320322  // member functions for CU data
     
    327329  Void          setCUTransquantBypassSubParts( Bool flag, UInt uiAbsPartIdx, UInt uiDepth );
    328330
    329 #if H_3D_DBBP
     331#if NH_3D_DBBP
    330332  Pel*          getVirtualDepthBlock(UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight, UInt& uiDepthStride);
    331333#endif
     
    351353  Void          setPredModeSubParts   ( PredMode eMode, UInt uiAbsPartIdx, UInt uiDepth );
    352354
    353 #if H_3D_DBBP
     355#if NH_3D_DBBP
    354356  Bool*         getDBBPFlag           ()                        { return m_pbDBBPFlag;               }
    355357  Bool          getDBBPFlag           ( UInt uiIdx )            { return m_pbDBBPFlag[uiIdx];        }
     
    452454  template <typename T>
    453455  Void          setSubPart            ( T bParameter, T* pbBaseCtu, UInt uiCUAddr, UInt uiCUDepth, UInt uiPUIdx );
    454 #if NH_3D_VSP
     456#if H_3D_VSP || NH_3D_DBBP
    455457  template<typename T>
    456458  Void          setSubPartT           ( T uiParameter, T* puhBaseLCU, UInt uiCUAddr, UInt uiCUDepth, UInt uiPUIdx );
     
    480482#if NH_3D_NBDV
    481483  Void          setDvInfoSubParts     ( DisInfo cDvInfo, UInt uiAbsPartIdx, UInt uiDepth );
     484#if H_3D_VSP || NH_3D_DBBP
    482485  Void          setDvInfoSubParts     ( DisInfo cDvInfo, UInt uiAbsPartIdx, UInt uiPartIdx, UInt uiDepth);
     486#endif
    483487  DisInfo*      getDvInfo             ()                        { return m_pDvInfo;                 }
    484488  DisInfo       getDvInfo             (UInt uiIdx)              { return m_pDvInfo[uiIdx];          }
     
    531535    );   
    532536#endif
    533 #if H_3D_ARP
     537#if NH_3D_ARP
    534538  UChar*        getARPW            ()                        { return m_puhARPW;               }
    535539  UChar         getARPW            ( UInt uiIdx )            { return m_puhARPW[uiIdx];        }
    536540  Void          setARPW            ( UInt uiIdx, UChar w )   { m_puhARPW[uiIdx] = w;           }
    537541  Void          setARPWSubParts    ( UChar w, UInt uiAbsPartIdx, UInt uiDepth );
    538   Double        getARPWFactor      ( UInt uiIdx );
    539542#endif
    540543#if H_3D_IC
     
    730733  UInt          getCtxSkipFlag                  ( UInt   uiAbsPartIdx                                 );
    731734  UInt          getCtxInterDir                  ( UInt   uiAbsPartIdx                                 );
    732 #if H_3D_ARP
     735#if NH_3D_ARP
    733736  UInt          getCTXARPWFlag                  ( UInt   uiAbsPartIdx                                 );
    734737#endif 
  • branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComInterpolationFilter.cpp

    r1200 r1270  
    7575};
    7676
    77 #if H_3D_ARP
     77#if NH_3D_ARP
    7878const Short TComInterpolationFilter::m_lumaFilterARP[4][NTAPS_LUMA_ARP] =
    7979{
     
    361361 */
    362362Void TComInterpolationFilter::filterHor(const ComponentID compID, Pel *src, Int srcStride, Pel *dst, Int dstStride, Int width, Int height, Int frac, Bool isLast, const ChromaFormat fmt, const Int bitDepth
    363 #if H_3D_ARP
     363#if NH_3D_ARP
    364364    , Bool filterType
    365365#endif
     
    372372  else if (isLuma(compID))
    373373  {
    374 #if H_3D_ARP
     374    assert(frac >= 0 && frac < LUMA_INTERPOLATION_FILTER_SUB_SAMPLE_POSITIONS);
     375#if NH_3D_ARP
    375376    if(filterType)
    376377    {
    377       filterHor<NTAPS_LUMA_ARP>(g_bitDepthY, src, srcStride, dst, dstStride, width, height, isLast, m_lumaFilterARP[frac]);
     378      filterHor<NTAPS_LUMA_ARP>(bitDepth, src, srcStride, dst, dstStride, width, height, isLast, m_lumaFilterARP[frac]);
    378379    }
    379380    else
    380381    {
    381382#endif
    382 
    383     assert(frac >= 0 && frac < LUMA_INTERPOLATION_FILTER_SUB_SAMPLE_POSITIONS);
    384383    filterHor<NTAPS_LUMA>(bitDepth, src, srcStride, dst, dstStride, width, height, isLast, m_lumaFilter[frac]);
    385 #if H_3D_ARP
     384#if NH_3D_ARP
    386385    }
    387386#endif
     
    392391    const UInt csx = getComponentScaleX(compID, fmt);
    393392    assert(frac >=0 && csx<2 && (frac<<(1-csx)) < CHROMA_INTERPOLATION_FILTER_SUB_SAMPLE_POSITIONS);
     393#if NH_3D_ARP
     394    if(filterType)
     395    {
     396      filterHor<NTAPS_CHROMA_ARP>(bitDepth, src, srcStride, dst, dstStride, width, height, isLast, m_chromaFilterARP[frac]);
     397    }
     398    else
     399    {
     400#endif
    394401    filterHor<NTAPS_CHROMA>(bitDepth, src, srcStride, dst, dstStride, width, height, isLast, m_chromaFilter[frac<<(1-csx)]);
     402#if NH_3D_ARP
     403    }
     404#endif
    395405  }
    396406}
     
    414424 */
    415425Void TComInterpolationFilter::filterVer(const ComponentID compID, Pel *src, Int srcStride, Pel *dst, Int dstStride, Int width, Int height, Int frac, Bool isFirst, Bool isLast, const ChromaFormat fmt, const Int bitDepth
    416 #if H_3D_ARP
     426#if NH_3D_ARP
    417427    , Bool filterType
    418428#endif
     
    425435  else if (isLuma(compID))
    426436  {
    427 #if H_3D_ARP
     437    assert(frac >= 0 && frac < LUMA_INTERPOLATION_FILTER_SUB_SAMPLE_POSITIONS);
     438#if NH_3D_ARP
    428439    if(filterType)
    429440    {
    430       filterVer<NTAPS_LUMA_ARP>(g_bitDepthY, src, srcStride, dst, dstStride, width, height, isFirst, isLast, m_lumaFilterARP[frac]);   
     441      filterVer<NTAPS_LUMA_ARP>(bitDepth, src, srcStride, dst, dstStride, width, height, isFirst, isLast, m_lumaFilterARP[frac]);   
    431442    }
    432443    else
    433444    {
    434445#endif
    435     assert(frac >= 0 && frac < LUMA_INTERPOLATION_FILTER_SUB_SAMPLE_POSITIONS);
    436446    filterVer<NTAPS_LUMA>(bitDepth, src, srcStride, dst, dstStride, width, height, isFirst, isLast, m_lumaFilter[frac]);
    437 #if H_3D_ARP
     447#if NH_3D_ARP
    438448    }
    439449#endif
     
    444454    const UInt csy = getComponentScaleY(compID, fmt);
    445455    assert(frac >=0 && csy<2 && (frac<<(1-csy)) < CHROMA_INTERPOLATION_FILTER_SUB_SAMPLE_POSITIONS);
     456#if NH_3D_ARP
     457    if(filterType)
     458    {
     459      filterVer<NTAPS_CHROMA_ARP>(bitDepth, src, srcStride, dst, dstStride, width, height, isFirst, isLast, m_chromaFilterARP[frac]);   
     460    }
     461    else
     462    {
     463#endif
    446464    filterVer<NTAPS_CHROMA>(bitDepth, src, srcStride, dst, dstStride, width, height, isFirst, isLast, m_chromaFilter[frac<<(1-csy)]);
    447   }
    448 }
    449 
    450 #if H_3D_ARP
    451     , Bool filterType
    452 #endif
    453 
    454 #if H_3D_ARP
    455     if(filterType)
    456     {
    457       filterHor<NTAPS_CHROMA_ARP>(g_bitDepthC, src, srcStride, dst, dstStride, width, height, isLast, m_chromaFilterARP[frac]);
    458     }
    459     else
    460     {
    461 #endif
    462 #if H_3D_ARP
    463     }
    464 #endif
    465 #if H_3D_ARP
    466     , Bool filterType
    467 #endif
    468 #if H_3D_ARP
    469     if(filterType)
    470     {
    471       filterVer<NTAPS_CHROMA_ARP>(g_bitDepthC, src, srcStride, dst, dstStride, width, height, isFirst, isLast, m_chromaFilterARP[frac]);
    472     }
    473     else
    474     {
    475 #endif
    476 #if H_3D_ARP
    477     }
    478 #endif
    479 
    480 
    481 
     465#if NH_3D_ARP
     466    }
     467#endif
     468    }
     469    }
    482470//! \}
  • branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComInterpolationFilter.h

    r1200 r1270  
    4545//! \{
    4646
    47 #if H_3D_ARP
     47#if NH_3D_ARP
    4848#define NTAPS_LUMA_ARP    2 ///< Number of taps for luma
    4949#define NTAPS_CHROMA_ARP  2 ///< Number of taps for chroma
     
    6363  static const TFilterCoeff m_lumaFilter[LUMA_INTERPOLATION_FILTER_SUB_SAMPLE_POSITIONS][NTAPS_LUMA];     ///< Luma filter taps
    6464  static const TFilterCoeff m_chromaFilter[CHROMA_INTERPOLATION_FILTER_SUB_SAMPLE_POSITIONS][NTAPS_CHROMA]; ///< Chroma filter taps
    65 #if H_3D_ARP
     65#if NH_3D_ARP
    6666  static const Short m_lumaFilterARP  [4][NTAPS_LUMA_ARP];     ///< Luma filter taps for ARP
    6767  static const Short m_chromaFilterARP[8][NTAPS_CHROMA_ARP];   ///< Chroma filter taps for ARP
     
    8383
    8484  Void filterHor(const ComponentID compID, Pel *src, Int srcStride, Pel *dst, Int dstStride, Int width, Int height, Int frac,               Bool isLast, const ChromaFormat fmt, const Int bitDepth
    85 #if H_3D_ARP
     85#if NH_3D_ARP
    8686    , Bool filterType = false
    8787#endif
    8888);
    8989  Void filterVer(const ComponentID compID, Pel *src, Int srcStride, Pel *dst, Int dstStride, Int width, Int height, Int frac, Bool isFirst, Bool isLast, const ChromaFormat fmt, const Int bitDepth
    90 #if H_3D_ARP
     90#if NH_3D_ARP
    9191    , Bool filterType = false
    9292#endif
     
    9494};
    9595
    96 #if H_3D_ARP
    97     , Bool filterType = false
    98 #endif
    99 #if H_3D_ARP
    100     , Bool filterType = false
    101 #endif
    102 
    10396//! \}
    10497
  • branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComPic.cpp

    r1210 r1270  
    143143}
    144144#if NH_3D
     145#if NH_3D_ARP
     146Void TComPic::getCUAddrAndPartIdx( Int iX, Int iY, Int& riCuAddr, Int& riAbsZorderIdx )
     147{
     148  Int iMaxCUWidth   = (Int) ( getPicSym()->getSPS().getMaxCUWidth()  );
     149  Int iMaxCuHeight  = (Int) ( getPicSym()->getSPS().getMaxCUHeight() );
     150
     151  UInt uiMaxTotalCUDepth = getPicSym()->getSPS().getMaxTotalCUDepth();
     152  Int iBaseUnitWidth  = iMaxCUWidth >> uiMaxTotalCUDepth;
     153  Int iBaseUnitHeight = iMaxCUWidth >> uiMaxTotalCUDepth;
     154
     155  Int iNumCuInWidth   = getPicYuvRec()->getWidth(COMPONENT_Y) / iMaxCUWidth;
     156  iNumCuInWidth      += ( getPicYuvRec()->getWidth(COMPONENT_Y) % iMaxCUWidth ) ? 1 : 0;
     157
     158
     159  Int iCuX            = iX / iMaxCUWidth;
     160  Int iCuY            = iY / iMaxCuHeight;
     161  Int iBaseX          = ( iX - iCuX * iMaxCUWidth  ) / iBaseUnitWidth;
     162  Int iBaseY          = ( iY - iCuY * iMaxCuHeight ) / iBaseUnitHeight;
     163  Int iCuSizeInBases  = iMaxCuHeight                 / iBaseUnitWidth;
     164
     165  riCuAddr            = iCuY   * iNumCuInWidth + iCuX;
     166  Int iRastPartIdx    = iBaseY * iCuSizeInBases  + iBaseX;
     167  riAbsZorderIdx      = g_auiRasterToZscan[ iRastPartIdx ];
     168}
     169#endif
    145170Void TComPic::compressMotion(Int scale)
    146171#else
     
    283308  return getPicYuv( layerIdInNuh, poc, recon );
    284309}
    285 #if H_3D_ARP
     310#if NH_3D_ARP
    286311TComList<TComPic*>* TComPicLists::getPicList( Int layerIdInNuh )
    287312{
  • branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComPic.h

    r1210 r1270  
    182182#endif
    183183#if NH_3D
     184#if NH_3D_ARP
     185  Void          getCUAddrAndPartIdx( Int iX, Int iY, Int& riCuAddr, Int& riAbsZorderIdx );
     186#endif
    184187  Void          compressMotion(Int scale);
    185188#else   
     
    248251  Void        push_back( TComList<TComPic*>* list ) { m_lists.push_back( list );   }
    249252  Int         size     ()                           { return (Int) m_lists.size(); }
    250 #if H_3D_ARP
     253#if NH_3D_ARP
    251254  TComList<TComPic*>*  getPicList   ( Int layerIdInNuh );
    252255#endif
  • branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComPicYuv.cpp

    r1259 r1270  
    321321  riAbsZorderIdx      = g_auiRasterToZscan[ iRastPartIdx ];
    322322}
     323
    323324#endif
    324325
  • branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComPrediction.cpp

    r1267 r1270  
    123123  m_cYuvPredTemp.destroy();
    124124
    125 #if H_3D_ARP
     125#if NH_3D_ARP
    126126  m_acYuvPredBase[0].destroy();
    127127  m_acYuvPredBase[1].destroy();
     
    182182
    183183    m_cYuvPredTemp.create( MAX_CU_SIZE, MAX_CU_SIZE, chromaFormatIDC );
    184 #if H_3D_ARP
    185     m_acYuvPredBase[0] .create( g_uiMaxCUWidth, g_uiMaxCUHeight );
    186     m_acYuvPredBase[1] .create( g_uiMaxCUWidth, g_uiMaxCUHeight );
     184#if NH_3D_ARP
     185    m_acYuvPredBase[0] .create( MAX_CU_SIZE, MAX_CU_SIZE, chromaFormatIDC );
     186    m_acYuvPredBase[1] .create( MAX_CU_SIZE, MAX_CU_SIZE, chromaFormatIDC );
    187187#endif
    188188#if NH_3D_VSP
     
    648648      Int RefPOCL0 = pcCU->getSlice()->getRefPic(REF_PIC_LIST_0, pcCU->getCUMvField(REF_PIC_LIST_0)->getRefIdx(PartAddr))->getPOC();
    649649      Int RefPOCL1 = pcCU->getSlice()->getRefPic(REF_PIC_LIST_1, pcCU->getCUMvField(REF_PIC_LIST_1)->getRefIdx(PartAddr))->getPOC();
    650 #if H_3D_ARP
     650#if NH_3D_ARP
    651651      if(!pcCU->getARPW(PartAddr) && RefPOCL0 == RefPOCL1 && pcCU->getCUMvField(REF_PIC_LIST_0)->getMv(PartAddr) == pcCU->getCUMvField(REF_PIC_LIST_1)->getMv(PartAddr))
    652652#else
     
    670670    pcCU->getSPAbsPartIdx(uiPartAddr, iSPWidth, iSPHeight, i, iNumSPInOneLine, uiSPAddr[i]);
    671671  }
    672 #if H_3D_ARP
     672#if H_3D_ARP // check this!
    673673  if( pcCU->getARPW( uiPartAddr ) != 0 )
    674674  {
     
    749749#endif
    750750
    751 #if H_3D_DBBP
     751#if NH_3D_DBBP
    752752PartSize TComPrediction::getPartitionSizeFromDepth(Pel* pDepthPels, UInt uiDepthStride, UInt uiSize, TComDataCU*& pcCU)
    753753{
     754  const TComSPS* sps = pcCU->getSlice()->getSPS();
     755  UInt uiMaxCUWidth = sps->getMaxCUWidth();
     756  UInt uiMaxCUHeight = sps->getMaxCUHeight();
     757 
    754758  // find virtual partitioning for this CU based on depth block
    755759  // segmentation of texture block --> mask IDs
     
    759763  Int iSumDepth = 0;
    760764  Int iSubSample = 4;
    761   Int iPictureWidth = pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getPicYuvRec()->getWidth();
    762   Int iPictureHeight = pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getPicYuvRec()->getHeight();
     765  Int iPictureWidth = pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getPicYuvRec()->getWidth(COMPONENT_Y);
     766  Int iPictureHeight = pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getPicYuvRec()->getHeight(COMPONENT_Y);
    763767  TComMv cDv = pcCU->getSlice()->getDepthRefinementFlag(  ) ? pcCU->getDvInfo(0).m_acDoNBDV : pcCU->getDvInfo(0).m_acNBDV;
    764768  if( pcCU->getSlice()->getDepthRefinementFlag(  ) )
     
    766770    cDv.setVer(0);
    767771  }
    768   Int iBlkX = ( pcCU->getAddr() % pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getFrameWidthInCU() ) * g_uiMaxCUWidth  + g_auiRasterToPelX[ g_auiZscanToRaster[ pcCU->getZorderIdxInCU() ] ]+ ((cDv.getHor()+2)>>2);
    769   Int iBlkY = ( pcCU->getAddr() / pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getFrameWidthInCU() ) * g_uiMaxCUHeight + g_auiRasterToPelY[ g_auiZscanToRaster[ pcCU->getZorderIdxInCU() ] ]+ ((cDv.getVer()+2)>>2);
     772  Int iBlkX = ( pcCU->getCtuRsAddr() % pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getFrameWidthInCtus() ) * uiMaxCUWidth  + g_auiRasterToPelX[ g_auiZscanToRaster[ pcCU->getZorderIdxInCtu() ] ]+ ((cDv.getHor()+2)>>2);
     773  Int iBlkY = ( pcCU->getCtuRsAddr() / pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getFrameWidthInCtus() ) * uiMaxCUHeight + g_auiRasterToPelY[ g_auiZscanToRaster[ pcCU->getZorderIdxInCtu() ] ]+ ((cDv.getVer()+2)>>2);
    770774 
    771775  UInt t=0;
     
    854858  }
    855859
    856   PartSize matchedPartSize = SIZE_NONE;
     860  PartSize matchedPartSize = NUMBER_OF_PART_SIZES;
    857861
    858862  Int iMaxMatchSum = 0;
     
    869873  }
    870874
    871   AOF( matchedPartSize != SIZE_NONE );
     875  AOF( matchedPartSize != NUMBER_OF_PART_SIZES );
    872876
    873877  return matchedPartSize;
     
    876880Bool TComPrediction::getSegmentMaskFromDepth( Pel* pDepthPels, UInt uiDepthStride, UInt uiWidth, UInt uiHeight, Bool* pMask, TComDataCU*& pcCU)
    877881{
     882  const TComSPS* sps = pcCU->getSlice()->getSPS();
     883  UInt uiMaxCUWidth = sps->getMaxCUWidth();
     884  UInt uiMaxCUHeight = sps->getMaxCUHeight();
     885 
    878886  // segmentation of texture block --> mask IDs
    879887  Pel*  pDepthBlockStart      = pDepthPels;
     
    887895  iSumDepth  = pDepthPels[ 0 ];
    888896 
    889   Int iPictureWidth = pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getPicYuvRec()->getWidth();
    890   Int iPictureHeight = pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getPicYuvRec()->getHeight(); 
     897  Int iPictureWidth = pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getPicYuvRec()->getWidth(COMPONENT_Y);
     898  Int iPictureHeight = pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getPicYuvRec()->getHeight(COMPONENT_Y); 
    891899  TComMv cDv = pcCU->getSlice()->getDepthRefinementFlag(  ) ? pcCU->getDvInfo(0).m_acDoNBDV : pcCU->getDvInfo(0).m_acNBDV;
    892900  if( pcCU->getSlice()->getDepthRefinementFlag(  ) )
     
    894902    cDv.setVer(0);
    895903  }
    896   Int iBlkX = ( pcCU->getAddr() % pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getFrameWidthInCU() ) * g_uiMaxCUWidth  + g_auiRasterToPelX[ g_auiZscanToRaster[ pcCU->getZorderIdxInCU() ] ]+ ((cDv.getHor()+2)>>2);
    897   Int iBlkY = ( pcCU->getAddr() / pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getFrameWidthInCU() ) * g_uiMaxCUHeight + g_auiRasterToPelY[ g_auiZscanToRaster[ pcCU->getZorderIdxInCU() ] ]+ ((cDv.getVer()+2)>>2);
     904  Int iBlkX = ( pcCU->getCtuRsAddr() % pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getFrameWidthInCtus() ) * uiMaxCUWidth  + g_auiRasterToPelX[ g_auiZscanToRaster[ pcCU->getZorderIdxInCtu() ] ]+ ((cDv.getHor()+2)>>2);
     905  Int iBlkY = ( pcCU->getCtuRsAddr() / pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getFrameWidthInCtus() ) * uiMaxCUHeight + g_auiRasterToPelY[ g_auiZscanToRaster[ pcCU->getZorderIdxInCtu() ] ]+ ((cDv.getVer()+2)>>2);
    898906  if (iBlkX>(Int)(iPictureWidth - uiWidth))
    899907  {
     
    10101018}
    10111019
    1012 Void TComPrediction::combineSegmentsWithMask( TComYuv* pInYuv[2], TComYuv* pOutYuv, Bool* pMask, UInt uiWidth, UInt uiHeight, UInt uiPartAddr, UInt partSize )
    1013 {
    1014   Pel*  piSrc[2]    = {pInYuv[0]->getLumaAddr(uiPartAddr), pInYuv[1]->getLumaAddr(uiPartAddr)};
    1015   UInt  uiSrcStride = pInYuv[0]->getStride();
    1016   Pel*  piDst       = pOutYuv->getLumaAddr(uiPartAddr);
    1017   UInt  uiDstStride = pOutYuv->getStride();
     1020Void TComPrediction::combineSegmentsWithMask( TComYuv* pInYuv[2], TComYuv* pOutYuv, Bool* pMask, UInt uiWidth, UInt uiHeight, UInt uiPartAddr, UInt partSize, Int bitDepthY )
     1021{
     1022  Pel*  piSrc[2]    = {pInYuv[0]->getAddr(COMPONENT_Y, uiPartAddr), pInYuv[1]->getAddr(COMPONENT_Y, uiPartAddr)};
     1023  UInt  uiSrcStride = pInYuv[0]->getStride(COMPONENT_Y);
     1024  Pel*  piDst       = pOutYuv->getAddr(COMPONENT_Y, uiPartAddr);
     1025  UInt  uiDstStride = pOutYuv->getStride(COMPONENT_Y);
    10181026 
    10191027  UInt  uiMaskStride= MAX_CU_SIZE;
     
    10541062        right  = (x==uiWidth-1)  ? tmpTar[y*uiWidth+x] : tmpTar[y*uiWidth+x+1];
    10551063       
    1056         piDst[x] = (l!=r) ? ClipY( Pel(( left + (tmpTar[y*uiWidth+x] << 1) + right ) >> 2 )) : tmpTar[y*uiWidth+x];
     1064        piDst[x] = (l!=r) ? ClipBD( Pel(( left + (tmpTar[y*uiWidth+x] << 1) + right ) >> 2 ), bitDepthY) : tmpTar[y*uiWidth+x];
    10571065      }
    10581066      piDst     += uiDstStride;
     
    10721080        bottom = (y==uiHeight-1) ? tmpTar[y*uiWidth+x] : tmpTar[(y+1)*uiWidth+x];
    10731081       
    1074         piDst[x] = (t!=b) ? ClipY( Pel(( top + (tmpTar[y*uiWidth+x] << 1) + bottom ) >> 2 )) : tmpTar[y*uiWidth+x];
     1082        piDst[x] = (t!=b) ? ClipBD( Pel(( top + (tmpTar[y*uiWidth+x] << 1) + bottom ) >> 2 ), bitDepthY) : tmpTar[y*uiWidth+x];
    10751083      }
    10761084      piDst     += uiDstStride;
     
    10851093 
    10861094  // now combine chroma
    1087   Pel*  piSrcU[2]       = { pInYuv[0]->getCbAddr(uiPartAddr), pInYuv[1]->getCbAddr(uiPartAddr) };
    1088   Pel*  piSrcV[2]       = { pInYuv[0]->getCrAddr(uiPartAddr), pInYuv[1]->getCrAddr(uiPartAddr) };
    1089   UInt  uiSrcStrideC    = pInYuv[0]->getCStride();
    1090   Pel*  piDstU          = pOutYuv->getCbAddr(uiPartAddr);
    1091   Pel*  piDstV          = pOutYuv->getCrAddr(uiPartAddr);
    1092   UInt  uiDstStrideC    = pOutYuv->getCStride();
     1095  Pel*  piSrcU[2]       = { pInYuv[0]->getAddr(COMPONENT_Cb, uiPartAddr), pInYuv[1]->getAddr(COMPONENT_Cb, uiPartAddr) };
     1096  Pel*  piSrcV[2]       = { pInYuv[0]->getAddr(COMPONENT_Cr, uiPartAddr), pInYuv[1]->getAddr(COMPONENT_Cr, uiPartAddr) };
     1097  UInt  uiSrcStrideC    = pInYuv[0]->getStride(COMPONENT_Cb);
     1098  Pel*  piDstU          = pOutYuv->getAddr(COMPONENT_Cb, uiPartAddr);
     1099  Pel*  piDstV          = pOutYuv->getAddr(COMPONENT_Cr, uiPartAddr);
     1100  UInt  uiDstStrideC    = pOutYuv->getStride(COMPONENT_Cb);
    10931101  UInt  uiWidthC        = uiWidth >> 1;
    10941102  UInt  uiHeightC       = uiHeight >> 1;
     
    11361144        if (l!=r)
    11371145        {
    1138           filSrcU = ClipC( Pel(( leftU + (tmpTarU[y*uiWidthC+x] << 1) + rightU ) >> 2 ));
    1139           filSrcV = ClipC( Pel(( leftV + (tmpTarV[y*uiWidthC+x] << 1) + rightV ) >> 2 ));
     1146          filSrcU = ClipBD( Pel(( leftU + (tmpTarU[y*uiWidthC+x] << 1) + rightU ) >> 2 ), bitDepthY);
     1147          filSrcV = ClipBD( Pel(( leftV + (tmpTarV[y*uiWidthC+x] << 1) + rightV ) >> 2 ), bitDepthY);
    11401148        }
    11411149        else
     
    11691177        if (t!=b)
    11701178        {
    1171           filSrcU = ClipC( Pel(( topU + (tmpTarU[y*uiWidthC+x] << 1) + bottomU ) >> 2 ));
    1172           filSrcV = ClipC( Pel(( topV + (tmpTarV[y*uiWidthC+x] << 1) + bottomV ) >> 2 ));
     1179          filSrcU = ClipBD( Pel(( topU + (tmpTarU[y*uiWidthC+x] << 1) + bottomU ) >> 2 ), bitDepthY);
     1180          filSrcV = ClipBD( Pel(( topV + (tmpTarV[y*uiWidthC+x] << 1) + bottomV ) >> 2 ), bitDepthY);
    11731181        }
    11741182        else
     
    13831391  pcCU->checkMvVertRest(cMv, eRefPicList, iRefIdx );
    13841392#endif
    1385 #if H_3D_ARP
    1386   if(pcCU->getARPW( uiPartAddr ) > 0  && pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPOC()== pcCU->getSlice()->getPOC())
    1387   {
    1388     xPredInterUniARPviewRef( pcCU , uiPartAddr , iWidth , iHeight , eRefPicList , rpcYuvPred , bi );
     1393#if NH_3D_ARP
     1394  if(  pcCU->getARPW( uiPartAddr ) > 0 )
     1395  {
     1396    if( pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPOC()== pcCU->getSlice()->getPOC() )
     1397  {
     1398      xPredInterUniARPviewRef( pcCU , uiPartAddr , iWidth , iHeight , eRefPicList , pcYuvPred , bi );
    13891399  }
    13901400  else
    13911401  {
    1392     if(  pcCU->getARPW( uiPartAddr ) > 0
    1393       && pcCU->getPartitionSize(uiPartAddr)==SIZE_2Nx2N
    1394       && pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPOC()!= pcCU->getSlice()->getPOC()
    1395       )
    1396     {
    1397       xPredInterUniARP( pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, rpcYuvPred, bi );
     1402      xPredInterUniARP( pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcYuvPred, bi );
     1403    }     
    13981404    }
    13991405    else
     
    14031409      Bool bICFlag = pcCU->getICFlag( uiPartAddr ) && ( pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getViewIndex() != pcCU->getSlice()->getViewIndex() );
    14041410      xPredInterLumaBlk  ( pcCU, pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPicYuvRec(), uiPartAddr, &cMv, iWidth, iHeight, rpcYuvPred, bi
    1405 #if H_3D_ARP
     1411#if NH_3D_ARP
    14061412        , false
    14071413#endif
     
    14091415      bICFlag = bICFlag && (iWidth > 8);
    14101416      xPredInterChromaBlk( pcCU, pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPicYuvRec(), uiPartAddr, &cMv, iWidth, iHeight, rpcYuvPred, bi
    1411 #if H_3D_ARP
     1417#if NH_3D_ARP
    14121418        , false
    14131419#endif
     
    14211427  }
    14221428#endif
    1423 #if H_3D_ARP
    1424     }
     1429#if NH_3D_ARP
    14251430  }
    14261431#endif
     
    14721477#endif
    14731478
    1474 #if H_3D_ARP
    1475 Void TComPrediction::xPredInterUniARP( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi, TComMvField * pNewMvFiled )
    1476 {
    1477   Int         iRefIdx      = pNewMvFiled ? pNewMvFiled->getRefIdx() : pcCU->getCUMvField( eRefPicList )->getRefIdx( uiPartAddr );           
    1478   TComMv      cMv          = pNewMvFiled ? pNewMvFiled->getMv()     : pcCU->getCUMvField( eRefPicList )->getMv( uiPartAddr );
     1479#if NH_3D_ARP
     1480//temporal ARP
     1481Void TComPrediction::xPredInterUniARP( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi )
     1482{
     1483  Int         iRefIdx      = pcCU->getCUMvField( eRefPicList )->getRefIdx( uiPartAddr );           
     1484  TComMv      cMv          = pcCU->getCUMvField( eRefPicList )->getMv( uiPartAddr );
    14791485  Bool        bTobeScaled  = false;
    14801486  TComPic* pcPicYuvBaseCol = NULL;
     
    14901496  UChar dW = pcCU->getARPW ( uiPartAddr );
    14911497
    1492   {
    14931498    Int arpRefIdx = pcCU->getSlice()->getFirstTRefIdx(eRefPicList);
    1494     if( dW > 0 && pcCU->getSlice()->getRefPic( eRefPicList, arpRefIdx )->getPOC()!= pcCU->getSlice()->getPOC() )
    1495     {
    1496       bTobeScaled = true;
    1497     }
    1498 
    1499     pcPicYuvBaseCol =  pcCU->getSlice()->getBaseViewRefPic( pcCU->getSlice()->getPOC(),                              cDistparity.m_aVIdxCan );
    1500 
    1501     pcPicYuvBaseRef =  pcCU->getSlice()->getBaseViewRefPic( pcCU->getSlice()->getRefPic( eRefPicList, arpRefIdx )->getPOC(), cDistparity.m_aVIdxCan );
    1502 
    1503     if (!pcCU->getSlice()->getArpRefPicAvailable( eRefPicList, cDistparity.m_aVIdxCan))
     1499  if (arpRefIdx < 0 || !pcCU->getSlice()->getArpRefPicAvailable( eRefPicList, cDistparity.m_aVIdxCan))
    15041500    {
    15051501      dW = 0;
     
    15081504    else
    15091505    {
    1510       assert( pcPicYuvBaseCol->getPOC() == pcCU->getSlice()->getPOC() && pcPicYuvBaseRef->getPOC() == pcCU->getSlice()->getRefPic( eRefPicList, arpRefIdx )->getPOC() );
     1506    if( arpRefIdx != iRefIdx )
     1507    {
     1508      bTobeScaled = true;
     1509    }
     1510    pcPicYuvBaseCol =  pcCU->getSlice()->getBaseViewRefPic( pcCU->getSlice()->getPOC(),                              cDistparity.m_aVIdxCan );
     1511    pcPicYuvBaseRef =  pcCU->getSlice()->getBaseViewRefPic( pcCU->getSlice()->getRefPic( eRefPicList, arpRefIdx )->getPOC(), cDistparity.m_aVIdxCan );
    15111512    }
    15121513
     
    15151516      Int iCurrPOC    = pcCU->getSlice()->getPOC();
    15161517      Int iColRefPOC  = pcCU->getSlice()->getRefPOC( eRefPicList, iRefIdx );
    1517       Int iCurrRefPOC = pcCU->getSlice()->getRefPOC( eRefPicList,  0);
     1518    Int iCurrRefPOC = pcCU->getSlice()->getRefPOC( eRefPicList, arpRefIdx );
    15181519      Int iScale = pcCU-> xGetDistScaleFactor(iCurrPOC, iCurrRefPOC, iCurrPOC, iColRefPOC);
    15191520      if ( iScale != 4096 )
     
    15211522        cMv = cMv.scaleMv( iScale );
    15221523      }
    1523       iRefIdx = 0;
    1524     }
     1524    iRefIdx = arpRefIdx;
    15251525  }
    15261526
    15271527  pcCU->clipMv(cMv);
    15281528  TComPicYuv* pcPicYuvRef = pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPicYuvRec();
    1529   xPredInterLumaBlk  ( pcCU, pcPicYuvRef, uiPartAddr, &cMv, iWidth, iHeight, rpcYuvPred, bi || ( dW > 0 ), true );
    1530   xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cMv, iWidth, iHeight, rpcYuvPred, bi || ( dW > 0 ), true );
     1529
     1530  for (UInt comp=COMPONENT_Y; comp< rpcYuvPred->getNumberValidComponents(); comp++)
     1531  {
     1532    const ComponentID compID=ComponentID(comp);
     1533    xPredInterBlk  ( compID,  pcCU, pcPicYuvRef, uiPartAddr, &cMv, iWidth, iHeight, rpcYuvPred, bi || ( dW > 0 ), pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID)), true );
     1534  }
    15311535
    15321536  if( dW > 0 )
     
    15441548    pcCU->clipMv( cNBDV );
    15451549   
    1546     pcPicYuvRef = pcPicYuvBaseCol->getPicYuvRec();
    1547     xPredInterLumaBlk  ( pcCU, pcPicYuvRef, uiPartAddr, &cNBDV, iWidth, iHeight, pYuvB0, true, true );
    1548     if (iWidth > 8)
    1549       xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cNBDV, iWidth, iHeight, pYuvB0, true, true );
     1550    TComPicYuv* pcPicYuvBaseColRec = pcPicYuvBaseCol->getPicYuvRec();
     1551    TComPicYuv* pcPicYuvBaseRefRec = pcPicYuvBaseRef->getPicYuvRec();
    15501552   
    1551     pcPicYuvRef = pcPicYuvBaseRef->getPicYuvRec();
    1552     xPredInterLumaBlk  ( pcCU, pcPicYuvRef, uiPartAddr, &cMVwithDisparity, iWidth, iHeight, pYuvB1, true, true );
    1553  
    1554     if (iWidth > 8)
    1555       xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cMVwithDisparity, iWidth, iHeight, pYuvB1, true, true );
     1553    UInt uiCompNum = ( iWidth > 8 ) ? 3: 1;
     1554    for (UInt comp=COMPONENT_Y; comp< uiCompNum; comp++)
     1555    {
     1556      const ComponentID compID=ComponentID(comp);
     1557      xPredInterBlk  ( compID,  pcCU, pcPicYuvBaseColRec, uiPartAddr, &cNBDV, iWidth, iHeight, pYuvB0, true, pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID)), true );
     1558      xPredInterBlk  ( compID,  pcCU, pcPicYuvBaseRefRec, uiPartAddr, &cMVwithDisparity, iWidth, iHeight, pYuvB1, true, pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID)), true );
     1559    }   
    15561560   
    15571561    pYuvB0->subtractARP( pYuvB0 , pYuvB1 , uiPartAddr , iWidth , iHeight );
     
    15611565      pYuvB0->multiplyARP( uiPartAddr , iWidth , iHeight , dW );
    15621566    }
    1563     rpcYuvPred->addARP( rpcYuvPred , pYuvB0 , uiPartAddr , iWidth , iHeight , !bi );
     1567    rpcYuvPred->addARP( rpcYuvPred , pYuvB0 , uiPartAddr , iWidth , iHeight , !bi, pcCU->getSlice()->getSPS()->getBitDepths() );
    15641568  }
    15651569}
     
    15701574  TComMv      cDMv          = pcCU->getCUMvField( eBaseRefPicList )->getMv( uiPartAddr );
    15711575  TComPic* pcPicYuvBaseCol  = pcCU->getSlice()->getRefPic( eBaseRefPicList, iRefIdx ); 
    1572   TComPicYuv* pcYuvBaseCol  = pcPicYuvBaseCol->getPicYuvRec();
    1573   Int uiLCUAddr,uiAbsPartAddr;
    15741576  Int irefPUX = pcCU->getCUPelX() + g_auiRasterToPelX[g_auiZscanToRaster[uiPartAddr]] + iWidth/2  + ((cDMv.getHor() + 2)>>2);
    15751577  Int irefPUY = pcCU->getCUPelY() + g_auiRasterToPelY[g_auiZscanToRaster[uiPartAddr]] + iHeight/2 + ((cDMv.getVer() + 2)>>2);
     
    15771579  irefPUX = (Int)Clip3<Int>(0, pcCU->getSlice()->getSPS()-> getPicWidthInLumaSamples()-1, irefPUX);
    15781580  irefPUY = (Int)Clip3<Int>(0, pcCU->getSlice()->getSPS()->getPicHeightInLumaSamples()-1, irefPUY); 
    1579   pcYuvBaseCol->getCUAddrAndPartIdx( irefPUX, irefPUY, uiLCUAddr, uiAbsPartAddr);
    1580   TComDataCU *pColCU = pcPicYuvBaseCol->getCU( uiLCUAddr );
     1581
     1582  Int uiLCUAddr,uiAbsPartAddr;
     1583  pcPicYuvBaseCol->getCUAddrAndPartIdx( irefPUX, irefPUY, uiLCUAddr, uiAbsPartAddr);
     1584  TComDataCU *pColCU = pcPicYuvBaseCol->getCtu( uiLCUAddr );
    15811585
    15821586  TComPic* pcPicYuvBaseTRef = NULL;
     
    16301634}
    16311635
    1632 Void TComPrediction::xPredInterUniARPviewRef( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi, TComMvField * pNewMvFiled )
     1636//inter-view ARP
     1637Void TComPrediction::xPredInterUniARPviewRef( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi )
    16331638{
    16341639  Int         iRefIdx       = pcCU->getCUMvField( eRefPicList )->getRefIdx( uiPartAddr );           
     
    16431648  Bool bTMVAvai = false;     
    16441649  TComMv cBaseTMV;
    1645   if( pNewMvFiled )
    1646   {
    1647     iRefIdx = pNewMvFiled->getRefIdx();
    1648     cDMv = pNewMvFiled->getMv();
    1649   }
     1650
    16501651  pcCU->clipMv(cTempDMv);
    16511652
    1652   assert(dW > 0);
    1653   if (!pcCU->getSlice()->getArpRefPicAvailable( eRefPicList, pcPicYuvBaseCol->getViewIndex()))
    1654   {
    1655     dW = 0;
    1656   }
    1657   Int uiLCUAddr,uiAbsPartAddr;
    16581653  Int irefPUX = pcCU->getCUPelX() + g_auiRasterToPelX[g_auiZscanToRaster[uiPartAddr]] + iWidth/2  + ((cDMv.getHor() + 2)>>2);
    16591654  Int irefPUY = pcCU->getCUPelY() + g_auiRasterToPelY[g_auiZscanToRaster[uiPartAddr]] + iHeight/2 + ((cDMv.getVer() + 2)>>2);
     
    16611656  irefPUX = (Int)Clip3<Int>(0, pcCU->getSlice()->getSPS()-> getPicWidthInLumaSamples()-1, irefPUX);
    16621657  irefPUY = (Int)Clip3<Int>(0, pcCU->getSlice()->getSPS()->getPicHeightInLumaSamples()-1, irefPUY); 
    1663   pcYuvBaseCol->getCUAddrAndPartIdx( irefPUX, irefPUY, uiLCUAddr, uiAbsPartAddr);
    1664   TComDataCU *pColCU = pcPicYuvBaseCol->getCU( uiLCUAddr );
     1658 
     1659  Int uiLCUAddr,uiAbsPartAddr;
     1660  pcPicYuvBaseCol->getCUAddrAndPartIdx( irefPUX, irefPUY, uiLCUAddr, uiAbsPartAddr);
     1661  TComDataCU *pColCU = pcPicYuvBaseCol->getCtu( uiLCUAddr );
    16651662  if( pcCU->getSlice()->isInterB() && !pcCU->getSlice()->getIsDepth() )
    16661663  {
     
    17331730      RefPicList eRefPicListCurr = RefPicList(iList);
    17341731      Int iRef = pColCU->getCUMvField(eRefPicListCurr)->getRefIdx(uiAbsPartAddr);
    1735       if( iRef != -1)
     1732      if( iRef != -1 && pcCU->getSlice()->getArpRefPicAvailable( eRefPicListCurr, pcPicYuvBaseCol->getViewIndex()))
    17361733      {
    17371734        pcPicYuvBaseTRef = pColCU->getSlice()->getRefPic(eRefPicListCurr, iRef); 
     
    17671764  }
    17681765
    1769   xPredInterLumaBlk  ( pcCU, pcYuvBaseCol, uiPartAddr, &cTempDMv, iWidth, iHeight, rpcYuvPred, bi || ( dW > 0 && bTMVAvai ),        bTMVAvai);
    1770   xPredInterChromaBlk( pcCU, pcYuvBaseCol, uiPartAddr, &cTempDMv, iWidth, iHeight, rpcYuvPred, bi || ( dW > 0 && bTMVAvai ),        bTMVAvai);
    1771 
    1772   if( dW > 0 && bTMVAvai )
    1773   {
     1766  for (UInt comp=COMPONENT_Y; comp< rpcYuvPred->getNumberValidComponents(); comp++)
     1767  {
     1768    const ComponentID compID=ComponentID(comp);
     1769    xPredInterBlk  ( compID,  pcCU, pcYuvBaseCol, uiPartAddr, &cTempDMv, iWidth, iHeight, rpcYuvPred, bi || ( dW > 0 && bTMVAvai ), pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID)), bTMVAvai );
     1770  }
     1771
     1772  if( dW > 0 )
     1773  {
     1774    assert ( bTMVAvai );
    17741775    TComYuv*    pYuvCurrTRef    = &m_acYuvPredBase[0];
    17751776    TComYuv*    pYuvBaseTRef    = &m_acYuvPredBase[1];
     
    17851786      pYuvCurrTRef->clear(); pYuvBaseTRef->clear();
    17861787    }
    1787     xPredInterLumaBlk  ( pcCU, pcYuvCurrTref, uiPartAddr, &cBaseTMV, iWidth, iHeight, pYuvCurrTRef, true,   true);
    1788 
    1789     if (iWidth > 8)
    1790       xPredInterChromaBlk( pcCU, pcYuvCurrTref, uiPartAddr, &cBaseTMV, iWidth, iHeight, pYuvCurrTRef, true,   true);
    1791 
    1792     xPredInterLumaBlk  ( pcCU, pcYuvBaseTref, uiPartAddr, &cTempMv,  iWidth, iHeight, pYuvBaseTRef, true,   true);
    1793 
    1794     if (iWidth > 8)
    1795       xPredInterChromaBlk( pcCU, pcYuvBaseTref, uiPartAddr, &cTempMv,  iWidth, iHeight, pYuvBaseTRef, true,   true);
     1788
     1789    UInt uiCompNum = ( iWidth > 8 ) ? 3: 1;
     1790    for (UInt comp=COMPONENT_Y; comp< uiCompNum; comp++)
     1791    {
     1792      const ComponentID compID=ComponentID(comp);
     1793      xPredInterBlk  ( compID,  pcCU, pcYuvCurrTref, uiPartAddr, &cBaseTMV, iWidth, iHeight, pYuvCurrTRef, true, pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID)), true );
     1794      xPredInterBlk  ( compID,  pcCU, pcYuvBaseTref, uiPartAddr, &cTempMv, iWidth, iHeight, pYuvBaseTRef, true, pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID)), true );
     1795    }
    17961796
    17971797    pYuvCurrTRef->subtractARP( pYuvCurrTRef , pYuvBaseTRef , uiPartAddr , iWidth , iHeight ); 
     
    18001800      pYuvCurrTRef->multiplyARP( uiPartAddr , iWidth , iHeight , dW );
    18011801    }
    1802     rpcYuvPred->addARP( rpcYuvPred , pYuvCurrTRef , uiPartAddr , iWidth , iHeight , !bi );
     1802    rpcYuvPred->addARP( rpcYuvPred , pYuvCurrTRef , uiPartAddr , iWidth , iHeight , !bi, pcCU->getSlice()->getSPS()->getBitDepths() );
    18031803  }
    18041804}
     
    18981898
    18991899Void TComPrediction::xPredInterBlk(const ComponentID compID, TComDataCU *cu, TComPicYuv *refPic, UInt partAddr, TComMv *mv, Int width, Int height, TComYuv *dstPic, Bool bi, const Int bitDepth
    1900 #if H_3D_ARP
     1900#if NH_3D_ARP
    19011901    , Bool filterType
    19021902#endif
     
    19421942    m_if.filterHor(compID, ref, refStride, dst,  dstStride, cxWidth, cxHeight, xFrac, !bi, chFmt, bitDepth
    19431943#endif
    1944 #if H_3D_ARP
     1944#if NH_3D_ARP
    19451945    , filterType
    19461946#endif
     
    19541954    m_if.filterVer(compID, ref, refStride, dst, dstStride, cxWidth, cxHeight, yFrac, true, !bi, chFmt, bitDepth
    19551955#endif
    1956 #if H_3D_ARP
     1956#if NH_3D_ARP
    19571957    , filterType
    19581958#endif
     
    19671967
    19681968    m_if.filterHor(compID, ref - ((vFilterSize>>1) -1)*refStride, refStride, tmp, tmpStride, cxWidth, cxHeight+vFilterSize-1, xFrac, false,      chFmt, bitDepth
    1969 #if H_3D_ARP
     1969#if NH_3D_ARP
    19701970    , filterType
    19711971#endif
     
    19761976    m_if.filterVer(compID, tmp + ((vFilterSize>>1) -1)*tmpStride, tmpStride, dst, dstStride, cxWidth, cxHeight,               yFrac, false, !bi, chFmt, bitDepth
    19771977#endif
    1978 #if H_3D_ARP
     1978#if NH_3D_ARP
    19791979    , filterType
    19801980#endif
     
    20192019}
    20202020
    2021 
    2022 #if H_3D_ARP
    2023     , Bool filterType
    2024 #endif
    20252021#if H_3D_IC
    20262022    , Bool bICFlag
     
    20302026#else
    20312027#endif
    2032 #if H_3D_ARP
    2033     , filterType
    2034 #endif
    20352028#if H_3D_IC
    20362029    m_if.filterHorChroma(refCr, refStride, dstCr,  dstStride, cxWidth, cxHeight, xFrac, !bi || bICFlag
    20372030#else
    20382031#endif
    2039 #if H_3D_ARP
    2040     , filterType
    2041 #endif
    20422032#if H_3D_IC
    20432033    m_if.filterVerChroma(refCb, refStride, dstCb, dstStride, cxWidth, cxHeight, yFrac, true, !bi || bICFlag
    20442034#else
    20452035#endif
    2046 #if H_3D_ARP
    2047     , filterType
    2048 #endif
    20492036#if H_3D_IC
    20502037    m_if.filterVerChroma(refCr, refStride, dstCr, dstStride, cxWidth, cxHeight, yFrac, true, !bi || bICFlag
    20512038#else
    20522039#endif
    2053 #if H_3D_ARP
    2054     , filterType
    2055 #endif
    2056 #if H_3D_ARP
    2057     , filterType
    2058 #endif 
    20592040#if H_3D_IC
    20602041    m_if.filterVerChroma(extY  + (halfFilterSize-1)*extStride, extStride, dstCb, dstStride, cxWidth, cxHeight  , yFrac, false, !bi || bICFlag
    20612042#else
    20622043#endif
    2063 #if H_3D_ARP
    2064     , filterType
    2065 #endif
    2066 #if H_3D_ARP
    2067     , filterType
    2068 #endif
    20692044#if H_3D_IC
    20702045    m_if.filterVerChroma(extY  + (halfFilterSize-1)*extStride, extStride, dstCr, dstStride, cxWidth, cxHeight  , yFrac, false, !bi || bICFlag
    20712046#else
    20722047#endif
    2073 #if H_3D_ARP
    2074     , filterType
    2075 #endif
    20762048#if H_3D_IC
    20772049  if( bICFlag )
  • branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComPrediction.h

    r1259 r1270  
    4545#include "TComWeightPrediction.h"
    4646
     47#if NH_3D_ARP
     48#include "TComPic.h"
     49#endif
    4750// forward declaration
    4851class TComMv;
     
    7780  TComYuv   m_acYuvPred[NUM_REF_PIC_LIST_01];
    7881  TComYuv   m_cYuvPredTemp;
    79 #if H_3D_ARP
     82#if NH_3D_ARP
    8083  TComYuv   m_acYuvPredBase[2];
    8184#endif
     
    100103
    101104  // motion compensation functions
    102 #if H_3D_ARP
    103   Void xPredInterUniARP         ( TComDataCU* pcCU,                          UInt uiPartAddr,               Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi=false, TComMvField * pNewMvFiled = NULL );
     105#if NH_3D_ARP
     106  Void xPredInterUniARP         ( TComDataCU* pcCU,                          UInt uiPartAddr,               Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi );
     107  Void xPredInterUniARPviewRef  ( TComDataCU* pcCU,                          UInt uiPartAddr,               Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi );
    104108  Bool xCheckBiInterviewARP     ( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eBaseRefPicList, TComPic*& pcPicYuvCurrTRef, TComMv& cBaseTMV, Int& iCurrTRefPoc );
    105   Void xPredInterUniARPviewRef( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi, TComMvField * pNewMvFiled = NULL );
    106109#endif
    107110
     
    114117
    115118  Void xPredInterBlk(const ComponentID compID, TComDataCU *cu, TComPicYuv *refPic, UInt partAddr, TComMv *mv, Int width, Int height, TComYuv *dstPic, Bool bi, const Int bitDepth
    116 #if H_3D_ARP
     119#if NH_3D_ARP
    117120    , Bool filterType = false
    118121#endif
     
    122125 );
    123126
    124 #if H_3D_ARP
    125     , Bool filterType = false
    126 #endif
    127127#if H_3D_IC
    128128    , Bool bICFlag    = false
     
    187187#endif
    188188 
    189 #if H_3D_DBBP
     189#if NH_3D_DBBP
    190190  PartSize      getPartitionSizeFromDepth(Pel* pDepthPels, UInt uiDepthStride, UInt uiSize, TComDataCU*& pcCU);
    191191  Bool          getSegmentMaskFromDepth( Pel* pDepthPels, UInt uiDepthStride, UInt uiWidth, UInt uiHeight, Bool* pMask, TComDataCU*& pcCU);
    192   Void          combineSegmentsWithMask( TComYuv* pInYuv[2], TComYuv* pOutYuv, Bool* pMask, UInt uiWidth, UInt uiHeight, UInt uiPartAddr, UInt partSize );
     192  Void          combineSegmentsWithMask( TComYuv* pInYuv[2], TComYuv* pOutYuv, Bool* pMask, UInt uiWidth, UInt uiHeight, UInt uiPartAddr, UInt partSize, Int bitDepthY );
    193193#endif
    194194
  • branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComRdCost.cpp

    r1200 r1270  
    311311  m_bUseEstimatedVSD        = false;
    312312#endif
    313 #if H_3D_DBBP
     313#if NH_3D_DBBP
    314314  m_bUseMask                = false;
    315315#endif
     
    340340  rcDistParam.DistFunc = m_afpDistortFunc[eDFunc + g_aucConvertToBit[ rcDistParam.iCols ] + 1 ];
    341341
    342 #if H_3D_DBBP
     342#if NH_3D_DBBP
    343343  if( m_bUseMask )
    344344  {
     
    397397  }
    398398
    399 #if H_3D_DBBP
     399#if NH_3D_DBBP
    400400  if( m_bUseMask )
    401401  {
     
    446446  }
    447447
    448 #if H_3D_DBBP
     448#if NH_3D_DBBP
    449449  if( m_bUseMask )
    450450  {
     
    468468  rcDP.bitDepth   = bitDepth;
    469469  rcDP.DistFunc   = m_afpDistortFunc[ ( bHadamard ? DF_HADS : DF_SADS ) + g_aucConvertToBit[ iWidth ] + 1 ];
    470 #if H_3D_DBBP
     470#if NH_3D_DBBP
    471471  if( m_bUseMask )
    472472  {
     
    649649// ====================================================================================================================
    650650
    651 #if H_3D_DBBP
     651#if NH_3D_DBBP
    652652// --------------------------------------------------------------------------------------------------------------------
    653653// Masked distortion functions
  • branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComRdCost.h

    r1200 r1270  
    167167#endif
    168168  Int                     m_iCostScale;
    169 #if H_3D_DBBP
     169#if NH_3D_DBBP
    170170  Bool                    m_bUseMask;
    171171#endif
     
    206206  Void    setDistParam( DistParam& rcDP, Int bitDepth, Pel* p1, Int iStride1, Pel* p2, Int iStride2, Int iWidth, Int iHeight, Bool bHadamard = false );
    207207
    208 #if H_3D_DBBP
     208#if NH_3D_DBBP
    209209  Void    setUseMask(Bool b) { m_bUseMask = b; }
    210210#endif
     
    302302  static Distortion xCalcHADs4x4      ( Pel *piOrg, Pel *piCurr, Int iStrideOrg, Int iStrideCur, Int iStep );
    303303  static Distortion xCalcHADs8x8      ( Pel *piOrg, Pel *piCurr, Int iStrideOrg, Int iStrideCur, Int iStep );
    304 #if H_3D_DBBP
     304#if NH_3D_DBBP
    305305  static UInt xGetMaskedSSE     ( DistParam* pcDtParam );
    306306  static UInt xGetMaskedSAD     ( DistParam* pcDtParam );
  • branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComSlice.cpp

    r1259 r1270  
    19961996      m_dimensionId[i][j] = 0;
    19971997    }
    1998 #if H_3D_ARP
     1998#if NH_3D_ARP
    19991999#endif
    20002000  } 
     
    20322032Int TComVPS::scalTypeToScalIdx( ScalabilityType scalType ) const
    20332033{
    2034   assert( scalType >= 0 && scalType <= MAX_NUM_SCALABILITY_TYPES );
    2035   assert( scalType == MAX_NUM_SCALABILITY_TYPES || getScalabilityMaskFlag( scalType ) );
     2034  assert( (Int)scalType >= 0 && (Int)scalType <= MAX_NUM_SCALABILITY_TYPES );
     2035  assert( (Int)scalType == MAX_NUM_SCALABILITY_TYPES || getScalabilityMaskFlag( scalType ) );
    20362036  Int scalIdx = 0;
    20372037  for( Int curScalType = 0; curScalType < scalType; curScalType++ )
     
    36213621#endif
    36223622
    3623 #if H_3D_ARP
     3623#if NH_3D_ARP
    36243624Void TComSlice::setARPStepNum( TComPicLists*ivPicLists )
    36253625{
     
    36883688          m_arpRefPicAvailable[eRefPicList][layerIdInNuh] = false;
    36893689        }
     3690      }
     3691    }
     3692  }
     3693  if( m_nARPStepNum > 1)
     3694  {
     3695    for(Int i = 0; i < getNumActiveRefLayerPics(); i ++ )
     3696    {
     3697      Int  iLayerId = getRefPicLayerId( i );
     3698      Int  iViewIdx =   getVPS()->getViewIndex(iLayerId);
     3699      Bool bIsDepth = ( getVPS()->getDepthId  ( iLayerId ) == 1 );
     3700      if( iViewIdx<getViewIndex() && !bIsDepth )
     3701      {
     3702        setBaseViewRefPicList( ivPicLists->getPicList( iLayerId ), iViewIdx );
    36903703      }
    36913704    }
  • branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComSlice.h

    r1259 r1270  
    25942594  Int        m_aiAlterRefIdx   [2];
    25952595#endif
    2596 #if H_3D_ARP
     2596#if NH_3D_ARP
    25972597  Bool       m_arpRefPicAvailable[2][MAX_NUM_LAYERS];
    25982598  TComList<TComPic*> * m_pBaseViewRefPicList[MAX_NUM_LAYERS];
     
    27212721  Bool                        getIcSkipParseFlag()                                   { return m_icSkipParseFlag;                                     }
    27222722#endif                                                                                                                                               
    2723 #if H_3D_ARP                                                                                                                                         
     2723#if NH_3D_ARP                                                                                                                                         
    27242724  Void                        setBaseViewRefPicList( TComList<TComPic*> *pListPic, Int iViewIdx )      { m_pBaseViewRefPicList[iViewIdx] = pListPic; }                 
    27252725  Void                        setARPStepNum( TComPicLists*ivPicLists );                                                                             
     
    29282928  Int                         getAlterRefIdx          ( RefPicList e )               { return  m_aiAlterRefIdx[e];                                   }
    29292929#endif                                                                                                                                               
    2930 #if H_3D_ARP                                                                                                                                         
     2930#if NH_3D_ARP                                                                                                                                         
    29312931  Int                         getFirstTRefIdx        ( RefPicList e )                { return  m_aiFirstTRefIdx[e];                                  }
    29322932  Void                        setFirstTRefIdx        ( RefPicList e, Int i )         { m_aiFirstTRefIdx[e]    = i;                                   }
  • branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComYuv.cpp

    r1200 r1270  
    487487}
    488488
    489 #if H_3D_ARP
    490 Void TComYuv::addARP( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight, Bool bClip )
    491 {
    492   addARPLuma   ( pcYuvSrc0, pcYuvSrc1, uiAbsPartIdx, uiWidth   , uiHeight    , bClip );
    493   addARPChroma ( pcYuvSrc0, pcYuvSrc1, uiAbsPartIdx, uiWidth>>1, uiHeight>>1 , bClip );
    494 }
    495 
    496 Void TComYuv::addARPLuma( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight, Bool bClip )
     489#if NH_3D_ARP
     490Void TComYuv::addARP( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight, Bool bClip, const BitDepths &clipBitDepths )
     491{
     492  addARPLuma   ( pcYuvSrc0, pcYuvSrc1, uiAbsPartIdx, uiWidth   , uiHeight    , bClip , clipBitDepths);
     493  addARPChroma ( pcYuvSrc0, pcYuvSrc1, uiAbsPartIdx, uiWidth>>1, uiHeight>>1 , bClip , clipBitDepths);
     494}
     495
     496Void TComYuv::addARPLuma( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight, Bool bClip, const BitDepths &clipBitDepths )
    497497{
    498498  Int x, y;
    499499
    500   Pel* pSrc0 = pcYuvSrc0->getLumaAddr( uiAbsPartIdx );
    501   Pel* pSrc1 = pcYuvSrc1->getLumaAddr( uiAbsPartIdx );
    502   Pel* pDst  = getLumaAddr( uiAbsPartIdx );
    503 
    504   UInt iSrc0Stride = pcYuvSrc0->getStride();
    505   UInt iSrc1Stride = pcYuvSrc1->getStride();
    506   UInt iDstStride  = getStride();
    507   Int iIFshift = IF_INTERNAL_PREC - g_bitDepthY;
     500  Pel* pSrc0 = pcYuvSrc0->getAddr( COMPONENT_Y, uiAbsPartIdx );
     501  Pel* pSrc1 = pcYuvSrc1->getAddr( COMPONENT_Y, uiAbsPartIdx );
     502  Pel* pDst  = getAddr( COMPONENT_Y, uiAbsPartIdx );
     503
     504  UInt iSrc0Stride = pcYuvSrc0->getStride(COMPONENT_Y);
     505  UInt iSrc1Stride = pcYuvSrc1->getStride(COMPONENT_Y);
     506  UInt iDstStride  = getStride(COMPONENT_Y);
     507  const Int clipbd = clipBitDepths.recon[CHANNEL_TYPE_LUMA];
     508  Int iIFshift = IF_INTERNAL_PREC - clipbd;
    508509  Int iOffSet  = ( 1 << ( iIFshift - 1 ) ) + IF_INTERNAL_OFFS;
    509510  for ( y = uiHeight-1; y >= 0; y-- )
     
    514515      if( bClip )
    515516      {
    516         pDst[x] = ClipY( ( pDst[x] + iOffSet ) >> iIFshift );
     517        pDst[x] = Pel(ClipBD<Int>(Int( ( pDst[x] + iOffSet ) >> iIFshift ), clipbd));
    517518      }
    518519    }
     
    523524}
    524525
    525 Void TComYuv::addARPChroma( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight, Bool bClip )
     526Void TComYuv::addARPChroma( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight, Bool bClip, const BitDepths &clipBitDepths )
    526527{
    527528  Int x, y;
    528529
    529   Pel* pSrcU0 = pcYuvSrc0->getCbAddr( uiAbsPartIdx );
    530   Pel* pSrcU1 = pcYuvSrc1->getCbAddr( uiAbsPartIdx );
    531   Pel* pSrcV0 = pcYuvSrc0->getCrAddr( uiAbsPartIdx );
    532   Pel* pSrcV1 = pcYuvSrc1->getCrAddr( uiAbsPartIdx );
    533   Pel* pDstU = getCbAddr( uiAbsPartIdx );
    534   Pel* pDstV = getCrAddr( uiAbsPartIdx );
    535 
    536   UInt  iSrc0Stride = pcYuvSrc0->getCStride();
    537   UInt  iSrc1Stride = pcYuvSrc1->getCStride();
    538   UInt  iDstStride  = getCStride();
    539 
    540   Int iIFshift = IF_INTERNAL_PREC - g_bitDepthC;
     530  Pel* pSrcU0 = pcYuvSrc0->getAddr( COMPONENT_Cb, uiAbsPartIdx );
     531  Pel* pSrcU1 = pcYuvSrc1->getAddr( COMPONENT_Cb, uiAbsPartIdx );
     532  Pel* pSrcV0 = pcYuvSrc0->getAddr( COMPONENT_Cr, uiAbsPartIdx );
     533  Pel* pSrcV1 = pcYuvSrc1->getAddr( COMPONENT_Cr, uiAbsPartIdx );
     534  Pel* pDstU = getAddr( COMPONENT_Cb, uiAbsPartIdx );
     535  Pel* pDstV = getAddr( COMPONENT_Cr, uiAbsPartIdx );
     536
     537  UInt  iSrc0StrideCb = pcYuvSrc0->getStride(COMPONENT_Cb);
     538  UInt  iSrc1StrideCb = pcYuvSrc1->getStride(COMPONENT_Cb);
     539  UInt  iDstStrideCb  = getStride(COMPONENT_Cb);
     540
     541  UInt  iSrc0StrideCr = pcYuvSrc0->getStride(COMPONENT_Cr);
     542  UInt  iSrc1StrideCr = pcYuvSrc1->getStride(COMPONENT_Cr);
     543  UInt  iDstStrideCr  = getStride(COMPONENT_Cr);
     544
     545  const Int clipbd = clipBitDepths.recon[CHANNEL_TYPE_CHROMA];
     546  Int iIFshift = IF_INTERNAL_PREC - clipbd;
    541547  Int iOffSet  = ( 1 << ( iIFshift - 1 ) ) + IF_INTERNAL_OFFS;
    542548
     
    549555      if( bClip )
    550556      {
    551         pDstU[x] = ClipC( ( pDstU[x] + iOffSet ) >> iIFshift );
    552         pDstV[x] = ClipC( ( pDstV[x] + iOffSet ) >> iIFshift );
    553       }
    554     }
    555 
     557        pDstU[x] = Pel(ClipBD<Int>( Int( ( pDstU[x] + iOffSet ) >> iIFshift ), clipbd));
     558        pDstV[x] = Pel(ClipBD<Int>( Int( ( pDstV[x] + iOffSet ) >> iIFshift ), clipbd));
     559      }
     560    }
     561
     562    pSrcU0 += iSrc0StrideCb;
     563    pSrcU1 += iSrc1StrideCb;
     564    pSrcV0 += iSrc0StrideCr;
     565    pSrcV1 += iSrc1StrideCr;
     566    pDstU  += iDstStrideCb;
     567    pDstV  += iDstStrideCr;
     568  }
     569}
     570
     571Void TComYuv::subtractARP( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth , UInt uiHeight )
     572{
     573  subtractARPLuma  ( pcYuvSrc0, pcYuvSrc1,  uiAbsPartIdx, uiWidth    , uiHeight    );
     574
     575  if (uiWidth > 8 && pcYuvSrc1->getNumberValidComponents() > 1)
     576  {
     577    subtractARPChroma( pcYuvSrc0, pcYuvSrc1,  uiAbsPartIdx, uiWidth>>1 , uiHeight>>1 );
     578}
     579}
     580
     581Void TComYuv::subtractARPLuma( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth , UInt uiHeight )
     582{
     583  Int x, y;
     584
     585  Pel* pSrc0 = pcYuvSrc0->getAddr(COMPONENT_Y, uiAbsPartIdx );
     586  Pel* pSrc1 = pcYuvSrc1->getAddr(COMPONENT_Y, uiAbsPartIdx );
     587  Pel* pDst  = getAddr           (COMPONENT_Y, uiAbsPartIdx );
     588
     589  Int  iSrc0Stride = pcYuvSrc0->getStride(COMPONENT_Y);
     590  Int  iSrc1Stride = pcYuvSrc1->getStride(COMPONENT_Y);
     591  Int  iDstStride  = getStride(COMPONENT_Y);
     592  for ( y = uiHeight-1; y >= 0; y-- )
     593  {
     594    for ( x = uiWidth-1; x >= 0; x-- )
     595    {
     596      pDst[x] = pSrc0[x] - pSrc1[x];
     597    }
     598    pSrc0 += iSrc0Stride;
     599    pSrc1 += iSrc1Stride;
     600    pDst  += iDstStride;
     601  }
     602}
     603
     604Void TComYuv::subtractARPChroma( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth , UInt uiHeight )
     605{
     606  Int x, y;
     607
     608  Pel* pSrcU0 = pcYuvSrc0->getAddr(COMPONENT_Cb, uiAbsPartIdx );
     609  Pel* pSrcU1 = pcYuvSrc1->getAddr(COMPONENT_Cb, uiAbsPartIdx );
     610  Pel* pSrcV0 = pcYuvSrc0->getAddr(COMPONENT_Cr, uiAbsPartIdx );
     611  Pel* pSrcV1 = pcYuvSrc1->getAddr(COMPONENT_Cr, uiAbsPartIdx );
     612  Pel* pDstU  = getAddr(COMPONENT_Cb, uiAbsPartIdx );
     613  Pel* pDstV  = getAddr(COMPONENT_Cr, uiAbsPartIdx );
     614
     615  Int  iSrc0Stride = pcYuvSrc0->getStride(COMPONENT_Cb);
     616  Int  iSrc1Stride = pcYuvSrc1->getStride(COMPONENT_Cb);
     617  Int  iDstStride  = getStride( COMPONENT_Cb );
     618  for ( y = uiHeight-1; y >= 0; y-- )
     619  {
     620    for ( x = uiWidth-1; x >= 0; x-- )
     621    {
     622      pDstU[x] = pSrcU0[x] - pSrcU1[x];
     623      pDstV[x] = pSrcV0[x] - pSrcV1[x];
     624    }
    556625    pSrcU0 += iSrc0Stride;
    557626    pSrcU1 += iSrc1Stride;
     
    563632}
    564633
    565 Void TComYuv::subtractARP( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth , UInt uiHeight )
    566 {
    567   subtractARPLuma  ( pcYuvSrc0, pcYuvSrc1,  uiAbsPartIdx, uiWidth    , uiHeight    );
    568 
    569   if (uiWidth > 8)
    570     subtractARPChroma( pcYuvSrc0, pcYuvSrc1,  uiAbsPartIdx, uiWidth>>1 , uiHeight>>1 );
    571 }
    572 
    573 Void TComYuv::subtractARPLuma( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth , UInt uiHeight )
    574 {
    575   Int x, y;
    576 
    577   Pel* pSrc0 = pcYuvSrc0->getLumaAddr( uiAbsPartIdx );
    578   Pel* pSrc1 = pcYuvSrc1->getLumaAddr( uiAbsPartIdx );
    579   Pel* pDst  = getLumaAddr( uiAbsPartIdx );
    580 
    581   Int  iSrc0Stride = pcYuvSrc0->getStride();
    582   Int  iSrc1Stride = pcYuvSrc1->getStride();
    583   Int  iDstStride  = getStride();
    584   for ( y = uiHeight-1; y >= 0; y-- )
    585   {
    586     for ( x = uiWidth-1; x >= 0; x-- )
    587     {
    588       pDst[x] = pSrc0[x] - pSrc1[x];
    589     }
    590     pSrc0 += iSrc0Stride;
    591     pSrc1 += iSrc1Stride;
    592     pDst  += iDstStride;
    593   }
    594 }
    595 
    596 Void TComYuv::subtractARPChroma( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth , UInt uiHeight )
    597 {
    598   Int x, y;
    599 
    600   Pel* pSrcU0 = pcYuvSrc0->getCbAddr( uiAbsPartIdx );
    601   Pel* pSrcU1 = pcYuvSrc1->getCbAddr( uiAbsPartIdx );
    602   Pel* pSrcV0 = pcYuvSrc0->getCrAddr( uiAbsPartIdx );
    603   Pel* pSrcV1 = pcYuvSrc1->getCrAddr( uiAbsPartIdx );
    604   Pel* pDstU  = getCbAddr( uiAbsPartIdx );
    605   Pel* pDstV  = getCrAddr( uiAbsPartIdx );
    606 
    607   Int  iSrc0Stride = pcYuvSrc0->getCStride();
    608   Int  iSrc1Stride = pcYuvSrc1->getCStride();
    609   Int  iDstStride  = getCStride();
    610   for ( y = uiHeight-1; y >= 0; y-- )
    611   {
    612     for ( x = uiWidth-1; x >= 0; x-- )
    613     {
    614       pDstU[x] = pSrcU0[x] - pSrcU1[x];
    615       pDstV[x] = pSrcV0[x] - pSrcV1[x];
    616     }
    617     pSrcU0 += iSrc0Stride;
    618     pSrcU1 += iSrc1Stride;
    619     pSrcV0 += iSrc0Stride;
    620     pSrcV1 += iSrc1Stride;
    621     pDstU  += iDstStride;
    622     pDstV  += iDstStride;
    623   }
    624 }
    625 
    626634Void TComYuv::multiplyARP( UInt uiAbsPartIdx , UInt uiWidth , UInt uiHeight , UChar dW )
    627635{
    628636  multiplyARPLuma( uiAbsPartIdx , uiWidth , uiHeight , dW );
    629637
    630   if (uiWidth > 8)
     638  if ( uiWidth > 8 && getNumberValidComponents() > 1 )
     639  {
    631640    multiplyARPChroma( uiAbsPartIdx , uiWidth >> 1 , uiHeight >> 1 , dW );
     641}
    632642}
    633643
     
    641651Void TComYuv::multiplyARPLuma( UInt uiAbsPartIdx , UInt uiWidth , UInt uiHeight , UChar dW )
    642652{
    643   Pel* pDst  = getLumaAddr( uiAbsPartIdx );
    644   Int  iDstStride  = getStride();
     653  Pel* pDst  = getAddr(COMPONENT_Y, uiAbsPartIdx );
     654  Int  iDstStride  = getStride(COMPONENT_Y);
    645655  for ( Int y = uiHeight-1; y >= 0; y-- )
    646656  {
     
    652662Void TComYuv::multiplyARPChroma( UInt uiAbsPartIdx , UInt uiWidth , UInt uiHeight , UChar dW )
    653663{
    654   Pel* pDstU  = getCbAddr( uiAbsPartIdx );
    655   Pel* pDstV  = getCrAddr( uiAbsPartIdx );
    656 
    657   Int  iDstStride  = getCStride();
     664  Pel* pDstU  = getAddr( COMPONENT_Cb, uiAbsPartIdx );
     665  Pel* pDstV  = getAddr( COMPONENT_Cr, uiAbsPartIdx );
     666
     667  Int  iDstStride  = getStride( COMPONENT_Cb );
    658668  for ( Int y = uiHeight-1; y >= 0; y-- )
    659669  {
  • branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TComYuv.h

    r1200 r1270  
    206206#if NH_3D
    207207  Void         addClipPartLuma( Int bitDepth, TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiTrUnitIdx, UInt uiPartSize );
    208 #if H_3D_ARP
    209   Void         addARP                     ( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth , UInt uiHeight , Bool bClip );
    210   Void         addARPLuma                 ( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth , UInt uiHeight , Bool bClip );
    211   Void         addARPChroma               ( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth , UInt uiHeight , Bool bClip );
     208#if NH_3D_ARP
     209  Void         addARP                     ( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth , UInt uiHeight , Bool bClip, const BitDepths &clipBitDepths );
     210  Void         addARPLuma                 ( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth , UInt uiHeight , Bool bClip, const BitDepths &clipBitDepths );
     211  Void         addARPChroma               ( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth , UInt uiHeight , Bool bClip, const BitDepths &clipBitDepths );
    212212  Void         subtractARP                ( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth , UInt uiHeight );
    213213  Void         subtractARPLuma            ( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiAbsPartIdx, UInt uiWidth , UInt uiHeight );
  • branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/TypeDef.h

    r1268 r1270  
    7777#define NH_3D_INTEGER_MV_DEPTH            1
    7878#define NH_3D_TEXT_MERGE                  1
     79#define NH_3D_DBBP                         1
     80#define BUF_FIX 1
     81#define NH_3D_ARP                         0  // Advanced residual prediction (ARP), JCT3V-D0177
     82                                              // QC_MTK_INTERVIEW_ARP_F0123_F0108 JCT3V-F0123; JCT3V-F0108
     83                                              // SHARP_ARP_REF_CHECK_F0105        ARP reference picture selection and DPB check
     84                                              // LGE_ARP_CTX_F0161                JCT3V-F0161
     85                                              // MTK_ARP_FLAG_CABAC_SIMP_G0061 Use 2 context for ARP flag referring to only left neighbor block in JCT3V-G0061
     86                                              // MTK_ARP_REF_SELECTION_G0053 ARP Reference picture selection in JCT3V-G0053
     87                                              // MTK_ALIGN_SW_WD_BI_PRED_ARP_H0085  Align the SW and WD for the bi-prediction ARP PUs by disallowing non-normative fast bi-prediction for ARP PUs, JCT3V-H0085
     88                                              // QC_I0051_ARP_SIMP         
     89                                              // SHARP_ARP_CHROMA_I0104     
     90                                              // MTK_I0072_IVARP_SCALING_FIX
     91                                              // SEC_ARP_VIEW_REF_CHECK_J0037    Signaling iv_res_pred_weight_idx when the current slice has both view and temporal reference picture(s), JCT3V-J0037 item1
     92                                              // SEC_ARP_REM_ENC_RESTRICT_K0035    Removal of encoder restriction of ARP, JCT3V-K0035
     93
    7994#endif
    8095
     
    105120                                              // MTK_TEXTURE_MRGCAND_BUGFIX_E0182  Bug fix for TEXTURE MERGING CANDIDATE     , JCT3V-E0182
    106121                                              // LGE_SIMP_DISP_AVAIL_J0041    // Use 2 status for disparity availability - DISP_AVAILABLE and DISP_NONE
    107 #define H_3D_ARP                          1   // Advanced residual prediction (ARP), JCT3V-D0177
    108                                               // QC_MTK_INTERVIEW_ARP_F0123_F0108 JCT3V-F0123; JCT3V-F0108
    109                                               // SHARP_ARP_REF_CHECK_F0105        ARP reference picture selection and DPB check
    110                                               // LGE_ARP_CTX_F0161                JCT3V-F0161
    111                                               // MTK_ARP_FLAG_CABAC_SIMP_G0061 Use 2 context for ARP flag referring to only left neighbor block in JCT3V-G0061
    112                                               // MTK_ARP_REF_SELECTION_G0053 ARP Reference picture selection in JCT3V-G0053
    113                                               // MTK_ALIGN_SW_WD_BI_PRED_ARP_H0085  Align the SW and WD for the bi-prediction ARP PUs by disallowing non-normative fast bi-prediction for ARP PUs, JCT3V-H0085
    114                                               // QC_I0051_ARP_SIMP         
    115                                               // SHARP_ARP_CHROMA_I0104     
    116                                               // MTK_I0072_IVARP_SCALING_FIX
    117                                               // SEC_ARP_VIEW_REF_CHECK_J0037    Signaling iv_res_pred_weight_idx when the current slice has both view and temporal reference picture(s), JCT3V-J0037 item1
    118                                               // SEC_ARP_REM_ENC_RESTRICT_K0035    Removal of encoder restriction of ARP, JCT3V-K0035
    119122#define H_3D_IC                           1   // Illumination Compensation, JCT3V-B0045, JCT3V-C0046, JCT3V-D0060
    120123                                              // Unifying rounding offset, for IC part, JCT3V-D0135
     
    301304#endif
    302305///// ***** ADVANCED INTERVIEW RESIDUAL PREDICTION *********
    303 #if H_3D_ARP
     306#if NH_3D_ARP
    304307#define H_3D_ARP_WFNR                     3
    305308#endif
     
    325328#endif
    326329///// ***** DEPTH BASED BLOCK PARTITIONING *********
    327 #if H_3D_DBBP
     330#if NH_3D_DBBP
    328331#define DBBP_INVALID_SHORT                (-4)
    329332#define DBBP_PACK_MODE               SIZE_2NxN
  • branches/HTM-14.1-update-dev3/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1259 r1270  
    18401840  else
    18411841  {
    1842     vpsVui->setVpsNumVideoSignalInfoMinus1( pcVPS->getMaxLayersMinus1() - pcVPS->getVpsBaseLayerInternalFlag() ? 0 : 1 );
     1842    vpsVui->setVpsNumVideoSignalInfoMinus1( (pcVPS->getMaxLayersMinus1() - pcVPS->getVpsBaseLayerInternalFlag()) ? 0 : 1 );
    18431843  }
    18441844
     
    33763376}
    33773377
    3378 #if H_3D_ARP
     3378#if NH_3D_ARP
    33793379Void TDecCavlc::parseARPW( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    33803380{
     
    34003400
    34013401#endif
    3402 #if H_3D_DBBP
     3402#if NH_3D_DBBP
    34033403  Void TDecCavlc::parseDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    34043404  {
  • branches/HTM-14.1-update-dev3/source/Lib/TLibDecoder/TDecCAVLC.h

    r1200 r1270  
    117117  Void parseMergeFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPUIdx );
    118118  Void parseMergeIndex      ( TComDataCU* pcCU, UInt& ruiMergeIndex );
    119 #if H_3D_ARP
     119#if NH_3D_ARP
    120120  Void parseARPW            ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    121121#endif
     
    127127  Void  parseSDCFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    128128#endif
    129 #if H_3D_DBBP
     129#if NH_3D_DBBP
    130130  Void  parseDBBPFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    131131#endif
  • branches/HTM-14.1-update-dev3/source/Lib/TLibDecoder/TDecCu.cpp

    r1259 r1270  
    5252  m_ppcYuvReco = NULL;
    5353  m_ppcCU      = NULL;
    54 #if H_3D_DBBP
     54#if NH_3D_DBBP
    5555  m_ppcYuvRecoDBBP = NULL;
    5656#endif
     
    8181  m_ppcYuvReco = new TComYuv*[m_uiMaxDepth-1];
    8282  m_ppcCU      = new TComDataCU*[m_uiMaxDepth-1];
    83 #if H_3D_DBBP
     83#if NH_3D_DBBP
    8484  m_ppcYuvRecoDBBP = new TComYuv*[m_uiMaxDepth-1];
    8585#endif
     
    9595    m_ppcYuvReco[ui] = new TComYuv;    m_ppcYuvReco[ui]->create( uiWidth, uiHeight, chromaFormatIDC );
    9696    m_ppcCU     [ui] = new TComDataCU; m_ppcCU     [ui]->create( chromaFormatIDC, uiNumPartitions, uiWidth, uiHeight, true, uiMaxWidth >> (m_uiMaxDepth - 1) );
    97 #if H_3D_DBBP
    98     m_ppcYuvRecoDBBP[ui] = new TComYuv;    m_ppcYuvRecoDBBP[ui]->create( uiWidth, uiHeight );
     97#if NH_3D_DBBP
     98    m_ppcYuvRecoDBBP[ui] = new TComYuv;    m_ppcYuvRecoDBBP[ui]->create( uiWidth, uiHeight, chromaFormatIDC );
    9999#endif
    100100}
     
    119119    m_ppcYuvReco[ui]->destroy(); delete m_ppcYuvReco[ui]; m_ppcYuvReco[ui] = NULL;
    120120    m_ppcCU     [ui]->destroy(); delete m_ppcCU     [ui]; m_ppcCU     [ui] = NULL;
    121 #if H_3D_DBBP
     121#if NH_3D_DBBP
    122122    m_ppcYuvRecoDBBP[ui]->destroy(); delete m_ppcYuvRecoDBBP[ui]; m_ppcYuvRecoDBBP[ui] = NULL;
    123123#endif
     
    127127  delete [] m_ppcYuvReco; m_ppcYuvReco = NULL;
    128128  delete [] m_ppcCU     ; m_ppcCU      = NULL;
    129 #if H_3D_DBBP
     129#if NH_3D_DBBP
    130130  delete [] m_ppcYuvRecoDBBP; m_ppcYuvRecoDBBP = NULL;
    131131#endif
     
    163163Void TDecCu::decompressCtu( TComDataCU* pCtu )
    164164{
    165 #if !NH_3D_IV_MERGE
     165#if !H_3D_IV_MERGE
    166166  xDecompressCU( pCtu, 0,  0 );
    167167#endif
     
    306306#else
    307307#if H_3D_ARP
    308     if( pcCU->getSlice()->getVPS()->getUseAdvRP(pcCU->getSlice()->getLayerId()) )
     308    if( pcCU->getSlice()->getIvResPredFlag( ) )
    309309#else
    310310#if H_3D_IV_MERGE
    311311    if( pcCU->getSlice()->getVPS()->getIvMvPredFlag(pcCU->getSlice()->getLayerId()) )
    312312#else
     313#if NH_3D_DBBP
     314    if( pcCU->getSlice()->getDepthBasedBlkPartFlag() )
     315#else
    313316    if (0)
     317#endif
    314318#endif
    315319#endif
     
    412416    m_pcEntropyDecoder->decodeMergeIndex( pcCU, 0, uiAbsPartIdx, uiDepth );
    413417    UInt uiMergeIndex = pcCU->getMergeIndex(uiAbsPartIdx);
    414 #if H_3D_ARP
     418#if NH_3D_ARP
    415419    m_pcEntropyDecoder->decodeARPW( pcCU , uiAbsPartIdx , uiDepth );
    416420#endif
     
    637641  {
    638642    case MODE_INTER:
    639 #if H_3D_DBBP
     643#if NH_3D_DBBP
    640644    if( m_ppcCU[uiDepth]->getDBBPFlag(0) )
    641645    {
     
    657661      }
    658662#endif
    659 #if H_3D_DBBP
     663#if NH_3D_DBBP
    660664    }
    661665#endif
     
    865869#endif
    866870
    867 #if H_3D_DBBP
     871#if NH_3D_DBBP
    868872Void TDecCu::xReconInterDBBP( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    869873{
     
    871875  AOF(!pcCU->getSlice()->isIntra());
    872876  PartSize ePartSize = pcCU->getPartitionSize( 0 );
     877 
     878  Int bitDepthY = pcCU->getSlice()->getSPS()->getBitDepth(CHANNEL_TYPE_LUMA);
    873879 
    874880  // get collocated depth block
     
    891897 
    892898  // first, extract the two sets of motion parameters
    893   UInt uiPUOffset = ( g_auiPUOffset[UInt( ePartSize )] << ( ( pcCU->getSlice()->getSPS()->getMaxCUDepth() - uiDepth ) << 1 ) ) >> 4;
     899  UInt uiPUOffset = ( g_auiPUOffset[UInt( ePartSize )] << ( ( pcCU->getSlice()->getSPS()->getMaxTotalCUDepth() - uiDepth ) << 1 ) ) >> 4;
    894900  for( UInt uiSegment = 0; uiSegment < 2; uiSegment++ )
    895901  {
     
    897903   
    898904    pDBBPTmpData->auhInterDir[uiSegment] = pcCU->getInterDir(uiPartAddr);
     905    assert( pDBBPTmpData->auhInterDir[uiSegment] == 1 || pDBBPTmpData->auhInterDir[uiSegment] == 2  );  // only uni-prediction allowed
    899906   
    900907    for ( UInt uiRefListIdx = 0; uiRefListIdx < 2; uiRefListIdx++ )
     
    904911    }
    905912   
     913#if H_3D
    906914    AOF( pcCU->getARPW(uiPartAddr) == 0 );
    907915    AOF( pcCU->getICFlag(uiPartAddr) == false );
    908916    AOF( pcCU->getSPIVMPFlag(uiPartAddr) == false );
    909917    AOF( pcCU->getVSPFlag(uiPartAddr) == 0 );
     918#endif
    910919  }
    911920 
     
    947956 
    948957  // reconstruct final prediction signal by combining both segments
    949   m_pcPrediction->combineSegmentsWithMask(apSegPredYuv, m_ppcYuvReco[uiDepth], pMask, pcCU->getWidth(0), pcCU->getHeight(0), 0, ePartSize);
     958  m_pcPrediction->combineSegmentsWithMask(apSegPredYuv, m_ppcYuvReco[uiDepth], pMask, pcCU->getWidth(0), pcCU->getHeight(0), 0, ePartSize, bitDepthY);
    950959
    951960  // inter recon
    952   xDecodeInterTexture( pcCU, 0, uiDepth );
     961  xDecodeInterTexture( pcCU, uiDepth );
    953962 
    954963  // clip for only non-zero cbp case
    955   if  ( ( pcCU->getCbf( 0, TEXT_LUMA ) ) || ( pcCU->getCbf( 0, TEXT_CHROMA_U ) ) || ( pcCU->getCbf(0, TEXT_CHROMA_V ) ) )
    956   {
    957     m_ppcYuvReco[uiDepth]->addClip( m_ppcYuvReco[uiDepth], m_ppcYuvResi[uiDepth], 0, pcCU->getWidth( 0 ) );
     964  if  ( ( pcCU->getCbf( 0, COMPONENT_Y ) ) || ( pcCU->getCbf( 0, COMPONENT_Cb ) ) || ( pcCU->getCbf(0, COMPONENT_Cr ) ) )
     965  {
     966    m_ppcYuvReco[uiDepth]->addClip( m_ppcYuvReco[uiDepth], m_ppcYuvResi[uiDepth], 0, pcCU->getWidth( 0 ), pcCU->getSlice()->getSPS()->getBitDepths() );
    958967  }
    959968  else
  • branches/HTM-14.1-update-dev3/source/Lib/TLibDecoder/TDecCu.h

    r1200 r1270  
    6262  TComDataCU**        m_ppcCU;            ///< CU data array
    6363
    64 #if H_3D_DBBP
     64#if NH_3D_DBBP
    6565  TComYuv**           m_ppcYuvRecoDBBP;
    6666#endif
     
    102102  Void xReconInter              ( TComDataCU* pcCU, UInt uiDepth );
    103103
    104 #if H_3D_DBBP
     104#if NH_3D_DBBP
    105105  Void xReconInterDBBP          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    106106#endif
  • branches/HTM-14.1-update-dev3/source/Lib/TLibDecoder/TDecEntropy.cpp

    r1259 r1270  
    105105}
    106106
    107 #if H_3D_ARP
     107#if NH_3D_ARP
    108108Void TDecEntropy::decodeARPW( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    109109{
     
    257257  }
    258258  Int numValidMergeCand = 0;
     259#if !NH_3D
    259260  Bool hasMergedCandList = false;
     261#else
     262  Bool isMerged = false;
     263#endif
    260264
    261265  pcSubCU->copyInterPredInfoFrom( pcCU, uiAbsPartIdx, REF_PIC_LIST_0 );
    262266  pcSubCU->copyInterPredInfoFrom( pcCU, uiAbsPartIdx, REF_PIC_LIST_1 );
    263 #if H_3D
     267#if NH_3D
    264268  for ( UInt uiPartIdx = 0, uiSubPartIdx = uiAbsPartIdx; uiPartIdx < uiNumPU; uiPartIdx++, uiSubPartIdx += uiPUOffset )
    265269  {
     
    293297
    294298  ////// Parse CUs extension syntax
     299#if NH_3D_DBBP
    295300  decodeDBBPFlag( pcCU, uiAbsPartIdx, uiDepth );
    296   decodeSDCFlag ( pcCU, uiAbsPartIdx, uiDepth );
    297 
    298 #if H_3D_ARP
     301#endif
     302  //decodeSDCFlag ( pcCU, uiAbsPartIdx, uiDepth );
     303
     304#if NH_3D_ARP
    299305  decodeARPW  ( pcCU, uiAbsPartIdx, uiDepth );
    300306#endif
     
    309315    {
    310316      UInt uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
    311 #if H_3D_DBBP
     317#if NH_3D_DBBP
    312318      if ( pcCU->getSlice()->getPPS()->getLog2ParallelMergeLevelMinus2() && ePartSize != SIZE_2Nx2N && pcSubCU->getWidth( 0 ) <= 8 && pcCU->getDBBPFlag(uiAbsPartIdx) == false )
    313319#else
     
    327333          pcSubCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand);
    328334          pcSubCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours
    329 #if H_3D_SPIVMP
     335#if NH_3D_SPIVMP
    330336            , pcMvFieldSP, puhInterDirSP
    331337#endif
    332338            , numValidMergeCand );
    333339          pcSubCU->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours, vspFlag
    334 #if H_3D_SPIVMP
     340#if NH_3D_SPIVMP
    335341            , bSPIVMPFlag
    336342#endif
     
    363369        pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
    364370        pcSubCU->xGetInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours
    365 #if H_3D_SPIVMP
     371#if NH_3D_SPIVMP
    366372          , pcMvFieldSP, puhInterDirSP
    367373#endif
    368374          ,numValidMergeCand, uiMergeIndex );
    369375        pcSubCU->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours, vspFlag
    370 #if H_3D_SPIVMP
     376#if NH_3D_SPIVMP
    371377          , bSPIVMPFlag
    372378#endif
     
    395401          pcCU->getCUMvField( RefPicList( uiRefListIdx ) )->setAllMvField( cMvFieldNeighbours[ 2*uiMergeIndex + uiRefListIdx ], ePartSize, uiSubPartIdx, uiDepth, uiPartIdx );
    396402#if NH_3D_VSP
    397 #if H_3D_DBBP
     403#if NH_3D_DBBP
    398404          if( pcCU->getVSPFlag( uiSubPartIdx ) != 0 && !pcCU->getDBBPFlag( uiAbsPartIdx ) )
    399405#else
     
    703709}
    704710
    705 #if H_3D
     711#if NH_3D
    706712Void TDecEntropy::decodeMVPIdxPU( TComDataCU* pcSubCU, UInt uiPartAddr, UInt uiDepth, UInt uiPartIdx, RefPicList eRefList )
    707713{
     
    11541160}
    11551161#endif
    1156 #if H_3D_DBBP
     1162#if NH_3D_DBBP
    11571163Void TDecEntropy::decodeDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    11581164{
  • branches/HTM-14.1-update-dev3/source/Lib/TLibDecoder/TDecEntropy.h

    r1200 r1270  
    8585  virtual Void parseMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPUIdx ) = 0;
    8686  virtual Void parseMergeIndex    ( TComDataCU* pcCU, UInt& ruiMergeIndex ) = 0;
    87 #if H_3D_ARP
     87#if NH_3D_ARP
    8888  virtual Void parseARPW          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
    8989#endif
     
    9595  virtual Void parseSDCFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
    9696#endif
    97 #if H_3D_DBBP
     97#if NH_3D_DBBP
    9898  virtual Void parseDBBPFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
    9999#endif
     
    145145  Void decodeMvdPU        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPartIdx, RefPicList eRefList );
    146146  Void decodeMVPIdxPU     ( TComDataCU* pcSubCU, UInt uiPartAddr, UInt uiDepth, UInt uiPartIdx, RefPicList eRefList );
    147 #if H_3D
     147#if NH_3D
    148148  Void decodeMvsAMVP      ( TComDataCU* pcSubCU, UInt uiPartAddr, UInt uiDepth, UInt uiPartIdx,
    149149RefPicList eRefList );
     
    174174  Void decodePartSize          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    175175
    176 #if H_3D_ARP
     176#if NH_3D_ARP
    177177  Void decodeARPW              ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    178178#endif
     
    183183  Void decodeSDCFlag           ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    184184#endif
    185 #if H_3D_DBBP
     185#if NH_3D_DBBP
    186186  Void decodeDBBPFlag          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    187187#endif
  • branches/HTM-14.1-update-dev3/source/Lib/TLibDecoder/TDecSbac.cpp

    r1200 r1270  
    7373, m_cCUMergeFlagExtSCModel                   ( 1,             1,                      NUM_MERGE_FLAG_EXT_CTX               , m_contextModels + m_numContextModels, m_numContextModels)
    7474, m_cCUMergeIdxExtSCModel                    ( 1,             1,                      NUM_MERGE_IDX_EXT_CTX                , m_contextModels + m_numContextModels, m_numContextModels)
    75 #if H_3D_ARP
     75#if NH_3D_ARP
    7676, m_cCUPUARPWSCModel          ( 1,             1,               NUM_ARPW_CTX                  , m_contextModels + m_numContextModels, m_numContextModels)
    7777#endif
     
    119119, m_cSDCFlagSCModel                  ( 1,             1,  NUM_SDC_FLAG_CTX                 , m_contextModels + m_numContextModels, m_numContextModels)
    120120#endif
    121 #if H_3D_DBBP
     121#if NH_3D_DBBP
    122122, m_cDBBPFlagSCModel             ( 1,             1,                 DBBP_NUM_FLAG_CTX           , m_contextModels + m_numContextModels, m_numContextModels)
    123123#endif
     
    164164  m_cCUMergeFlagExtSCModel.initBuffer             ( sliceType, qp, (UChar*)INIT_MERGE_FLAG_EXT );
    165165  m_cCUMergeIdxExtSCModel.initBuffer              ( sliceType, qp, (UChar*)INIT_MERGE_IDX_EXT );
    166 #if H_3D_ARP
     166#if NH_3D_ARP
    167167  m_cCUPUARPWSCModel.initBuffer          ( sliceType, qp, (UChar*)INIT_ARPW );
    168168#endif
     
    210210  m_cSDCFlagSCModel.initBuffer            ( sliceType, qp, (UChar*)INIT_SDC_FLAG );
    211211#endif
    212 #if H_3D_DBBP
     212#if NH_3D_DBBP
    213213  m_cDBBPFlagSCModel.initBuffer              ( sliceType, qp, (UChar*)INIT_DBBP_FLAG );
    214214#endif
     
    240240  m_cCUDISFlagSCModel.initBuffer         ( eSliceType, iQp, (UChar*)INIT_DIS_FLAG );
    241241  m_cCUDISTypeSCModel.initBuffer         ( eSliceType, iQp, (UChar*)INIT_DIS_TYPE );
    242 #endif
    243 #if H_3D_ARP
    244   m_cCUPUARPWSCModel.initBuffer          ( eSliceType, iQp, (UChar*)INIT_ARPW );
    245242#endif
    246243#if H_3D_IC
     
    259256#if H_3D_DIM_SDC
    260257  m_cSDCFlagSCModel.initBuffer            ( eSliceType, iQp, (UChar*)INIT_SDC_FLAG );
    261 #endif
    262 #if H_3D_DBBP
    263   m_cDBBPFlagSCModel.initBuffer              ( eSliceType, iQp, (UChar*)INIT_DBBP_FLAG );
    264258#endif
    265259
     
    24202414}
    24212415
    2422 #if H_3D_ARP
     2416#if NH_3D_ARP
    24232417Void TDecSbac::parseARPW( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    24242418{
    2425   UInt uiMaxW = pcCU->getSlice()->getARPStepNum() - 1;
    24262419  UInt uiW = 0;
    24272420  UInt uiOffset = pcCU->getCTXARPWFlag(uiAbsPartIdx);
    24282421  UInt uiCode = 0;
    24292422
    2430   assert ( uiMaxW > 0 );
    2431 
    2432   m_pcTDecBinIf->decodeBin( uiCode , m_cCUPUARPWSCModel.get( 0, 0, 0 + uiOffset ) );
     2423  m_pcTDecBinIf->decodeBin( uiCode , m_cCUPUARPWSCModel.get( 0, 0, 0 + uiOffset ) RExt__DECODER_DEBUG_BIT_STATISTICS_PASS_OPT_ARG(STATS__CABAC_BITS__ARP_FLAG));
    24332424
    24342425  uiW = uiCode;
    24352426  if( 1 == uiW )   
    24362427  {
    2437     m_pcTDecBinIf->decodeBin( uiCode , m_cCUPUARPWSCModel.get( 0, 0, 2 ) );
     2428    m_pcTDecBinIf->decodeBin( uiCode , m_cCUPUARPWSCModel.get( 0, 0, 2 ) RExt__DECODER_DEBUG_BIT_STATISTICS_PASS_OPT_ARG(STATS__CABAC_BITS__ARP_FLAG));
    24382429    uiW += ( 1 == uiCode ? 1 : 0 );
    24392430  }
     
    25412532#endif
    25422533
    2543 #if H_3D_DBBP
     2534#if NH_3D_DBBP
    25442535Void TDecSbac::parseDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    25452536{
     
    25492540  UInt uiSymbol = 0;
    25502541 
    2551   m_pcTDecBinIf->decodeBin( uiSymbol, m_cDBBPFlagSCModel.get( 0, 0, 0 ) );
     2542  m_pcTDecBinIf->decodeBin( uiSymbol, m_cDBBPFlagSCModel.get( 0, 0, 0 ) RExt__DECODER_DEBUG_BIT_STATISTICS_PASS_OPT_ARG(STATS__CABAC_BITS__DBBP_FLAG) );
    25522543  DTRACE_CU("dbbp_flag", uiSymbol)
    25532544  PartSize ePartSize = pcCU->getPartitionSize( uiAbsPartIdx );
    25542545  AOF( ePartSize == SIZE_2NxN || ePartSize == SIZE_Nx2N );
    2555   UInt uiPUOffset = ( g_auiPUOffset[UInt( ePartSize )] << ( ( pcCU->getSlice()->getSPS()->getMaxCUDepth() - uiDepth ) << 1 ) ) >> 4;
     2546  UInt uiPUOffset = ( g_auiPUOffset[UInt( ePartSize )] << ( ( pcCU->getSlice()->getSPS()->getMaxTotalCUDepth() - uiDepth ) << 1 ) ) >> 4;
    25562547  pcCU->setDBBPFlagSubParts(uiSymbol, uiAbsPartIdx, 0, uiDepth);
    25572548  pcCU->setDBBPFlagSubParts(uiSymbol, uiAbsPartIdx+uiPUOffset, 1, uiDepth);
  • branches/HTM-14.1-update-dev3/source/Lib/TLibDecoder/TDecSbac.h

    r1200 r1270  
    121121  Void  parseSDCFlag         ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    122122#endif
    123 #if H_3D_DBBP
     123#if NH_3D_DBBP
    124124  Void parseDBBPFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    125125#endif
     
    139139  Void parseMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPUIdx );
    140140  Void parseMergeIndex    ( TComDataCU* pcCU, UInt& ruiMergeIndex );
    141 #if H_3D_ARP
     141#if NH_3D_ARP
    142142  Void parseARPW          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    143143#endif
     
    190190  ContextModel3DBuffer m_cCUMergeFlagExtSCModel;
    191191  ContextModel3DBuffer m_cCUMergeIdxExtSCModel;
    192 #if H_3D_ARP
     192#if NH_3D_ARP
    193193  ContextModel3DBuffer m_cCUPUARPWSCModel;
    194194#endif
     
    240240  ContextModel3DBuffer m_cSDCFlagSCModel;
    241241#endif
    242 #if H_3D_DBBP
     242#if NH_3D_DBBP
    243243  ContextModel3DBuffer m_cDBBPFlagSCModel;
    244244#endif
  • branches/HTM-14.1-update-dev3/source/Lib/TLibDecoder/TDecTop.cpp

    r1259 r1270  
    11451145    pcSlice->setDefaultRefView();
    11461146#endif
    1147 #if H_3D_ARP
     1147#if NH_3D_ARP
    11481148    pcSlice->setARPStepNum(m_ivPicLists);
    1149     if( pcSlice->getARPStepNum() > 1 )
    1150     {
    1151       // GT: This seems to be broken, not all nuh_layer_ids are necessarily present
    1152       for(Int iLayerId = 0; iLayerId < nalu.m_nuhLayerId; iLayerId ++ )
    1153       {
    1154         Int  iViewIdx =   pcSlice->getVPS()->getViewIndex(iLayerId);
    1155         Bool bIsDepth = ( pcSlice->getVPS()->getDepthId  ( iLayerId ) == 1 );
    1156         if( iViewIdx<getViewIndex() && !bIsDepth )
    1157         {
    1158           pcSlice->setBaseViewRefPicList( m_ivPicLists->getPicList( iLayerId ), iViewIdx );
    1159         }
    1160       }
    1161     }
    11621149#endif
    11631150#else
  • branches/HTM-14.1-update-dev3/source/Lib/TLibEncoder/TEncCavlc.cpp

    r1259 r1270  
    25782578}
    25792579
    2580 #if H_3D_ARP
     2580#if NH_3D_ARP
    25812581Void TEncCavlc::codeARPW( TComDataCU* pcCU, UInt uiAbsPartIdx )
    25822582{
     
    29012901#endif
    29022902   
    2903 #if H_3D_DBBP
     2903#if NH_3D_DBBP
    29042904Void TEncCavlc::codeDBBPFlag    ( TComDataCU* pcCU, UInt uiAbsPartIdx )
    29052905{
  • branches/HTM-14.1-update-dev3/source/Lib/TLibEncoder/TEncCavlc.h

    r1200 r1270  
    126126  Void codeMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    127127  Void codeMergeIndex    ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    128 #if H_3D_ARP
     128#if NH_3D_ARP
    129129  Void codeARPW          ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    130130#endif
     
    136136  Void codeSDCFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    137137#endif
    138 #if H_3D_DBBP
     138#if NH_3D_DBBP
    139139  Void codeDBBPFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    140140#endif
  • branches/HTM-14.1-update-dev3/source/Lib/TLibEncoder/TEncCu.cpp

    r1259 r1270  
    6868  m_ppcTempCU      = new TComDataCU*[m_uhTotalDepth-1];
    6969
    70 #if H_3D_ARP
     70#if NH_3D_ARP
    7171  m_ppcWeightedTempCU = new TComDataCU*[m_uhTotalDepth-1];
    7272#endif
     
    7979  m_ppcRecoYuvTemp = new TComYuv*[m_uhTotalDepth-1];
    8080  m_ppcOrigYuv     = new TComYuv*[m_uhTotalDepth-1];
    81 #if H_3D_DBBP
     81#if NH_3D_DBBP
    8282  m_ppcOrigYuvDBBP = new TComYuv*[m_uhTotalDepth-1];
    8383#endif
     
    9292    m_ppcBestCU[i] = new TComDataCU; m_ppcBestCU[i]->create( chromaFormat, uiNumPartitions, uiWidth, uiHeight, false, uiMaxWidth >> (m_uhTotalDepth - 1) );
    9393    m_ppcTempCU[i] = new TComDataCU; m_ppcTempCU[i]->create( chromaFormat, uiNumPartitions, uiWidth, uiHeight, false, uiMaxWidth >> (m_uhTotalDepth - 1) );
    94 #if H_3D_ARP
    95     m_ppcWeightedTempCU[i] = new TComDataCU; m_ppcWeightedTempCU[i]->create( uiNumPartitions, uiWidth, uiHeight, false, uiMaxWidth >> (m_uhTotalDepth - 1) );
     94#if NH_3D_ARP
     95    m_ppcWeightedTempCU[i] = new TComDataCU; m_ppcWeightedTempCU[i]->create( chromaFormat, uiNumPartitions, uiWidth, uiHeight, false, uiMaxWidth >> (m_uhTotalDepth - 1) );
    9696#endif 
    9797
     
    105105
    106106    m_ppcOrigYuv    [i] = new TComYuv; m_ppcOrigYuv    [i]->create(uiWidth, uiHeight, chromaFormat);
    107 #if H_3D_DBBP
    108     m_ppcOrigYuvDBBP[i] = new TComYuv; m_ppcOrigYuvDBBP[i]->create(uiWidth, uiHeight);
     107#if NH_3D_DBBP
     108    m_ppcOrigYuvDBBP[i] = new TComYuv; m_ppcOrigYuvDBBP[i]->create(uiWidth, uiHeight, chromaFormat);
    109109#endif
    110110
     
    146146      m_ppcTempCU[i]->destroy();      delete m_ppcTempCU[i];      m_ppcTempCU[i] = NULL;
    147147    }
    148 #if H_3D_ARP
     148#if NH_3D_ARP
    149149    if(m_ppcWeightedTempCU[i])
    150150    {
     
    180180      m_ppcOrigYuv[i]->destroy();     delete m_ppcOrigYuv[i];     m_ppcOrigYuv[i] = NULL;
    181181    }
    182 #if H_3D_DBBP
     182#if NH_3D_DBBP
    183183    if(m_ppcOrigYuvDBBP[i])
    184184    {
     
    198198  }
    199199
    200 #if H_3D_ARP
     200#if NH_3D_ARP
    201201  if(m_ppcWeightedTempCU)
    202202  {
     
    240240    m_ppcOrigYuv = NULL;
    241241  }
    242 #if H_3D_DBBP
     242#if NH_3D_DBBP
    243243  if(m_ppcOrigYuvDBBP)
    244244  {
     
    279279  m_ppcBestCU[0]->initCtu( pCtu->getPic(), pCtu->getCtuRsAddr() );
    280280  m_ppcTempCU[0]->initCtu( pCtu->getPic(), pCtu->getCtuRsAddr() );
     281
     282#if NH_3D_ARP
     283  m_ppcWeightedTempCU[0]->initCtu( pCtu->getPic(), pCtu->getCtuRsAddr() );
     284#endif
    281285
    282286#if KWU_RC_MADPRED_E0227
     
    599603        if( rpcTempCU->getSlice()->getViewSynthesisPredFlag() )
    600604#else
    601 #if H_3D_ARP
    602         if( rpcTempCU->getSlice()->getVPS()->getUseAdvRP(rpcTempCU->getSlice()->getLayerId()) )
     605#if NH_3D_ARP
     606        if( rpcTempCU->getSlice()->getIvResPredFlag() )
    603607#else
    604608#if H_3D_IV_MERGE
    605609        if( rpcTempCU->getSlice()->getVPS()->getIvMvPredFlag(rpcTempCU->getSlice()->getLayerId()) )
    606610#else
     611#if NH_3D_DBBP
     612        if( rpcTempCU->getSlice()->getDepthBasedBlkPartFlag() )
     613#else