Context navigation

← Previous change
Next change →

Changeset 1262 in SHVCSoftware for branches/SHM-dev

Timestamp:

14 Jul 2015, 03:30:11 (9 years ago)

Author:

seregin

Message:

port rev 4259

Location:

branches/SHM-dev/source/Lib

Files:

: 12 edited

TLibCommon/ContextModel3DBuffer.h (modified) (1 diff)
TLibCommon/NAL.h (modified) (1 diff)
TLibCommon/TComBitStream.h (modified) (1 diff)
TLibCommon/TComDataCU.h (modified) (2 diffs)
TLibCommon/TComMv.h (modified) (1 diff)
TLibCommon/TComPattern.h (modified) (1 diff)
TLibCommon/TComPrediction.cpp (modified) (1 diff)
TLibCommon/TComPrediction.h (modified) (1 diff)
TLibCommon/TComWeightPrediction.cpp (modified) (1 diff)
TLibCommon/TComWeightPrediction.h (modified) (1 diff)
TLibCommon/TComYuv.h (modified) (1 diff)
TLibDecoder/TDecSbac.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/SHM-dev/source/Lib/TLibCommon/ContextModel3DBuffer.h

r1259	r1262
40	40
41	41	#include <stdio.h>
42		~~#include <assert.h>~~
43	42	#include <memory.h>
44	43

branches/SHM-dev/source/Lib/TLibCommon/NAL.h

r1260	r1262
37	37	#define __NAL__
38	38
39		~~#include <vector>~~
40	39	#include <sstream>
41	40	#include "CommonDef.h"

branches/SHM-dev/source/Lib/TLibCommon/TComBitStream.h

r1260	r1262
46	46	#include <vector>
47	47	#include <stdio.h>
48		~~#include <assert.h>~~
49	48	#include "CommonDef.h"
50	49

branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.h

-                      r1259
+                      r1262
 #define __TCOMDATACU__
+#include <assert.h>
+#include <algorithm>
+#include <vector>
 // Include files
 …
 #include "TComRdCost.h"
 #include "TComPattern.h"
-#include <algorithm>
-#include <vector>
 //! \ingroup TLibCommon

branches/SHM-dev/source/Lib/TLibCommon/TComMv.h

r1259	r1262
40	40
41	41	#include "CommonDef.h"
42		~~#include <cstdlib>~~
43	42
44	43	//! \ingroup TLibCommon

branches/SHM-dev/source/Lib/TLibCommon/TComPattern.h

-                      r1259
+                      r1262
 // Include files
-#include <stdio.h>
 #include "CommonDef.h"
-#include <string>
 //! \ingroup TLibCommon

branches/SHM-dev/source/Lib/TLibCommon/TComPrediction.cpp

r1260	r1262
38	38	#include <memory.h>
39	39	#include "TComPrediction.h"
	40	#include "TComPic.h"
40	41	#include "TComTU.h"
41	42

branches/SHM-dev/source/Lib/TLibCommon/TComPrediction.h

-                      r1259
+                      r1262
 // Include files
+#include "TComPic.h"
+#include "TComMotionInfo.h"
+#include "TComPattern.h"
+#include "TComTrQuant.h"
+#include "TComYuv.h"
 #include "TComInterpolationFilter.h"
 #include "TComWeightPrediction.h"
+class TComTU; // forward declaration
+// forward declaration
+class TComMv;
+class TComTU;
 #if SVC_EXTENSION

branches/SHM-dev/source/Lib/TLibCommon/TComWeightPrediction.cpp

-                      r1260
+                      r1262
 // Include files
+#include "TComSlice.h"
+#include "CommonDef.h"
+#include "TComYuv.h"
+#include "TComPic.h"
+#include "TComInterpolationFilter.h"
 #include "TComWeightPrediction.h"
-#include "TComInterpolationFilter.h"

branches/SHM-dev/source/Lib/TLibCommon/TComWeightPrediction.h

-                      r1259
+                      r1262
 #define __TCOMWEIGHTPREDICTION__
+#include "CommonDef.h"
+// Include files
+#include "TComPic.h"
+#include "TComMotionInfo.h"
+#include "TComPattern.h"
+#include "TComTrQuant.h"
+#include "TComInterpolationFilter.h"
+// forward declarations
+class  TComDataCU;
+class  TComYuv;
+struct WPScalingParam;
 // ====================================================================================================================

branches/SHM-dev/source/Lib/TLibCommon/TComYuv.h

r1259	r1262
40	40	#ifndef __TCOMYUV__
41	41	#define __TCOMYUV__
42		~~#include <assert.h>~~
43	42	#include "CommonDef.h"
44	43	#include "TComPicYuv.h"

branches/SHM-dev/source/Lib/TLibDecoder/TDecSbac.cpp

r1260	r1262
38	38	#include "TDecSbac.h"
39	39	#include "TLibCommon/TComTU.h"
	40	#include "TLibCommon/TComTrQuant.h"
40	41
41	42	#if RExt__DECODER_DEBUG_BIT_STATISTICS

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: