Changeset 331 in 3DVCSoftware

Timestamp:

20 Apr 2013, 12:05:40 (12 years ago)

Author:

tech

Message:

Fixed inter_view_mv_vert_constraint_flag.

Location:

branches/HTM-DEV-0.1-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibCommon/TComSlice.h (modified) (2 diffs)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -1470 +1470 @@
 , m_vuiParametersPresentFlag  (false)
 , m_vuiParameters             ()
+#if H_MV
+, m_interViewMvVertConstraintFlag (false)
+#endif
 {
   for ( Int i = 0; i < MAX_TLAYER; i++ )

branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.h

@@ -968 +968 @@
   static const Int   m_winUnitY[MAX_CHROMA_FORMAT_IDC+1];
   TComPTL     m_pcPTL;
+
+#if H_MV
+  Bool        m_interViewMvVertConstraintFlag;
+#endif
+
 public:
   TComSPS();
@@ -1094 +1099 @@
 
   TComPTL* getPTL()     { return &m_pcPTL; }
+
+#if H_MV
+  Void setInterViewMvVertConstraintFlag(Bool val) { m_interViewMvVertConstraintFlag = val; }
+  Bool getInterViewMvVertConstraintFlag()         { return m_interViewMvVertConstraintFlag;}
+#endif
 };
 

branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -710 +710 @@
   if (uiCode)
   {
+#if H_MV
+    READ_FLAG( uiCode, "inter_view_mv_vert_constraint_flag" );    pcSPS->setInterViewMvVertConstraintFlag(uiCode == 1 ? true : false);
+#else
     while ( xMoreRbspData() )
     {
       READ_FLAG( uiCode, "sps_extension_data_flag");
     }
+#endif
   }
 }

branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -554 +554 @@
   }
 
+#if H_MV
+  WRITE_FLAG( 1, "sps_extension_flag" );
+
+  WRITE_FLAG( pcSPS->getInterViewMvVertConstraintFlag() ? 1 : 0, "inter_view_mv_vert_constraint_flag" );
+#else
   WRITE_FLAG( 0, "sps_extension_flag" );
+#endif
 }