Changeset 868 in 3DVCSoftware


Ignore:
Timestamp:
25 Mar 2014, 12:11:22 (10 years ago)
Author:
tech
Message:

Merged fix from 10.0r1.

Location:
branches/HTM-10.0-dev0/source/Lib/TLibCommon
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-10.0-dev0/source/Lib/TLibCommon/CommonDef.h

    r854 r868  
    6060
    6161#if H_MV
    62 #define NV_VERSION        "10.0"              ///< Current software version
     62#define NV_VERSION        "10.0r1"                ///< Current software version
    6363#define HM_VERSION        "13.0"                ///<
    6464#else
  • branches/HTM-10.0-dev0/source/Lib/TLibCommon/TComDataCU.cpp

    r852 r868  
    47184718
    47194719          TComMvField cMVField;
     4720#if !HTM10RC1_FIX
    47204721          UChar ucInterDir = pcTextureCU->getInterDir( uiPartIdx );
    4721 
     4722#endif
    47224723          Int iDV = 0;
    47234724          Int iViewIdx = 0;
     4725#if !HTM10RC1_FIX
    47244726          if( ucInterDir & 1 )
    47254727          {
     4728#endif
    47264729              pcTextureCU->getMvField( pcTextureCU, uiPartIdx, REF_PIC_LIST_0, cMVField );
     4730#if HTM10RC1_FIX
     4731              if( cMVField.getRefIdx() >= 0 )
     4732              {
     4733#endif
    47274734              if( pcTextureSlice->getRefPOC( REF_PIC_LIST_0, cMVField.getRefIdx()) == pcTextureSlice->getPOC() )
    47284735              {
     
    47444751              }
    47454752          }
     4753
     4754#if !HTM10RC1_FIX
    47464755          if( !tmpDir && ( ucInterDir & 2 ))
    47474756          {
     4757#endif
    47484758              pcTextureCU->getMvField( pcTextureCU, uiPartIdx, REF_PIC_LIST_1, cMVField );
     4759
     4760#if HTM10RC1_FIX
     4761              if( !tmpDir && cMVField.getRefIdx() >= 0 )
     4762              {
     4763#endif
    47494764              if( pcTextureSlice->getRefPOC( REF_PIC_LIST_1, cMVField.getRefIdx()) == pcTextureSlice->getPOC() )
    47504765              {
  • branches/HTM-10.0-dev0/source/Lib/TLibCommon/TypeDef.h

    r866 r868  
    5555
    5656#ifndef HEVC_EXT
    57 #define HEVC_EXT                    1
     57#define HEVC_EXT                    2
    5858#endif
    5959
     
    279279
    280280#define MTK_DDD_G0063                     1   // Disparity derived depth coding
     281#define HTM10RC1_FIX                           1   // Fix of DDD
     282
    281283
    282284#if H_3D_VSP
Note: See TracChangeset for help on using the changeset viewer.