Changeset 1025 in 3DVCSoftware


Ignore:
Timestamp:
29 Jul 2014, 04:18:55 (10 years ago)
Author:
samsung-htm
Message:

Integration of JCT3V-I0100: vps_extension2 and slice_segment_header clean-up

Location:
branches/HTM-11.2-dev2-Samsung
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

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

    r1017 r1025  
    18371837    {
    18381838      vps.setIvMvPredFlag    (layer, false);
     1839#if SEC_HLS_CLEANUP_I0100
     1840      vps.setIvMvScalingFlag (layer, false);
     1841#endif
    18391842    }
    18401843    else
    … …  
    18481851        vps.setIvMvPredFlag         ( layer, !isLayerZero && m_ivMvPredFlag[0] );
    18491852      }
     1853#if SEC_HLS_CLEANUP_I0100
     1854      vps.setIvMvScalingFlag (layer, m_ivMvScalingFlag);
     1855#endif
    18501856    }
    18511857#endif
    … …  
    18751881#endif
    18761882#if H_3D
     1883#if !SEC_HLS_CLEANUP_I0100
    18771884  vps.setIvMvScalingFlag( m_ivMvScalingFlag );   
     1885#endif
    18781886#endif
    18791887}

  • branches/HTM-11.2-dev2-Samsung/source/Lib/TLibCommon/TComDataCU.cpp

    r1007 r1025  
    59005900    Int iColRefViewId  = pColCU->getSlice()->getRefPic( eColRefPicList, pColCU->getCUMvField(eColRefPicList)->getRefIdx(uiAbsPartAddr))->getViewIndex();
    59015901    iScale = xGetDistScaleFactor( iCurrViewId, iCurrRefViewId, iColViewId, iColRefViewId );
     5902#if SEC_HLS_CLEANUP_I0100
     5903    if ( iScale != 4096 && m_pcSlice->getVPS()->getIvMvScalingFlag(getSlice()->getLayerIdInVps()) )
     5904#else
    59025905    if ( iScale != 4096 && m_pcSlice->getVPS()->getIvMvScalingFlag() )
     5906#endif
    59035907    {
    59045908      rcMv = cColMv.scaleMv( iScale );

  • branches/HTM-11.2-dev2-Samsung/source/Lib/TLibCommon/TComSlice.cpp

    r1007 r1025  
    19421942    m_viewIndex         [i] = -1;
    19431943    m_vpsDepthModesFlag [i] = false;
     1944#if SEC_HLS_CLEANUP_I0100
     1945    m_ivMvScalingFlag[i] = true;
     1946#else
    19441947    m_ivMvScalingFlag = true;
     1948#endif
    19451949#endif
    19461950

  • branches/HTM-11.2-dev2-Samsung/source/Lib/TLibCommon/TComSlice.h

    r1007 r1025  
    798798#if H_3D_IV_MERGE
    799799  Bool        m_ivMvPredFlag             [ MAX_NUM_LAYERS ];
     800#if SEC_HLS_CLEANUP_I0100
     801  Bool        m_ivMvScalingFlag          [ MAX_NUM_LAYERS ];
     802#endif
    800803#if H_3D_SPIVMP
    801804  Int         m_iSubPULog2Size           [MAX_NUM_LAYERS   ];
    … …  
    824827  Int         ***m_aaaiCodedScale ;
    825828  Int         ***m_aaaiCodedOffset;
     829
     830#if !SEC_HLS_CLEANUP_I0100
    826831  Bool        m_ivMvScalingFlag;
     832#endif
     833
    827834#endif
    828835#if H_3D_INTER_SDC
    … …  
    11611168  Bool    getVpsDepthModesFlag( Int layerIdInVps )                         { return m_vpsDepthModesFlag[ layerIdInVps ]; }
    11621169
     1170#if SEC_HLS_CLEANUP_I0100
     1171  Bool    getIvMvScalingFlag   ( Int layerIdInVps )                        { return m_ivMvScalingFlag[ layerIdInVps ]; }
     1172  Void    setIvMvScalingFlag   (Int layerIdInVps, Bool b )                 { m_ivMvScalingFlag[ layerIdInVps ] = b;    } 
     1173#else
    11631174  Bool    getIvMvScalingFlag   (  )                       { return m_ivMvScalingFlag; }
    11641175  Void    setIvMvScalingFlag   ( Bool b )                 { m_ivMvScalingFlag = b;    } 
     1176#endif
     1177
    11651178#if H_3D_INTER_SDC
    11661179  Bool    getInterSDCFlag      ( Int layerIdInVps )           { return m_bInterSDCFlag[layerIdInVps]; }

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

    r1024 r1025  
    259259
    260260#define SEC_VPS_CLEANUP_I0090             1
     261#define SEC_HLS_CLEANUP_I0100             1
    261262
    262263#endif // H_3D

  • branches/HTM-11.2-dev2-Samsung/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1024 r1025  
    17771777#if MTK_I0099_VPS_EX2
    17781778      READ_FLAG( uiCode, "iv_mv_pred_flag[i]");          pcVPS->setIvMvPredFlag         ( i, uiCode == 1 ? true : false );
     1779#if SEC_HLS_CLEANUP_I0100
     1780      READ_FLAG( uiCode, "iv_mv_scaling_flag[i]");       pcVPS->setIvMvScalingFlag         ( i, uiCode == 1 ? true : false );
     1781#endif
    17791782#endif
    17801783      if( !( pcVPS->getDepthId( i ) == 1 ) )
    … …  
    18841887  READ_UVLC (uiCode, "log2_sub_PU_MPI_size_minus3");              pcVPS->setSubPUMPILog2Size( uiCode + 3 );
    18851888#endif
     1889#if !SEC_HLS_CLEANUP_I0100
    18861890  READ_FLAG( uiCode, "iv_mv_scaling_flag");                       pcVPS->setIvMvScalingFlag( uiCode == 1 ? true : false );
     1891#endif
    18871892}
    18881893#endif
    … …  
    24852490    }
    24862491#if H_3D_IC
     2492#if SEC_HLS_CLEANUP_I0100
     2493    else if( rpcSlice->getViewIndex() && ( rpcSlice->getSliceType() == P_SLICE || rpcSlice->getSliceType() == B_SLICE ) && !rpcSlice->getIsDepth() && vps->getNumDirectRefLayers( layerId ) > 0 )
     2494#else
    24872495    else if( rpcSlice->getViewIndex() && ( rpcSlice->getSliceType() == P_SLICE || rpcSlice->getSliceType() == B_SLICE ) && !rpcSlice->getIsDepth())
     2496#endif
    24882497    {
    24892498      UInt uiCodeTmp = 0;

  • branches/HTM-11.2-dev2-Samsung/source/Lib/TLibEncoder/TEncCavlc.cpp

    r1024 r1025  
    15721572#if MTK_I0099_VPS_EX2
    15731573      WRITE_FLAG( pcVPS->getIvMvPredFlag         ( i ) ? 1 : 0 , "iv_mv_pred_flag[i]");
     1574#if SEC_HLS_CLEANUP_I0100
     1575      WRITE_FLAG( pcVPS->getIvMvScalingFlag( i ) ? 1 : 0 ,       "iv_mv_scaling_flag[i]" );
     1576#endif
     1577
    15741578#endif
    15751579      if ( !( pcVPS->getDepthId( i ) == 1 ) )
    … …  
    16531657#endif
    16541658#if H_3D_TMVP
     1659#if !SEC_HLS_CLEANUP_I0100
    16551660  WRITE_FLAG( pcVPS->getIvMvScalingFlag( ) ? 1 : 0 ,          "iv_mv_scaling_flag" );
     1661#endif
    16561662#endif
    16571663}
    … …  
    20392045    }
    20402046#if H_3D_IC
    2041     else if( pcSlice->getViewIndex() && ( pcSlice->getSliceType() == P_SLICE || pcSlice->getSliceType() == B_SLICE ) && !pcSlice->getIsDepth())
     2047#if SEC_HLS_CLEANUP_I0100
     2048    else if( pcSlice->getViewIndex() && ( pcSlice->getSliceType() == P_SLICE || pcSlice->getSliceType() == B_SLICE ) && !pcSlice->getIsDepth() && vps->getNumDirectRefLayers( layerId ) > 0 )
     2049#else
     2050    else if( pcSlice->getViewIndex() && ( pcSlice->getSliceType() == P_SLICE || pcSlice->getSliceType() == B_SLICE ) && !pcSlice->getIsDepth() )
     2051#endif
    20422052    {
    20432053      WRITE_FLAG( pcSlice->getApplyIC() ? 1 : 0, "slice_ic_enable_flag" );
Note: See TracChangeset for help on using the changeset viewer.