Ignore:
Timestamp:
13 Jan 2014, 00:44:19 (10 years ago)
Author:
tech
Message:

Further fixes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-9.2-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

    r766 r768  
    444444  ("QuadtreeTUMaxDepthIntra", m_uiQuadtreeTUMaxDepthIntra, 1u, "Depth of TU tree for intra CUs")
    445445  ("QuadtreeTUMaxDepthInter", m_uiQuadtreeTUMaxDepthInter, 2u, "Depth of TU tree for inter CUs")
    446  
    447446  // Coding structure parameters
     447#if H_MV 
    448448  ("IntraPeriod,-ip",         m_iIntraPeriod,std::vector<Int>(1,-1), "Intra period in frames, (-1: only first frame), per layer")
     449#else
     450("IntraPeriod,-ip",         m_iIntraPeriod,              -1, "Intra period in frames, (-1: only first frame)")
     451#endif
    449452  ("DecodingRefreshType,-dr", m_iDecodingRefreshType,       0, "Intra refresh type (0:none 1:CRA 2:IDR)")
    450453  ("GOPSize,g",               m_iGOPSize,                   1, "GOP size of temporal structure")
     
    14401443  xConfirmPara( m_iGOPSize < 1 ,                                                            "GOP Size must be greater or equal to 1" );
    14411444  xConfirmPara( m_iGOPSize > 1 &&  m_iGOPSize % 2,                                          "GOP Size must be a multiple of 2, if GOP Size is greater than 1" );
     1445#if H_MV
    14421446  for( Int layer = 0; layer < m_numberOfLayers; layer++ )
    14431447  {
    14441448    xConfirmPara( (m_iIntraPeriod[layer] > 0 && m_iIntraPeriod[layer] < m_iGOPSize) || m_iIntraPeriod[layer] == 0, "Intra period must be more than GOP size, or -1 , not 0" );
    14451449  }
     1450#else
     1451  xConfirmPara( (m_iIntraPeriod > 0 && m_iIntraPeriod < m_iGOPSize) || m_iIntraPeriod == 0, "Intra period must be more than GOP size, or -1 , not 0" );
     1452#endif
    14461453  xConfirmPara( m_iDecodingRefreshType < 0 || m_iDecodingRefreshType > 2,                   "Decoding Refresh Type must be equal to 0, 1 or 2" );
    14471454#if H_MV
     
    14691476  if (m_iDecodingRefreshType == 2)
    14701477  {
     1478#if H_MV
    14711479    for (Int i = 0; i < m_numberOfLayers; i++ )
    14721480    {
    14731481      xConfirmPara( m_iIntraPeriod[i] > 0 && m_iIntraPeriod[i] <= m_iGOPSize ,                      "Intra period must be larger than GOP size for periodic IDR pictures");
    14741482    }
     1483#else
     1484    xConfirmPara( m_iIntraPeriod > 0 && m_iIntraPeriod <= m_iGOPSize ,                      "Intra period must be larger than GOP size for periodic IDR pictures");
     1485#endif
    14751486  }
    14761487  xConfirmPara( (m_uiMaxCUWidth  >> m_uiMaxCUDepth) < 4,                                    "Minimum partition width size should be larger than or equal to 8");
     
    17311742  /* if this is an intra-only sequence, ie IntraPeriod=1, don't verify the GOP structure
    17321743   * This permits the ability to omit a GOP structure specification */
    1733   if (m_iIntraPeriod[layer] == 1 && m_GOPList[0].m_POC == -1) {
     1744#if H_MV
     1745  if (m_iIntraPeriod[layer] == 1 && m_GOPList[0].m_POC == -1)
     1746  {
     1747#else
     1748  if (m_iIntraPeriod == 1 && m_GOPList[0].m_POC == -1) {
     1749#endif
    17341750    m_GOPList[0] = GOPEntry();
    17351751    m_GOPList[0].m_QPFactor = 1;
     
    17561772  }
    17571773  Int numOK=0;
     1774#if H_MV
     1775xConfirmPara( m_iIntraPeriod >=0&&(m_iIntraPeriod%m_iGOPSize!=0), "Intra period must be a multiple of GOPSize, or -1" );
     1776#else
    17581777  xConfirmPara( m_iIntraPeriod[layer] >=0&&(m_iIntraPeriod[layer]%m_iGOPSize!=0), "Intra period must be a multiple of GOPSize, or -1" );
     1778#endif
    17591779
    17601780  for(Int i=0; i<m_iGOPSize; i++)
     
    22922312  printf("Min PCM size                 : %d\n", 1 << m_uiPCMLog2MinSize);
    22932313  printf("Motion search range          : %d\n", m_iSearchRange );
     2314#if H_MV
    22942315  xPrintParaVector( "Intra period", m_iIntraPeriod );
     2316#else
     2317  printf("Intra period                 : %d\n", m_iIntraPeriod );
     2318#endif
    22952319  printf("Decoding refresh type        : %d\n", m_iDecodingRefreshType );
    22962320#if !H_MV
Note: See TracChangeset for help on using the changeset viewer.