Changeset 1079 in 3DVCSoftware for branches/HTM-12.1-dev0

Timestamp:

21 Oct 2014, 23:01:55 (10 years ago)

Author:

tech

Message:

Removed MV-HEVC related macros part 5
.

Location:

branches/HTM-12.1-dev0/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (2 diffs)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)
• Lib/TLibDecoder/TDecGop.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)

branches/HTM-12.1-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -386 +386 @@
   ("DLT",                   m_useDLT,           true,  "Depth lookup table")
 #endif
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D
   ("SingleDepthMode",    m_useSingleDepthMode, true, "Single depth mode")                         
 #endif
@@ -2617 +2617 @@
   printf("DLT:%d ", m_useDLT );
 #endif
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D
   printf("SingleDepthMode:%d ",    m_useSingleDepthMode);
 #endif

branches/HTM-12.1-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2763 +2763 @@
     }
     assert( ( m_pcBitstream->getNumBitsRead() - posFollSliceSegHeaderExtLen ) == rpcSlice->getSliceSegmentHeaderExtensionLength() * 8  ); 
+  }
 #else
     READ_UVLC( uiCode, "slice_header_extension_length" );
@@ -2770 +2771 @@
       READ_CODE(8,ignore,"slice_header_extension_data_byte");
     }  
-  }
-  else
-  {
-    rpcSlice->setSliceSegmentHeaderExtensionLength( 0 );
-    rpcSlice->setPocMsbValPresentFlag( false );
   }
 #endif

branches/HTM-12.1-dev0/source/Lib/TLibDecoder/TDecGop.cpp

@@ -248 +248 @@
     calcAndPrintHashStatus(*rpcPic->getPicYuvRec(), hash);
   }
+#if !H_MV
+#if SETTING_PIC_OUTPUT_MARK
+  rpcPic->setOutputMark(rpcPic->getSlice(0)->getPicOutputFlag() ? true : false);
+#else
+  rpcPic->setOutputMark(true);
+#endif
+  rpcPic->setReconMark(true);
+#endif
 }
 

branches/HTM-12.1-dev0/source/Lib/TLibDecoder/TDecTop.cpp

@@ -1173 +1173 @@
 #endif    
 #endif
-    // For generalized B
 #if H_MV
     if( m_layerId > 0 && !pcSlice->isIntra() && pcSlice->getEnableTMVPFlag() )

branches/HTM-12.1-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -2300 +2300 @@
   WRITE_FLAG(ptl->getFrameOnlyConstraintFlag(), "general_frame_only_constraint_flag");
   
+#if H_MV
   if( ptl->getV2ConstraintsPresentFlag() ) 
   {
@@ -2329 +2330 @@
     WRITE_FLAG(0, "reserved_zero_bit");
   }
+#else
+  WRITE_CODE(0 , 16, "XXX_reserved_zero_44bits[0..15]");
+  WRITE_CODE(0 , 16, "XXX_reserved_zero_44bits[16..31]");
+  WRITE_CODE(0 , 12, "XXX_reserved_zero_44bits[32..43]");
+#endif
 }