Changeset 21 in SHVCSoftware for trunk/source/Lib/TLibCommon

Timestamp:

29 Jan 2013, 20:23:17 (12 years ago)

Author:

seregin

Message:

REF_IDX_ME_ZEROMV: use zero motion for inter-layer reference picture without fractional ME (L0051)

Location:

trunk/source/Lib/TLibCommon

Files:

• TComPic.cpp (modified) (1 diff)
• TComPic.h (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

trunk/source/Lib/TLibCommon/TComPic.cpp

@@ -68 +68 @@
 , m_bSpatialEnhLayer( false )
 , m_pcFullPelBaseRec( NULL )
-#if REF_IDX_ME_AROUND_ZEROMV || ENCODER_FAST_MODE
+#if REF_IDX_ME_AROUND_ZEROMV || REF_IDX_ME_ZEROMV || ENCODER_FAST_MODE
 , m_bIsILR                                (false)
 #endif

trunk/source/Lib/TLibCommon/TComPic.h

@@ -88 +88 @@
   Bool                  m_bSpatialEnhLayer;       // whether current layer is a spatial enhancement layer,
   TComPicYuv*           m_pcFullPelBaseRec;    // upsampled base layer recontruction for difference domain inter prediction
-#if REF_IDX_ME_AROUND_ZEROMV || ENCODER_FAST_MODE
+#if REF_IDX_ME_AROUND_ZEROMV || REF_IDX_ME_ZEROMV || ENCODER_FAST_MODE
   Bool                  m_bIsILR;                 //  Is ILR picture
 #endif
@@ -118 +118 @@
   TComPicYuv*   getFullPelBaseRec   ()  { return  m_pcFullPelBaseRec;  }
 #endif
-#if REF_IDX_ME_AROUND_ZEROMV || ENCODER_FAST_MODE
+#if REF_IDX_ME_AROUND_ZEROMV || REF_IDX_ME_ZEROMV || ENCODER_FAST_MODE
   Void          setIsILR( Bool bIsILR)      {m_bIsILR = bIsILR;}
   Bool          getIsILR()                  {return m_bIsILR;}

trunk/source/Lib/TLibCommon/TypeDef.h

@@ -58 +58 @@
 #if REF_IDX_FRAMEWORK
 #define REF_IDX_ME_AROUND_ZEROMV         0      ///< added ME around zero MV for inter-layer reference picture
+#define REF_IDX_ME_ZEROMV                1      ///< L0051: use zero motion for inter-layer reference picture (without fractional ME)
 #define ENCODER_FAST_MODE                1      ///< L0174: enable encoder fast mode. TestMethod 1 is enabled by setting to 1 and TestMethod 2 is enable by setting to 2. By default it is set to 1.
 #else