Changeset 731 in 3DVCSoftware for branches


Ignore:
Timestamp:
9 Dec 2013, 17:22:20 (11 years ago)
Author:
tech
Message:

Merged fix from HTM-9.0-Fix@728.

Location:
branches/HTM-9.0-dev0/source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-9.0-dev0/source/App/TAppEncoder/TAppEncTop.cpp

    r730 r731  
    19481948    if( isDepth )
    19491949    {
     1950#if MTK_F0110_FIX
     1951      vps.setSubPULog2Size         ( layer, (layer != 1) ? 6: 0 );
     1952#else
    19501953      vps.setSubPULog2Size         ( layer, (layer != 1) ? m_iSubPULog2Size: 0 );
     1954#endif
    19511955    }
    19521956    else

  • branches/HTM-9.0-dev0/source/Lib/TLibCommon/TypeDef.h

    r730 r731  
    313313#define QC_DEPTH_IV_MRG_F0125                   1 // JCT3V-F0125: Depth oriented Inter-view MV candidate
    314314#define MTK_SPIVMP_F0110                        1 // JCT3V-F0110: Sub-PU level inter-view motion prediction
     315#define MTK_F0110_FIX                           1 // Disable Sub-PU IVMP in Depth, fix some delete problems
    315316#define BUGFIX_F0093                            1 // bug fix for F0093 for depth IvMC pruning
    316317#define BUGFIX_2_F0093                          1 // bug fix for VSP inheritance

  • branches/HTM-9.0-dev0/source/Lib/TLibDecoder/TDecCu.cpp

    r724 r731  
    488488      }
    489489    }
     490#if MTK_F0110_FIX
     491    delete[] pcMvFieldSP;
     492    delete[] puhInterDirSP;
     493#else
    490494    delete pcMvFieldSP;
    491495    delete puhInterDirSP;
     496#endif
    492497#endif
    493498#if !LGE_SHARP_VSP_INHERIT_F0104

  • branches/HTM-9.0-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp

    r724 r731  
    402402  }
    403403#if MTK_SPIVMP_F0110
     404#if MTK_F0110_FIX
     405  delete[] pcMvFieldSP;
     406  delete[] puhInterDirSP;
     407#else
    404408  delete pcMvFieldSP;
    405409  delete puhInterDirSP;
     410#endif
    406411#endif
    407412  return;

  • branches/HTM-9.0-dev0/source/Lib/TLibEncoder/TEncCu.cpp

    r724 r731  
    20942094 }
    20952095#if MTK_SPIVMP_F0110
     2096#if MTK_F0110_FIX
     2097 delete[] pcMvFieldSP;
     2098 delete[] puhInterDirSP;
     2099#else
    20962100 delete pcMvFieldSP;
    20972101 delete puhInterDirSP;
     2102#endif
    20982103#endif
    20992104#if H_3D_ARP

  • branches/HTM-9.0-dev0/source/Lib/TLibEncoder/TEncSearch.cpp

    r724 r731  
    44924492      }
    44934493#if MTK_SPIVMP_F0110
     4494#if MTK_F0110_FIX
     4495      delete[] pcMvFieldSP;
     4496      delete[] puhInterDirSP;
     4497#else
    44944498      delete pcMvFieldSP;
    44954499      delete puhInterDirSP;
     4500#endif
    44964501#endif
    44974502    }
Note: See TracChangeset for help on using the changeset viewer.