Ignore:
Timestamp:
18 Oct 2013, 04:44:23 (11 years ago)
Author:
kwu-htm
Message:

Macro enclosed and cleaned-up

File:
1 edited

Legend:

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

    r637 r638  
    8484
    8585#if KWU_RC_MADPRED_E0227
    86   m_DepthMADPred = 0;
     86  m_depthMADPred = 0;
    8787#endif
    8888}
     
    600600
    601601#if KWU_RC_VIEWRC_E0227
    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")
     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_DepthMADPred, (UInt)0, "Depth based MAD prediction on/off")
     606  ("DepthMADPred, -dm", m_depthMADPred, (UInt)0, "Depth based MAD prediction on/off")
    607607#endif
    608608#else
     
    612612
    613613#if KWU_RC_VIEWRC_E0227
    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")
     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_DepthMADPred, (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
     
    23252325
    23262326#if KWU_RC_MADPRED_E0227
    2327     printf("Depth based MAD prediction   : %d\n", m_DepthMADPred);
     2327    printf("Depth based MAD prediction   : %d\n", m_depthMADPred);
    23282328#endif
    23292329#if KWU_RC_VIEWRC_E0227
    2330     printf("View-wise Rate control       : %d\n", m_ViewWiseRateCtrl);
    2331     if(m_ViewWiseRateCtrl)
     2330    printf("View-wise Rate control       : %d\n", m_viewWiseRateCtrl);
     2331    if(m_viewWiseRateCtrl)
    23322332    {
    23332333
    23342334      printf("ViewWiseTargetBits           : ");
    2335       for (int i = 0 ; i < m_iNumberOfViews ; i++)
    2336         printf("%d ", m_ViewTargetBits[i]);
     2335      for (Int i = 0 ; i < m_iNumberOfViews ; i++)
     2336        printf("%d ", m_viewTargetBits[i]);
    23372337      printf("\n");
    23382338    }
     
    23512351
    23522352#if KWU_RC_MADPRED_E0227
    2353     printf("Depth based MAD prediction   : %d\n", m_DepthMADPred);
     2353    printf("Depth based MAD prediction   : %d\n", m_depthMADPred);
    23542354#endif
    23552355#if KWU_RC_VIEWRC_E0227
    2356     printf("View-wise Rate control       : %d\n", m_ViewWiseRateCtrl);
    2357     if(m_ViewWiseRateCtrl)
     2356    printf("View-wise Rate control       : %d\n", m_viewWiseRateCtrl);
     2357    if(m_viewWiseRateCtrl)
    23582358    {
    23592359
    23602360      printf("ViewWiseTargetBits           : ");
    2361       for (int i = 0 ; i < m_iNumberOfViews ; i++)
    2362         printf("%d ", m_ViewTargetBits[i]);
     2361      for (Int i = 0 ; i < m_iNumberOfViews ; i++)
     2362        printf("%d ", m_viewTargetBits[i]);
    23632363      printf("\n");
    23642364    }
Note: See TracChangeset for help on using the changeset viewer.