Import jm17.2

Alexis Michael Tourapis · cyining · commit 9a15b27bb238 · 2010-07-15T16:38:00.000+08:00
diff --git a/CHANGES.TXT b/CHANGES.TXT
@@ -1,3 +1,8 @@
+Changes in Version JM 17.2 (since JM 17.1)
+------------------------------------------
+- encoder: fix memory leak for picture based RD-decision (YY)
+- rtpdump: fix build in old workspaces (KS)
+
 Changes in Version JM 17.1 (since JM 17.0)
 ------------------------------------------
 - decoder: fix delta_pic_order_cnt[0] in IDR frames (KS, bug #57)
diff --git a/COPYRIGHT_ISO_IEC.txt b/COPYRIGHT_ISO_IEC.txt
@@ -0,0 +1,18 @@
+/**********************************************************************
+ * Software Copyright Licensing Disclaimer
+ *
+ * This software module was originally developed by contributors to the
+ * course of the development of ISO/IEC 14496-10 for reference purposes
+ * and its performance may not have been optimized.  This software
+ * module is an implementation of one or more tools as specified by
+ * ISO/IEC 14496-10.  ISO/IEC gives users free license to this software
+ * module or modifications thereof. Those intending to use this software
+ * module in products are advised that its use may infringe existing
+ * patents.  ISO/IEC have no liability for use of this software module
+ * or modifications thereof.  The original contributors retain full
+ * rights to modify and use the code for their own purposes, and to
+ * assign or donate the code to third-parties.
+ *
+ * This copyright notice must be included in all copies or derivative
+ * works.  Copyright (c) ISO/IEC 2004, 2005, 2006, 2007, 2008.
+ **********************************************************************/
diff --git a/COPYRIGHT_ITU.txt b/COPYRIGHT_ITU.txt
diff --git a/doc/JM Reference Software Manual.doc b/doc/JM Reference Software Manual.doc
diff --git a/ldecod/inc/defines.h b/ldecod/inc/defines.h
@@ -31,7 +31,7 @@
 #endif
 
 #define JM                  "17 (FRExt)"
-#define VERSION             "17.1"
+#define VERSION             "17.2"
 #define EXT_VERSION         "(FRExt)"
 
 #define DUMP_DPB                  0    //!< Dump DPB info for debug purposes
diff --git a/ldecod/src/ldecod.c b/ldecod/src/ldecod.c
@@ -15,7 +15,7 @@
  *     The main contributors are listed in contributors.h
  *
  *  \version
- *     JM 17.1 (FRExt)
+ *     JM 17.2 (FRExt)
  *
  *  \note
  *     tags are used for document system "doxygen"
diff --git a/lencod/inc/defines.h b/lencod/inc/defines.h
@@ -28,7 +28,7 @@
 #endif
 
 #define JM                  "17 (FRExt)"
-#define VERSION             "17.1"
+#define VERSION             "17.2"
 #define EXT_VERSION         "(FRExt)"
 
 #define GET_METIME                1    //!< Enables or disables ME computation time
diff --git a/lencod/src/image_mp.c b/lencod/src/image_mp.c
@@ -196,6 +196,8 @@ void frame_picture_mp_p_slice(VideoParameters *p_Vid, InputParameters *p_Inp)
         {
           p_Vid->write_macroblock = FALSE;
           p_Vid->p_curr_frm_struct->qp = p_Vid->qp;
+          free_slice_list(p_Vid->frame_pic[rd_pass]);
+          free_storable_picture(p_Vid, p_Vid->enc_frame_picture[rd_pass]);
           frame_picture (p_Vid, p_Vid->frame_pic[rd_pass], &p_Vid->imgData, rd_pass);
           selection = picture_coding_decision(p_Vid, p_Vid->frame_pic[0], p_Vid->frame_pic[rd_pass], rd_qp);
 #if (DBG_IMAGE_MP)
diff --git a/lencod/src/lencod.c b/lencod/src/lencod.c
@@ -14,7 +14,7 @@
  *     The main contributors are listed in contributors.h
  *
  *  \version
- *     JM 17.1 (FRExt)
+ *     JM 17.2 (FRExt)
  *
  *  \note
  *     tags are used for document system "doxygen"
diff --git a/lencod_vc8.vcproj b/lencod_vc8.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="lencod"
 	ProjectGUID="{9A39F1B7-3DFE-4263-8C02-8070F7D99AFA}"
 	RootNamespace="lencod"
@@ -1439,10 +1439,6 @@
 			RelativePath="bin\encoder_yuv422.cfg"
 			>
 		</File>
-		<File
-			RelativePath=".\VTune\lencod.vpj"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/rtpdump/rtpdump_vc7.vcproj b/rtpdump/rtpdump_vc7.vcproj
@@ -3,9 +3,9 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="rtpdump"
+	ProjectGUID="{BE2D5D97-BD3F-489B-A346-123834DDDBBD}"
 	SccProjectName=""
-	SccLocalPath=""
-	ProjectGUID="{BE2D5D97-BD3F-489B-A346-123834DDDBBD}">
+	SccLocalPath="">
 	<Platforms>
 		<Platform
 			Name="Win32"/>
@@ -25,7 +25,7 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile=".\Debug_vc7/rtpdump.pch"
 				AssemblerListingLocation=".\Debug_vc7/"
@@ -89,7 +89,7 @@
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="3"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile=".\Release_vc7/rtpdump.pch"
 				AssemblerListingLocation=".\Release_vc7/"
@@ -159,34 +159,10 @@
 						PreprocessorDefinitions=""/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="StdAfx.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						UsePrecompiledHeader="1"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="1"/>
-				</FileConfiguration>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="StdAfx.h">
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/rtpdump/rtpdump_vc8.vcproj b/rtpdump/rtpdump_vc8.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="rtpdump"
 	ProjectGUID="{BE2D5D97-BD3F-489B-A346-123834DDDBBD}"
+	RootNamespace="rtpdump"
 	>
 	<Platforms>
 		<Platform
@@ -46,7 +47,7 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile=".\Debug_vc8/rtpdump.pch"
 				AssemblerListingLocation=".\Debug_vc8/"
@@ -139,7 +140,7 @@
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough="stdafx.h"
 				PrecompiledHeaderFile=".\Release_vc8/rtpdump.pch"
 				AssemblerListingLocation=".\Release_vc8/"
@@ -226,41 +227,11 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="StdAfx.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"
-						UsePrecompiledHeader="1"
-						BrowseInformation="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
-			<File
-				RelativePath="StdAfx.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`* The main contributors are listed in contributors.h`
`16`	`16`	`*`
`17`	`17`	`* \version`
`18`		`- * JM 17.1 (FRExt)`
	`18`	`+ * JM 17.2 (FRExt)`
`19`	`19`	`*`
`20`	`20`	`* \note`
`21`	`21`	`* tags are used for document system "doxygen"`
Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,8 @@ void frame_picture_mp_p_slice(VideoParameters p_Vid, InputParameters p_Inp)`
`196`	`196`	`{`
`197`	`197`	`p_Vid->write_macroblock = FALSE;`
`198`	`198`	`p_Vid->p_curr_frm_struct->qp = p_Vid->qp;`
	`199`	`+ free_slice_list(p_Vid->frame_pic[rd_pass]);`
	`200`	`+ free_storable_picture(p_Vid, p_Vid->enc_frame_picture[rd_pass]);`
`199`	`201`	`frame_picture (p_Vid, p_Vid->frame_pic[rd_pass], &p_Vid->imgData, rd_pass);`
`200`	`202`	`selection = picture_coding_decision(p_Vid, p_Vid->frame_pic[0], p_Vid->frame_pic[rd_pass], rd_qp);`
`201`	`203`	`#if (DBG_IMAGE_MP)`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`* The main contributors are listed in contributors.h`
`15`	`15`	`*`
`16`	`16`	`* \version`
`17`		`- * JM 17.1 (FRExt)`
	`17`	`+ * JM 17.2 (FRExt)`
`18`	`18`	`*`
`19`	`19`	`* \note`
`20`	`20`	`* tags are used for document system "doxygen"`