Ignore:
Timestamp:
16 Oct 2013, 11:27:16 (11 years ago)
Author:
kwu-htm
Message:

Clean-up version of JCT3V-E0227.

File:
1 edited

Legend:

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

    r635 r636  
    8484
    8585#if KWU_RC_MADPRED_E0227
    86   m_uiDepthMADPred = 0;
     86  m_DepthMADPred = 0;
    8787#endif
    8888}
     
    600600
    601601#if KWU_RC_VIEWRC_E0227
    602   ("ViewWiseTargetBits, -vtbr" ,  m_pchViewTargetBits,  std::vector<Int>(1, 32), "View-wise target bit-rate setting")
    603   ("TargetBitAssign, -ta", m_bViewWiseRateCtrl, false, "View-wise rate control on/off")
     602  ("ViewWiseTargetBits, -vtbr" ,  m_ViewTargetBits,  std::vector<Int>(1, 32), "View-wise target bit-rate setting")
     603  ("TargetBitAssign, -ta", m_ViewWiseRateCtrl, false, "View-wise rate control on/off")
    604604#endif
    605605#if KWU_RC_MADPRED_E0227
    606   ("DepthMADPred, -dm", m_uiDepthMADPred, (UInt)0, "Depth based MAD prediction on/off")
    607 #endif
    608 #else
    609   ("RateControl,-rc", m_enableRateCtrl, false, "Rate control on/off")
     606  ("DepthMADPred, -dm", m_DepthMADPred, (UInt)0, "Depth based MAD prediction on/off")
     607#endif
     608#else
     609  ("RateCtrl,-rc", m_enableRateCtrl, false, "Rate control on/off")
    610610  ("TargetBitrate,-tbr", m_targetBitrate, 0, "Input target bitrate")
    611611  ("NumLCUInUnit,-nu", m_numLCUInUnit, 0, "Number of LCUs in an Unit")
    612612
    613613#if KWU_RC_VIEWRC_E0227
    614   ("ViewWiseTargetBits, -vtbr" ,  m_pchViewTargetBits,  std::vector<Int>(1, 32), "View-wise target bit-rate setting")
    615   ("TargetBitAssign, -ta", m_bViewWiseRateCtrl, false, "View-wise rate control on/off")
     614  ("ViewWiseTargetBits, -vtbr" ,  m_ViewTargetBits,  std::vector<Int>(1, 32), "View-wise target bit-rate setting")
     615  ("TargetBitAssign, -ta", m_ViewWiseRateCtrl, false, "View-wise rate control on/off")
    616616#endif
    617617#if KWU_RC_MADPRED_E0227
    618   ("DepthMADPred, -dm", m_uiDepthMADPred, (UInt)0, "Depth based MAD prediction on/off")
     618  ("DepthMADPred, -dm", m_DepthMADPred, (UInt)0, "Depth based MAD prediction on/off")
    619619#endif
    620620#endif
     
    21792179    xConfirmPara( (numLCUInPic % m_numLCUInUnit) != 0, "total number of LCUs in a frame should be completely divided by NumLCUInUnit" );
    21802180
    2181     //m_iMaxDeltaQP       = MAX_DELTA_QP;
     2181#if !(KWU_RC_MADPRED_E0227 || KWU_RC_VIEWRC_E0227)
     2182    m_iMaxDeltaQP       = MAX_DELTA_QP;
     2183#endif
    21822184    m_iMaxCuDQPDepth    = MAX_CUDQP_DEPTH;
    21832185  }
     
    23232325
    23242326#if KWU_RC_MADPRED_E0227
    2325     printf("Depth based MAD prediction   : %d\n", m_uiDepthMADPred);
     2327    printf("Depth based MAD prediction   : %d\n", m_DepthMADPred);
    23262328#endif
    23272329#if KWU_RC_VIEWRC_E0227
    2328     printf("View-wise Rate control       : %d\n", m_bViewWiseRateCtrl);
    2329     if(m_bViewWiseRateCtrl)
     2330    printf("View-wise Rate control       : %d\n", m_ViewWiseRateCtrl);
     2331    if(m_ViewWiseRateCtrl)
    23302332    {
    23312333
    23322334      printf("ViewWiseTargetBits           : ");
    23332335      for (int i = 0 ; i < m_iNumberOfViews ; i++)
    2334         printf("%d ", m_pchViewTargetBits[i]);
     2336        printf("%d ", m_ViewTargetBits[i]);
    23352337      printf("\n");
    23362338    }
     
    23492351
    23502352#if KWU_RC_MADPRED_E0227
    2351     printf("Depth based MAD prediction   : %d\n", m_uiDepthMADPred);
     2353    printf("Depth based MAD prediction   : %d\n", m_DepthMADPred);
    23522354#endif
    23532355#if KWU_RC_VIEWRC_E0227
    2354     printf("View-wise Rate control       : %d\n", m_bViewWiseRateCtrl);
    2355     if(m_bViewWiseRateCtrl)
     2356    printf("View-wise Rate control       : %d\n", m_ViewWiseRateCtrl);
     2357    if(m_ViewWiseRateCtrl)
    23562358    {
    23572359
    23582360      printf("ViewWiseTargetBits           : ");
    23592361      for (int i = 0 ; i < m_iNumberOfViews ; i++)
    2360         printf("%d ", m_pchViewTargetBits[i]);
     2362        printf("%d ", m_ViewTargetBits[i]);
    23612363      printf("\n");
    23622364    }
Note: See TracChangeset for help on using the changeset viewer.