Changeset 101 in 3DVCSoftware for trunk


Ignore:
Timestamp:
10 Aug 2012, 17:56:17 (12 years ago)
Author:
tech
Message:
  • Added POZNAN_CABAC_INIT_FLAG_FIX bug
  • Fixed CTC cfg-file bug
  • Changed define name
Location:
trunk
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/CommonTestConditionsCfgs/baseCfg_3view+depth.cfg

    r100 r101  
    208208
    209209#========== view synthesis optimization (VSO) ==========
    210 VSOConfig                 : [cx0 B(cc1) I(s0.25 s0.5 s0.75)][cx1 B(oo0) B(oo2) I(s0.25 s0.5 s0.75 s1.125 s1.5 s1.75)][cx2 B(cc1) I(s1.25 s1.5 s1.75)] # VSO configuration string
     210VSOConfig                 : [cx0 B(cc1) I(s0.25 s0.5 s0.75)][cx1 B(oo0) B(oo2) I(s0.25 s0.5 s0.75 s1.25 s1.5 s1.75)][cx2 B(cc1) I(s1.25 s1.5 s1.75)] # VSO configuration string
    211211#============ Misc. ================
    212212SEIpictureDigest          : 0                                      # Control generation of picture_digest SEI messages

  • trunk/cfg/encoder_mvd.cfg

    r100 r101  
    207207
    208208#========== view synthesis optimization (VSO) ==========
    209 VSOConfig                 : [cx0 B(cc1) I(s0.25 s0.5 s0.75)][cx1 B(oo0) B(oo2) I(s0.25 s0.5 s0.75 s1.125 s1.5 s1.75)][cx2 B(cc1) I(s1.25 s1.5 s1.75)] # VSO configuration string (3 view)
     209VSOConfig                 : [cx0 B(cc1) I(s0.25 s0.5 s0.75)][cx1 B(oo0) B(oo2) I(s0.25 s0.5 s0.75 s1.25 s1.5 s1.75)][cx2 B(cc1) I(s1.25 s1.5 s1.75)] # VSO configuration string (3 view)
    210210VSOConfig                 : [cx0 B(cc1) I(s0.25 s0.5 s0.75)][cx1 B(oo0)        I(s0.25 s0.5 s0.75)]                                                   # VSO configuration string (2 view)
    211211

  • trunk/source/App/TAppEncoder/TAppEncTop.cpp

    r100 r101  
    655655    if ( m_uiVSOMode == 4 )
    656656    {
    657 #if HHI_VSO_SPEEDUP_A033
     657#if HHI_VSO_SPEEDUP_A0033
    658658#if LGE_VSO_EARLY_SKIP_A0093
    659659      m_cRendererModel.create( m_cRenModStrParser.getNumOfBaseViews(), m_cRenModStrParser.getNumOfModels(), m_iSourceWidth, g_uiMaxCUHeight , LOG2_DISP_PREC_LUT, 0, m_bVSOEarlySkip );
    … …  
    12491249#endif
    12501250#if HHI_VSO
    1251 #if HHI_VSO_SPEEDUP_A033
     1251#if HHI_VSO_SPEEDUP_A0033
    12521252Void TAppEncTop::setupRenModel( Int iPoc, Int iEncViewIdx, Int iEncContent, Int iHorOffset )
    12531253{

  • trunk/source/App/TAppEncoder/TAppEncTop.h

    r100 r101  
    139139#endif
    140140#if HHI_VSO
    141 #if HHI_VSO_SPEEDUP_A033
     141#if HHI_VSO_SPEEDUP_A0033
    142142  Void                  setupRenModel    ( Int iPoc, Int iEncViewIdx, Int iEncContent, Int iHorOffset );
    143143#else

  • trunk/source/App/TAppRenderer/TAppRendererTop.cpp

    r100 r101  
    532532#endif
    533533
    534 #if HHI_VSO_SPEEDUP_A033
     534#if HHI_VSO_SPEEDUP_A0033
    535535    cCurModel.setHorOffset( 0 );
    536536#endif
    … …  
    709709
    710710  AOT( m_iLog2SamplingFactor != 0 );
    711 #if HHI_VSO_SPEEDUP_A033
     711#if HHI_VSO_SPEEDUP_A0033
    712712  cCurModel.setHorOffset( 0 );
    713713#endif

  • trunk/source/Lib/TLibCommon/TComSlice.cpp

    r100 r101  
    15291529, m_cabacInitPresentFlag        (false)
    15301530, m_encCABACTableIdx            (0)
     1531#if POZNAN_CABAC_INIT_FLAG_FIX
     1532, m_encPrevPOC            (0)
     1533#endif
    15311534#endif
    15321535{

  • trunk/source/Lib/TLibCommon/TComSlice.h

    r100 r101  
    854854  Bool     m_cabacInitPresentFlag;
    855855  UInt     m_encCABACTableIdx;           // Used to transmit table selection across slices
     856#if POZNAN_CABAC_INIT_FLAG_FIX
     857  UInt     m_encPrevPOC;
     858#endif
    856859#endif
    857860#if DBL_CONTROL
    … …  
    986989  Bool     getCabacInitPresentFlag()                { return m_cabacInitPresentFlag;    }
    987990  UInt     getEncCABACTableIdx()                    { return m_encCABACTableIdx;        }
     991#if POZNAN_CABAC_INIT_FLAG_FIX
     992  Void     setEncPrevPOC(UInt uiPOC)                { m_encPrevPOC = uiPOC;             }
     993  UInt     getEncPrevPOC()                          { return m_encPrevPOC;              }
     994#endif
    988995#endif
    989996#if DBL_CONTROL

  • trunk/source/Lib/TLibCommon/TypeDef.h

    r100 r101  
    4242//! \{
    4343
    44 #define FIXES                           1
    45 #define LGE_EDGE_INTRA                  1       //JCT2-A0070
     44#define FIXES                             1
     45#define POZNAN_CABAC_INIT_FLAG_FIX        1
     46
     47
     48#define LGE_EDGE_INTRA                    1   // JCT2-A0070
    4649#if LGE_EDGE_INTRA
    47 #define LGE_EDGE_INTRA_MIN_SIZE         4
    48 #define LGE_EDGE_INTRA_MAX_SIZE        32
    49 #define LGE_EDGE_INTRA_THRESHOLD       20
     50#define LGE_EDGE_INTRA_MIN_SIZE           4
     51#define LGE_EDGE_INTRA_MAX_SIZE           32
     52#define LGE_EDGE_INTRA_THRESHOLD          20
    5053#define LGE_EDGE_INTRA_MAX_EDGE_NUM_PER_4x4 8
    51 #define LGE_EDGE_INTRA_DELTA_DC         1
    52 #define LGE_EDGE_INTRA_PIXEL_DIFFERENCE 1
    53 #endif
    54 
    55 #define LG_ZEROINTRADEPTHRESI_M26039      1  //JCT2-A0087
    56 
     54#define LGE_EDGE_INTRA_DELTA_DC           1
     55#define LGE_EDGE_INTRA_PIXEL_DIFFERENCE   1
     56#endif
     57
     58#define LG_ZEROINTRADEPTHRESI_M26039      1   // JCT2-A0087
     59                                       
    5760#define SONY_COLPIC_AVAILABILITY          1
    58 
     61                                       
    5962#define HHI_INTER_VIEW_MOTION_PRED        1   // inter-view motion parameter prediction
    6063#define HHI_INTER_VIEW_RESIDUAL_PRED      1   // inter-view residual prediction
    61 #define QC_MULTI_DIS_CAN                  1         // JCT2-A0097
    62 #if QC_MULTI_DIS_CAN
     64#define QC_MULTI_DIS_CAN                  1   // JCT2-A0097
     65#if QC_MULTI_DIS_CAN                   
    6366    #define DIS_CANS                      1
    64 #endif
    65 
    66 #define MTK_INTERVIEW_MERGE_A0049         1 //  JCT2-A0049 second part
    67 
    68 #define LGE_DVMCP                         1 //  JCT2-A0126     
    69 #if LGE_DVMCP
     67#endif                                 
     68                                       
     69#define MTK_INTERVIEW_MERGE_A0049         1   //  JCT2-A0049 second part
     70                                       
     71#define LGE_DVMCP                         1   //  JCT2-A0126     
     72#if LGE_DVMCP                           
    7073#define DVFROM_LEFTBELOW                  1
    7174#define DVFROM_LEFT                       2
    … …  
    8285#define HHI_VSO_SYNTH_DIST_OUT            0
    8386#define HHI_VSO_COLOR_PLANES              1
    84 #define HHI_VSO_SPEEDUP_A033              1 // JCT2-A0033 modification 1 (changes classes directly related the renderer model
     87#define HHI_VSO_SPEEDUP_A0033             1 // JCT2-A0033 modification 1 (changes in classes directly related the renderer model
    8588                                            // to are not covered by this define, since nearly the entire class has been changed)
    8689#define HHI_VSO_RM_ASSERTIONS             0 // output VSO assertions
    … …  
    102105#endif
    103106
    104 #define HHI_MPI                         1   // motion parameter inheritance from texture picture for depth map coding
    105 #define HHI_MPI_MERGE_POS               0
    106 #define HHI_FULL_PEL_DEPTH_MAP_MV_ACC   1   // full-pel mv accuracy for depth maps
    107 
    108 #if HHI_INTER_VIEW_MOTION_PRED
    109 #define SAIT_IMPROV_MOTION_PRED_M24829  1   // improved inter-view motion vector prediction
    110 #else
    111 #define SAIT_IMPROV_MOTION_PRED_M24829  0   
    112 #endif
    113 
    114 #if HHI_INTER_VIEW_RESIDUAL_PRED
    115 #define LG_RESTRICTEDRESPRED_M24766     1   // restricted inter-view residual prediction
    116 #define QC_SIMPLIFIEDIVRP_M24938        1
    117 #else
    118 #define LG_RESTRICTEDRESPRED_M24766     0
    119 #define QC_SIMPLIFIEDIVRP_M24938        0
     107#define HHI_MPI                           1   // motion parameter inheritance from texture picture for depth map coding
     108#define HHI_MPI_MERGE_POS                 0
     109#define HHI_FULL_PEL_DEPTH_MAP_MV_ACC     1   // full-pel mv accuracy for depth maps
     110                                       
     111#if HHI_INTER_VIEW_MOTION_PRED         
     112#define SAIT_IMPROV_MOTION_PRED_M24829    1   // improved inter-view motion vector prediction
     113#else                                 
     114#define SAIT_IMPROV_MOTION_PRED_M24829    0   
     115#endif                                
     116                                       
     117#if HHI_INTER_VIEW_RESIDUAL_PRED       
     118#define LG_RESTRICTEDRESPRED_M24766       1   // restricted inter-view residual prediction
     119#define QC_SIMPLIFIEDIVRP_M24938          1
     120#else                                 
     121#define LG_RESTRICTEDRESPRED_M24766       0
     122#define QC_SIMPLIFIEDIVRP_M24938          0
    120123#endif
    121124
    … …  
    125128#define NO_COMBINED_PARALLEL              1 ///< Disallow any combined usage of parallel tools among Tile, EntropySlice and Wavefont
    126129
    127 #define LOSSLESS_CODING                   1  ///< H0530: lossless and lossy (mixed) coding
     130#define LOSSLESS_CODING                   1 ///< H0530: lossless and lossy (mixed) coding
    128131#if LOSSLESS_CODING
    129 #define SEQUENCE_LEVEL_LOSSLESS           0  ///< H0530: used only for sequence or frame-level lossless coding
     132#define SEQUENCE_LEVEL_LOSSLESS           0 ///< H0530: used only for sequence or frame-level lossless coding
    130133#endif
    131134
    132135#define PARALLEL_MERGE  1                   //< H0082 parallel merge/skip
    133 #define LOG2_PARALLEL_MERGE_LEVEL_MINUS2 0 //< H0082 parallel merge level 0-> 4x4, 1-> 8x8, 2->16x16, 3->32x32, 4->64x64
     136#define LOG2_PARALLEL_MERGE_LEVEL_MINUS2  0 //< H0082 parallel merge level 0-> 4x4, 1-> 8x8, 2->16x16, 3->32x32, 4->64x64
    134137#if PARALLEL_MERGE && LOG2_PARALLEL_MERGE_LEVEL_MINUS2
    135 #define CU_BASED_MRG_CAND_LIST           1  //< H0240: single merge candidate list for all PUs inside a 8x8 CU conditioned on LOG2_PARALLEL_MERGE_LEVEL_MINUS2 > 0
    136 #endif
    137 #define MVP_AT_ENTROPYSLICE_BOUNDARY  1     //< H0362 enable motion prediction accross entropy slice boundary
    138 
    139 #define FAST_DECISION_FOR_MRG_RD_COST  1 ////< H0178: Fast Decision for Merge 2Nx2N RDCost
     138#define CU_BASED_MRG_CAND_LIST            1  //< H0240: single merge candidate list for all PUs inside a 8x8 CU conditioned on LOG2_PARALLEL_MERGE_LEVEL_MINUS2 > 0
     139#endif
     140#define MVP_AT_ENTROPYSLICE_BOUNDARY      1  //< H0362 enable motion prediction accross entropy slice boundary
     141
     142#define FAST_DECISION_FOR_MRG_RD_COST     1 ////< H0178: Fast Decision for Merge 2Nx2N RDCost
    140143
    141144#define PIC_CROPPING              1 ///< Picture cropping and size constraints
    … …  
    700703};
    701704
    702 #if HHI_VSO_SPEEDUP_A033
     705#if HHI_VSO_SPEEDUP_A0033
    703706
    704707enum BlenMod

  • trunk/source/Lib/TLibEncoder/TEncGOP.cpp

    r100 r101  
    448448#endif
    449449
    450 #if HHI_VSO_SPEEDUP_A033
     450#if HHI_VSO_SPEEDUP_A0033
    451451#else
    452452    if ( iVSOMode == 4 )

  • trunk/source/Lib/TLibEncoder/TEncGOP.h

    r100 r101  
    137137 
    138138  Void  preLoopFilterPicAll  ( TComPic* pcPic, UInt64& ruiDist, UInt64& ruiBits );
    139 #if HHI_VSO_SPEEDUP_A033
     139#if HHI_VSO_SPEEDUP_A0033
    140140  TEncTop* getEncTop() { return m_pcEncTop; }
    141141#endif

  • trunk/source/Lib/TLibEncoder/TEncSbac.cpp

    r100 r101  
    278278    m_pcSlice->getPPS()->setEncCABACTableIdx( I_SLICE );
    279279  } 
     280
     281  #if CABAC_INIT_FLAG && POZNAN_CABAC_INIT_FLAG_FIX
     282    m_pcSlice->getPPS()->setEncPrevPOC( m_pcSlice->getPOC() );
     283  #endif
    280284}
    281285#endif

  • trunk/source/Lib/TLibEncoder/TEncSlice.cpp

    r100 r101  
    3838#include "TEncTop.h"
    3939#include "TEncSlice.h"
    40 #if HHI_VSO_SPEEDUP_A033
     40#if HHI_VSO_SPEEDUP_A0033
    4141#include "../../App/TAppEncoder/TAppEncTop.h"
    4242#endif
    … …  
    642642  m_uiPicDist       = 0;
    643643 
     644#if CABAC_INIT_FLAG && POZNAN_CABAC_INIT_FLAG_FIX
     645  Bool bReset =(pcSlice->getPOC() == 0) ||
     646    (pcSlice->getPOC() % m_pcCfg->getIntraPeriod() == 0) ||
     647    (pcSlice->getPPS()->getEncPrevPOC() % m_pcCfg->getIntraPeriod() == 0) ||
     648    (pcSlice->getPOC()/m_pcCfg->getIntraPeriod() > pcSlice->getPPS()->getEncPrevPOC()/m_pcCfg->getIntraPeriod()) ||
     649    (m_pcGOPEncoder->getGOPSize() == 0);
     650
     651  if ( bReset && pcSlice->getPPS()->getCabacInitPresentFlag())
     652  {
     653    pcSlice->getPPS()->setEncCABACTableIdx(pcSlice->getSliceType()); // reset cabac initialization table index
     654  };
     655#endif
     656
    644657  // set entropy coder
    645658  if( m_pcCfg->getUseSBACRD() )
    … …  
    787800  UInt uiTileLCUX     = 0;
    788801
    789 #if HHI_VSO_SPEEDUP_A033
     802#if HHI_VSO_SPEEDUP_A0033
    790803  Int iLastPosY = -1;
    791804#endif
    … …  
    802815    pcCU->initCU( rpcPic, uiCUAddr );
    803816
    804 #if HHI_VSO_SPEEDUP_A033
     817#if HHI_VSO_SPEEDUP_A0033
    805818    if ( m_pcRdCost->getUseRenModel() )
    806819    {

  • trunk/source/Lib/TLibRenderer/TRenImage.cpp

    r100 r101  
    106106}
    107107
    108 #if HHI_VSO_SPEEDUP_A033
     108#if HHI_VSO_SPEEDUP_A0033
    109109template<typename T>
    110110Void TRenImage<T>::getDataAndStrides( T** pptData, Int* piStrides )

  • trunk/source/Lib/TLibRenderer/TRenImage.h

    r100 r101  
    6969  TRenImagePlane<T>** getPlanes() const;
    7070
    71 #if HHI_VSO_SPEEDUP_A033
     71#if HHI_VSO_SPEEDUP_A0033
    7272  Void getDataAndStrides( T**    pptData, Int*  piStrides );
    7373  Void getWidthAndHeight( Int*  piWidths, Int*  piHeights );

  • trunk/source/Lib/TLibRenderer/TRenModel.cpp

    r100 r101  
    635635TRenModel::getSynthDepth( Int iModelNum, Int iViewNum, TComPicYuv* pcPicYuv )
    636636{
    637 #if HHI_VSO_SPEEDUP_A033
     637#if HHI_VSO_SPEEDUP_A0033
    638638  m_apcRenModels[iModelNum]->getSynthDepth(iViewNum, pcPicYuv, m_uiHorOff );
    639639#else

  • trunk/source/Lib/TLibRenderer/TRenModel.h

    r100 r101  
    103103  Int m_iNumOfBaseViews;
    104104
    105 #if HHI_VSO_SPEEDUP_A033                 
     105#if HHI_VSO_SPEEDUP_A0033                 
    106106  // Horizontal Offset in input data
    107107  UInt m_uiHorOff;         
Note: See TracChangeset for help on using the changeset viewer.