Changeset 152 in 3DVCSoftware for branches/HTM-4.1-dev2-LG/source/App

Timestamp:

26 Oct 2012, 12:08:59 (12 years ago)

Author:

lg

Message:

1. integration of JCT3V-B0045.
2. cleanup of defined, valued but not used variable "uiPrevTexPartIndex" in function xCompressCU. This cleanup is made to pass the compiling in Linux.

Location:

branches/HTM-4.1-dev2-LG/source/App

Files:

• TAppEncoder/TAppEncCfg.cpp (modified) (3 diffs)
• TAppEncoder/TAppEncCfg.h (modified) (1 diff)
• TAppEncoder/TAppEncTop.cpp (modified) (2 diffs)
• utils/BitrateTargeting/QuickStartGuide.pdf (modified) (previous)
• utils/BitrateTargeting/makefile (modified) (2 diffs)

branches/HTM-4.1-dev2-LG/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -326 +326 @@
   ("LoopFilterBetaOffset_div2", m_loopFilterBetaOffsetDiv2, 0 )
   ("LoopFilterTcOffset_div2", m_loopFilterTcOffsetDiv2, 0 )
+#if LGE_ILLUCOMP_B0045
+  ("IlluCompEnable",                  m_bUseIC                  , true         , "Use illumination compensation for inter-view prediction" )
+#endif
 #if DBL_CONTROL
 #if FIX_DBL_CONTROL_DEFAULT
@@ -1718 +1721 @@
   printf("SAO:%d ", (m_abUseSAO [0] ? 1 : 0));
   printf("RDQ:%d ", (m_abUseRDOQ[0] ? 1 : 0) );
+#if LGE_ILLUCOMP_B0045
+  printf("IlluCompEnable: %d ", m_bUseIC);
+#endif
   printf("\n");
 
@@ -1730 +1736 @@
   printf("WVSO:%d ", m_bUseWVSO );
 #endif
+
 #if OL_DEPTHLIMIT_A0044
   printf("DPL:%d ", m_bDepthPartitionLimiting);

branches/HTM-4.1-dev2-LG/source/App/TAppEncoder/TAppEncCfg.h

@@ -160 +160 @@
 #endif
   vector<Bool> m_abUseSAO;
+#if LGE_ILLUCOMP_B0045
+  Bool      m_bUseIC;                                     ///< flag for using illumination compensation for inter-view prediction
+#endif
 #if SAO_UNIT_INTERLEAVING
   Int       m_maxNumOffsetsPerPic;                            ///< SAO maximun number of offset per picture

branches/HTM-4.1-dev2-LG/source/App/TAppEncoder/TAppEncTop.cpp

@@ -300 +300 @@
     m_acTEncTopList[iViewIdx]->setLFCrossSliceBoundaryFlag( m_bLFCrossSliceBoundaryFlag );
     m_acTEncTopList[iViewIdx]->setUseSAO               ( m_abUseSAO[0]     );
+#if LGE_ILLUCOMP_B0045
+  m_acTEncTopList[iViewIdx]->setUseIC                ( m_bUseIC          );
+#endif
 #if SAO_UNIT_INTERLEAVING
     m_acTEncTopList[iViewIdx]->setMaxNumOffsetsPerPic (m_maxNumOffsetsPerPic);
@@ -579 +582 @@
       m_acTEncDepthTopList[iViewIdx]->setLFCrossSliceBoundaryFlag( m_bLFCrossSliceBoundaryFlag );
       m_acTEncDepthTopList[iViewIdx]->setUseSAO               ( m_abUseSAO[1]     );
+#if LGE_ILLUCOMP_B0045
+    m_acTEncDepthTopList[iViewIdx]->setUseIC                ( false     );
+#endif
 #if SAO_UNIT_INTERLEAVING
       m_acTEncDepthTopList[iViewIdx]->setMaxNumOffsetsPerPic (m_maxNumOffsetsPerPic);

branches/HTM-4.1-dev2-LG/source/App/utils/BitrateTargeting/makefile

@@ -42 +42 @@
 
 $(extractBitratesExecutable): $(extractBitratesObjects)
-        g++ -o $@ $(extractBitratesObjects)
+  g++ -o $@ $(extractBitratesObjects)
 $(guessLambdaModifiersExecutable): $(guessLambdaModifiersObjects)
-        g++ -o $@ $(guessLambdaModifiersObjects)
+  g++ -o $@ $(guessLambdaModifiersObjects)
 
 ExtractBitrates.o: ExtractBitrates.h RuntimeError.h
@@ -52 +52 @@
 
 clean:
-        rm $(extractBitratesExecutable) $(extractBitratesObjects) $(guessLambdaModifiersExecutable) $(guessLambdaModifiersObjects)
+  rm $(extractBitratesExecutable) $(extractBitratesObjects) $(guessLambdaModifiersExecutable) $(guessLambdaModifiersObjects)