diff --git a/build/mktargets.sh b/build/mktargets.sh index 9d4fc7ad..547daaff 100755 --- a/build/mktargets.sh +++ b/build/mktargets.sh @@ -2,7 +2,7 @@ (cd codec/decoder && python ../../build/mktargets.py --directory codec/decoder --library decoder --exclude StdAfx.cpp) (cd codec/encoder && python ../../build/mktargets.py --directory codec/encoder --library encoder --exclude DllEntry.cpp) (cd codec/common && python ../../build/mktargets.py --directory codec/common --library common) -(cd codec/processing && python ../../build/mktargets.py --directory codec/processing --library processing --exclude wels_process.cpp --exclude WelsVideoProcessor.cpp) +(cd codec/processing && python ../../build/mktargets.py --directory codec/processing --library processing) (cd codec/console/dec && python ../../../build/mktargets.py --directory codec/console/dec --binary h264dec) (cd codec/console/enc && python ../../../build/mktargets.py --directory codec/console/enc --binary h264enc) diff --git a/codec/processing/src/common/WelsVP.aps b/codec/processing/src/common/WelsVP.aps deleted file mode 100644 index e0dbbbe1..00000000 Binary files a/codec/processing/src/common/WelsVP.aps and /dev/null differ diff --git a/codec/processing/src/common/typedef.h b/codec/processing/src/common/typedef.h index aed38865..e0296625 100644 --- a/codec/processing/src/common/typedef.h +++ b/codec/processing/src/common/typedef.h @@ -58,7 +58,7 @@ WELSVP_NAMESPACE_BEGIN -#if ( defined(_WIN32) || defined(_WIN32) ) && defined(_MSC_VER) +#if defined(_MSC_VER) typedef char int8_t ; typedef unsigned char uint8_t ; diff --git a/codec/processing/src/common/util.cpp b/codec/processing/src/common/util.cpp deleted file mode 100644 index 6e65bcaa..00000000 --- a/codec/processing/src/common/util.cpp +++ /dev/null @@ -1,45 +0,0 @@ -/*! - * \copy - * Copyright (c) 2013, Cisco Systems - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ - -#include "util.h" - -WELSVP_NAMESPACE_BEGIN -///////////////////////////////////////////////////////////////////////////////// - - -int32_t WelsStrCmp (const str_t* kpStr1, const str_t* kpStr2) { - return ::strcmp (kpStr1, kpStr2); -} - - -///////////////////////////////////////////////////////////////////////////////// -WELSVP_NAMESPACE_END diff --git a/codec/processing/src/common/util.h b/codec/processing/src/common/util.h index 660477e8..2831d307 100644 --- a/codec/processing/src/common/util.h +++ b/codec/processing/src/common/util.h @@ -94,12 +94,6 @@ inline_t EMethods WelsVpGetValidMethod (int32_t a) { #define _SafeDelete(p) if (p) { delete (p); (p) = NULL; } -////////////////////////////////////////////////////////////////////////////////////// - -int32_t WelsStrCmp (const str_t* kpStr1, const str_t* kpStr2); - - -////////////////////////////////////////////////////////////////////////////////////// WELSVP_NAMESPACE_END #endif diff --git a/codec/processing/targets.mk b/codec/processing/targets.mk index 7789b923..2deaff63 100644 --- a/codec/processing/targets.mk +++ b/codec/processing/targets.mk @@ -5,7 +5,6 @@ PROCESSING_CPP_SRCS=\ $(PROCESSING_SRCDIR)/./src/backgounddetection/BackgroundDetection.cpp\ $(PROCESSING_SRCDIR)/./src/common/memory.cpp\ $(PROCESSING_SRCDIR)/./src/common/thread.cpp\ - $(PROCESSING_SRCDIR)/./src/common/util.cpp\ $(PROCESSING_SRCDIR)/./src/common/WelsFrameWork.cpp\ $(PROCESSING_SRCDIR)/./src/common/WelsFrameWorkEx.cpp\ $(PROCESSING_SRCDIR)/./src/complexityanalysis/ComplexityAnalysis.cpp\