shithub: openh264

Download patch

ref: 5aa7cdedb88b756bb729f8b094c86efc971cd701
parent: eceb4e51ada31e04f4b73ca8bff0e09ea7c9b020
author: ruil2 <ruil2@cisco.com>
date: Tue Jun 10 06:39:44 EDT 2014 

clean build warning related encoder


--- a/codec/encoder/core/src/au_set.cpp
+++ b/codec/encoder/core/src/au_set.cpp
@@ -41,14 +41,6 @@
 #include "au_set.h"
 #include "svc_enc_golomb.h"
 namespace WelsSVCEnc {
-static const uint32_t g_kuiMaxDPBx2AtLevel[52] = { // *2 on the basic of Annex A, Table A-1, for int32_t type
-  0,		0,		0,		0,		0,	0,	0,	0,	0,	0, //0~9
-  297,	675,	1782,	1782,	0,	0,	0,	0,	0,	0, //10, 11, 12, 13
-  1782,	3564,	6075,	0,		0,	0,	0,	0,	0,	0, //20, 21, 22
-  6075,	13500,	15360,	0,		0,	0,	0,	0,	0,	0, //30, 31, 32
-  24576,	24576,	26112,	0,		0,	0,	0,	0,	0,	0, //40, 41, 42
-  82800,	138240											//50, 51
-};
 
 
 #define LEVEL_NUMBER 16
--- a/codec/encoder/core/src/deblocking.cpp
+++ b/codec/encoder/core/src/deblocking.cpp
@@ -115,37 +115,6 @@
   }, // table_bn_idx
 };
 
-static const ALIGNED_DECLARE (int32_t, g_kiTableBlock8x8Idx[2][4][4], 16) = {
-  {
-    {0, 0, 2, 2},
-    {0, 0, 2, 2},
-    {1, 1, 3, 3},
-    {1, 1, 3, 3}
-  },
-
-  {
-    {0, 0, 1, 1},
-    {0, 0, 1, 1},
-    {2, 2, 3, 3},
-    {2, 2, 3, 3}
-  }
-};
-static const ALIGNED_DECLARE (int32_t, g_kiTableBlock8x8NIdx[2][4][4], 16) = {
-  {
-    {1, 1, 3, 3},
-    {0, 0, 2, 2},
-    {0, 0, 2, 2},
-    {1, 1, 3, 3}
-  },
-
-  {
-    {2, 2, 3, 3},
-    {0, 0, 1, 1},
-    {0, 0, 1, 1},
-    {2, 2, 3, 3}
-  }
-};
-
 #define TC0_TBL_LOOKUP(iTc, iIdexA, pBS, bchroma) \
 {\
 	iTc[0] = g_kiTc0Table(iIdexA)[pBS[0]] + bchroma;\
--- a/codec/encoder/core/src/set_mb_syn_cavlc.cpp
+++ b/codec/encoder/core/src/set_mb_syn_cavlc.cpp
@@ -50,10 +50,6 @@
   0, 1, 2, 3, 4, 5, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7
 };
 
-const ALIGNED_DECLARE (uint8_t, g_kuiTrailingOneIndex[8], 16) = {
-  3, 0, 1, 0, 2, 0, 1, 0
-};
-
 int32_t CavlcParamCal_c (int16_t* pCoffLevel, uint8_t* pRun, int16_t* pLevel, int32_t* pTotalCoeff ,
                          int32_t iLastIndex) {
   int32_t iTotalZeros = 0;
--- a/codec/encoder/core/src/svc_motion_estimate.cpp
+++ b/codec/encoder/core/src/svc_motion_estimate.cpp
@@ -961,5 +961,6 @@
   }
 }
 
+
 } // namespace WelsSVCEnc
 
--- a/test/api/BaseEncoderTest.cpp
+++ b/test/api/BaseEncoderTest.cpp
@@ -77,7 +77,7 @@
 
   BufferedData buf;
   buf.SetLength(frameSize);
-  ASSERT_TRUE(buf.Length() == frameSize);
+  ASSERT_TRUE(buf.Length() == (size_t)frameSize);
 
   SFrameBSInfo info;
   memset(&info, 0, sizeof(SFrameBSInfo));
--- a/test/api/DataGenerator.cpp
+++ b/test/api/DataGenerator.cpp
@@ -19,7 +19,7 @@
   const int32_t kiFrameSize = SRC_FRAME_WIDTH*SRC_FRAME_HEIGHT;
   BufferedData sBuf;
   sBuf.SetLength(kiFrameSize);
-  if (sBuf.Length() != kiFrameSize) {
+  if (sBuf.Length() != (size_t)kiFrameSize) {
     return false;
   }