Changeset 294 in 3DVCSoftware for branches/HTM-5.1-dev0/source/App


Ignore:
Timestamp:
19 Feb 2013, 20:33:52 (12 years ago)
Author:
tech
Message:

Removed HM-6.1 related guard macros.

Location:
branches/HTM-5.1-dev0/source/App
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-5.1-dev0/source/App/TAppDecoder/TAppDecTop.cpp

    r289 r294  
    369369      if(newPicture[viewDepthId])
    370370      {
    371 #if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
    372371        xWriteOutput( pcListPic[viewDepthId], viewDepthId, nalu.m_temporalId );
    373 #else
    374         xWriteOutput( pcListPic[viewDepthId], viewDepthId );
    375 #endif
    376372      }
    377373    }
    … …  
    440436}
    441437
    442 #if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
    443438Void TAppDecTop::xWriteOutput( TComList<TComPic*>* pcListPic, Int viewDepthId, UInt tId )
    444 #else
    445 Void TAppDecTop::xWriteOutput( TComList<TComPic*>* pcListPic, Int viewDepthId )
    446 #endif
    447439{
    448440  TComList<TComPic*>::iterator iterPic   = pcListPic->begin();
    … …  
    463455  {
    464456    TComPic* pcPic = *(iterPic);
    465 #if PIC_CROPPING
    466457    TComSPS *sps = pcPic->getSlice(0)->getSPS();
    467 #endif
    468458   
    469 #if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
    470459    if ( pcPic->getOutputMark() && (not_displayed >  pcPic->getSlice(0)->getSPS()->getNumReorderPics(tId) && pcPic->getPOC() > m_pocLastDisplay[viewDepthId]))
    471 #else
    472     if ( pcPic->getOutputMark() && (not_displayed >  pcPic->getSlice(0)->getSPS()->getNumReorderFrames() && pcPic->getPOC() > m_pocLastDisplay[viewDepthId]))
    473 #endif
    474460    {
    475461      // write to file
    … …  
    477463      if ( m_pchReconFile )
    478464      {
    479 #if PIC_CROPPING
    480465        m_tVideoIOYuvReconFile[viewDepthId]->write( pcPic->getPicYuvRec(), sps->getPicCropLeftOffset(), sps->getPicCropRightOffset(), sps->getPicCropTopOffset(), sps->getPicCropBottomOffset() );
    481 #else
    482         m_tVideoIOYuvReconFile[viewDepthId]->write( pcPic->getPicYuvRec(), pcPic->getSlice(0)->getSPS()->getPad() );
    483 #endif
    484466      }
    485467     
    … …  
    526508  {
    527509    TComPic* pcPic = *(iterPic);
    528 #if PIC_CROPPING
    529510    TComSPS *sps = pcPic->getSlice(0)->getSPS();
    530 #endif
    531511
    532512    if ( pcPic->getOutputMark() )
    … …  
    535515      if ( m_pchReconFile )
    536516      {
    537 #if PIC_CROPPING
    538517        m_tVideoIOYuvReconFile[viewDepthId]->write( pcPic->getPicYuvRec(), sps->getPicCropLeftOffset(), sps->getPicCropRightOffset(), sps->getPicCropTopOffset(), sps->getPicCropBottomOffset() );
    539 #else
    540         m_tVideoIOYuvReconFile[viewDepthId]->write( pcPic->getPicYuvRec(), pcPic->getSlice(0)->getSPS()->getPad() );
    541 #endif
    542518      }
    543519     

  • branches/HTM-5.1-dev0/source/App/TAppDecoder/TAppDecTop.h

    r231 r294  
    121121//  Void  xInitDecLib       (); ///< initialize decoder class
    122122 
    123 #if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
    124123  Void  xWriteOutput      ( TComList<TComPic*>* pcListPic, Int viewDepthId, UInt tId); ///< write YUV to file
    125 #else
    126   Void  xWriteOutput      ( TComList<TComPic*>* pcListPic, Int viewDepthId ); ///< write YUV to file
    127 #endif
    128124  Void  xFlushOutput      ( TComList<TComPic*>* pcListPic, Int viewDepthId ); ///< flush all remaining decoded pictures to file
    129125

  • branches/HTM-5.1-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

    r292 r294  
    233233  ("SourceWidth,-wdt",        m_iSourceWidth,           0,                            "Source picture width")
    234234  ("SourceHeight,-hgt",       m_iSourceHeight,          0,                            "Source picture height")
    235 #if PIC_CROPPING
    236235  ("CroppingMode",            m_croppingMode,           0,                            "Cropping mode (0: no cropping, 1:automatic padding, 2: padding, 3:cropping")
    237236  ("CropLeft",                m_cropLeft,               0,                            "Left cropping/padding for cropping mode 3")
    … …  
    241240  ("HorizontalPadding,-pdx",  m_aiPad[0],               0,                            "horizontal source padding for cropping mode 2")
    242241  ("VerticalPadding,-pdy",    m_aiPad[1],               0,                            "vertical source padding for cropping mode 2")
    243 #endif
    244242  ("InputBitDepth",         m_uiInputBitDepth, 8u, "bit-depth of input file")
    245243  ("BitDepth",              m_uiInputBitDepth, 8u, "deprecated alias of InputBitDepth")
    246244  ("OutputBitDepth",        m_uiOutputBitDepth, 0u, "bit-depth of output file")
    247245  ("InternalBitDepth",      m_uiInternalBitDepth, 0u, "Internal bit-depth (BitDepth+BitIncrement)")
    248 #if !PIC_CROPPING
    249   ("HorizontalPadding,-pdx",m_aiPad[0],      0, "horizontal source padding size")
    250   ("VerticalPadding,-pdy",  m_aiPad[1],      0, "vertical source padding size")
    251   ("PAD",                   m_bUsePAD,   false, "automatic source padding of multiple of 16" )
    252 #endif
    253246  ("FrameRate,-fr",         m_iFrameRate,        0, "Frame rate")
    254247  ("FrameSkip,-fs",         m_FrameSkip,         0u, "Number of frames to skip at start of input YUV")
    … …  
    279272  ("DecodingRefreshType,-dr",m_iDecodingRefreshType, 0, "intra refresh, (0:none 1:CRA 2:IDR)")
    280273  ("GOPSize,g",      m_iGOPSize,      1, "GOP size of temporal structure")
    281 #if !H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
    282   ("MaxNumberOfReorderPictures",   m_numReorderFrames,               -1, "Max. number of reorder pictures: -1: encoder determines value, >=0: set explicitly")
    283   ("MaxNumberOfReferencePictures", m_maxNumberOfReferencePictures, 6, "Max. number of reference pictures")
    284 #endif
    285274  ("ListCombination,-lc", m_bUseLComb, true, "combined reference list flag for uni-prediction in B-slices")
    286275  ("LCModification", m_bLCMod, false, "enables signalling of combined reference list derivation")
    … …  
    321310  ("TemporalLayerQPOffset_L3,-tq3", m_aiTLayerQPOffset[3], MAX_QP + 1, "QP offset of temporal layer 3")
    322311 
    323 #if !H0566_TLA
    324   ("TLayeringBasedOnCodingStruct,-tl", m_bTLayering, false, "Temporal ID is set based on the hierarchical coding structure")
    325  
    326   ("TLayerSwitchingFlag_L0,-ts0", m_abTLayerSwitchingFlag[0], false, "Switching flag for temporal layer 0")
    327   ("TLayerSwitchingFlag_L1,-ts1", m_abTLayerSwitchingFlag[1], false, "Switching flag for temporal layer 1")
    328   ("TLayerSwitchingFlag_L2,-ts2", m_abTLayerSwitchingFlag[2], false, "Switching flag for temporal layer 2")
    329   ("TLayerSwitchingFlag_L3,-ts3", m_abTLayerSwitchingFlag[3], false, "Switching flag for temporal layer 3")
    330 #endif
    331312
    332313  /* Entropy coding parameters */
    … …  
    349330  ("IVSEnable",                       m_bUseIVS                 , true         , "Use inter-view vector scaling" )
    350331#endif
    351 #if DBL_CONTROL
    352332  ("DeblockingFilterControlPresent", m_DeblockingFilterControlPresent, true)
    353 #endif
    354333
    355334  /* Camera Paremetes */
    … …  
    412391  ("ALF", m_abUseALF, std::vector<Bool>(1,true), "Enables ALF")
    413392  ("SAO", m_abUseSAO, std::vector<Bool>(1, true), "SAO")
    414 #if SAO_UNIT_INTERLEAVING
    415393  ("MaxNumOffsetsPerPic", m_maxNumOffsetsPerPic, 2048, "2048: default")   
    416394  ("SAOInterleaving", m_saoInterleavingFlag, false, "0: SAO Picture Mode, 1: SAO Interleaving ")   
    417 #endif
    418395
    419396  ("ALFEncodePassReduction", m_iALFEncodePassReduction, 0, "0:Original 16-pass, 1: 1-pass, 2: 2-pass encoding")
    420397
    421398  ("ALFMaxNumFilter,-ALFMNF", m_iALFMaxNumberFilters, 16, "16: No Constrained, 1-15: Constrained max number of filter")
    422 #if LCU_SYNTAX_ALF
    423399  ("ALFParamInSlice", m_bALFParamInSlice, false, "ALF parameters in 0: APS, 1: slice header")
    424400  ("ALFPicBasedEncode", m_bALFPicBasedEncode, true, "ALF picture-based encoding 0: false, 1: true")
    425 #endif
    426401
    427402    ("SliceMode",            m_iSliceMode,           0, "0: Disable all Recon slice limits, 1: Enforce max # of LCUs, 2: Enforce max # of bytes")
    … …  
    446421    ("TileInfoPresentFlag",         m_iColumnRowInfoPresent,         1,          "0: tiles parameters are NOT present in the PPS. 1: tiles parameters are present in the PPS")
    447422    ("UniformSpacingIdc",           m_iUniformSpacingIdr,            0,          "Indicates if the column and row boundaries are distributed uniformly")
    448 #if !REMOVE_TILE_DEPENDENCE
    449     ("TileBoundaryIndependenceIdc", m_iTileBoundaryIndependenceIdr,  1,          "Indicates if the column and row boundaries break the prediction")
    450 #endif
    451423    ("NumTileColumnsMinus1",        m_iNumColumnsMinus1,             0,          "Number of columns in a picture minus 1")
    452424    ("ColumnWidthArray",            cfg_ColumnWidth,                 string(""), "Array containing ColumnWidth values in units of LCU")
    … …  
    463435    ("ScalingList",                 m_useScalingListId,              0,          "0: no scaling list, 1: default scaling lists, 2: scaling lists specified in ScalingListFile")
    464436    ("ScalingListFile",             cfg_ScalingListFile,             string(""), "Scaling list file name")
    465 #if MULTIBITS_DATA_HIDING
    466437    ("SignHideFlag,-SBH",                m_signHideFlag, 1)
    467438    ("SignHideThreshold,-TSIG",          m_signHidingThreshold,         4)
    468 #endif
    469439#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    470440  ("DMM",                         m_bUseDMM,                       false,      "depth model modes flag")
    … …  
    484454  ("FEN", m_bUseFastEnc, false, "fast encoder setting")
    485455  ("ECU", m_bUseEarlyCU, false, "Early CU setting")
    486 #if FAST_DECISION_FOR_MRG_RD_COST
    487456  ("FDM", m_useFastDecisionForMerge, true, "Fast decision for Merge RD Cost")
    488 #endif
    489457  ("CFM", m_bUseCbfFastMode, false, "Cbf fast mode setting")
    490458#if HHI_INTERVIEW_SKIP
    … …  
    624592  }
    625593
    626 #if PIC_CROPPING
    627594  switch (m_croppingMode)
    628595  {
    … …  
    674641    }
    675642  }
    676 #else
    677 
    678   // compute source padding size
    679   if ( m_bUsePAD )
    680   {
    681     if ( m_iSourceWidth%MAX_PAD_SIZE )
    682     {
    683       m_aiPad[0] = (m_iSourceWidth/MAX_PAD_SIZE+1)*MAX_PAD_SIZE - m_iSourceWidth;
    684     }
    685    
    686     if ( m_iSourceHeight%MAX_PAD_SIZE )
    687     {
    688       m_aiPad[1] = (m_iSourceHeight/MAX_PAD_SIZE+1)*MAX_PAD_SIZE - m_iSourceHeight;
    689     }
    690   }
    691   m_iSourceWidth  += m_aiPad[0];
    692   m_iSourceHeight += m_aiPad[1];
    693 #endif
    694643 
    695644  // allocate slice-based dQP values
    … …  
    897846  xConfirmPara( (m_iIntraPeriod > 0 && m_iIntraPeriod < m_iGOPSize) || m_iIntraPeriod == 0, "Intra period must be more than GOP size, or -1 , not 0" );
    898847  xConfirmPara( m_iDecodingRefreshType < 0 || m_iDecodingRefreshType > 2,                   "Decoding Refresh Type must be equal to 0, 1 or 2" );
    899 #if H0736_AVC_STYLE_QP_RANGE
    900848  xConfirmPara( m_aiQP[0] < -6 * ((Int)m_uiInternalBitDepth - 8) || m_aiQP[0] > 51,         "QP exceeds supported range (-QpBDOffsety to 51)" );
    901849  if ( m_aiQP.size() >= 2 )
    … …  
    903851    xConfirmPara( m_aiQP[1] < -6 * ((Int)m_uiInternalBitDepth - 8) || m_aiQP[1] > 51,       "QP depth exceeds supported range (-QpBDOffsety to 51)" );
    904852  }
    905 #else
    906   xConfirmPara( m_aiQP[0] < 0 || m_aiQP[0] > 51,                                             "QP exceeds supported range (0 to 51)" );
    907   if ( m_aiQP.size() >= 2 )
    908   {
    909     xConfirmPara( m_aiQP[1] < 0 || m_aiQP[1] > 51,                                           "QP Depth exceeds supported range (0 to 51)" );
    910   }
    911 #endif
    912853  xConfirmPara( m_iALFEncodePassReduction < 0 || m_iALFEncodePassReduction > 2,             "ALFEncodePassReduction must be equal to 0, 1 or 2");
    913 #if LCU_SYNTAX_ALF
    914854  xConfirmPara( m_iALFMaxNumberFilters < 1,                                                 "ALFMaxNumFilter should be larger than 1"); 
    915 #else
    916   xConfirmPara( m_iALFMaxNumberFilters < 1 || m_iALFMaxNumberFilters > 16,                  "ALFMaxNumFilter exceeds supported range (1 to 16)"); 
    917 #endif
    918855  xConfirmPara( m_loopFilterBetaOffsetDiv2 < -13 || m_loopFilterBetaOffsetDiv2 > 13,          "Loop Filter Beta Offset div. 2 exceeds supported range (-13 to 13)");
    919856  xConfirmPara( m_loopFilterTcOffsetDiv2 < -13 || m_loopFilterTcOffsetDiv2 > 13,              "Loop Filter Tc Offset div. 2 exceeds supported range (-13 to 13)");
    … …  
    941878  xConfirmPara( m_uiMaxCUWidth < 16,                                                        "Maximum partition width size should be larger than or equal to 16");
    942879  xConfirmPara( m_uiMaxCUHeight < 16,                                                       "Maximum partition height size should be larger than or equal to 16");
    943 #if PIC_CROPPING
    944880  xConfirmPara( (m_iSourceWidth  % (m_uiMaxCUWidth  >> (m_uiMaxCUDepth-1)))!=0,             "Resulting coded frame width must be a multiple of the minimum CU size");
    945881  xConfirmPara( (m_iSourceHeight % (m_uiMaxCUHeight >> (m_uiMaxCUDepth-1)))!=0,             "Resulting coded frame height must be a multiple of the minimum CU size");
    946 #else
    947   xConfirmPara( (m_iSourceWidth  % (m_uiMaxCUWidth  >> (m_uiMaxCUDepth-1)))!=0,             "Frame width should be multiple of minimum CU size");
    948   xConfirmPara( (m_iSourceHeight % (m_uiMaxCUHeight >> (m_uiMaxCUDepth-1)))!=0,             "Frame height should be multiple of minimum CU size");
    949 #endif
    950882 
    951883  xConfirmPara( m_uiQuadtreeTULog2MinSize < 2,                                        "QuadtreeTULog2MinSize must be 2 or greater.");
    … …  
    1005937  }
    1006938#if ADAPTIVE_QP_SELECTION
    1007 #if H0736_AVC_STYLE_QP_RANGE
    1008939  xConfirmPara( m_bUseAdaptQpSelect == true && m_aiQP[0] < 0,                                              "AdaptiveQpSelection must be disabled when QP < 0.");
    1009940  xConfirmPara( m_bUseAdaptQpSelect == true && m_aiQP[1] < 0,                                              "AdaptiveQpSelection must be disabled when QP < 0.");
    1010941  xConfirmPara( m_bUseAdaptQpSelect == true && (m_iChromaQpOffset !=0 || m_iChromaQpOffset2nd != 0 ),  "AdaptiveQpSelection must be disabled when ChromaQpOffset is not equal to 0.");
    1011 #endif
    1012942#endif
    1013943
    … …  
    1020950  }
    1021951
    1022 #if FIXED_NUMBER_OF_TILES_SLICE_MODE
    1023952  xConfirmPara( m_iSliceMode < 0 || m_iSliceMode > 3, "SliceMode exceeds supported range (0 to 3)" );
    1024 #endif
    1025953  if (m_iSliceMode!=0)
    1026954  {
    1027955    xConfirmPara( m_iSliceArgument < 1 ,         "SliceArgument should be larger than or equal to 1" );
    1028956  }
    1029 #if FIXED_NUMBER_OF_TILES_SLICE_MODE
    1030957  if (m_iSliceMode==3)
    1031958  {
    1032959    xConfirmPara( m_iSliceGranularity > 0 ,      "When SliceMode == 3 is chosen, the SliceGranularity must be 0" );
    1033960  }
    1034 #endif
    1035961  xConfirmPara( m_iEntropySliceMode < 0 || m_iEntropySliceMode > 2, "EntropySliceMode exceeds supported range (0 to 2)" );
    1036962  if (m_iEntropySliceMode!=0)
    … …  
    1042968  xConfirmPara( m_iSliceGranularity > m_iMaxCuDQPDepth, "SliceGranularity must be smaller smaller than or equal to maximum dqp depth" );
    1043969
    1044 #if NO_COMBINED_PARALLEL
    1045970  bool tileFlag = (m_iNumColumnsMinus1 > 0 || m_iNumRowsMinus1 > 0 );
    1046971  xConfirmPara( tileFlag && m_iEntropySliceMode,            "Tile and Entropy Slice can not be applied together");
    1047972  xConfirmPara( tileFlag && m_iWaveFrontSynchro,            "Tile and Wavefront can not be applied together");
    1048973  xConfirmPara( m_iWaveFrontSynchro && m_iEntropySliceMode, "Wavefront and Entropy Slice can not be applied together"); 
    1049 #endif
    1050974
    1051975  // max CU width and height should be power of 2
    … …  
    12391163      for( Int i = 0; i < MAX_GOP; i++ ) { isOK[i] = false; }
    12401164      Int numOK = 0;
    1241 #if !H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
    1242       Int numReorderFramesRequired=0;
    1243       m_maxNumberOfReferencePictures=0;
    1244       Int lastDisp = -1;
    1245 #endif
    12461165      m_extraRPSs[viewId] = 0;
    12471166      //start looping through frames in coding order until we can verify that the GOP structure is correct.
    … …  
    14271346            }
    14281347          }
    1429 #if !H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
    1430           if(m_maxNumberOfReferencePictures<numRefs)
    1431           {
    1432             m_maxNumberOfReferencePictures=numRefs;
    1433           }
    1434 #endif
    14351348          refList[numRefs] = curPOC;
    14361349          numRefs++;
    1437 #if !H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
    1438           Int nonDisplayed=0;
    1439           for(Int i=0; i<numRefs; i++)
    1440           {
    1441             if(refList[i]==lastDisp+1)
    1442             {
    1443               lastDisp=refList[i];
    1444               i=0;
    1445             }
    1446           }
    1447           for(Int i=0; i<numRefs; i++)
    1448           {
    1449             if(refList[i]>lastDisp)
    1450             {
    1451               nonDisplayed++;
    1452             }
    1453           }
    1454           if(nonDisplayed>numReorderFramesRequired)
    1455           {
    1456             numReorderFramesRequired=nonDisplayed;
    1457           }
    1458 #endif
    14591350        }
    14601351        checkGOP++;
    14611352      }
    1462 #if !H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
    1463       if (m_numReorderFrames == -1)
    1464       {
    1465         m_numReorderFrames = numReorderFramesRequired;
    1466       }
    1467 #endif
    14681353      xConfirmPara( errorGOP, "Invalid GOP structure given" );
    1469 #if H0566_TLA
    14701354      m_maxTempLayer[viewId] = 1;
    1471 #endif
    14721355      for( Int i = 0; i < m_iGOPSize; i++ )
    14731356      {
    1474 #if H0566_TLA
    14751357        if( m_GOPListsMvc[viewId][i].m_temporalId >= m_maxTempLayer[viewId] )
    14761358        {
    14771359          m_maxTempLayer[viewId] = m_GOPListsMvc[viewId][i].m_temporalId + 1;
    14781360        }
    1479 #endif
    14801361        xConfirmPara( m_GOPListsMvc[viewId][i].m_sliceType != 'B' && m_GOPListsMvc[viewId][i].m_sliceType != 'P', "Slice type must be equal to B or P" );
    14811362      }
    14821363
    1483 #if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
    14841364      for( Int i = 0; i < MAX_TLAYER; i++ )
    14851365      {
    … …  
    15381418        m_maxDecPicBuffering[viewId][MAX_TLAYER-1] = m_numReorderPics[viewId][MAX_TLAYER-1];
    15391419      }
    1540 #endif
    1541 
    1542 #if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
     1420
    15431421      xConfirmPara( m_bUseLComb == false && m_numReorderPics[viewId][MAX_TLAYER-1] != 0, "ListCombination can only be 0 in low delay coding (more precisely when L0 and L1 are identical)" );  // Note however this is not the full necessary condition as ref_pic_list_combination_flag can only be 0 if L0 == L1.
    1544 #else
    1545       xConfirmPara( m_bUseLComb==false && m_numReorderFrames!=0, "ListCombination can only be 0 in low delay coding (more precisely when L0 and L1 are identical)" );  // Note however this is not the full necessary condition as ref_pic_list_combination_flag can only be 0 if L0 == L1.
    1546       xConfirmPara( m_numReorderFrames < numReorderFramesRequired, "For the used GOP the encoder requires more pictures for reordering than specified in MaxNumberOfReorderPictures" );
    1547 #endif
    15481422    }
    15491423  }
    … …  
    16551529    }
    16561530  }
    1657 #if PIC_CROPPING
    16581531  printf("Real     Format              : %dx%d %dHz\n", m_iSourceWidth - m_cropLeft - m_cropRight, m_iSourceHeight - m_cropTop - m_cropBottom, m_iFrameRate );
    1659 #else
    1660   printf("Real     Format              : %dx%d %dHz\n", m_iSourceWidth - m_aiPad[0], m_iSourceHeight-m_aiPad[1], m_iFrameRate );
    1661 #endif
    16621532  printf("Internal Format              : %dx%d %dHz\n", m_iSourceWidth, m_iSourceHeight, m_iFrameRate );
    16631533  printf("Frame index                  : %u - %d (%d frames)\n", m_FrameSkip, m_FrameSkip+m_iFrameToBeEncoded-1, m_iFrameToBeEncoded );
    … …  
    17271597 
    17281598  printf("TOOL CFG General: "); 
    1729 #if LCU_SYNTAX_ALF
    17301599  printf("ALFMNF:%d ", m_iALFMaxNumberFilters);
    17311600  printf("ALFInSlice:%d ", m_bALFParamInSlice);
    17321601  printf("ALFPicEnc:%d ", m_bALFPicBasedEncode);
    1733 #endif
    17341602  printf("IBD:%d ", !!g_uiBitIncrement);
    17351603  printf("HAD:%d ", m_bUseHADME           );
    … …  
    17371605  printf("SQP:%d ", m_uiDeltaQpRD         );
    17381606  printf("ASR:%d ", m_bUseASR             );
    1739 #if !PIC_CROPPING
    1740   printf("PAD:%d ", m_bUsePAD             );
    1741 #endif
    17421607  printf("LComb:%d ", m_bUseLComb         );
    17431608  printf("LCMod:%d ", m_bLCMod         );
    17441609  printf("FEN:%d ", m_bUseFastEnc         );
    17451610  printf("ECU:%d ", m_bUseEarlyCU         );
    1746 #if FAST_DECISION_FOR_MRG_RD_COST
    17471611  printf("FDM:%d ", m_useFastDecisionForMerge );
    1748 #endif
    17491612  printf("CFM:%d ", m_bUseCbfFastMode         );
    17501613  printf("RQT:%d ", 1     );
    … …  
    17611624  }
    17621625  printf("CIP:%d ", m_bUseConstrainedIntraPred);
    1763 #if BURST_IPCM
    17641626  printf("PCM:%d ", (m_usePCM && (1<<m_uiPCMLog2MinSize) <= m_uiMaxCUWidth)? 1 : 0);
    1765 #else
    1766   printf("PCM:%d ", ((1<<m_uiPCMLog2MinSize) <= m_uiMaxCUWidth)? 1 : 0);
    1767 #endif
    1768 #if SAO_UNIT_INTERLEAVING
    17691627  printf("SAOInterleaving:%d ", (m_saoInterleavingFlag)?(1):(0));
    1770 #endif
    17711628#if LOSSLESS_CODING
    17721629  printf("LosslessCuEnabled:%d ", (m_useLossless)? 1:0 );
    … …  
    17741631  printf("WPP:%d ", (Int)m_bUseWeightPred);
    17751632  printf("WPB:%d ", m_uiBiPredIdc);
    1776 #if !REMOVE_TILE_DEPENDENCE
    1777   printf("TileBoundaryIndependence:%d ", m_iTileBoundaryIndependenceIdr );
    1778 #endif
    17791633  printf("TileLocationInSliceHdr:%d ", m_iTileLocationInSliceHeaderFlag);
    17801634  printf("TileMarker:%d", m_iTileMarkerFlag);
    … …  
    17991653#endif
    18001654
    1801 #if MULTIBITS_DATA_HIDING
    18021655  printf(" SignBitHidingFlag:%d SignBitHidingThreshold:%d", m_signHideFlag, m_signHidingThreshold);
    1803 #endif
    18041656  printf("\n");
    18051657  printf("TOOL CFG VIDEO  : ");

  • branches/HTM-5.1-dev0/source/App/TAppEncoder/TAppEncCfg.h

    r292 r294  
    7373  Int       m_iSourceWidth;                                   ///< source width in pixel
    7474  Int       m_iSourceHeight;                                  ///< source height in pixel
    75 #if PIC_CROPPING
    7675  Int       m_croppingMode;
    7776  Int       m_cropLeft;
    … …  
    7978  Int       m_cropTop;
    8079  Int       m_cropBottom;
    81 #endif
    8280  Int       m_iFrameToBeEncoded;                              ///< number of encoded frames
    83 #if !PIC_CROPPING
    84   Bool      m_bUsePAD;                                        ///< flag for using source padding
    85 #endif
    8681  Int       m_aiPad[2];                                       ///< number of padded pixels for width and height
    8782 
    … …  
    10095  Int       m_extraRPSs[MAX_VIEW_NUM];
    10196  GOPEntryMvc m_GOPListsMvc[MAX_VIEW_NUM][MAX_GOP+1];
    102 #if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
    10397  Int       m_numReorderPics[MAX_VIEW_NUM][MAX_TLAYER];       ///< total number of reorder pictures
    10498  Int       m_maxDecPicBuffering[MAX_VIEW_NUM][MAX_TLAYER];   ///< total number of reference pictures needed for decoding
    105 #else
    106   Int       m_numReorderFrames;                               ///< total number of reorder pictures
    107   Int       m_maxNumberOfReferencePictures;                   ///< total number of reference pictures needed for decoding
    108 #endif
    10999  Bool      m_bUseLComb;                                      ///< flag for using combined reference list for uni-prediction in B-slices (JCTVC-D421)
    110100  Bool      m_bLCMod;                                         ///< flag for specifying whether the combined reference list for uni-prediction in B-slices is uploaded explicitly
    … …  
    136126  Int       m_iQPAdaptationRange;                             ///< dQP range by QP adaptation
    137127 
    138 #if H0566_TLA
    139128  Int       m_maxTempLayer[MAX_VIEW_NUM];                     ///< Max temporal layer
    140 #else
    141   Bool      m_bTLayering;                                     ///< indicates whether temporal IDs are set based on the hierarchical coding structure
    142   Bool      m_abTLayerSwitchingFlag[MAX_TLAYER];              ///< temporal layer switching flags corresponding to each temporal layer
    143 #endif
    144129
    145130  // coding unit (CU) definition
    … …  
    179164  Bool      m_bUseIVS;                                        ///< flag for using inter-view vector scaling
    180165#endif
    181 #if SAO_UNIT_INTERLEAVING
    182166  Int       m_maxNumOffsetsPerPic;                            ///< SAO maximun number of offset per picture
    183167  Bool      m_saoInterleavingFlag;                            ///< SAO interleaving flag
    184 #endif
    185168  // coding tools (loop filter)
    186169  vector<Bool> m_abUseALF;                                    ///< flag for using adaptive loop filter [0] - video, [1] - depth
    … …  
    188171 
    189172  Int       m_iALFMaxNumberFilters;                           ///< ALF Max Number Filters in one picture
    190 #if LCU_SYNTAX_ALF
    191173  Bool      m_bALFParamInSlice;
    192174  Bool      m_bALFPicBasedEncode;
    193 #endif
    194175
    195176  vector<Bool> m_abLoopFilterDisable;                         ///< flag for using deblocking filter filter [0] - video, [1] - depth
    … …  
    197178  Int       m_loopFilterBetaOffsetDiv2;                     ///< beta offset for deblocking filter
    198179  Int       m_loopFilterTcOffsetDiv2;                       ///< tc offset for deblocking filter
    199 #if DBL_CONTROL
    200180  Bool      m_DeblockingFilterControlPresent;                 ///< deblocking filter control present flag in PPS
    201 #endif
    202181 
    203182  Bool      m_bUseLMChroma;                                  ///< JL: Chroma intra prediction based on luma signal
    … …  
    242221#endif
    243222
    244 #if FAST_DECISION_FOR_MRG_RD_COST
    245223  Bool      m_useFastDecisionForMerge;         ///< flag for using Fast Decision Merge RD-Cost
    246 #endif
    247224  Bool      m_bUseCbfFastMode;                 ///< flag for using Cbf Fast PU Mode Decision
    248225  Int       m_iSliceMode;                      ///< 0: Disable all Recon slice limits, 1 : Maximum number of largest coding units per slice, 2: Maximum number of bytes in a slice
    … …  
    257234  Int       m_iColumnRowInfoPresent;
    258235  Int       m_iUniformSpacingIdr;
    259 #if !REMOVE_TILE_DEPENDENCE
    260   Int       m_iTileBoundaryIndependenceIdr;
    261 #endif
    262236  Int       m_iNumColumnsMinus1;
    263237  char*     m_pchColumnWidth;
    … …  
    287261#endif
    288262
    289 #if MULTIBITS_DATA_HIDING
    290263  Int       m_signHideFlag;
    291264  Int       m_signHidingThreshold;
    292 #endif
    293265#if HHI_MPI
    294266  Bool      m_bUseMVI;  ///< flag for using Motion Vector Inheritance for depth map coding

  • branches/HTM-5.1-dev0/source/App/TAppEncoder/TAppEncTop.cpp

    r292 r294  
    9797    m_acTEncTopList[iViewIdx]->setSourceWidth                  ( m_iSourceWidth );
    9898    m_acTEncTopList[iViewIdx]->setSourceHeight                 ( m_iSourceHeight );
    99 #if PIC_CROPPING
    10099    m_acTEncTopList[iViewIdx]->setCroppingMode                 ( m_croppingMode );
    101100    m_acTEncTopList[iViewIdx]->setCropLeft                     ( m_cropLeft );
    … …  
    103102    m_acTEncTopList[iViewIdx]->setCropTop                      ( m_cropTop );
    104103    m_acTEncTopList[iViewIdx]->setCropBottom                   ( m_cropBottom );
    105 #endif
    106104    m_acTEncTopList[iViewIdx]->setFrameToBeEncoded             ( m_iFrameToBeEncoded );
    107105    m_acTEncTopList[iViewIdx]->setViewId                       ( iViewIdx );
    … …  
    138136    m_acTEncTopList[iViewIdx]->setGopList                      ( m_GOPListsMvc[iViewIdx] );
    139137    m_acTEncTopList[iViewIdx]->setExtraRPSs                    ( m_extraRPSs[iViewIdx] );
    140 #if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
    141138    for(Int i = 0; i < MAX_TLAYER; i++)
    142139    {
    … …  
    144141      m_acTEncTopList[iViewIdx]->setMaxDecPicBuffering         ( m_maxDecPicBuffering[iViewIdx][i], i );
    145142    }
    146 #else
    147     m_acTEncTopList[iViewIdx]->setNumReorderFrames             ( m_numReorderFrames );
    148     m_acTEncTopList[iViewIdx]->setMaxNumberOfReferencePictures ( m_maxNumberOfReferencePictures );
    149 #endif
    150143    for( UInt uiLoop = 0; uiLoop < MAX_TLAYER; ++uiLoop )
    151144    {
    … …  
    157150    m_acTEncTopList[iViewIdx]->setPad                          ( m_aiPad );
    158151   
    159 #if H0566_TLA
    160152    m_acTEncTopList[iViewIdx]->setMaxTempLayer                 ( m_maxTempLayer[iViewIdx] );
    161 #else
    162     m_acTEncTopList[iViewIdx]->setTLayering                    ( m_bTLayering );
    163     m_acTEncTopList[iViewIdx]->setTLayerSwitchingFlag          ( m_abTLayerSwitchingFlag );
    164 #endif
    165153
    166154    m_acTEncTopList[iViewIdx]->setDisInter4x4                  ( m_bDisInter4x4);
    … …  
    176164    m_acTEncTopList[iViewIdx]->setLoopFilterBetaOffset         ( m_loopFilterBetaOffsetDiv2  );
    177165    m_acTEncTopList[iViewIdx]->setLoopFilterTcOffset           ( m_loopFilterTcOffsetDiv2    );
    178 #if DBL_CONTROL
    179166    m_acTEncTopList[iViewIdx]->setDeblockingFilterControlPresent( m_DeblockingFilterControlPresent);
    180 #endif
    181167
    182168  //====== Motion search ========
    … …  
    201187#if LOSSLESS_CODING
    202188    Int lowestQP;
    203 #if H0736_AVC_STYLE_QP_RANGE
    204189    lowestQP =  - ( (Int)(6*(g_uiBitDepth + g_uiBitIncrement - 8)) );
    205 #else
    206     lowestQP = 0;
    207 #endif
    208190    if ((m_iMaxDeltaQP == 0 ) && (m_aiQP[0] == lowestQP) && (m_useLossless == true))
    209191    {
    … …  
    260242    m_acTEncTopList[iViewIdx]->setdQPs                         ( m_aidQP        );
    261243    m_acTEncTopList[iViewIdx]->setUseRDOQ                      ( m_abUseRDOQ[0] );
    262 #if !PIC_CROPPING
    263     m_acTEncTopList[iViewIdx]->setUsePAD                       ( m_bUsePAD      );
    264 #endif
    265244    m_acTEncTopList[iViewIdx]->setQuadtreeTULog2MaxSize        ( m_uiQuadtreeTULog2MaxSize );
    266245    m_acTEncTopList[iViewIdx]->setQuadtreeTULog2MinSize        ( m_uiQuadtreeTULog2MinSize );
    … …  
    269248    m_acTEncTopList[iViewIdx]->setUseFastEnc                   ( m_bUseFastEnc  );
    270249    m_acTEncTopList[iViewIdx]->setUseEarlyCU                   ( m_bUseEarlyCU  );
    271 #if FAST_DECISION_FOR_MRG_RD_COST
    272250    m_acTEncTopList[iViewIdx]->setUseFastDecisionForMerge      ( m_useFastDecisionForMerge  );
    273 #endif
    274251    m_acTEncTopList[iViewIdx]->setUseCbfFastMode               ( m_bUseCbfFastMode  );
    275252#if HHI_INTERVIEW_SKIP
    … …  
    304281      m_acTEncTopList[iViewIdx]->setSliceArgument ( m_iSliceArgument * ( iNumPartInCU >> ( m_iSliceGranularity << 1 ) ) );
    305282    }
    306 #if FIXED_NUMBER_OF_TILES_SLICE_MODE
    307283    if(m_iSliceMode==AD_HOC_SLICES_FIXED_NUMBER_OF_TILES_IN_SLICE)
    308284    {
    309285      m_acTEncTopList[iViewIdx]->setSliceArgument ( m_iSliceArgument );
    310286    }
    311 #endif
    312287    m_acTEncTopList[iViewIdx]->setSliceGranularity        ( m_iSliceGranularity         );
    313288    if(m_iSliceMode == 0 )
    … …  
    327302    m_acTEncTopList[iViewIdx]->setUseIVS               ( m_bUseIVS          );
    328303#endif
    329 #if SAO_UNIT_INTERLEAVING
    330304    m_acTEncTopList[iViewIdx]->setMaxNumOffsetsPerPic (m_maxNumOffsetsPerPic);
    331305    m_acTEncTopList[iViewIdx]->setSaoInterleavingFlag (m_saoInterleavingFlag);
    332 #endif
    333306    m_acTEncTopList[iViewIdx]->setPCMInputBitDepthFlag  ( m_bPCMInputBitDepthFlag);
    334307    m_acTEncTopList[iViewIdx]->setPCMFilterDisableFlag  ( m_bPCMFilterDisableFlag);
    … …  
    338311    m_acTEncTopList[iViewIdx]->setColumnRowInfoPresent       ( m_iColumnRowInfoPresent );
    339312    m_acTEncTopList[iViewIdx]->setUniformSpacingIdr          ( m_iUniformSpacingIdr );
    340 #if !REMOVE_TILE_DEPENDENCE
    341     m_acTEncTopList[iViewIdx]->setTileBoundaryIndependenceIdr( m_iTileBoundaryIndependenceIdr );
    342 #endif
    343313    m_acTEncTopList[iViewIdx]->setNumColumnsMinus1           ( m_iNumColumnsMinus1 );
    344314    m_acTEncTopList[iViewIdx]->setNumRowsMinus1              ( m_iNumRowsMinus1 );
    … …  
    357327    m_acTEncTopList[iViewIdx]->setMaxTileMarkerOffset         ( m_dMaxTileMarkerOffset );
    358328    m_acTEncTopList[iViewIdx]->setTileBehaviorControlPresentFlag( m_iTileBehaviorControlPresentFlag );
    359 #if !REMOVE_TILE_DEPENDENCE
    360     if(m_iTileBoundaryIndependenceIdr == 0 || uiTilesCount == 1)
    361 #else
    362329    if(uiTilesCount == 1)
    363 #endif
    364330    {
    365331      m_bLFCrossTileBoundaryFlag = true;
    … …  
    376342    m_acTEncTopList[iViewIdx]->setUseScalingListId           ( m_useScalingListId  );
    377343    m_acTEncTopList[iViewIdx]->setScalingListFile            ( m_scalingListFile   );
    378 #if MULTIBITS_DATA_HIDING
    379344    m_acTEncTopList[iViewIdx]->setSignHideFlag(m_signHideFlag);
    380345    m_acTEncTopList[iViewIdx]->setTSIG(m_signHidingThreshold);
    381 #endif
    382 
    383 #if LCU_SYNTAX_ALF
     346
    384347    if(uiTilesCount > 1)
    385348    {
    … …  
    389352    m_acTEncTopList[iViewIdx]->setALFParamInSlice              ( m_bALFParamInSlice);
    390353    m_acTEncTopList[iViewIdx]->setALFPicBasedEncode            ( m_bALFPicBasedEncode);
    391 #endif
    392354
    393355    //====== Depth tools ========
    … …  
    445407      m_acTEncDepthTopList[iViewIdx]->setSourceWidth                  ( m_iSourceWidth );
    446408      m_acTEncDepthTopList[iViewIdx]->setSourceHeight                 ( m_iSourceHeight );
    447 #if PIC_CROPPING
    448409      m_acTEncDepthTopList[iViewIdx]->setCroppingMode                 ( m_croppingMode );
    449410      m_acTEncDepthTopList[iViewIdx]->setCropLeft                     ( m_cropLeft );
    … …  
    451412      m_acTEncDepthTopList[iViewIdx]->setCropTop                      ( m_cropTop );
    452413      m_acTEncDepthTopList[iViewIdx]->setCropBottom                   ( m_cropBottom );
    453 #endif
    454414      m_acTEncDepthTopList[iViewIdx]->setFrameToBeEncoded             ( m_iFrameToBeEncoded );
    455415      m_acTEncDepthTopList[iViewIdx]->setViewId                       ( iViewIdx );
    … …  
    480440      m_acTEncDepthTopList[iViewIdx]->setGopList                      ( m_GOPListsMvc[iViewIdx] );
    481441      m_acTEncDepthTopList[iViewIdx]->setExtraRPSs                    ( m_extraRPSs[iViewIdx] );
    482 #if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
    483442      for(Int i = 0; i < MAX_TLAYER; i++)
    484443      {
    … …  
    486445        m_acTEncDepthTopList[iViewIdx]->setMaxDecPicBuffering         ( m_maxDecPicBuffering[iViewIdx][i], i );
    487446      }
    488 #else
    489       m_acTEncDepthTopList[iViewIdx]->setNumReorderFrames             ( m_numReorderFrames );
    490       m_acTEncDepthTopList[iViewIdx]->setMaxNumberOfReferencePictures ( m_maxNumberOfReferencePictures );
    491 #endif
    492447      for( UInt uiLoop = 0; uiLoop < MAX_TLAYER; ++uiLoop )
    493448      {
    … …  
    499454      m_acTEncDepthTopList[iViewIdx]->setPad                          ( m_aiPad );
    500455
    501 #if H0566_TLA
    502456      m_acTEncDepthTopList[iViewIdx]->setMaxTempLayer                 ( m_maxTempLayer[iViewIdx] );
    503 #else
    504       m_acTEncDepthTopList[iViewIdx]->setTLayering                    ( m_bTLayering );
    505       m_acTEncDepthTopList[iViewIdx]->setTLayerSwitchingFlag          ( m_abTLayerSwitchingFlag );
    506 #endif
    507457
    508458      m_acTEncDepthTopList[iViewIdx]->setDisInter4x4                  ( m_bDisInter4x4);
    … …  
    518468      m_acTEncDepthTopList[iViewIdx]->setLoopFilterBetaOffset         ( m_loopFilterBetaOffsetDiv2  );
    519469      m_acTEncDepthTopList[iViewIdx]->setLoopFilterTcOffset           ( m_loopFilterTcOffsetDiv2    );
    520 #if DBL_CONTROL
    521470      m_acTEncDepthTopList[iViewIdx]->setDeblockingFilterControlPresent( m_DeblockingFilterControlPresent);
    522 #endif
    523471
    524472      //====== Motion search ========
    … …  
    560508      m_acTEncDepthTopList[iViewIdx]->setdQPs                         ( m_aidQPdepth   );
    561509      m_acTEncDepthTopList[iViewIdx]->setUseRDOQ                      ( m_abUseRDOQ[1] );
    562 #if !PIC_CROPPING
    563       m_acTEncDepthTopList[iViewIdx]->setUsePAD                       ( m_bUsePAD      );
    564 #endif
    565510      m_acTEncDepthTopList[iViewIdx]->setQuadtreeTULog2MaxSize        ( m_uiQuadtreeTULog2MaxSize );
    566511      m_acTEncDepthTopList[iViewIdx]->setQuadtreeTULog2MinSize        ( m_uiQuadtreeTULog2MinSize );
    … …  
    569514      m_acTEncDepthTopList[iViewIdx]->setUseFastEnc                   ( m_bUseFastEnc  );
    570515      m_acTEncDepthTopList[iViewIdx]->setUseEarlyCU                   ( m_bUseEarlyCU  );
    571 #if FAST_DECISION_FOR_MRG_RD_COST
    572516      m_acTEncDepthTopList[iViewIdx]->setUseFastDecisionForMerge      ( m_useFastDecisionForMerge  );
    573 #endif
    574517      m_acTEncDepthTopList[iViewIdx]->setUseCbfFastMode               ( m_bUseCbfFastMode  );
    575518#if HHI_INTERVIEW_SKIP
    … …  
    633576        m_acTEncDepthTopList[iViewIdx]->setSliceArgument ( m_iSliceArgument * ( iNumPartInCU >> ( m_iSliceGranularity << 1 ) ) );
    634577      }
    635 #if FIXED_NUMBER_OF_TILES_SLICE_MODE
    636578      if(m_iSliceMode==AD_HOC_SLICES_FIXED_NUMBER_OF_TILES_IN_SLICE)
    637579      {
    638580        m_acTEncDepthTopList[iViewIdx]->setSliceArgument ( m_iSliceArgument );
    639581      }
    640 #endif
    641582      m_acTEncDepthTopList[iViewIdx]->setSliceGranularity        ( m_iSliceGranularity         );
    642583      if(m_iSliceMode == 0 )
    … …  
    652593     m_acTEncDepthTopList[iViewIdx]->setUseIVS                ( m_bUseIVS );
    653594#endif
    654 #if SAO_UNIT_INTERLEAVING
    655595      m_acTEncDepthTopList[iViewIdx]->setMaxNumOffsetsPerPic (m_maxNumOffsetsPerPic);
    656596      m_acTEncDepthTopList[iViewIdx]->setSaoInterleavingFlag (m_saoInterleavingFlag);
    657 #endif
    658597      m_acTEncDepthTopList[iViewIdx]->setPCMInputBitDepthFlag  ( m_bPCMInputBitDepthFlag);
    659598      m_acTEncDepthTopList[iViewIdx]->setPCMFilterDisableFlag  ( m_bPCMFilterDisableFlag);
    … …  
    663602      m_acTEncDepthTopList[iViewIdx]->setColumnRowInfoPresent       ( m_iColumnRowInfoPresent );
    664603      m_acTEncDepthTopList[iViewIdx]->setUniformSpacingIdr          ( m_iUniformSpacingIdr );
    665 #if !REMOVE_TILE_DEPENDENCE
    666       m_acTEncDepthTopList[iViewIdx]->setTileBoundaryIndependenceIdr( m_iTileBoundaryIndependenceIdr );
    667 #endif
    668604      m_acTEncDepthTopList[iViewIdx]->setNumColumnsMinus1           ( m_iNumColumnsMinus1 );
    669605      m_acTEncDepthTopList[iViewIdx]->setNumRowsMinus1              ( m_iNumRowsMinus1 );
    … …  
    682618      m_acTEncDepthTopList[iViewIdx]->setMaxTileMarkerOffset         ( m_dMaxTileMarkerOffset );
    683619      m_acTEncDepthTopList[iViewIdx]->setTileBehaviorControlPresentFlag( m_iTileBehaviorControlPresentFlag );
    684 #if !REMOVE_TILE_DEPENDENCE
    685       if(m_iTileBoundaryIndependenceIdr == 0 || uiTilesCount == 1)
    686 #else
    687620      if(uiTilesCount == 1)
    688 #endif
    689621      {
    690622        m_bLFCrossTileBoundaryFlag = true;
    … …  
    701633      m_acTEncDepthTopList[iViewIdx]->setUseScalingListId           ( m_useScalingListId  );
    702634      m_acTEncDepthTopList[iViewIdx]->setScalingListFile            ( m_scalingListFile   );
    703 #if MULTIBITS_DATA_HIDING
    704635      m_acTEncDepthTopList[iViewIdx]->setSignHideFlag(m_signHideFlag);
    705636      m_acTEncDepthTopList[iViewIdx]->setTSIG(m_signHidingThreshold);
    706 #endif
    707 
    708 #if LCU_SYNTAX_ALF
     637
    709638      if(uiTilesCount > 1)
    710639      {
    … …  
    714643      m_acTEncDepthTopList[iViewIdx]->setALFParamInSlice              ( m_bALFParamInSlice);
    715644      m_acTEncDepthTopList[iViewIdx]->setALFPicBasedEncode            ( m_bALFPicBasedEncode);
    716 #endif
    717645
    718646  //====== Depth tools ========
    … …  
    13251253        if (m_pchReconFileList[iViewIdx])
    13261254        {
    1327 #if PIC_CROPPING
    13281255          m_acTVideoIOYuvReconFileList[iViewIdx]->write( pcPicYuvRec, m_cropLeft, m_cropRight, m_cropTop, m_cropBottom );
    1329 #else
    1330           m_acTVideoIOYuvReconFileList[iViewIdx]->write( pcPicYuvRec, m_aiPad );
    1331 #endif
    13321256        }
    13331257      }
    … …  
    13361260        if (m_pchDepthReconFileList[iViewIdx])
    13371261        {
    1338 #if PIC_CROPPING
    13391262          m_acTVideoIOYuvDepthReconFileList[iViewIdx]->write( pcPicYuvRec, m_cropLeft, m_cropRight, m_cropTop, m_cropBottom );
    1340 #else
    1341           m_acTVideoIOYuvDepthReconFileList[iViewIdx]->write( pcPicYuvRec, m_aiPad );
    1342 #endif
    13431263        }
    13441264      }
    … …  
    13931313    {
    13941314    case NAL_UNIT_CODED_SLICE:
    1395 #if H0566_TLA
    13961315#if !QC_REM_IDV_B0046
    13971316    case NAL_UNIT_CODED_SLICE_IDV:
    … …  
    13991318    case NAL_UNIT_CODED_SLICE_TLA:
    14001319    case NAL_UNIT_CODED_SLICE_CRA:
    1401 #else
    1402     case NAL_UNIT_CODED_SLICE_DATAPART_A:
    1403     case NAL_UNIT_CODED_SLICE_DATAPART_B:
    1404     case NAL_UNIT_CODED_SLICE_CDR:
    1405 #endif
    14061320    case NAL_UNIT_CODED_SLICE_IDR:
    14071321    case NAL_UNIT_SPS:

  • branches/HTM-5.1-dev0/source/App/TAppRenderer/TAppRendererTop.cpp

    r210 r294  
    429429      // Write Output
    430430
    431 #if PIC_CROPPING
    432431      m_apcTVideoIOYuvSynthOutput[m_bSweep ? 0 : iSynthViewIdx]->write( pcPicYuvSynthOut, 0, 0, 0, 0 );
    433 #else
    434       m_apcTVideoIOYuvSynthOutput[m_bSweep ? 0 : iSynthViewIdx]->write( pcPicYuvSynthOut, aiPad );
    435 #endif
    436432    }
    437433    iFrame++;
    … …  
    665661
    666662          // Write Output
    667 #if PIC_CROPPING
    668663          m_apcTVideoIOYuvSynthOutput[m_bSweep ? 0 : iModelNum]->write( pcPicYuvSynthOut, 0 ,0 ,0, 0 );
    669 #else
    670           m_apcTVideoIOYuvSynthOutput[m_bSweep ? 0 : iModelNum]->write( pcPicYuvSynthOut, aiPad );
    671 #endif
    672664        }
    673665      }
    … …  
    867859
    868860      // Write Output
    869 #if PIC_CROPPING
    870861      m_apcTVideoIOYuvSynthOutput[m_bSweep ? 0 : iSynthViewIdx]->write( pcPicYuvSynthOut, 0, 0, 0, 0 );
    871 #else
    872       m_apcTVideoIOYuvSynthOutput[m_bSweep ? 0 : iSynthViewIdx]->write( pcPicYuvSynthOut, aiPad );
    873 #endif
    874862    }
    875863    iFrame++;
    … …  
    998986
    999987      // Write Output
    1000 #if PIC_CROPPING
    1001988      m_apcTVideoIOYuvSynthOutput[iViewIdx-1]->write( pcPicYuvSynthOut, 0, 0, 0 );
    1002 #else
    1003       m_apcTVideoIOYuvSynthOutput[iViewIdx-1]->write( pcPicYuvSynthOut, aiPad );
    1004 #endif
    1005989
    1006990    }
Note: See TracChangeset for help on using the changeset viewer.