Changeset 296 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComSlice.cpp


Ignore:
Timestamp:
20 Feb 2013, 22:07:43 (11 years ago)
Author:
tech
Message:

Reintegrated branch 5.1-dev0 rev. 295.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/TComSlice.cpp

    r210 r296  
    110110, m_cabacInitIdc                 ( -1 )
    111111#endif
    112 #if TILES_WPP_ENTRY_POINT_SIGNALLING
    113112, m_numEntryPointOffsets          ( 0 )
    114 #endif
    115 #if SONY_COLPIC_AVAILABILITY
    116 , m_iViewOrderIdx                 ( 0 )
    117 #endif
    118113#if LGE_ILLUCOMP_B0045
    119114, m_bApplyIC                      ( false )
    120115#endif
     116#if INTER_VIEW_VECTOR_SCALING_C0115
     117, m_bIVScalingFlag                (false)
     118, m_iViewOrderIdx                 ( 0 )        // will be changed to view_id
     119#endif
    121120{
    122121  m_aiNumRefIdx[0] = m_aiNumRefIdx[1] = m_aiNumRefIdx[2] = 0;
    123  
     122
    124123  initEqualRef();
    125124 
     
    196195  m_cabacInitFlag        = false;
    197196#endif
    198 #if TILES_WPP_ENTRY_POINT_SIGNALLING
    199197  m_numEntryPointOffsets = 0;
     198#if QC_TMVP_MRG_REFIDX_C0047
     199  m_aiNewRefIdx[0]                  = -1;
     200  m_aiNewRefIdx[1]                  = -1;
    200201#endif
    201202}
     
    419420    }
    420421  }
     422#if QC_TMVP_MRG_REFIDX_C0047
     423  Int  iCurrPOC = this->getPOC();
     424  for ( UInt uiRefListIdx = 0; uiRefListIdx < 2; uiRefListIdx++ )//just to get one updated ref idx for merge in each L0/L1 direction, if it is not avaialbe, it is still -1
     425  {       
     426    if ( this->getNumRefIdx( RefPicList( uiRefListIdx ) ) == 0)
     427        continue;
     428
     429    Bool bZeroIdxInterViewFlag =  ( this->getRefPic(RefPicList(uiRefListIdx), 0)->getPOC() == iCurrPOC ) ? true : false;
     430    for(Int i = 1; i < this->getNumRefIdx(RefPicList(uiRefListIdx)); i++ )
     431    {
     432      if ( (bZeroIdxInterViewFlag && this->getRefPic(RefPicList(uiRefListIdx), i)->getPOC() != iCurrPOC ) ||
     433           (!bZeroIdxInterViewFlag && this->getRefPic(RefPicList(uiRefListIdx), i)->getPOC() == iCurrPOC ) )
     434      {
     435        this->setNewRefIdx(RefPicList(uiRefListIdx),i);
     436        break;
     437      }
     438    }
     439  }
     440
     441#endif
    421442}
    422443
     
    621642    }
    622643  }
    623 #if H0566_TLA
    624644  if( getNalUnitTypeBaseViewMvc() == NAL_UNIT_CODED_SLICE_CRA ) // CRA picture found
    625 #else
    626   if( getNalUnitTypeBaseViewMvc() == NAL_UNIT_CODED_SLICE_CDR ) // CDR picture found
    627 #endif
    628645  {
    629646    pocCRA = getPOC();
     
    678695      bRefreshPending = false;
    679696    }
    680 #if H0566_TLA
    681697    if( getNalUnitTypeBaseViewMvc() == NAL_UNIT_CODED_SLICE_CRA ) // CRA picture found
    682 #else
    683     if( getNalUnitTypeBaseViewMvc() == NAL_UNIT_CODED_SLICE_CDR ) // CDR picture found
    684 #endif
    685698    {
    686699      bRefreshPending = true;
     
    698711  m_iPOC                 = pSrc->m_iPOC;
    699712  m_viewId               = pSrc->m_viewId;
    700 #if SONY_COLPIC_AVAILABILITY
    701   m_iViewOrderIdx        = pSrc->m_iViewOrderIdx;
     713#if INTER_VIEW_VECTOR_SCALING_C0115   
     714  m_iViewOrderIdx        = pSrc->m_iViewOrderIdx;// will be changed to view_id
     715  m_bIVScalingFlag       = pSrc->m_bIVScalingFlag;
    702716#endif
    703717  m_eNalUnitType         = pSrc->m_eNalUnitType;
     
    804818
    805819  m_saoEnabledFlag = pSrc->m_saoEnabledFlag;
    806 #if SAO_UNIT_INTERLEAVING
    807820  m_saoInterleavingFlag = pSrc->m_saoInterleavingFlag;
    808821  m_saoEnabledFlagCb = pSrc->m_saoEnabledFlagCb;
    809822  m_saoEnabledFlagCr = pSrc->m_saoEnabledFlagCr;
    810 #endif
    811823#if CABAC_INIT_FLAG
    812824  m_cabacInitFlag                = pSrc->m_cabacInitFlag;
    813825#endif
    814 #if TILES_WPP_ENTRY_POINT_SIGNALLING
    815826  m_numEntryPointOffsets  = pSrc->m_numEntryPointOffsets;
    816 #endif
    817 
    818 #if H0111_MVD_L1_ZERO
     827
    819828  m_bLMvdL1Zero = pSrc->m_bLMvdL1Zero;
    820 #endif
    821829}
    822830
     
    830838Void TComSlice::setTLayerInfo( UInt uiTLayer )
    831839{
    832 #if !H0566_TLA
    833   // If temporal_id_nesting_flag == 1, then num_temporal_layer_switching_point_flags shall be inferred to be 0 and temporal_layer_switching_point_flag shall be inferred to be 1 for all temporal layers
    834   if ( m_pcSPS->getTemporalIdNestingFlag() )
    835   {
    836     m_pcPPS->setNumTLayerSwitchingFlags( 0 );
    837     for ( UInt i = 0; i < MAX_TLAYER; i++ )
    838     {
    839       m_pcPPS->setTLayerSwitchingFlag( i, true );
    840     }
    841   }
    842   else
    843   {
    844     for ( UInt i = m_pcPPS->getNumTLayerSwitchingFlags(); i < MAX_TLAYER; i++ )
    845     {
    846       m_pcPPS->setTLayerSwitchingFlag( i, false );
    847     }
    848   }
    849 #endif
    850840
    851841  m_uiTLayer = uiTLayer;
    852 #if !H0566_TLA
    853   m_bTLayerSwitchingFlag = m_pcPPS->getTLayerSwitchingFlag( uiTLayer );
    854 #endif
    855 }
    856 
    857 #if H0566_TLA && H0566_TLA_SET_FOR_SWITCHING_POINTS
     842}
     843
     844#if H0566_TLA_SET_FOR_SWITCHING_POINTS
    858845/** Function for checking if this is a switching-point
    859846*/
     
    933920/** Function for applying picture marking based on the Reference Picture Set in pReferencePictureSet.
    934921*/
    935 #if START_DECODING_AT_CRA
    936922Int TComSlice::checkThatAllRefPicsAreAvailable( TComList<TComPic*>& rcListPic, TComReferencePictureSet *pReferencePictureSet, Bool outputFlag, Int pocRandomAccess)
    937 #else
    938 Int TComSlice::checkThatAllRefPicsAreAvailable( TComList<TComPic*>& rcListPic, TComReferencePictureSet *pReferencePictureSet, Bool outputFlag)
    939 #endif
    940923{
    941924  TComPic* rpcPic;
     
    983966    if(isAvailable == 0)   
    984967    {           
    985 #if START_DECODING_AT_CRA
    986968      if (this->getPOC() + pReferencePictureSet->getDeltaPOC(i) >= pocRandomAccess)
    987969      {
    988 #endif
    989970        if(!pReferencePictureSet->getUsed(i) )
    990971        {
     
    1000981          iPocLost=this->getPOC() + pReferencePictureSet->getDeltaPOC(i);
    1001982        }
    1002 #if START_DECODING_AT_CRA
    1003       }
    1004 #endif
     983      }
    1005984    }
    1006985  } 
     
    10271006    if(isAvailable == 0)   
    10281007    {           
    1029 #if START_DECODING_AT_CRA
    10301008      if (this->getPOC() + pReferencePictureSet->getDeltaPOC(i) >= pocRandomAccess)
    10311009      {
    1032 #endif
    10331010        if(!pReferencePictureSet->getUsed(i) )
    10341011        {
     
    10441021          iPocLost=this->getPOC() + pReferencePictureSet->getDeltaPOC(i);
    10451022        }
    1046 #if START_DECODING_AT_CRA
    1047       }
    1048 #endif
     1023      }
    10491024    }
    10501025  }   
     
    11121087    Int rIdx =  this->getRPSidx() - pReferencePictureSet->getDeltaRIdxMinus1() - 1;
    11131088    Int deltaRPS = pReferencePictureSet->getDeltaRPS();
    1114 #if RPS_IN_SPS
    11151089    TComReferencePictureSet* pcRefRPS = this->getSPS()->getRPSList()->getReferencePictureSet(rIdx);
    1116 #else
    1117     TComReferencePictureSet* pcRefRPS = this->getPPS()->getRPSList()->getReferencePictureSet(rIdx);
    1118 #endif
    11191090    Int iRefPics = pcRefRPS->getNumberOfPictures();
    11201091    Int iNewIdc=0;
     
    11431114    pcRPS->setNumRefIdc(iNewIdc);
    11441115    pcRPS->setDeltaRPS(deltaRPS);
    1145 #if RPS_IN_SPS
    11461116    pcRPS->setDeltaRIdxMinus1(pReferencePictureSet->getDeltaRIdxMinus1() + this->getSPS()->getRPSList()->getNumberOfReferencePictureSets() - this->getRPSidx());
    1147 #else
    1148     pcRPS->setDeltaRIdxMinus1(pReferencePictureSet->getDeltaRIdxMinus1() + this->getPPS()->getRPSList()->getNumberOfReferencePictureSets() - this->getRPSidx());
    1149 #endif
    11501117  }
    11511118
     
    13821349    Int iRefStride = pcRefPicYuvOrg->getStride();
    13831350    Int iSumOrgSAD = 0;
     1351#if LGE_ILLUCOMP_DEPTH_C0046
     1352    Double dThresholdOrgSAD = getIsDepth() ? 0.1 : 0.05;
     1353#else
    13841354    double dThresholdOrgSAD = 0.05;
     1355#endif
    13851356    // Histogram building - luminance
    13861357    for ( Int y = 0; y < iHeight; y++)
     
    15091480, m_picWidthInLumaSamples     (352)
    15101481, m_picHeightInLumaSamples    (288)
    1511 #if PIC_CROPPING
    15121482, m_picCroppingFlag           (false)
    15131483, m_picCropLeftOffset         (  0)
     
    15151485, m_picCropTopOffset          (  0)
    15161486, m_picCropBottomOffset       (  0)
    1517 #endif
    15181487, m_uiMaxCUWidth              ( 32)
    15191488, m_uiMaxCUHeight             ( 32)
     
    15211490, m_uiMinTrDepth              (  0)
    15221491, m_uiMaxTrDepth              (  1)
    1523 #if RPS_IN_SPS
    15241492, m_bLongTermRefsPresent      (false)
    1525 #endif
    1526 #if !H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
    1527 , m_numReorderFrames          (  0)
    1528 #endif
    15291493, m_iNumberOfUsableInterViewRefs( 0 )
    15301494, m_uiQuadtreeTULog2MaxSize   (  0)
     
    15381502, m_bDisInter4x4              (  1)
    15391503, m_bUseALF                   (false)
    1540 #if LCU_SYNTAX_ALF
    15411504, m_bALFCoefInSlice           (false)
    1542 #endif
    1543 #if !PIC_CROPPING
    1544 , m_bUsePAD                   (false)
    1545 #endif
    15461505, m_bUseLMChroma              (false)
    15471506, m_bUseLComb                 (false)
    15481507, m_bLCMod                    (false)
    1549 #if H0412_REF_PIC_LIST_RESTRICTION
    15501508#if QC_MVHEVC_B0046
    15511509, m_restrictedRefPicListsFlag   (  0)
     
    15541512#endif
    15551513, m_listsModificationPresentFlag(  0)
    1556 #endif
    15571514, m_uiBitDepth                (  8)
    15581515, m_uiBitIncrement            (  0)
    1559 #if H0736_AVC_STYLE_QP_RANGE
    15601516, m_qpBDOffsetY               (  0)
    15611517, m_qpBDOffsetC               (  0)
    1562 #endif
    15631518#if LOSSLESS_CODING
    15641519, m_useLossless               (false)
     
    15831538, m_bTemporalIdNestingFlag    (false)
    15841539, m_scalingListEnabledFlag    (false)
    1585 #if !H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
    1586 , m_uiMaxDecFrameBuffering    (  0)
    1587 , m_uiMaxLatencyIncrease      (  0)
    1588 #endif
    1589 #if TILES_WPP_ENTRY_POINT_SIGNALLING
    15901540,  m_tilesOrEntropyCodingSyncIdc( 0 )
    15911541,  m_numSubstreams              ( 0 )
    1592 #endif
    15931542#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    15941543, m_bUseDMM                   (false)
     
    16031552  // AMVP parameter
    16041553  ::memset( m_aeAMVPMode, 0, sizeof( m_aeAMVPMode ) );
    1605 #if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
    16061554  for ( Int i = 0; i < MAX_TLAYER; i++ )
    16071555  {
     
    16101558    m_numReorderPics[i]       = 0;
    16111559  }
    1612 #endif
    16131560
    16141561  m_uiViewId              = 0;
     
    16261573  ::memset( m_aiPdmOffset,        0x00, sizeof( m_aiPdmOffset         ) );
    16271574#endif
    1628 #if HHI_INTER_VIEW_MOTION_PRED
     1575#if H3D_IVMP
    16291576  m_uiMultiviewMvPredMode    = 0;
    16301577#endif
     
    17481695, m_iChromaQpOffset             (0)
    17491696, m_iChromaQpOffset2nd          (0)
    1750 #if !RPS_IN_SPS
    1751 , m_bLongTermRefsPresent        (false)
    1752 #endif
    1753 #if !H0566_TLA
    1754 , m_uiNumTlayerSwitchingFlags   (0)
    1755 #endif
    17561697, m_iSliceGranularity           (0)
    17571698, m_iTileBehaviorControlPresentFlag (0)
     
    17591700, m_iColumnRowInfoPresent        (0)
    17601701, m_iUniformSpacingIdr           (0)
    1761 #if !REMOVE_TILE_DEPENDENCE
    1762 , m_iTileBoundaryIndependenceIdr (0)
    1763 #endif
    17641702, m_iNumColumnsMinus1            (0)
    17651703, m_puiColumnWidth               (NULL)
    17661704, m_iNumRowsMinus1               (0)
    17671705, m_puiRowHeight                 (NULL)
    1768 #if !WPP_SIMPLIFICATION
    1769 ,  m_iEntropyCodingSynchro      (0)
    1770 ,  m_bCabacIstateReset          (false)
    1771 #endif
    17721706,  m_iNumSubstreams             (1)
    1773 #if MULTIBITS_DATA_HIDING
    17741707, m_signHideFlag(0)
    17751708, m_signHidingThreshold(0)
    1776 #endif
    17771709#if CABAC_INIT_FLAG
    17781710, m_cabacInitPresentFlag        (false)
     
    17831715#endif
    17841716{
    1785 #if !H0566_TLA
    1786   for ( UInt i = 0; i < MAX_TLAYER; i++ )
    1787   {
    1788     m_abTLayerSwitchingFlag[i] = false;
    1789   }
    1790 #endif
    17911717}
    17921718
     
    18601786
    18611787  m_uiPredDepthMapGeneration = uiPdmGenMode;
    1862 #if HHI_INTER_VIEW_MOTION_PRED
     1788#if H3D_IVMP
    18631789  m_uiMultiviewMvPredMode    = uiPdmMvPredMode;
    18641790#endif
     
    20561982: m_bRefPicListModificationFlagL0 (false)
    20571983, m_bRefPicListModificationFlagL1 (false)
    2058 #if !H0137_0138_LIST_MODIFICATION
    2059 , m_uiNumberOfRefPicListModificationsL0 (0)
    2060 , m_uiNumberOfRefPicListModificationsL1 (0)
    2061 #endif
    2062 {
    2063 #if !H0137_0138_LIST_MODIFICATION
    2064   ::memset( m_ListIdcL0, 0, sizeof(m_ListIdcL0) );
    2065 #endif
     1984{
    20661985  ::memset( m_RefPicSetIdxL0, 0, sizeof(m_RefPicSetIdxL0) );
    2067 #if !H0137_0138_LIST_MODIFICATION
    2068   ::memset( m_ListIdcL1, 0, sizeof(m_ListIdcL1) );
    2069 #endif
    20701986  ::memset( m_RefPicSetIdxL1, 0, sizeof(m_RefPicSetIdxL1) );
    20711987}
     
    20811997  m_bSaoEnabled = false;
    20821998  m_pSaoParam = NULL;
    2083 #if LCU_SYNTAX_ALF
    20841999  m_alfParamSet = NULL;
    2085 #else
    2086   m_pAlfParam = NULL;
    2087 #endif
    20882000  m_scalingList = NULL;
    20892001  m_scalingListEnabled = false;
     
    21052017  m_bSaoEnabled = src.m_bSaoEnabled;
    21062018  m_pSaoParam   = src.m_pSaoParam;
    2107 #if LCU_SYNTAX_ALF
    21082019  m_alfParamSet    = src.m_alfParamSet;
    2109 #else
    2110   m_pAlfParam   = src.m_pAlfParam;
    2111 #endif
    21122020  m_scalingList = src.m_scalingList;
    21132021  m_scalingListEnabled = src.m_scalingListEnabled;
    2114 #if SAO_UNIT_INTERLEAVING
    21152022  m_saoInterleavingFlag = src.m_saoInterleavingFlag;
    2116 #endif
    21172023
    21182024  return *this;
     
    21352041Void TComAPS::createAlfParam()
    21362042{
    2137 #if LCU_SYNTAX_ALF
    21382043  m_alfParamSet = new AlfParamSet;
    2139 #else
    2140   m_pAlfParam = new ALFParam;
    2141 #endif
    21422044}
    21432045Void TComAPS::destroyAlfParam()
    21442046{
    2145 #if LCU_SYNTAX_ALF
    21462047  if(m_alfParamSet != NULL)
    21472048  {
     
    21492050    m_alfParamSet = NULL;
    21502051  }
    2151 #else
    2152   if(m_pAlfParam != NULL)
    2153   {
    2154     delete m_pAlfParam;
    2155     m_pAlfParam = NULL;
    2156   }
    2157 #endif
    21582052}
    21592053
     
    21912085 * \returns true if use default quantization matrix in all size
    21922086*/
    2193 #if SCALING_LIST
    21942087Bool TComSlice::checkDefaultScalingList()
    21952088{
     
    22082101  return (defaultCounter == (SCALING_LIST_NUM * SCALING_LIST_SIZE_NUM - 4)) ? true : false; // -4 for 32x32
    22092102}
    2210 #else
    2211 Bool TComSlice::checkDefaultScalingList()
    2212 {
    2213   UInt i;
    2214   Int *dst=0;
    2215   Int *src=0;
    2216   UInt defaultCounter=0;
    2217 
    2218   //4x4
    2219   for(i=0;i<SCALING_LIST_NUM;i++)
    2220   {
    2221     src = (i<3) ? g_quantIntraDefault4x4 : g_quantInterDefault4x4;
    2222     dst = getScalingList()->getScalingListAddress(SCALING_LIST_4x4,i);
    2223     if(::memcmp(dst,src,sizeof(UInt)*16) == 0) defaultCounter++;
    2224   }
    2225 
    2226   //8x8
    2227   for(i=0;i<SCALING_LIST_NUM;i++)
    2228   {
    2229     src = (i<3) ? g_quantIntraDefault8x8 : g_quantInterDefault8x8;
    2230     dst = getScalingList()->getScalingListAddress(SCALING_LIST_8x8,i);
    2231     if(::memcmp(dst,src,sizeof(UInt)*64) == 0) defaultCounter++;
    2232   }
    2233   //16x16
    2234   for(i=0;i<SCALING_LIST_NUM;i++)
    2235   {
    2236     src = (i<3) ? g_quantIntraDefault16x16 : g_quantInterDefault16x16;
    2237     dst = getScalingList()->getScalingListAddress(SCALING_LIST_16x16,i);
    2238     if(::memcmp(dst,src,sizeof(UInt)*256) == 0) defaultCounter++;
    2239   }
    2240   //32x32
    2241   for(i=0;i<SCALING_LIST_NUM_32x32;i++)
    2242   {
    2243     src = (i<1) ? g_quantIntraDefault32x32 : g_quantInterDefault32x32;
    2244     dst = getScalingList()->getScalingListAddress(SCALING_LIST_32x32,i*3);
    2245     if(::memcmp(dst,src,sizeof(UInt)*1024) == 0) defaultCounter++;
    2246   }
    2247   return (defaultCounter == (SCALING_LIST_NUM * SCALING_LIST_SIZE_NUM - 4)) ? true : false; // -4 for 32x32
    2248 }
    2249 #endif
    22502103/** get scaling matrix from RefMatrixID
    22512104 * \param sizeId size index
     
    22552108Void TComScalingList::processRefMatrix( UInt sizeId, UInt listId , UInt refListId )
    22562109{
    2257 #if SCALING_LIST
    22582110  ::memcpy(getScalingListAddress(sizeId, listId),getScalingListAddress(sizeId, refListId),sizeof(Int)*min(MAX_MATRIX_COEF_NUM,(Int)g_scalingListSize[sizeId]));
    2259 #else
    2260   ::memcpy(getScalingListAddress(sizeId, listId),getScalingListAddress(sizeId, refListId),sizeof(Int)*g_scalingListSize[sizeId]);
    2261 #endif
    22622111}
    22632112/** parse syntax infomation
     
    22832132  for(sizeIdc = 0; sizeIdc < SCALING_LIST_SIZE_NUM; sizeIdc++)
    22842133  {
    2285 #if SCALING_LIST
    22862134    size = min(MAX_MATRIX_COEF_NUM,(Int)g_scalingListSize[sizeIdc]);
    2287 #else
    2288     size = g_scalingListSize[sizeIdc];
    2289 #endif
    22902135    for(listIdc = 0; listIdc < g_scalingListNum[sizeIdc]; listIdc++)
    22912136    {
     
    23132158        src[i] = data;
    23142159      }
    2315 #if SCALING_LIST
    23162160      //set DC value for default matrix check
    23172161      setScalingListDC(sizeIdc,listIdc,src[0]);
     
    23392183          setScalingListDC(sizeIdc,listIdc,data);
    23402184      }
    2341 #endif
    23422185    }
    23432186  }
     
    23542197    for(UInt listId = 0; listId < g_scalingListNum[sizeId]; listId++)
    23552198    {
    2356 #if SCALING_LIST
    23572199      m_scalingListCoef[sizeId][listId] = new Int [min(MAX_MATRIX_COEF_NUM,(Int)g_scalingListSize[sizeId])];
    2358 #else
    2359       m_scalingListCoef[sizeId][listId] = new Int [g_scalingListSize[sizeId]];
    2360 #endif
    23612200    }
    23622201  }
     
    23912230      src = (listId<3) ? g_quantIntraDefault8x8 : g_quantInterDefault8x8;
    23922231      break;
    2393 #if SCALING_LIST
    23942232    case SCALING_LIST_16x16:
    23952233      src = (listId<3) ? g_quantIntraDefault8x8 : g_quantInterDefault8x8;
     
    23982236      src = (listId<1) ? g_quantIntraDefault8x8 : g_quantInterDefault8x8;
    23992237      break;
    2400 #else
    2401     case SCALING_LIST_16x16:
    2402       src = (listId<3) ? g_quantIntraDefault16x16 : g_quantInterDefault16x16;
    2403       break;
    2404     case SCALING_LIST_32x32:
    2405       src = (listId<1) ? g_quantIntraDefault32x32 : g_quantInterDefault32x32;
    2406       break;
    2407 #endif
    24082238    default:
    24092239      assert(0);
     
    24192249Void TComScalingList::processDefaultMarix(UInt sizeId, UInt listId)
    24202250{
    2421 #if SCALING_LIST
    24222251  ::memcpy(getScalingListAddress(sizeId, listId),getScalingListDefaultAddress(sizeId,listId),sizeof(Int)*min(MAX_MATRIX_COEF_NUM,(Int)g_scalingListSize[sizeId]));
    24232252  setUseDefaultScalingMatrixFlag(sizeId,listId,true);
    24242253  setScalingListDC(sizeId,listId,SCALING_LIST_DC);
    2425 #else
    2426   ::memcpy(getScalingListAddress(sizeId, listId),getScalingListDefaultAddress(sizeId,listId),sizeof(Int)*(Int)g_scalingListSize[sizeId]);
    2427 #endif
    2428 }
    2429 #if SCALING_LIST
     2254}
    24302255/** check DC value of matrix for default matrix signaling
    24312256 */
     
    24452270  }
    24462271}
    2447 #endif
    24482272
    24492273ParameterSetManager::ParameterSetManager()
Note: See TracChangeset for help on using the changeset viewer.