Changeset 1017 in 3DVCSoftware


Ignore:
Timestamp:
24 Jul 2014, 09:17:07 (10 years ago)
Author:
mediatek-htm
Message:

JCT3V-I0099 FIX allow encoder only QTL

Location:
branches/HTM-11.2-dev2-MediaTek/source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-11.2-dev2-MediaTek/source/App/TAppEncoder/TAppEncCfg.cpp

    r1007 r1017  
    764764  ("LimQtPredFlag",                   m_bLimQtPredFlag          , true          , "Use Predictive Coding with QTL" )
    765765#endif
    766 #if !MTK_I0099_VPS_EX2
     766#if !MTK_I0099_VPS_EX2 || MTK_I0099_FIX
    767767#if H_3D_QTLPC
    768768  ("QTL",                             m_bUseQTL                 , true          , "Use depth Quadtree Limitation" )
     769#if !MTK_I0099_VPS_EX2
    769770  ("PC",                              m_bUsePC                  , true          , "Use Predictive Coding with QTL" )
     771#endif
    770772#endif
    771773#endif
    … …  
    24972499#endif
    24982500#if MTK_I0099_VPS_EX2
    2499   printf("LimQtPredFlag:%d", m_bLimQtPredFlag ? 1 : 0);
    2500 #endif
    2501 #if !MTK_I0099_VPS_EX2
     2501  printf("LimQtPredFlag:%d ", m_bLimQtPredFlag ? 1 : 0);
     2502#endif
     2503#if !MTK_I0099_VPS_EX2 || MTK_I0099_FIX
    25022504#if H_3D_QTLPC
    25032505  printf("QTL:%d ", m_bUseQTL);
     2506#if !MTK_I0099_VPS_EX2
    25042507  printf("PC:%d " , m_bUsePC );
     2508#endif
    25052509#endif
    25062510#endif

  • branches/HTM-11.2-dev2-MediaTek/source/App/TAppEncoder/TAppEncCfg.h

    r1007 r1017  
    476476  Bool      m_useDLT;                                        ///< flag for using DLT
    477477#endif
    478 #if !MTK_I0099_VPS_EX2
     478#if !MTK_I0099_VPS_EX2 || MTK_I0099_FIX
    479479#if H_3D_QTLPC
    480480  Bool      m_bUseQTL;                                        ///< flag for using depth QuadTree Limitation
     481#if !MTK_I0099_VPS_EX2
    481482  Bool      m_bUsePC;                                         ///< flag for using Predictive Coding with QTL
     483#endif
    482484#endif
    483485#endif

  • branches/HTM-11.2-dev2-MediaTek/source/App/TAppEncoder/TAppEncTop.cpp

    r1007 r1017  
    202202    m_cTEncTop.setUseDLT                       ( isDepth ? m_useDLT               : false );
    203203#endif
    204 #if !MTK_I0099_VPS_EX2
     204#if !MTK_I0099_VPS_EX2 || MTK_I0099_FIX
    205205#if H_3D_QTLPC
    206206    m_cTEncTop.setUseQTL                       ( isDepth ? m_bUseQTL               : false );
     207#if !MTK_I0099_VPS_EX2   
    207208    m_cTEncTop.setUsePC                        ( isDepth ? m_bUsePC                : false );
     209#endif
    208210#endif
    209211#endif

  • branches/HTM-11.2-dev2-MediaTek/source/Lib/TLibCommon/TypeDef.h

    r1011 r1017  
    251251
    252252#define MTK_I0099_VPS_EX2                 1  ///< JCT3V-I0099, sub-PU size signaling and lim_qt_pred_flag in VPS extension 2
    253 
     253#define MTK_I0099_FIX                     1  ///< Fix the problem of removing encoder only QTL
    254254
    255255// Rate Control

  • branches/HTM-11.2-dev2-MediaTek/source/Lib/TLibEncoder/TEncCfg.h

    r1007 r1017  
    420420  Bool      m_useMPI;
    421421#endif
    422 #if !MTK_I0099_VPS_EX2
     422#if !MTK_I0099_VPS_EX2 || MTK_I0099_FIX
    423423#if H_3D_QTLPC
    424424  Bool      m_bUseQTL;
     425#if !MTK_I0099_VPS_EX2
    425426  Bool      m_bUsePC;
     427#endif
    426428#endif
    427429#endif
    … …  
    10101012  Void      setUseDLT                       ( Bool b) { m_useDLT = b;    }
    10111013#endif
    1012 #if !MTK_I0099_VPS_EX2
     1014#if !MTK_I0099_VPS_EX2 || MTK_I0099_FIX
    10131015#if H_3D_QTLPC
    10141016  Void      setUseQTL                       ( Bool b ) { m_bUseQTL = b;    }
    10151017  Bool      getUseQTL                       ()         { return m_bUseQTL; }
     1018#if !MTK_I0099_VPS_EX2
    10161019  Void      setUsePC                        ( Bool b ) { m_bUsePC  = b;    }
    10171020  Bool      getUsePC                        ()         { return m_bUsePC;  }
     1021#endif
    10181022#endif
    10191023#endif

  • branches/HTM-11.2-dev2-MediaTek/source/Lib/TLibEncoder/TEncCu.cpp

    r1007 r1017  
    537537
    538538#if MTK_I0099_VPS_EX2
     539#if MTK_I0099_FIX
     540      if(depthMapDetect && !bIntraSliceDetect && !rapPic && ( m_pcEncCfg->getUseQTL() || bLimQtPredFalg ))
     541#else
    539542      if(depthMapDetect && !bIntraSliceDetect && !rapPic && bLimQtPredFalg)
     543#endif
    540544#else
    541545      if(depthMapDetect && !bIntraSliceDetect && !rapPic && sps->getUseQTL())
    … …  
    695699#if H_3D_QTLPC     
    696700#if MTK_I0099_VPS_EX2
     701#if MTK_I0099_FIX
     702      if(depthMapDetect && !bIntraSliceDetect && !rapPic && ( m_pcEncCfg->getUseQTL() || bLimQtPredFalg ))
     703#else
    697704      if(depthMapDetect && !bIntraSliceDetect && !rapPic && bLimQtPredFalg)
     705#endif
    698706#else
    699707      if(depthMapDetect && !bIntraSliceDetect && !rapPic && sps->getUseQTL())
Note: See TracChangeset for help on using the changeset viewer.