Changeset 194 in 3DVCSoftware for branches/HTM-5.0-Qualcomm/source/Lib/TLibRenderer

Timestamp:

26 Nov 2012, 18:35:20 (12 years ago)

Author:

qualcomm

Message:

JCT3V-B0046, MVHEVC codec;
Two bugs fixed for HTM:
1) encoder crash, see the macro 'BUG_FIX_HTM'
2) wrong place for '#endif' in TComPrediction.h

Location:

branches/HTM-5.0-Qualcomm/source/Lib/TLibRenderer

Files:

• TRenModSetupStrParser.cpp (modified) (2 diffs)
• TRenModSetupStrParser.h (modified) (2 diffs)
• TRenModel.cpp (modified) (2 diffs)
• TRenModel.h (modified) (2 diffs)
• TRenSingleModel.cpp (modified) (2 diffs)
• TRenSingleModel.h (modified) (2 diffs)

branches/HTM-5.0-Qualcomm/source/Lib/TLibRenderer/TRenModSetupStrParser.cpp

@@ -36 +36 @@
 #include "TRenFilter.h"
 #include "TRenModSetupStrParser.h"
-
+#if !MVHEVC
 Int
 TRenModSetupStrParser::getNumOfModels()
@@ -450 +450 @@
   rcNextChar = m_pchSetStr[iPos];
 }
+#endif
+

branches/HTM-5.0-Qualcomm/source/Lib/TLibRenderer/TRenModSetupStrParser.h

@@ -31 +31 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-
+#if !MVHEVC
 #ifndef __TRENMODSETUPSTRPARSER__
 #define __TRENMODSETUPSTRPARSER__
@@ -127 +127 @@
 
 #endif //__TRENMODEL__
+#endif
+

branches/HTM-5.0-Qualcomm/source/Lib/TLibRenderer/TRenModel.cpp

@@ -35 +35 @@
 #include "TRenFilter.h"
 #include "TRenModel.h"
-
+#if !MVHEVC
 ///////////  TRENMODEL //////////////////////
 TRenModel::TRenModel()
@@ -697 +697 @@
   }
 }
+#endif
+

branches/HTM-5.0-Qualcomm/source/Lib/TLibRenderer/TRenModel.h

@@ -32 +32 @@
  */
 
-
+#if !MVHEVC
 #ifndef __TRENMODEL__
 #define __TRENMODEL__
@@ -156 +156 @@
 
 #endif //__TRENMODEL__
+#endif
+

branches/HTM-5.0-Qualcomm/source/Lib/TLibRenderer/TRenSingleModel.cpp

@@ -36 +36 @@
 #include "TRenSingleModel.h"
 
+#if !MVHEVC
 ////////////// TRENSINGLE MODEL ///////////////
 template <BlenMod iBM, Bool bBitInc>
@@ -1956 +1957 @@
 }
 #endif
+#endif
+

branches/HTM-5.0-Qualcomm/source/Lib/TLibRenderer/TRenSingleModel.h

@@ -32 +32 @@
  */
 
-
-#ifndef __TRENSINGLEMODEL__
+#if !MVHEVC
+#ifndef __TRENSINGLEMODEL__ 
 #define __TRENSINGLEMODEL__
 
@@ -391 +391 @@
 
 #endif //__TRENSINGLEMODEL__
+#endif
+