changeset 1222:4470f5f36d76

Merged multicoreware/xhevc into default
author Deepthi Devaki Akkoorath <deepthidevaki@multicorewareinc.com>
date Wed, 08 May 2013 14:32:48 +0530
parents cd5e5e2498d8 (current diff) 1aa6126cf203 (diff)
children f928fa3e7405
files
diffstat 4 files changed, 76 insertions(+-), 4 deletions(-) [+]
line wrap: on
line diff
--- a/source/Lib/TLibEncoder/TEncTop.cpp	Wed May 08 10:27:35 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncTop.cpp	Wed May 08 14:32:48 2013 +0530
@@ -494,7 +494,7 @@ Void TEncTop::xInitSPS()
     for (i = 0; i < g_uiMaxCUDepth - g_uiAddCUDepth; i++)
     {
         m_cSPS.setAMPAcc(i, m_useAMP);
-        m_cSPS.setAMPRefineAcc(i, m_useAMP);
+        m_cSPS.setAMPRefineAcc(i, m_useAMPRefine);
         //m_cSPS.setAMPAcc( i, 1 );
     }
 
@@ -505,7 +505,7 @@ Void TEncTop::xInitSPS()
     for (i = g_uiMaxCUDepth - g_uiAddCUDepth; i < g_uiMaxCUDepth; i++)
     {
         m_cSPS.setAMPAcc(i, 0);
-        m_cSPS.setAMPRefineAcc(i, 0);
+        m_cSPS.setAMPRefineAcc(i, 1);
     }
 
     m_cSPS.setBitDepthY(g_bitDepthY);
--- a/source/encoder/CMakeLists.txt	Wed May 08 10:27:35 2013 +0530
+++ b/source/encoder/CMakeLists.txt	Wed May 08 14:32:48 2013 +0530
@@ -27,8 +27,9 @@ add_library(x265 ../../COPYING ../x265.h
     bitcost.cpp bitcost.h mv.h
     motion.cpp motion.h
     TShortYUV.cpp TShortYUV.h
-    InterpolationFilter.cpp InterpolationFilter.h)
-
+    InterpolationFilter.cpp InterpolationFilter.h
+    common.cpp common.h)
+    
 if(ENABLE_PRIMITIVES)
     if(ENABLE_PRIMITIVES_VEC)
         add_subdirectory(vec)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/source/encoder/common.cpp	Wed May 08 14:32:48 2013 +0530
@@ -0,0 +1,39 @@
+/*****************************************************************************
+ * Copyright (C) 2013 x265 project
+ *
+ * Authors: Deepthi Nandakumar <deepthi@multicorewareinc.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
+ *
+ * This program is also available under a commercial proprietary license.
+ * For more information, contact us at licensing@multicorewareinc.com.
+ *****************************************************************************/
+#include "common.h"
+
+int dumpBuffer(void * pbuf, size_t bufsize, const char * filename)
+{
+	char fname[1024]; sprintf(fname, filename);
+	const char * mode = "wb";
+	
+	FILE * fp = fopen(fname, mode); 
+    if(!fp) 
+    { 
+        printf("ERROR: dumpBuffer: fopen('%s','%s') failed\n", fname, mode); return -1; 
+    }
+	fwrite(pbuf, 1, bufsize, fp);
+	fclose(fp);
+	printf("dumpBuffer: dumped %8d bytes into %s\n", bufsize, fname);
+	return 0;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/source/encoder/common.h	Wed May 08 14:32:48 2013 +0530
@@ -0,0 +1,32 @@
+/*****************************************************************************
+ * Copyright (C) 2013 x265 project
+ *
+ * Authors: Deepthi Nandakumar <deepthi@multicorewareinc.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
+ *
+ * This program is also available under a commercial proprietary license.
+ * For more information, contact us at licensing@multicorewareinc.com.
+ *****************************************************************************/
+
+#ifndef __COMMON__
+#define __COMMON__
+
+#include <stdlib.h>
+#include <fstream>
+
+int dumpBuffer(void * pbuf, size_t bufsize, const char * filename);
+
+#endif
\ No newline at end of file